← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-03-08 21:53:22 UTC
  • mfrom: (2325.1.2 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20070308215322-265e2cf0b768f432
(Dmitry Vasiliev) Small fixes to cmd_diff

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1336
1336
            Difference between the working tree and revision 1
1337
1337
        bzr diff -r1..2
1338
1338
            Difference between revision 2 and revision 1
1339
 
        bzr diff --diff-prefix old/:new/
 
1339
        bzr diff --prefix old/:new/
1340
1340
            Same as 'bzr diff' but prefix paths with old/ and new/
1341
1341
        bzr diff bzr.mine bzr.dev
1342
1342
            Show the differences between the two working trees
1359
1359
        Option('prefix', type=str,
1360
1360
               short_name='p',
1361
1361
               help='Set prefixes to added to old and new filenames, as '
1362
 
                    'two values separated by a colon.'),
 
1362
                    'two values separated by a colon. (eg "old/:new/")'),
1363
1363
        ]
1364
1364
    aliases = ['di', 'dif']
1365
1365
    encoding_type = 'exact'
1379
1379
        elif ':' in prefix:
1380
1380
            old_label, new_label = prefix.split(":")
1381
1381
        else:
1382
 
            raise BzrCommandError(
1383
 
                "--prefix expects two values separated by a colon")
 
1382
            raise errors.BzrCommandError(
 
1383
                '--prefix expects two values separated by a colon'
 
1384
                ' (eg "old/:new/")')
1384
1385
 
1385
1386
        if revision and len(revision) > 2:
1386
1387
            raise errors.BzrCommandError('bzr diff --revision takes exactly'
1387
1388
                                         ' one or two revision specifiers')
1388
 
        
 
1389
 
1389
1390
        try:
1390
1391
            tree1, file_list = internal_tree_files(file_list)
1391
1392
            tree2 = None