Rev 4992: Fix lines too long, fix inverted assertions. in file:///home/vila/src/bzr/reviews/giveback/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/reviews/giveback/

------------------------------------------------------------
revno: 4992
revision-id: v.ladeuil+lp at free.fr-20100301161757-140o4hw1zj9mwnom
parent: ed at marsfire.com-20100207004017-ya6pbyb0yfgb9ti7
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: giveback
timestamp: Mon 2010-03-01 17:17:57 +0100
message:
  Fix lines too long, fix inverted assertions.
-------------- next part --------------
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2010-02-07 00:40:17 +0000
+++ b/bzrlib/builtins.py	2010-03-01 16:17:57 +0000
@@ -2737,9 +2737,10 @@
         try:
             revno = int(revno)
         except ValueError:
-            raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
-
-        self.outf.write("%s\n" % WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno))
+            raise errors.BzrCommandError("not a valid revision-number: %r"
+                                         % revno)
+        revid = WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
+        self.outf.write("%s\n" % revid)
 
 
 class cmd_export(Command):
@@ -3320,7 +3321,7 @@
 
     @display_command
     def printme(self, branch):
-        self.outf.write(branch.nick)
+        self.outf.write('%s\n' % branch.nick)
 
 
 class cmd_alias(Command):
@@ -4734,7 +4735,8 @@
                  end_revision=last_revno)
 
         if dry_run:
-            self.outf.write('Dry-run, pretending to remove the above revisions.\n')
+            self.outf.write('Dry-run, pretending to remove'
+                            ' the above revisions.\n')
         else:
             self.outf.write('The above revision(s) will be removed.\n')
 

=== modified file 'bzrlib/tests/blackbox/test_nick.py'
--- a/bzrlib/tests/blackbox/test_nick.py	2009-03-23 14:59:43 +0000
+++ b/bzrlib/tests/blackbox/test_nick.py	2010-03-01 16:17:57 +0000
@@ -30,11 +30,11 @@
         self.make_branch_and_tree('me.dev')
         os.chdir('me.dev')
         nick = self.run_bzr('nick')[0]
-        self.assertEqual(nick, 'me.dev\n')
+        self.assertEqual('me.dev\n', nick)
         # set the nickname
         self.run_bzr("nick moo")
         nick = self.run_bzr('nick')[0]
-        self.assertEqual(nick, 'moo\n')
+        self.assertEqual('moo\n', nick)
 
     def test_autonick_urlencoded(self):
         # https://bugs.launchpad.net/bzr/+bug/66857 -- nick was printed
@@ -42,30 +42,30 @@
         self.make_branch_and_tree('!repo')
         os.chdir('!repo')
         nick = self.run_bzr('nick')[0]
-        self.assertEqual(nick, '!repo\n')
+        self.assertEqual('!repo\n', nick)
 
     def test_bound_nick(self):
         """Check that nick works well for checkouts."""
         base = self.make_branch_and_tree('base')
         child = self.make_branch_and_tree('child')
         os.chdir('child')
-        self.assertEqual(self.run_bzr('nick')[0][:-1], 'child')
-        self.assertEqual(child.branch.get_config().has_explicit_nickname(),
-            False)
+        self.assertEqual('child', self.run_bzr('nick')[0][:-1])
+        self.assertEqual(False,
+                         child.branch.get_config().has_explicit_nickname())
         self.run_bzr('bind ../base')
-        self.assertEqual(self.run_bzr('nick')[0][:-1], base.branch.nick)
-        self.assertEqual(child.branch.get_config().has_explicit_nickname(),
-            False)
+        self.assertEqual(base.branch.nick, self.run_bzr('nick')[0][:-1])
+        self.assertEqual(False,
+                         child.branch.get_config().has_explicit_nickname())
 
         self.run_bzr('unbind')
         self.run_bzr("nick explicit_nick")
-        self.assertEqual(self.run_bzr('nick')[0][:-1], "explicit_nick")
-        self.assertEqual(child.branch.get_config()._get_explicit_nickname(),
-            "explicit_nick")
+        self.assertEqual("explicit_nick", self.run_bzr('nick')[0][:-1])
+        self.assertEqual("explicit_nick",
+                         child.branch.get_config()._get_explicit_nickname())
         self.run_bzr('bind ../base')
-        self.assertEqual(self.run_bzr('nick')[0][:-1], base.branch.nick)
-        self.assertEqual(child.branch.get_config()._get_explicit_nickname(),
-            base.branch.nick)
+        self.assertEqual(base.branch.nick, self.run_bzr('nick')[0][:-1])
+        self.assertEqual(base.branch.nick,
+                         child.branch.get_config()._get_explicit_nickname())
 
     def test_boundless_nick(self):
         """Nick defaults to implicit local nick when bound branch is AWOL"""
@@ -73,8 +73,8 @@
         child = self.make_branch_and_tree('child')
         os.chdir('child')
         self.run_bzr('bind ../base')
-        self.assertEqual(self.run_bzr('nick')[0][:-1], base.branch.nick)
-        self.assertEqual(child.branch.get_config().has_explicit_nickname(),
-            False)
+        self.assertEqual(base.branch.nick, self.run_bzr('nick')[0][:-1])
+        self.assertEqual(False,
+                         child.branch.get_config().has_explicit_nickname())
         osutils.rmtree('../base')
-        self.assertEqual(self.run_bzr('nick')[0][:-1], 'child')
+        self.assertEqual('child', self.run_bzr('nick')[0][:-1])