← 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-09-01 16:04:44 UTC
  • mfrom: (2745.4.5 changeset)
  • Revision ID: pqm@pqm.ubuntu.com-20070901160444-hcr66zejwyy0jezc
Introduce -c option for diff and status

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
167
167
    # TODO: --no-recurse, --recurse options
168
168
    
169
169
    takes_args = ['file*']
170
 
    takes_options = ['show-ids', 'revision',
 
170
    takes_options = ['show-ids', 'revision', 'change',
171
171
                     Option('short', help='Give short SVN-style status lines.'),
172
172
                     Option('versioned', help='Only show versioned files.')]
173
173
    aliases = ['st', 'stat']
180
180
            versioned=False):
181
181
        from bzrlib.status import show_tree_status
182
182
 
 
183
        if revision and len(revision) > 2:
 
184
            raise errors.BzrCommandError('bzr status --revision takes exactly'
 
185
                                         ' one or two revision specifiers')
 
186
 
183
187
        tree, file_list = tree_files(file_list)
184
188
            
185
189
        show_tree_status(tree, show_ids=show_ids,
1417
1421
               help='Set prefixes to added to old and new filenames, as '
1418
1422
                    'two values separated by a colon. (eg "old/:new/").'),
1419
1423
        'revision',
 
1424
        'change',
1420
1425
        ]
1421
1426
    aliases = ['di', 'dif']
1422
1427
    encoding_type = 'exact'