← Back to branch summary

~andon-sikavica/bzr-java-lib/experimental

« back to all changes in this revision

Viewing changes to src/main/java/org/vcs/bazaar/client/commandline/CommandLineClient.java

  • Committer: Guillermo Gonzalez
  • Date: 2008-08-24 06:03:52 UTC
  • mfrom: (178.1.2 dev)
  • Revision ID: guillo.gonzo@gmail.com-20080824060352-uxu111t2ege9rkv7
 * merge with my dev branch
 * version bump to 0.2.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/main/java/org/vcs/bazaar/client/commandline/CommandLineClient.java
69
69
import org.vcs.bazaar.client.commandline.parser.XMLMissingParser;
70
70
import org.vcs.bazaar.client.commandline.parser.XMLStatusParser;
71
71
import org.vcs.bazaar.client.commandline.syntax.ILsOptions;
 
72
import org.vcs.bazaar.client.commandline.syntax.IVersionOptions;
72
73
import org.vcs.bazaar.client.core.BazaarClientException;
73
74
import org.vcs.bazaar.client.core.BranchLocation;
74
75
import org.vcs.bazaar.client.utils.StringUtil;
210
211
                return log(cmd, options);
211
212
        }
212
213
        
 
214
        public IBazaarLogMessage[] log(BranchLocation location, Option... options) throws BazaarClientException {
 
215
                Log cmd = new Log(workDir, location);
 
216
                return log(cmd, options);
 
217
        }
 
218
        
213
219
        private IBazaarLogMessage[] log(Command cmd, Option... options) throws BazaarClientException {
214
220
                // TODO: implement -v (verbose) in the parser
215
221
                // cmd.setOption(Log.VERBOSE);
432
438
        }
433
439
        
434
440
        public void merge(BranchLocation remoteBranch, Option... options) throws BazaarClientException {
435
 
                Merge cmd = new Merge(workDir, remoteBranch.getURI());
 
441
                Merge cmd = new Merge(workDir, remoteBranch);
436
442
                for (Option option : options) {
437
443
                        cmd.setOption(option);
438
444
                }
482
488
                alreadyAskedForAvailability = force?!force:alreadyAskedForAvailability;
483
489
                if (!alreadyAskedForAvailability) {
484
490
                        Version cmd = new Version();
 
491
                        cmd.setOption(IVersionOptions.SHORT);
485
492
                        try {
486
493
                                cmd.execute(new ShellCommandRunner(true));
487
494
                                available = true;