Merge lp:~alex-idereal/bzr-eclipse/ignore-SSL-errors into lp:bzr-eclipse

[Alexander Taler]

(Reminding myself what the proposal does.)

[Alexander Taler (alex-idereal)]

Reviewed by Piotr over email

review: Approve

[Alexander Taler (alex-idereal)]

Have promoted to trunk

=== modified file 'org.vcs.bazaar.eclipse.core.tests/.classpath'
--- org.vcs.bazaar.eclipse.core.tests/.classpath	2014-01-16 12:36:20 +0000
+++ org.vcs.bazaar.eclipse.core.tests/.classpath	2014-06-11 09:53:26 +0000
@@ -5,5 +5,6 @@
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="lib" path="bzr-java-lib-1.3.4-tests.jar"/>
+	<classpathentry kind="lib" path="bzr-java-lib-1.3.4.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

=== modified file 'org.vcs.bazaar.eclipse.core.tests/src/org/vcs/bazaar/eclipse/core/commands/CommitCommandTest.java'
--- org.vcs.bazaar.eclipse.core.tests/src/org/vcs/bazaar/eclipse/core/commands/CommitCommandTest.java	2013-10-31 17:23:10 +0000
+++ org.vcs.bazaar.eclipse.core.tests/src/org/vcs/bazaar/eclipse/core/commands/CommitCommandTest.java	2014-06-11 09:53:26 +0000
@@ -59,7 +59,7 @@
 		BazaarTreeStatus treeStatus = getClient().status(new File[] { getProject().getLocation().toFile() });
 		getWt().check(treeStatus.getStatusAsArray(), getProject().getLocation().toFile().getCanonicalPath());
 
-		CommitCommand cmd = new CommitCommand(resources, "test commit", new ArrayList<Option>(0));
+		CommitCommand cmd = new CommitCommand(resources, "test commit");
 		IResource[] commitedResources = cmd.execute(new NullProgressMonitor());
 		assertNotNull(commitedResources);
 		assertEquals(1, commitedResources.length);
@@ -79,7 +79,7 @@
 		final String textToAdd = "this is text added to " + aFile.getName();
 		addContentToFile(aFile, textToAdd);
 
-		CommitCommand cmd = new CommitCommand(resources, "Příšrně žlutý kůň úpěl ďábelské ódy (czech language)", new ArrayList<Option>(0));
+		CommitCommand cmd = new CommitCommand(resources, "Příšrně žlutý kůň úpěl ďábelské ódy (czech language)");
 		IResource[] commitedResources = cmd.execute(new NullProgressMonitor());
 		assertNotNull(commitedResources);
 		assertEquals(1, commitedResources.length);

=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/IBazaarCoreConstants.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/IBazaarCoreConstants.java	2014-01-14 22:00:23 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/IBazaarCoreConstants.java	2014-06-11 09:53:26 +0000
@@ -20,5 +20,6 @@
 	public static final String AUTO_SHARE_PROJECTS = "auto_share_projects"; //$NON-NLS-1$
 	public static final String OVERWRITE_EMAIL = "pref_overwrite_email"; //$NON-NLS-1$
 	public static final String DISABLE_LOGS = "disable_logs"; //$NON-NLS-1$
+	public static final String IGNORE_SSL_ERRORS = "ignore_ssl_errors"; //$NON-NLS-1$
 
 }

=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/AddCommand.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/AddCommand.java	2013-10-28 14:20:05 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/AddCommand.java	2014-06-11 09:53:26 +0000
@@ -35,7 +35,7 @@
 	@Override
     public IResource[] execute(IProgressMonitor monitor) throws BazaarException {
 		try {
-			root.getClient().add(getFiles(resources));
+			root.getClient().add(getFiles(resources), getOptions());
 			return BzrWorkspaceRoot.findProjectsInBranch(root.getBranch());
 		} catch (BazaarClientException e) {
 			throw BazaarException.wrapException(e);

=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/AnnotateCommand.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/AnnotateCommand.java	2013-10-28 14:20:05 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/AnnotateCommand.java	2014-06-11 09:53:26 +0000
@@ -41,7 +41,7 @@
 			monitor.beginTask(CoreTexts.AnnotateCommand_annotate, 1000);
 			monitor.setTaskName(CoreTexts.AnnotateCommand_annotate);
 			IBazaarClient client = getClient(resource.getIResource().getProject());
-			annotation = client.annotate(resource.getIResource().getLocation().toFile());
+			annotation = client.annotate(resource.getIResource().getLocation().toFile(), getOptions());
 			monitor.worked(1000);
 		} catch (BazaarClientException e) {
 			throw BazaarException.wrapException(e, resource.getIResource());

=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/BazaarCommand.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/BazaarCommand.java	2013-10-28 14:20:05 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/BazaarCommand.java	2014-06-11 09:53:26 +0000
@@ -1,5 +1,6 @@
 /*******************************************************************************
  * Copyright (c) 2007-2013 Guillermo Gonzalez
+ * Copyright (C) 2014 Alexander Taler
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -11,6 +12,7 @@
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
@@ -19,9 +21,12 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.vcs.bazaar.client.IBazaarClient;
+import org.vcs.bazaar.client.commandline.commands.options.Option;
 import org.vcs.bazaar.eclipse.BzrWorkspaceRoot;
+import org.vcs.bazaar.eclipse.IBazaarCoreConstants;
 import org.vcs.bazaar.eclipse.core.model.IBzrBranch;
 import org.vcs.bazaar.eclipse.core.model.local.IBzrLocalResource;
+import org.vcs.bazaar.eclipse.core.utils.PreferenceHelper;
 import org.vcs.bazaar.eclipse.internal.core.BazaarException;
 
 /**
@@ -111,7 +116,39 @@
 		}
 		return list;
 	}
-	
+
+	private Option[] options = null;
+
+	/**
+	 * The command-line options included in this command.
+	 */
+	public Option[] getOptions() {
+		if (options == null) {
+			// Create options, adding common ones.
+			if (PreferenceHelper.getBoolean(IBazaarCoreConstants.IGNORE_SSL_ERRORS)) {
+				options = new Option[1];
+				options[0] = new Option("-Ossl.cert_reqs=none");
+			} else {
+				options = new Option[0];
+			}			
+		}
+		return options;
+	}
+
+	/**
+	 * Add more command-line options to this command.
+	 */
+	public void addOptions(Option...moreO) {
+		// Ensure this.options is initialised
+		getOptions();
+
+		Option[] newO = Arrays.copyOf(options, options.length + moreO.length);
+		for (int i = 0; i < moreO.length; i++) {
+			newO[options.length + i] = moreO[i];
+		}
+		options = newO;
+	}
+
 	public abstract void run(IProgressMonitor monitor) throws BazaarException;
 
 }

=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/BindCommand.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/BindCommand.java	2013-10-28 14:20:05 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/BindCommand.java	2014-06-11 09:53:26 +0000
@@ -39,7 +39,7 @@
 			monitor.beginTask(CoreTexts.BindCommand_taskName, 1000);
 			IBazaarClient client = getClient(branch);
 			monitor.worked(500);
-			client.bind(location);
+			client.bind(location, getOptions());
 			return BzrWorkspaceRoot.findProjectsInBranch(branch);
 		} catch (BazaarClientException e) {
 			throw BazaarException.wrapException(e);

=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/BranchCommand.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/BranchCommand.java	2013-10-28 14:20:05 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/BranchCommand.java	2014-06-11 09:53:26 +0000
@@ -14,6 +14,7 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.vcs.bazaar.client.BazaarRevision;
 import org.vcs.bazaar.client.IBazaarClient;
+import org.vcs.bazaar.client.commandline.commands.options.Option;
 import org.vcs.bazaar.client.core.BazaarClientException;
 import org.vcs.bazaar.client.core.BazaarClientException.BazaarUncheckedException;
 import org.vcs.bazaar.client.core.BranchLocation;
@@ -25,15 +26,16 @@
 /**
  * @author Guillermo Gonzalez TODO: add revision support and write a testcase
  */
-public class BranchCommand implements IBazaarCommand {
+public class BranchCommand extends BazaarCommand {
 
 	private final IBzrBranch remoteLocation;
 	private BazaarRevision revision;
 	private final File toLocation;
 
-	public BranchCommand(final IBzrBranch sourceLocation, final File toLocation, String revision) {
+	public BranchCommand(final IBzrBranch sourceLocation, final File toLocation, String revision, Option...options) {
 		this.remoteLocation = sourceLocation;
 		this.toLocation = toLocation;
+		addOptions(options);
 		if (revision != null && revision.trim().length() != 0) {
 			try {
 				this.setRevision(BazaarRevision.getRevision(BazaarRevision.Prefix.REVNO, revision));
@@ -72,7 +74,7 @@
 	 */
 	protected void runOnClient(IBazaarClient client, CommandProgressListener cpl) 
 		throws BazaarClientException {
-		client.branch(getRemoteLocation(), getToLocation(), getRevision(), cpl);
+		client.branch(getRemoteLocation(), getToLocation(), getRevision(), cpl, getOptions());
 	}
 
 	/**

=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/CatCommand.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/CatCommand.java	2013-10-28 14:20:05 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/CatCommand.java	2014-06-11 09:53:26 +0000
@@ -60,9 +60,9 @@
 			monitor.beginTask(CoreTexts.CatCommand_taskName, 1000);
 			IBazaarClient client = getClient(branch, true);
 			if (file != null) {
-				content = client.cat(file, revision, charsetName);
+				content = client.cat(file, revision, charsetName, getOptions());
 			} else {
-				content = client.cat(location, revision, charsetName);
+				content = client.cat(location, revision, charsetName, getOptions());
 			}
 		} catch (BazaarClientException e) {
 			if (e.getMessage() != null && e.getMessage().contains("is not present in revision")) {

=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/CheckoutCommand.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/CheckoutCommand.java	2013-10-31 17:23:10 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/CheckoutCommand.java	2014-06-11 09:53:26 +0000
@@ -22,11 +22,8 @@
  */
 public class CheckoutCommand extends BranchCommand {
 
-	private final Option[] options;
-
 	public CheckoutCommand(final IBzrBranch sourceLocation, final File toLocation, Option...options) {
-		super(sourceLocation, toLocation, null);
-		this.options = options;
+		super(sourceLocation, toLocation, null, options);
 	}
 
 	/**
@@ -35,7 +32,7 @@
 	@Override
 	protected void runOnClient(IBazaarClient client, CommandProgressListener cpl) 
 		throws BazaarClientException {
-		client.checkout(getRemoteLocation(), getToLocation(), cpl, options);
+		client.checkout(getRemoteLocation(), getToLocation(), cpl, getOptions());
 	}
 
 }

=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/CommitCommand.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/CommitCommand.java	2013-10-28 14:20:05 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/CommitCommand.java	2014-06-11 09:53:26 +0000
@@ -35,7 +35,6 @@
 
 	private String commitMessage;
 	private List<IBzrLocalResource> resources;
-	final private List<Option> options;
 	private boolean fullCommit;
 	private boolean fullRefresh;
 
@@ -46,10 +45,10 @@
 	 * @param commitMessage
 	 * @param localCommit
 	 */
-    public CommitCommand(List<IBzrLocalResource> filesToCommit, String commitMessage, List<Option> options) {
+    public CommitCommand(List<IBzrLocalResource> filesToCommit, String commitMessage, Option... options) {
 		this.resources = filesToCommit;
 		this.commitMessage = commitMessage;
-		this.options = options;
+		addOptions(options);
 	}
 
     /**
@@ -59,8 +58,8 @@
      * @param options
      * @param fullCommit if tru, the filesToCommit 'll be ignored and a full commit 'll be executed (commit with 0 arguments)
      */
-    public CommitCommand(List<IBzrLocalResource> filesToCommit, String commitMessage, List<Option> options, 
-    		boolean fullCommit, boolean fullRefresh) {
+    public CommitCommand(List<IBzrLocalResource> filesToCommit, String commitMessage, 
+    		boolean fullCommit, boolean fullRefresh, Option... options) {
 		this(filesToCommit, commitMessage, options);
 		this.fullCommit = fullCommit;
 		this.fullRefresh = fullRefresh;
@@ -81,9 +80,9 @@
 			for (IBzrBranch branch : map.keySet()) {
 				IBazaarClient client = BzrWorkspaceRoot.getClient(branch);
                 if(fullCommit) {
-                	client.commit(new File[]{branch.getFile()}, commitMessage, options.toArray(new Option[options.size()]));
+                	client.commit(new File[]{branch.getFile()}, commitMessage, getOptions());
                 } else {
-                	client.commit(map.get(branch).toArray(new File[0]), commitMessage, options.toArray(new Option[options.size()]));
+                	client.commit(map.get(branch).toArray(new File[0]), commitMessage, getOptions());
                 }
 			}
 			if (fullCommit || fullRefresh) {

=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/ConflictsCommand.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/ConflictsCommand.java	2013-04-14 21:56:10 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/ConflictsCommand.java	2014-06-11 09:53:26 +0000
@@ -33,7 +33,7 @@
 		try {
 			monitor.beginTask("Getting conflicts", 1000);
 			IBazaarClient client = getClient(branch, true);
-			conflicts = client.conflicts();
+			conflicts = client.conflicts(getOptions());
 			monitor.worked(1000);
 		} catch (BazaarClientException e) {
 			throw BazaarException.wrapException(e);

=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/CreatePatchCommand.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/CreatePatchCommand.java	2013-04-15 10:16:38 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/CreatePatchCommand.java	2014-06-11 09:53:26 +0000
@@ -41,7 +41,7 @@
 		try {
 			List<File> files = getFiles(resources);
 			IBazaarClient client = getClient(resources.get(0).getIResource().getProject());
-			patchContent = client.diff(files.toArray(new File[0]), revision);
+			patchContent = client.diff(files.toArray(new File[0]), revision, getOptions());
 			monitor.worked(100);
 		} catch (BazaarClientException e) {
 			throw BazaarException.wrapException(e);

=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/InfoCommand.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/InfoCommand.java	2013-10-28 14:20:05 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/InfoCommand.java	2014-06-11 09:53:26 +0000
@@ -44,9 +44,8 @@
 			IBazaarClient client = getClient(branch, true);
 			// to improve performance when only the default info is required
 			if(verbose)
-				info = client.info(branch.getFile(), IInfoOptions.VERBOSE);
-			else
-				info = client.info(branch.getFile());
+				addOptions(IInfoOptions.VERBOSE);
+			info = client.info(branch.getFile(), getOptions());
 		} catch (BazaarClientException e) {
 			throw BazaarException.wrapException(e);
 		} finally {

=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/InitCommand.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/InitCommand.java	2013-10-28 14:20:05 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/InitCommand.java	2014-06-11 09:53:26 +0000
@@ -25,7 +25,7 @@
  * @author Guillermo Gonzalez
  *
  */
-public class InitCommand implements IBazaarCommand {
+public class InitCommand extends BazaarCommand {
 
 	private final IProject project;
 	private final IPath branchPath;
@@ -45,7 +45,7 @@
 			IBazaarClient client = EclipseBazaarCore.getDefault().createClient();
 			client.setWorkDir(branchPath.toFile().getParentFile());
 			if (project != null && !new File(branchPath.toFile(), IBzrBranch.DIR_META_FOLDER).exists())
-				client.init(branchPath.toFile());
+				client.init(branchPath.toFile(), getOptions());
 		} catch (BazaarClientException e) {
 			EclipseBazaarCore.log(e.getMessage(), IStatus.ERROR);
 			throw BazaarException.wrapException(e, project);

=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/LogCommand.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/LogCommand.java	2013-11-05 13:35:33 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/LogCommand.java	2014-06-11 09:53:26 +0000
@@ -9,7 +9,6 @@
  *******************************************************************************/
 package org.vcs.bazaar.eclipse.core.commands;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -17,7 +16,6 @@
 import org.vcs.bazaar.client.IBazaarClient;
 import org.vcs.bazaar.client.IBazaarLogMessage;
 import org.vcs.bazaar.client.IBazaarRevisionSpec;
-import org.vcs.bazaar.client.commandline.commands.options.Option;
 import org.vcs.bazaar.client.commandline.syntax.ILogOptions;
 import org.vcs.bazaar.client.core.BazaarClientException;
 import org.vcs.bazaar.eclipse.CoreTexts;
@@ -78,23 +76,23 @@
 			monitor.beginTask(CoreTexts.LogCommand_log, 1000);
 			monitor.setTaskName(CoreTexts.LogCommand_log);
 			IBazaarClient client = getClient(resource.getBranch(), false);
-			List<Option> options = new ArrayList<Option>();
+
 			if (limit != null) {
-				options.add(ILogOptions.LIMIT.setArgument(limit.toString()));
+				addOptions(ILogOptions.LIMIT.setArgument(limit.toString()));
 			} 
 			if (revision != null) {
-				options.add(ILogOptions.REVISION.setArgument(revision.toString()));
+				addOptions(ILogOptions.REVISION.setArgument(revision.toString()));
 			}
 			if (verbose) {
-				options.add(ILogOptions.VERBOSE);
+				addOptions(ILogOptions.VERBOSE);
 			}
 			if(resource instanceof IBzrBranch) {
-				logMessages = client.log(((IBzrBranch)resource).getBranchLocation(), options.toArray(new Option[0]));
+				logMessages = client.log(((IBzrBranch)resource).getBranchLocation(), getOptions());
 			} else if (resource instanceof IBzrLocalResource) {
 				IBzrLocalResource localResource = ((IBzrLocalResource)resource);
-				logMessages = client.log(localResource.getFile(), options.toArray(new Option[0]));
+				logMessages = client.log(localResource.getFile(), getOptions());
 			} else {
-				logMessages = client.log(resource.getLocation(), options.toArray(new Option[0]));
+				logMessages = client.log(resource.getLocation(), getOptions());
 			}
 		} catch (BazaarClientException e) {
 			throw BazaarException.wrapException(e);

=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/LsCommand.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/LsCommand.java	2013-10-28 14:20:05 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/LsCommand.java	2014-06-11 09:53:26 +0000
@@ -38,9 +38,9 @@
 			monitor.beginTask("executing ls", 1000);
 			IBazaarClient client = getClient(resource.getProject(), true);
 			if(ignored)
-				paths = client.ls(resource.getLocation().toFile(), null, ILsOptions.IGNORED, ILsOptions.VERSIONED);
-			else
-				paths = client.ls(resource.getLocation().toFile(), null, ILsOptions.VERSIONED);
+				addOptions(ILsOptions.IGNORED);
+			addOptions(ILsOptions.VERSIONED);
+			paths = client.ls(resource.getLocation().toFile(), null, getOptions());
 		} catch (BazaarClientException e) {
 			throw BazaarException.wrapException(e, resource);
 		} finally {

=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/MergeCommand.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/MergeCommand.java	2013-10-28 14:20:05 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/MergeCommand.java	2014-06-11 09:53:26 +0000
@@ -30,13 +30,12 @@
 
 	private final IBzrBranch branch;
 	private final BranchLocation location;
-	private Option[] options;
 	
 	public MergeCommand(IBzrBranch branch, BranchLocation location, Option...options) {
 		super();
 		this.branch = branch;
 		this.location = location;
-		this.options = options;
+		addOptions(options);
 	}
 
 	@Override
@@ -46,7 +45,7 @@
 			monitor.setTaskName(CoreTexts.MergeCommand_taskName);
 			IBazaarClient client = getClient(branch);
 			monitor.worked(10);
-            client.merge(location, options);
+			client.merge(location, getOptions());
 		} catch (BazaarClientException e) {
 			if (!setPostCommandErrorOnConflicts(e.getMessage())) {
 				throw BazaarException.wrapException(e);
@@ -59,7 +58,7 @@
 
 	@Override
 	protected int getChangeType() {
-		for (Option option : options) {
+		for (Option option : getOptions()) {
 			if(option.equals(IMergeOptions.PULL)) {
 				return BzrChangeStateEvent.BRANCH_STATE_MODIFY;
 			}

=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/PullCommand.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/PullCommand.java	2013-10-28 14:20:05 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/PullCommand.java	2014-06-11 09:53:26 +0000
@@ -9,13 +9,9 @@
  *******************************************************************************/
 package org.vcs.bazaar.eclipse.core.commands;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.vcs.bazaar.client.IBazaarClient;
-import org.vcs.bazaar.client.commandline.commands.options.Option;
 import org.vcs.bazaar.client.commandline.syntax.IPullOptions;
 import org.vcs.bazaar.client.core.BazaarClientException;
 import org.vcs.bazaar.client.core.BranchLocation;
@@ -45,14 +41,13 @@
 		try {
 			monitor.beginTask(CoreTexts.PullCommand_taskName, 100);
 			IBazaarClient client = getClient(branch);
-			List<Option> options = new ArrayList<Option>(0);
 			if (remember) {
-				options.add(IPullOptions.REMEMBER);
+				addOptions(IPullOptions.REMEMBER);
 			}
 			if (overwrite) {
-				options.add(IPullOptions.OVERWRITE);
+				addOptions(IPullOptions.OVERWRITE);
 			}
-			String err = client.pull(location, new CommandProgressListener(monitor), options.toArray(new Option[options.size()]));
+			String err = client.pull(location, new CommandProgressListener(monitor), getOptions());
 			setPostCommandErrorOnConflicts(err);
 			return BzrWorkspaceRoot.findProjectsInBranch(branch);
 		} catch (BazaarClientException e) {

=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/PushCommand.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/PushCommand.java	2013-10-28 14:20:05 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/PushCommand.java	2014-06-11 09:53:26 +0000
@@ -9,12 +9,8 @@
  *******************************************************************************/
 package org.vcs.bazaar.eclipse.core.commands;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.vcs.bazaar.client.IBazaarClient;
-import org.vcs.bazaar.client.commandline.commands.options.Option;
 import org.vcs.bazaar.client.commandline.syntax.IPushOptions;
 import org.vcs.bazaar.client.core.BazaarClientException;
 import org.vcs.bazaar.client.core.BranchLocation;
@@ -42,17 +38,16 @@
     public void run(IProgressMonitor monitor) throws BazaarException {
 		try {
 			IBazaarClient client = getClient(branch);
-			List<Option> options = new ArrayList<Option>(0);
 			if(remember) {
-				options.add(IPushOptions.REMEMBER);
+				addOptions(IPushOptions.REMEMBER);
 			} 
 			if(useExsitingDir) {
-				options.add(IPushOptions.USE_EXISTING_DIR);
+				addOptions(IPushOptions.USE_EXISTING_DIR);
 			}
 			if (overwrite) {
-				options.add(IPushOptions.OVERWRITE);
+				addOptions(IPushOptions.OVERWRITE);
 			}
-			client.push(location, options.toArray(new Option[options.size()]));
+			client.push(location, getOptions());
 		} catch (BazaarClientException e) {
 			throw BazaarException.wrapException(e);
 		} finally {

=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/RebaseAbortCommand.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/RebaseAbortCommand.java	2013-06-08 06:24:53 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/RebaseAbortCommand.java	2014-06-11 09:53:26 +0000
@@ -22,7 +22,7 @@
 
 	@Override
 	protected void executeInternally(IBazaarClient client) throws BazaarClientException {
-		client.rebaseAbort();
+		client.rebaseAbort(getOptions());
 	}
 
 }

=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/RebaseCommand.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/RebaseCommand.java	2013-09-18 09:51:10 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/RebaseCommand.java	2014-06-11 09:53:26 +0000
@@ -29,7 +29,6 @@
 
 	private final IBzrBranch branch;
 	private final BranchLocation location;
-	private final Option[] options;
 	private BazaarException rebaseConflictsException;
 	private static final Pattern CONFLICT_PATTERN = Pattern.compile("conflict occurred");
 	
@@ -40,7 +39,7 @@
 	public RebaseCommand(IBzrBranch branch, BranchLocation location, Option...options) {
 		this.branch = branch;
 		this.location = location;
-		this.options = options;
+		addOptions(options);
 	}
 
 	@Override
@@ -63,7 +62,7 @@
 	}
 
 	protected void executeInternally(IBazaarClient client) throws BazaarClientException {
-		client.rebase(location, options);
+		client.rebase(location, getOptions());
 	}
 
 	@Override

=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/RebaseContinueCommand.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/RebaseContinueCommand.java	2013-06-08 06:24:53 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/RebaseContinueCommand.java	2014-06-11 09:53:26 +0000
@@ -22,6 +22,6 @@
 
 	@Override
 	protected void executeInternally(IBazaarClient client) throws BazaarClientException {
-		client.rebaseContinue();
+		client.rebaseContinue(getOptions());
 	}
 }

=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/RebaseToDoCommand.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/RebaseToDoCommand.java	2013-05-17 18:36:24 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/RebaseToDoCommand.java	2014-06-11 09:53:26 +0000
@@ -29,7 +29,7 @@
 	public void run(IProgressMonitor monitor) throws BazaarException {
 		IBazaarClient client = getClient(branch, true);
         try {
-			rebaseInterrupted = client.rebaseToDo();
+			rebaseInterrupted = client.rebaseToDo(getOptions());
 		} catch (BazaarClientException e) {
 			throw BazaarException.wrapException(e);
 		}

=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/ReconfigureCommand.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/ReconfigureCommand.java	2014-04-09 18:54:55 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/ReconfigureCommand.java	2014-06-11 09:53:26 +0000
@@ -71,7 +71,7 @@
 			BranchLocation remoteLocation = getBranchLocation();
 			if (remoteLocation != null) {
 				// 1. run regular checkout
-				client.checkout(remoteLocation, tempFolder, new CommandProgressListener(monitor));
+				client.checkout(remoteLocation, tempFolder, new CommandProgressListener(monitor), getOptions());
 				// 2. copy repository folder
 				moveFolder(tempFolder, IBzrBranch.REPOSITORY_FOLDER);
 				// 3. copy branch folder

=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/RemoveCommand.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/RemoveCommand.java	2013-10-28 14:20:05 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/RemoveCommand.java	2014-06-11 09:53:26 +0000
@@ -43,7 +43,8 @@
 			monitor.setTaskName(CoreTexts.RemoveCommand_removing);
 			for (IBzrBranch branch : map.keySet()) {
 				IBazaarClient client = getClient(branch);
-				client.remove(map.get(branch).toArray(new File[0]), IRemoveOptions.KEEP);
+				addOptions(IRemoveOptions.KEEP);
+				client.remove(map.get(branch).toArray(new File[0]), getOptions());
 			}
 			return getIResources(resources);
 		} catch (BazaarClientException e) {

=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/ResolveCommand.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/ResolveCommand.java	2013-10-28 14:20:05 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/ResolveCommand.java	2014-06-11 09:53:26 +0000
@@ -32,7 +32,6 @@
 public class ResolveCommand extends ResourceChangeCommand {
 
 	private final IBzrLocalResource[] resources;
-	private final Option[] options;
 
 	/**
 	 * This constructor should to be used only on non-project resources (only files and folders)
@@ -48,7 +47,7 @@
 	 */
 	public ResolveCommand(IBzrLocalResource[] bzrResources,  Option...options) {
 		this.resources = bzrResources;
-		this.options = options;
+		addOptions(options);
 	}
 
 	public ResolveCommand(Collection<IResource> resources, Option...options) {
@@ -81,7 +80,7 @@
 		monitor.beginTask("Resolving", map.keySet().size());
 		for (IBzrBranch branch : map.keySet()) {
 			IBazaarClient client = getClient(branch);
-			client.resolve(map.get(branch), options);
+			client.resolve(map.get(branch), getOptions());
 			monitor.worked(1);
 		}
 		List<IResource> changed = new ArrayList<IResource>(resources.length);

=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/RevertCommand.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/RevertCommand.java	2013-10-28 14:20:05 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/RevertCommand.java	2014-06-11 09:53:26 +0000
@@ -32,7 +32,6 @@
  */
 public class RevertCommand extends ResourceChangeCommand {
 	private List<IBzrLocalResource> resources;
-	private Option[] options;
 	private boolean revertBranch;
 
 	/**
@@ -44,7 +43,7 @@
 	public RevertCommand(List<IBzrLocalResource> resourcesToRevert, boolean revertBranch, Option[] options) {
 		super();
 		this.resources = resourcesToRevert;
-		this.options = options;
+		addOptions(options);
 		this.revertBranch = revertBranch;
 	}
 
@@ -63,9 +62,9 @@
 			for (IBzrBranch branch : map.keySet()) {
 				IBazaarClient client = BzrWorkspaceRoot.getClient(branch);
 				if(revertBranch) {
-					client.revert(new File[]{branch.getFile()}, options);
+					client.revert(new File[]{branch.getFile()}, getOptions());
 				} else {
-					client.revert(map.get(branch).toArray(new File[0]), options);
+					client.revert(map.get(branch).toArray(new File[0]), getOptions());
 				}
 				resourcesToRefresh.addAll(Arrays.asList(BzrWorkspaceRoot.findProjectsInBranch(branch)));
 			}

=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/SendCommand.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/SendCommand.java	2013-10-31 17:23:10 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/SendCommand.java	2014-06-11 09:53:26 +0000
@@ -28,13 +28,12 @@
 
 	private final IBzrLocalResource resource;
 	private IBazaarAnnotation annotation;
-	private Option[] options;
 	private BranchLocation branchLocation;
 
 
 	public SendCommand(IBzrLocalResource bzrResource, Option[] options, BranchLocation branchLocation) {
 		this.resource = bzrResource;
-		this.options = options;
+		addOptions(options);
 		this.branchLocation = branchLocation;
 	}
 
@@ -48,7 +47,7 @@
 			monitor.beginTask(CoreTexts.SendCommand_send, 1000);
 			IBazaarClient client = getClient(resource.getBranch());
 
-			client.send(branchLocation, options);
+			client.send(branchLocation, getOptions());
 
 		} catch (BazaarClientException e) {
 			throw BazaarException.wrapException(e, resource.getIResource());

=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/ShelveCommand.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/ShelveCommand.java	2013-09-14 22:05:16 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/ShelveCommand.java	2014-06-11 09:53:26 +0000
@@ -30,13 +30,12 @@
 public class ShelveCommand extends ResourceChangeCommand {
 
 	private List<IBzrLocalResource> resources;
-	private Option[] options;
 	private boolean shelveBranch;
 
 	public ShelveCommand(List<IBzrLocalResource> resourcesToShelve, boolean shelveBranch, Option[] options) {
 		this.resources = resourcesToShelve;
 		this.shelveBranch = shelveBranch;
-		this.options = options;
+		addOptions(options);
 	}
 
 	@Override
@@ -48,9 +47,9 @@
 			for (IBzrBranch branch : map.keySet()) {
 				IBazaarClient client = BzrWorkspaceRoot.getClient(branch);
 				if (shelveBranch) {
-					client.shelve(new File[0], options);
+					client.shelve(new File[0], getOptions());
 				} else {
-					client.shelve(map.get(branch).toArray(new File[0]), options);
+					client.shelve(map.get(branch).toArray(new File[0]), getOptions());
 				}
 				resourcesToRefresh.addAll(Arrays.asList(BzrWorkspaceRoot.findProjectsInBranch(branch)));
 			}

=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/ShelveListCommand.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/ShelveListCommand.java	2013-04-14 21:56:10 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/ShelveListCommand.java	2014-06-11 09:53:26 +0000
@@ -34,7 +34,7 @@
 		try {
 			monitor.beginTask(CoreTexts.ShelveListCommand_taskName, 100);
 			IBazaarClient client = getClient(branch, true);
-			shelves = client.shelveList();
+			shelves = client.shelveList(getOptions());
 			monitor.worked(100);
 		} catch (BazaarClientException e) {
 			throw BazaarException.wrapException(e);

=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/StatusCommand.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/StatusCommand.java	2013-10-28 14:20:05 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/StatusCommand.java	2014-06-11 09:53:26 +0000
@@ -33,7 +33,6 @@
 import org.vcs.bazaar.client.IBazaarRevisionSpec;
 import org.vcs.bazaar.client.IBazaarStatus;
 import org.vcs.bazaar.client.commandline.commands.options.KeywordOption;
-import org.vcs.bazaar.client.commandline.commands.options.Option;
 import org.vcs.bazaar.client.commandline.syntax.IStatusOptions;
 import org.vcs.bazaar.client.core.BazaarClientException;
 import org.vcs.bazaar.eclipse.BzrWorkspaceRoot;
@@ -59,7 +58,6 @@
 	/* if set folders with status 'unknown' will be scanned and all sub-folders/files will be added to status map with status 'unknown' */
 	private boolean addNestedUnknown = true;
 	private List<IBazaarLogMessage> pendingMerges;
-	private Option[] options = new Option[0];
 
 	/**
 	 * Invoked by StatusCommand
@@ -84,7 +82,7 @@
 
 	public StatusCommand(IBzrLocalResource[] resources, IBazaarRevisionSpec revision) {
 		this(resources, true);
-		options = new KeywordOption[]{new KeywordOption(IStatusOptions.REVISION.getOption(), revision.toString())};
+		addOptions(new KeywordOption(IStatusOptions.REVISION.getOption(), revision.toString()));
 	}
 
 	/*
@@ -135,7 +133,7 @@
 	 */
 	private void executeAndFilterLogOutput(final IBzrBranch branch, File[] files) throws BazaarClientException, CoreException {
 		IBazaarClient client = getClient(branch, noLog);
-		BazaarTreeStatus treeStatus = client.status(files, options);
+		BazaarTreeStatus treeStatus = client.status(files, getOptions());
 		pendingMerges = treeStatus.getPendingMerges();
 		IBazaarStatus[] statuses = treeStatus.getStatusAsArray();
 		Set<IContainer> unknown = new HashSet<IContainer>();

=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/StatusUpdaterCommand.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/StatusUpdaterCommand.java	2013-09-12 10:03:07 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/StatusUpdaterCommand.java	2014-06-11 09:53:26 +0000
@@ -8,10 +8,8 @@
 package org.vcs.bazaar.eclipse.core.commands;
 
 import java.io.File;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -28,7 +26,6 @@
 import org.vcs.bazaar.client.IBazaarItemInfo;
 import org.vcs.bazaar.client.IBazaarLogMessage;
 import org.vcs.bazaar.client.IBazaarStatus;
-import org.vcs.bazaar.client.commandline.commands.options.Option;
 import org.vcs.bazaar.client.commandline.syntax.ILsOptions;
 import org.vcs.bazaar.client.core.BazaarClientException;
 import org.vcs.bazaar.eclipse.core.model.BzrStatus;
@@ -88,17 +85,14 @@
 		File file = resourceToRefresh.getLocation().toFile();
 		/* get all versioned and ignored resources with ls command excluding derived resources */
 		IBazaarItemInfo[] paths;
-		List<Option> options = new ArrayList<Option>();
-		options.add(ILsOptions.IGNORED);
-		options.add(ILsOptions.VERSIONED);
-		options.add(ILsOptions.UNKNOWN);
+		addOptions(ILsOptions.IGNORED, ILsOptions.VERSIONED, ILsOptions.UNKNOWN);
 		if (shallow) {
-			options.add(ILsOptions.NON_RECURSIVE);
+			addOptions(ILsOptions.NON_RECURSIVE);
 		}
 		if (verbose) {
-			options.add(ILsOptions.VERBOSE);
+			addOptions(ILsOptions.VERBOSE);
 		}
-		paths = client.ls(file, null, options.toArray(new Option[0]));
+		paths = client.ls(file, null, getOptions());
 		/* execute st command and turn its result into a status map */
 		BazaarTreeStatus treeStatus = client.status(new File[]{file});
 		IBazaarStatus[] statuses = treeStatus.getStatusAsArray();

=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/SwitchCommand.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/SwitchCommand.java	2013-10-28 14:20:05 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/SwitchCommand.java	2014-06-11 09:53:26 +0000
@@ -9,13 +9,9 @@
  *******************************************************************************/
 package org.vcs.bazaar.eclipse.core.commands;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.vcs.bazaar.client.IBazaarClient;
-import org.vcs.bazaar.client.commandline.commands.options.Option;
 import org.vcs.bazaar.client.commandline.syntax.ISwitchOptions;
 import org.vcs.bazaar.client.core.BazaarClientException;
 import org.vcs.bazaar.client.core.BranchLocation;
@@ -47,14 +43,13 @@
 			monitor.beginTask(CoreTexts.bind(CoreTexts.SwitchCommand_taskName, location.toString()), 100);
 			monitor.setTaskName(CoreTexts.bind(CoreTexts.SwitchCommand_taskName, location.toString()));
 			IBazaarClient client = getClient(branch);
-			List<Option> options = new ArrayList<Option>(0);
 			if (force) {
-				options.add(ISwitchOptions.FORCE);
+				addOptions(ISwitchOptions.FORCE);
 			}
 			if (createBranch) {
-				options.add(ISwitchOptions.CREATE_BRANCH);
+				addOptions(ISwitchOptions.CREATE_BRANCH);
 			}
-			client.switchBranch(location, new CommandProgressListener(monitor), options.toArray(new Option[options.size()]));
+			client.switchBranch(location, new CommandProgressListener(monitor), getOptions());
 			return BzrWorkspaceRoot.findProjectsInBranch(branch);
 		} catch (BazaarClientException e) {
 			throw BazaarException.wrapException(e);

=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/TagCommand.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/TagCommand.java	2013-03-19 15:05:13 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/TagCommand.java	2014-06-11 09:53:26 +0000
@@ -22,12 +22,11 @@
 
 	private final IBzrBranch branch;
 	private final String tagName;
-	private final Option[] options;
 	
 	public TagCommand(IBzrBranch branch, String tagName, Option[] options) {
 		this.branch = branch;
 		this.tagName = tagName;
-		this.options = options;
+		addOptions(options);
 	}
 	
 	@Override
@@ -36,7 +35,7 @@
 			monitor.beginTask(CoreTexts.bind(CoreTexts.TagCommand_taskName, branch.getName()), 100);
 			monitor.setTaskName(CoreTexts.bind(CoreTexts.TagCommand_taskName, branch.getName()));
 			IBazaarClient client = getClient(branch);
-			client.tag(tagName, options);
+			client.tag(tagName, getOptions());
 		} catch (BazaarClientException e) {
 			throw BazaarException.wrapException(e);
 		} finally {

=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/UnBindCommand.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/UnBindCommand.java	2013-10-28 14:20:05 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/UnBindCommand.java	2014-06-11 09:53:26 +0000
@@ -36,7 +36,7 @@
 			monitor.beginTask(CoreTexts.UnBindCommand_taskName, 1000);
 			monitor.setTaskName(CoreTexts.UnBindCommand_taskName);
 			IBazaarClient client = getClient(branch);
-			client.unBind();
+			client.unBind(getOptions());
 			monitor.worked(1000);
 			return BzrWorkspaceRoot.findProjectsInBranch(branch);
 		} catch (BazaarClientException e) {

=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/UnCommitCommand.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/UnCommitCommand.java	2013-10-28 14:20:05 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/UnCommitCommand.java	2014-06-11 09:53:26 +0000
@@ -34,7 +34,7 @@
 		try {
 			monitor.beginTask(CoreTexts.UnCommitCommand_unCommiting, 100);
 			monitor.setTaskName(CoreTexts.UnCommitCommand_unCommiting);
-			BzrWorkspaceRoot.getClient(branch).unCommit(branch.getPath().toFile());
+			BzrWorkspaceRoot.getClient(branch).unCommit(branch.getPath().toFile(), getOptions());
 			monitor.worked(100);
 			return BzrWorkspaceRoot.findProjectsInBranch(branch);
 		} catch (BazaarClientException e) {

=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/UnShelveCommand.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/UnShelveCommand.java	2013-04-14 21:56:10 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/UnShelveCommand.java	2014-06-11 09:53:26 +0000
@@ -24,12 +24,11 @@
 
 	private IBzrBranch branch;
 	private String shelfId;
-	private Option[] options;
 
 	public UnShelveCommand(IBzrBranch branch, String shelfId, Option[] options) {
 		this.branch = branch;
 		this.shelfId = shelfId;
-		this.options = options;
+		addOptions(options);
 	}
 
 	@Override
@@ -38,7 +37,7 @@
 			monitor.beginTask(CoreTexts.UnShelveCommand_taskName, 100);
 			monitor.setTaskName(CoreTexts.UnShelveCommand_taskName);
 			IBazaarClient client = BzrWorkspaceRoot.getClient(branch);
-			client.unShelve(shelfId, options);
+			client.unShelve(shelfId, getOptions());
 			monitor.worked(100);
 			return BzrWorkspaceRoot.findProjectsInBranch(branch);
 		} catch (BazaarClientException e) {

=== modified file 'org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/UpdateCommand.java'
--- org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/UpdateCommand.java	2013-10-28 14:20:05 +0000
+++ org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/UpdateCommand.java	2014-06-11 09:53:26 +0000
@@ -36,7 +36,7 @@
 			monitor.beginTask("Update command", 100);
 			monitor.setTaskName("Updating");
 			IBazaarClient client = getClient(branch);
-			client.update(branch.getFile(), new CommandProgressListener(monitor));
+			client.update(branch.getFile(), new CommandProgressListener(monitor), getOptions());
 		} catch (BazaarClientException e) {
 			if (!setPostCommandErrorOnConflicts(e.getMessage())) {
 				throw BazaarException.wrapException(e);

=== modified file 'org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/UITexts.java'
--- org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/UITexts.java	2014-01-14 22:00:23 +0000
+++ org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/UITexts.java	2014-06-11 09:53:26 +0000
@@ -77,6 +77,7 @@
 	public static String BazaarPreferencesPage_disable_logs;
 	public static String BazaarPreferencesPage_xmlrpc_port;
     public static String BazaarPreferencesPage_client_type;
+	public static String BazaarPreferencesPage_ignore_ssl_errors;
 	
 	// Console preferences
 	public static String BazaarConsole_name;

=== modified file 'org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/actions/CommitAction.java'
--- org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/actions/CommitAction.java	2014-02-04 13:27:54 +0000
+++ org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/actions/CommitAction.java	2014-06-11 09:53:26 +0000
@@ -154,7 +154,7 @@
 		final List<IBzrLocalResource> filesToCommit = getResources(commitDialog.getSelectedFiles());
 		final String commitText = commitDialog.getCommitMessage();
 		final boolean pushAfterCommit = commitDialog.isPushAfterCommit();
-		final List<Option> options = commitDialog.getOptions();
+		final Option[] options = commitDialog.getOptions().toArray(new Option[0]);
 		final boolean fullRefresh = !getUnknownOrAddedResources(commitDialog.getSelectedFiles()).isEmpty();
 		Job job = new Job("Running commit") {
 			@Override
@@ -174,9 +174,9 @@
 						if(commitableResources.getAllPendingMerges().size() > 0) {
 							// commit all modified files (including unknowns)
 							// currently we do this, by committing without passing any file to the commit cmd
-							commitCmd = new CommitCommand(filesToCommit, commitText, options, true, true);
+							commitCmd = new CommitCommand(filesToCommit, commitText, true, true, options);
 						} else {
-							commitCmd = new CommitCommand(filesToCommit, commitText, options, false, fullRefresh);
+							commitCmd = new CommitCommand(filesToCommit, commitText, false, fullRefresh, options);
 						}
 						commitCmd.run(EclipseBazaarCore.subProgressMonitorFor(monitor));
 					}

=== modified file 'org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/preferences/BazaarPreferencePage.java'
--- org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/preferences/BazaarPreferencePage.java	2014-01-15 17:33:43 +0000
+++ org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/preferences/BazaarPreferencePage.java	2014-06-11 09:53:26 +0000
@@ -72,6 +72,7 @@
 		createXmlRpClientConfigControl();
 		disableLogs = new BooleanFieldEditor(IBazaarCoreConstants.DISABLE_LOGS, UITexts.BazaarPreferencesPage_disable_logs, getFieldEditorParent());
 		addField(disableLogs);
+		addField(new BooleanFieldEditor(IBazaarCoreConstants.IGNORE_SSL_ERRORS, UITexts.BazaarPreferencesPage_ignore_ssl_errors, getFieldEditorParent()));
 		executable.getTextControl(getFieldEditorParent()).setEditable(false);
 		email.getTextControl(getFieldEditorParent()).setEnabled(getPreferenceStore().getBoolean(IBazaarCoreConstants.OVERWRITE_EMAIL));
 	}

=== modified file 'org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/uitexts.properties'
--- org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/uitexts.properties	2014-01-14 22:00:23 +0000
+++ org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/uitexts.properties	2014-06-11 09:53:26 +0000
@@ -78,6 +78,7 @@
 BazaarPreferencesPage_disable_logs=&Disable logging to file (.bzr.log) 
 BazaarPreferencesPage_xmlrpc_port=XMLRpc service port
 BazaarPreferencesPage_client_type=Client type:
+BazaarPreferencesPage_ignore_ssl_errors=Ignore SSL certificate errors for this workspace
 
 #Console
 BazaarConsole_name=Bazaar Console

=== modified file 'org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/createproject/CreateProjectWizard.java'
--- org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/createproject/CreateProjectWizard.java	2013-11-12 20:25:36 +0000
+++ org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/wizards/createproject/CreateProjectWizard.java	2014-06-11 09:53:26 +0000
@@ -182,12 +182,13 @@
 					}
 					if (projectToUse != null) {
 						op = new CreateBazaarProjectOperation(getContainer(), tempFolder, projectToUse);
+						op.run();
 					}
 				} else {
 					op = new CreateBazaarProjectOperation(getContainer(), tempFolder, 
 							wizard.getProjectName(), wizard.getProjectLocation(), wizard.getWizardType() == ProjectWizardType.IMPORT_EXISTING);
+					op.run();
 				}
-				op.run();
 			}
 			// Clean up the mess
 			if (op == null) {