Rev 2327: Add (eg "old/:new/") to errors to make it a little clearer. in http://bzr.arbash-meinel.com/branches/bzr/jam-integration

John Arbash Meinel john at arbash-meinel.com
Thu Mar 8 17:46:51 GMT 2007


At http://bzr.arbash-meinel.com/branches/bzr/jam-integration

------------------------------------------------------------
revno: 2327
revision-id: john at arbash-meinel.com-20070308174644-shb8ue22yqlnmo8d
parent: john at arbash-meinel.com-20070308174053-y1r0glqavi8iulez
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-03-08 11:46:44 -0600
message:
  Add (eg "old/:new/") to errors to make it a little clearer.
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
-------------- next part --------------
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2007-03-08 17:40:53 +0000
+++ b/bzrlib/builtins.py	2007-03-08 17:46:44 +0000
@@ -1359,7 +1359,7 @@
         Option('prefix', type=str,
                short_name='p',
                help='Set prefixes to added to old and new filenames, as '
-                    'two values separated by a colon.'),
+                    'two values separated by a colon. (eg "old/:new/")'),
         ]
     aliases = ['di', 'dif']
     encoding_type = 'exact'
@@ -1380,12 +1380,13 @@
             old_label, new_label = prefix.split(":")
         else:
             raise errors.BzrCommandError(
-                "--prefix expects two values separated by a colon")
+                '--prefix expects two values separated by a colon'
+                ' (eg "old/:new/")')
 
         if revision and len(revision) > 2:
             raise errors.BzrCommandError('bzr diff --revision takes exactly'
                                          ' one or two revision specifiers')
-        
+
         try:
             tree1, file_list = internal_tree_files(file_list)
             tree2 = None



More information about the bazaar-commits mailing list