Rev 5370: Cope with trees without user_url property in UncomittedChanges in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 5370 [merge]
revision-id: pqm at pqm.ubuntu.com-20100806124332-dywuju3s7bzn5y69
parent: pqm at pqm.ubuntu.com-20100806032440-cetyanzrh3jcxjlf
parent: jelmer at samba.org-20100806000545-kicecc5iu1j2e6zy
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2010-08-06 13:43:32 +0100
message:
  Cope with trees without user_url property in UncomittedChanges
  	exception. (Jelmer)
modified:
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
=== modified file 'bzrlib/errors.py'
--- a/bzrlib/errors.py	2010-07-29 11:17:57 +0000
+++ b/bzrlib/errors.py	2010-08-06 00:05:45 +0000
@@ -2843,8 +2843,11 @@
         else:
             more = ' ' + more
         import bzrlib.urlutils as urlutils
-        display_url = urlutils.unescape_for_display(
-            tree.user_url, 'ascii')
+        user_url = getattr(tree, "user_url", None)
+        if user_url is None:
+            display_url = str(tree)
+        else:
+            display_url = urlutils.unescape_for_display(user_url, 'ascii')
         BzrError.__init__(self, tree=tree, display_url=display_url, more=more)