← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Martin Pool
  • Date: 2006-05-04 05:02:55 UTC
  • mto: This revision was merged to the branch mainline in revision 1699.
  • Revision ID: mbp@sourcefrog.net-20060504050255-d0c0573ef8849c59
Remove 'a/', 'b/' default prefixes on diff output.  
(You can still get them with --diff-prefix)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1006
1006
 
1007
1007
        if diff_prefix:
1008
1008
            if not ':' in diff_prefix:
1009
 
                 raise BzrError("--diff-prefix expects two values separated by a colon")            
1010
 
            old_label,new_label=diff_prefix.split(":")
 
1009
                 raise BzrError("--diff-prefix expects two values separated by a colon")
 
1010
            old_label, new_label = diff_prefix.split(":")
1011
1011
        else:
1012
 
            old_label='a/'
1013
 
            new_label='b/'
 
1012
            old_label = ''
 
1013
            new_label = ''
1014
1014
        
1015
1015
        try:
1016
1016
            tree1, file_list = internal_tree_files(file_list)