Rev 4447: (igc) better message when split fails (Neil Martinsen-Burrell) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4447
revision-id: pqm at pqm.ubuntu.com-20090616132232-4s8a3v00nfzh3i8w
parent: pqm at pqm.ubuntu.com-20090616090534-gl7ghksxrhuse5z4
parent: ian.clatworthy at canonical.com-20090616122220-k1ye45pbu5zylltt
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2009-06-16 14:22:32 +0100
message:
  (igc) better message when split fails (Neil Martinsen-Burrell)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/tests/blackbox/test_split.py test_split.py-20061008023421-qy0vdpzysh5rriu8-1
    ------------------------------------------------------------
    revno: 4446.1.1
    revision-id: ian.clatworthy at canonical.com-20090616122220-k1ye45pbu5zylltt
    parent: pqm at pqm.ubuntu.com-20090616090534-gl7ghksxrhuse5z4
    parent: nmb at wartburg.edu-20090608020208-zb6y8877j6oxhml2
    committer: Ian Clatworthy <ian.clatworthy at canonical.com>
    branch nick: integration
    timestamp: Tue 2009-06-16 22:22:20 +1000
    message:
      (igc) better message when split fails (Neil Martinsen-Burrell)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
      bzrlib/tests/blackbox/test_split.py test_split.py-20061008023421-qy0vdpzysh5rriu8-1
    ------------------------------------------------------------
    revno: 4416.6.1
    revision-id: nmb at wartburg.edu-20090608020208-zb6y8877j6oxhml2
    parent: pqm at pqm.ubuntu.com-20090606005240-2qms4n1eqdshzp0w
    committer: Neil Martinsen-Burrell <nmb at wartburg.edu>
    branch nick: bzr-220067
    timestamp: Sun 2009-06-07 21:02:08 -0500
    message:
      Fix #220067 adding more specificity to the error message when split fails
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
      bzrlib/tests/blackbox/test_split.py test_split.py-20061008023421-qy0vdpzysh5rriu8-1
=== modified file 'NEWS'
--- a/NEWS	2009-06-16 09:05:34 +0000
+++ b/NEWS	2009-06-16 12:22:20 +0000
@@ -17,6 +17,9 @@
   diverged-branches`` when a push fails because the branches have
   diverged.  (Neil Martinsen-Burrell, #269477)
 
+* Better message in ``bzr split`` error suggesting a rich root format.
+  (Neil Martinsen-Burrell, #220067)
+
 Internals
 *********
 

=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2009-06-15 06:47:14 +0000
+++ b/bzrlib/builtins.py	2009-06-16 12:22:20 +0000
@@ -4675,7 +4675,7 @@
         try:
             containing_tree.extract(sub_id)
         except errors.RootNotRich:
-            raise errors.UpgradeRequired(containing_tree.branch.base)
+            raise errors.RichRootUpgradeRequired(containing_tree.branch.base)
 
 
 class cmd_merge_directive(Command):

=== modified file 'bzrlib/errors.py'
--- a/bzrlib/errors.py	2009-06-10 03:56:49 +0000
+++ b/bzrlib/errors.py	2009-06-16 12:22:20 +0000
@@ -2161,6 +2161,12 @@
     _fmt = "To use this feature you must upgrade your repository at %(path)s."
 
 
+class RichRootUpgradeRequired(UpgradeRequired):
+
+    _fmt = ("To use this feature you must upgrade your branch at %(path)s to"
+           " a format which supports rich roots.")
+
+
 class LocalRequiresBoundBranch(BzrError):
 
     _fmt = "Cannot perform local-only commits on unbound branches."

=== modified file 'bzrlib/tests/blackbox/test_split.py'
--- a/bzrlib/tests/blackbox/test_split.py	2009-03-23 14:59:43 +0000
+++ b/bzrlib/tests/blackbox/test_split.py	2009-06-08 02:02:08 +0000
@@ -47,7 +47,7 @@
         self.build_tree(['tree/subtree/'])
         tree.add('subtree')
         tree.commit('added subtree')
-        self.run_bzr_error(('must upgrade your branch at .*tree',),
+        self.run_bzr_error(('must upgrade your branch at .*tree','rich roots'),
                            'split tree/subtree')
 
     def split_formats(self, format, repo_format):