Rev 5400: Fix lines too long and vertical spaces. in file:///home/vila/src/bzr/reviews/mergetools/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 5400
revision-id: v.ladeuil+lp at free.fr-20101124165634-7j4hqvtoe3t0qqp9
parent: gordon at doxxx.net-20101112033204-csd2tf2a6czjpeae
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: mergetools
timestamp: Wed 2010-11-24 17:56:34 +0100
message:
  Fix lines too long and vertical spaces.
-------------- next part --------------
=== modified file 'bzrlib/help_topics/en/configuration.txt'
--- a/bzrlib/help_topics/en/configuration.txt	2010-11-12 03:32:04 +0000
+++ b/bzrlib/help_topics/en/configuration.txt	2010-11-24 16:56:34 +0000
@@ -592,8 +592,8 @@
 ~~~~~~~~~~~~~~~~~
 
 Defines an external merge tool called <name> with the given command-line.
-Arguments containing spaces should be quoted using single or double quotes. The
-executable may omit its path if it can be found on the PATH.
+Arguments containing spaces should be quoted using single or double
+quotes. The executable may omit its path if it can be found on the PATH.
 
 The following markers can be used in the command-line to substitute filenames
 involved in the merge conflict:

=== modified file 'bzrlib/mergetools.py'
--- a/bzrlib/mergetools.py	2010-11-12 01:27:00 +0000
+++ b/bzrlib/mergetools.py	2010-11-24 16:56:34 +0000
@@ -67,6 +67,7 @@
 
 
 class MergeTool(object):
+
     def __init__(self, name, commandline):
         """Initializes the merge tool with a name and a command-line (a string
         or sequence of strings).

=== modified file 'bzrlib/tests/test_mergetools.py'
--- a/bzrlib/tests/test_mergetools.py	2010-11-12 01:27:00 +0000
+++ b/bzrlib/tests/test_mergetools.py	2010-11-24 16:56:34 +0000
@@ -27,6 +27,7 @@
 
 
 class TestBasics(tests.TestCase):
+
     def setUp(self):
         super(TestBasics, self).setUp()
         self.tool = mergetools.MergeTool('sometool',
@@ -97,6 +98,7 @@
 
 
 class TestUnicodeBasics(tests.TestCase):
+
     def setUp(self):
         super(TestUnicodeBasics, self).setUp()
         self.tool = mergetools.MergeTool(u'someb\u0414r',
@@ -168,6 +170,7 @@
 
 
 class TestMergeToolOperations(tests.TestCaseInTempDir):
+
     def test_filename_substitution(self):
         def dummy_invoker(executable, args, cleanup):
             self._commandline = [executable] + args
@@ -235,11 +238,13 @@
 
 
 class TestModuleFunctions(tests.TestCaseInTempDir):
+
     def test_get_merge_tools(self):
         conf = config.GlobalConfig()
         conf.set_user_option('mergetools.kdiff3', 'kdiff3 %b %t %o -o %r')
         conf.set_user_option('mergetools.winmergeu', 'winmergeu %r')
-        conf.set_user_option('mergetools.funkytool', 'funkytool "arg with spaces" %T')
+        conf.set_user_option('mergetools.funkytool',
+                             'funkytool "arg with spaces" %T')
         tools = mergetools.get_merge_tools(conf)
         self.log(repr(tools))
         self.assertEqual(3, len(tools))
@@ -300,7 +305,8 @@
         del tools[0]
         mergetools.set_merge_tools(tools, conf)
         self.assertEqual(sorted([
-            ('mergetools.funkytool', 'funkytool "arg with spaces" %T', 'DEFAULT', 'bazaar'),
+            ('mergetools.funkytool', 'funkytool "arg with spaces" %T',
+             'DEFAULT', 'bazaar'),
             ('mergetools.winmergeu', 'winmergeu %r', 'DEFAULT', 'bazaar'),
             ]),
             sorted(conf._get_options()))