← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commands.py

  • Committer: mbp at sourcefrog
  • Date: 2005-03-28 02:32:30 UTC
  • Revision ID: mbp@sourcefrog.net-20050328023230-3abca9271cbadfea
more help for diff command

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commands.py
244
244
 
245
245
 
246
246
def cmd_diff(revision=None):
247
 
    """Show diff from basis to working copy.
248
 
 
249
 
    :todo: Take one or two revision arguments, look up those trees,
250
 
           and diff them.
251
 
 
252
 
    :todo: Allow diff across branches.
253
 
 
254
 
    :todo: Mangle filenames in diff to be more relevant.
255
 
 
256
 
    :todo: Shouldn't be in the cmd function.
257
 
 
258
 
    TODO: Option to use external diff command; could be GNU diff,
259
 
    wdiff, or a graphical diff.
260
 
    """
 
247
    """bzr diff: Show differences in working tree.
 
248
    
 
249
usage: bzr diff [-r REV]
 
250
 
 
251
--revision REV
 
252
    Show changes since REV, rather than predecessor.
 
253
 
 
254
TODO: Given two revision arguments, show the difference between them.
 
255
 
 
256
TODO: Allow diff across branches.
 
257
 
 
258
TODO: Option to use external diff command; could be GNU diff, wdiff,
 
259
or a graphical diff.
 
260
 
 
261
TODO: Diff selected files.
 
262
"""
 
263
 
 
264
    ## TODO: Shouldn't be in the cmd function.
261
265
 
262
266
    b = Branch('.')
263
267