Rev 6097: (mbp) clearer messages for 'bzr missing' (bug 250296) (Thomi Richards) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 6097 [merge]
revision-id: pqm at pqm.ubuntu.com-20110825032044-1vtgcxhsmfyjqlj7
parent: pqm at pqm.ubuntu.com-20110824235503-awoynimslk9acds9
parent: thomir at gmail.com-20110726063846-3imskxn5cqfdp7qa
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2011-08-25 03:20:44 +0000
message:
  (mbp) clearer messages for 'bzr missing' (bug 250296) (Thomi Richards)
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2011-08-24 09:28:57 +0000
+++ b/bzrlib/builtins.py	2011-08-25 03:20:44 +0000
@@ -4667,10 +4667,10 @@
 
         if mine_only and not local_extra:
             # We checked local, and found nothing extra
-            message('This branch is up to date.\n')
+            message('This branch has no new revisions.\n')
         elif theirs_only and not remote_extra:
             # We checked remote, and found nothing extra
-            message('Other branch is up to date.\n')
+            message('Other branch has no new revisions.\n')
         elif not (mine_only or theirs_only or local_extra or
                   remote_extra):
             # We checked both branches, and neither one had extra

=== modified file 'bzrlib/tests/blackbox/test_missing.py'
--- a/bzrlib/tests/blackbox/test_missing.py	2011-06-03 08:45:36 +0000
+++ b/bzrlib/tests/blackbox/test_missing.py	2011-07-26 06:38:46 +0000
@@ -98,7 +98,7 @@
         lines2 = lines2.splitlines()
         self.assertEqual(lines, lines2)
         lines3 = self.run_bzr('missing ../b --theirs-only', retcode=0)[0]
-        self.assertEqualDiff('Other branch is up to date.\n', lines3)
+        self.assertEqualDiff('Other branch has no new revisions.\n', lines3)
 
         # relative to a, missing the 'merge' commit
         os.chdir('../b')
@@ -109,7 +109,7 @@
         lines2 = lines2.splitlines()
         self.assertEqual(lines, lines2)
         lines3 = self.run_bzr('missing ../a --mine-only', retcode=0)[0]
-        self.assertEqualDiff('This branch is up to date.\n', lines3)
+        self.assertEqualDiff('This branch has no new revisions.\n', lines3)
         lines4 = self.run_bzr('missing ../a --short', retcode=1)[0]
         lines4 = lines4.splitlines()
         self.assertEqual(4, len(lines4))
@@ -131,7 +131,7 @@
         self.assertEqual("  a", lines8[-1])
 
         os.chdir('../a')
-        self.assertEqualDiff('Other branch is up to date.\n',
+        self.assertEqualDiff('Other branch has no new revisions.\n',
                              self.run_bzr('missing ../b --theirs-only')[0])
 
         # after a pull we're back on track
@@ -142,9 +142,9 @@
         self.assertEqualDiff('Branches are up to date.\n',
                              self.run_bzr('missing ../a')[0])
         # If you supply mine or theirs you only know one side is up to date
-        self.assertEqualDiff('This branch is up to date.\n',
+        self.assertEqualDiff('This branch has no new revisions.\n',
                              self.run_bzr('missing ../a --mine-only')[0])
-        self.assertEqualDiff('Other branch is up to date.\n',
+        self.assertEqualDiff('Other branch has no new revisions.\n',
                              self.run_bzr('missing ../a --theirs-only')[0])
 
     def test_missing_filtered(self):
@@ -217,7 +217,7 @@
         b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
         self.build_tree_contents([('b/a', 'initial\nmore\n')])
         b_tree.commit(message='more')
-        
+
         out2, err2 = self.run_bzr('missing --directory a b', retcode=1)
         os.chdir('a')
         out1, err1 = self.run_bzr('missing ../b', retcode=1)