Rev 5109: (vila, for parthm) better message for InvalidRevisionSpec in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Wed Mar 24 15:40:49 GMT 2010


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

------------------------------------------------------------
revno: 5109 [merge]
revision-id: pqm at pqm.ubuntu.com-20100324154046-f9a50havuqyj8t1l
parent: pqm at pqm.ubuntu.com-20100324145053-1edalqun0nesmbeh
parent: v.ladeuil+lp at free.fr-20100324141615-08h6pppwthrhz2fw
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2010-03-24 15:40:46 +0000
message:
  (vila, for parthm) better message for InvalidRevisionSpec
modified:
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
  bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
  bzrlib/tests/blackbox/test_tags.py test_tags.py-20070116132048-5h4qak2cm22jlb9e-1
=== modified file 'bzrlib/errors.py'
--- a/bzrlib/errors.py	2010-03-03 08:25:15 +0000
+++ b/bzrlib/errors.py	2010-03-24 14:15:01 +0000
@@ -1179,7 +1179,7 @@
 
 class InvalidRevisionSpec(BzrError):
 
-    _fmt = ("Requested revision: %(spec)r does not exist in branch:"
+    _fmt = ("Requested revision: '%(spec)s' does not exist in branch:"
             " %(branch)s%(extra)s")
 
     def __init__(self, spec, branch, extra=None):

=== modified file 'bzrlib/tests/blackbox/test_annotate.py'
--- a/bzrlib/tests/blackbox/test_annotate.py	2010-02-17 17:11:16 +0000
+++ b/bzrlib/tests/blackbox/test_annotate.py	2010-03-24 14:15:01 +0000
@@ -140,7 +140,7 @@
         out, err = self.run_bzr('annotate hello.txt -r 10',
                                 retcode=3)
         self.assertEqual('', out)
-        self.assertContainsRe(err, 'Requested revision: \'10\' does not exist')
+        self.assertContainsRe(err, "Requested revision: '10' does not exist")
 
     def test_annotate_cmd_two_revisions(self):
         out, err = self.run_bzr('annotate hello.txt -r1..2',

=== modified file 'bzrlib/tests/blackbox/test_diff.py'
--- a/bzrlib/tests/blackbox/test_diff.py	2009-09-18 08:50:05 +0000
+++ b/bzrlib/tests/blackbox/test_diff.py	2010-03-24 14:15:01 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006 Canonical Ltd
+# Copyright (C) 2006-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/blackbox/test_tags.py'
--- a/bzrlib/tests/blackbox/test_tags.py	2010-03-12 02:02:31 +0000
+++ b/bzrlib/tests/blackbox/test_tags.py	2010-03-24 14:16:15 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2007 Canonical Ltd
+# Copyright (C) 2007-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by




More information about the bazaar-commits mailing list