Rev 5354: (vila) Dont print internal object names in invalid revision spec in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5354 [merge]
revision-id: pqm at pqm.ubuntu.com-20100720121136-r4c42ke7mjobuuo4
parent: pqm at pqm.ubuntu.com-20100719213209-3bqfu9jg2md5zga6
parent: v.ladeuil+lp at free.fr-20100720105044-2qcm9avezubw3dea
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2010-07-20 13:11:36 +0100
message:
  (vila) Dont print internal object names in invalid revision spec
  	error (Neil Martinsen-Burrell)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
=== modified file 'NEWS'
--- a/NEWS	2010-07-19 20:12:38 +0000
+++ b/NEWS	2010-07-20 10:50:44 +0000
@@ -31,13 +31,16 @@
 * Check if both --diff-options and --using are set, and exit with error
   in this case. (Matthäus G. Chajdas, #234708)
 
+* Don't print internal object name when print an invalid revision spec
+  error.  (Neil Martinsen-Burrell, #598701)
+
+* `PathNotChild` should not give a traceback.
+  (Martin Pool, #98735)
+
 * ``Transport.stat`` on a symlink, including a transport pointing directly
   to a symlink, now returns information about the symlink.
   (Martin Pool)
 
-* `PathNotChild` should not give a traceback.
-  (Martin Pool, #98735)
-
 Improvements
 ************
 

=== modified file 'bzrlib/errors.py'
--- a/bzrlib/errors.py	2010-07-16 13:53:26 +0000
+++ b/bzrlib/errors.py	2010-07-20 10:50:44 +0000
@@ -1180,10 +1180,11 @@
 class InvalidRevisionSpec(BzrError):
 
     _fmt = ("Requested revision: '%(spec)s' does not exist in branch:"
-            " %(branch)s%(extra)s")
+            " %(branch_url)s%(extra)s")
 
     def __init__(self, spec, branch, extra=None):
         BzrError.__init__(self, branch=branch, spec=spec)
+        self.branch_url = getattr(branch, 'user_url', str(branch))
         if extra:
             self.extra = '\n' + str(extra)
         else: