/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Martin Pool
  • Date: 2006-05-04 06:07:43 UTC
  • mto: This revision was merged to the branch mainline in revision 1699.
  • Revision ID: mbp@sourcefrog.net-20060504060743-cdcb40c14eb62d10
When a diff prefix is given, don't show it in === summary lines, only on the diffs themselves.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
984
984
        bzr diff -r1
985
985
        bzr diff -r1..2
986
986
        bzr diff --diff-prefix old/:new/
 
987
        bzr diff bzr.mine bzr.dev
 
988
        bzr diff foo.c
987
989
    """
988
990
    # TODO: Option to use external diff command; could be GNU diff, wdiff,
989
991
    #       or a graphical diff.
996
998
 
997
999
    # TODO: This probably handles non-Unix newlines poorly.
998
1000
    
999
 
    # TODO: When a prefix is given, it's also shown in the summary lines, e.g.
1000
 
    # "modified file new/foo.c"; perhaps it would be better to omit it from
1001
 
    # there?
1002
 
    
1003
1001
    takes_args = ['file*']
1004
1002
    takes_options = ['revision', 'diff-options', 'prefix']
1005
1003
    aliases = ['di', 'dif']