Rev 6609: Fix pep8 in changelog_merge plugin. in file:///home/vila/src/bzr/experimental/py3/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Wed Sep 2 09:13:58 UTC 2015
At file:///home/vila/src/bzr/experimental/py3/
------------------------------------------------------------
revno: 6609
revision-id: v.ladeuil+lp at free.fr-20150902091357-qfaf0o6z71vitqop
parent: v.ladeuil+lp at free.fr-20150902091014-lis8nhu2n80jxkzd
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: pep8
timestamp: Wed 2015-09-02 11:13:57 +0200
message:
Fix pep8 in changelog_merge plugin.
-------------- next part --------------
=== modified file 'bzrlib/plugins/changelog_merge/__init__.py'
--- a/bzrlib/plugins/changelog_merge/__init__.py 2011-12-18 12:46:49 +0000
+++ b/bzrlib/plugins/changelog_merge/__init__.py 2015-09-02 09:13:57 +0000
@@ -55,9 +55,11 @@
strange results if there is a criss-cross merge.
"""
+import bzrlib
+from bzrlib.hooks import install_lazy_named_hook
# Since we are a built-in plugin we share the bzrlib version
-from bzrlib import version_info
-from bzrlib.hooks import install_lazy_named_hook
+version_info = bzrlib.version_info
+
# Put most of the code in a separate module that we lazy-import to keep the
# overhead of this plugin as minimal as possible.
@@ -67,12 +69,13 @@
return ChangeLogMerger(merger)
install_lazy_named_hook("bzrlib.merge", "Merger.hooks", "merge_file_content",
- changelog_merge_hook, 'GNU ChangeLog file merge')
+ changelog_merge_hook, 'GNU ChangeLog file merge')
+
def load_tests(basic_tests, module, loader):
testmod_names = [
'tests',
]
basic_tests.addTest(loader.loadTestsFromModuleNames(
- ["%s.%s" % (__name__, tmn) for tmn in testmod_names]))
+ ["%s.%s" % (__name__, tmn) for tmn in testmod_names]))
return basic_tests
=== modified file 'bzrlib/plugins/changelog_merge/changelog_merge.py'
--- a/bzrlib/plugins/changelog_merge/changelog_merge.py 2012-01-30 14:18:22 +0000
+++ b/bzrlib/plugins/changelog_merge/changelog_merge.py 2015-09-02 09:13:57 +0000
@@ -70,7 +70,7 @@
so that e.g. if the config says ``changelog_merge_files = ChangeLog``,
then all ChangeLog files in the tree will match (not just one in the
root of the tree).
-
+
:param params: A MergeHookParams describing the file to merge
:param tree: a Tree, e.g. self.merger.this_tree.
"""
@@ -143,7 +143,7 @@
def merge_entries(base_entries, this_entries, other_entries,
- guess_edits=default_guess_edits):
+ guess_edits=default_guess_edits):
"""Merge changelog given base, this, and other versions."""
m3 = Merge3(base_entries, this_entries, other_entries, allow_objects=True)
result_entries = []
@@ -192,7 +192,7 @@
else:
result_entries.extend(new_in_other)
result_entries.extend(updated_this)
- else: # unchanged, same, a, or b.
+ else: # unchanged, same, a, or b.
lines = group[1]
result_entries.extend(lines)
at_top = False
=== modified file 'bzrlib/plugins/changelog_merge/tests/__init__.py'
--- a/bzrlib/plugins/changelog_merge/tests/__init__.py 2011-03-10 08:02:30 +0000
+++ b/bzrlib/plugins/changelog_merge/tests/__init__.py 2015-09-02 09:13:57 +0000
@@ -14,11 +14,11 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
def load_tests(basic_tests, module, loader):
testmod_names = [
'test_changelog_merge',
]
basic_tests.addTest(loader.loadTestsFromModuleNames(
- ["%s.%s" % (__name__, tmn) for tmn in testmod_names]))
+ ["%s.%s" % (__name__, tmn) for tmn in testmod_names]))
return basic_tests
-
=== modified file 'bzrlib/plugins/changelog_merge/tests/test_changelog_merge.py'
--- a/bzrlib/plugins/changelog_merge/tests/test_changelog_merge.py 2012-03-13 16:28:30 +0000
+++ b/bzrlib/plugins/changelog_merge/tests/test_changelog_merge.py 2015-09-02 09:13:57 +0000
@@ -31,7 +31,7 @@
sample_this_entries = [
'This entry T1',
'This entry T2',
- #'Base entry B1 updated',
+ # 'Base entry B1 updated',
'Base entry B1',
'Base entry B2',
'Base entry B3',
@@ -39,7 +39,7 @@
sample_other_entries = [
'Other entry O1',
- #'Base entry B1',
+ # 'Base entry B1',
'Base entry B1',
'Base entry B2 updated',
'Base entry B3',
@@ -55,14 +55,14 @@
sample2_this_entries = [
'This entry T1',
'This entry T2',
- #'Base entry B1 updated',
+ # 'Base entry B1 updated',
'Base entry B1',
'Base entry B2',
]
sample2_other_entries = [
'Other entry O1',
- #'Base entry B1',
+ # 'Base entry B1',
'Base entry B1 edit', # > 80% similar according to difflib
'Base entry B2',
]
@@ -125,9 +125,8 @@
the new entry and the edited entry are adjacent.
"""
def guess_edits(new, deleted):
- #import pdb; pdb.set_trace()
- return changelog_merge.default_guess_edits(new, deleted,
- entry_as_str=lambda x: x)
+ return changelog_merge.default_guess_edits(
+ new, deleted, entry_as_str=lambda x: x)
result_entries = changelog_merge.merge_entries(
sample2_base_entries, sample2_this_entries, sample2_other_entries,
guess_edits=guess_edits)
@@ -147,12 +146,12 @@
# resolve. (Ideally perhaps we'd generate a nice conflict file, but
# for now we just give up.)
self.assertRaises(changelog_merge.EntryConflict,
- changelog_merge.merge_entries,
- sample2_base_entries, [], sample2_other_entries)
+ changelog_merge.merge_entries,
+ sample2_base_entries, [], sample2_other_entries)
def test_default_guess_edits(self):
"""default_guess_edits matches a new entry only once.
-
+
(Even when that entry is the best match for multiple old entries.)
"""
new_in_other = [('AAAAA',), ('BBBBB',)]
@@ -161,15 +160,15 @@
result = changelog_merge.default_guess_edits(
new_in_other, deleted_in_other)
self.assertEqual(
- ([('AAAAA',)], # new
- [('DDDDD',), ('BBBBBxx',)], # deleted
- [(('BBBBBx',), ('BBBBB',))]), # edits
+ ([('AAAAA',)], # new
+ [('DDDDD',), ('BBBBBxx',)], # deleted
+ [(('BBBBBx',), ('BBBBB',))]), # edits
result)
class TestChangeLogMerger(tests.TestCaseWithTransport):
"""Tests for ChangeLogMerger class.
-
+
Most tests should be unit tests for merge_entries (and its helpers).
This class is just to cover the handful of lines of code in ChangeLogMerger
itself.
@@ -183,7 +182,7 @@
def make_changelog_merger(self, base_text, this_text, other_text):
builder = self.make_builder()
builder.add_file('clog-id', builder.tree_root, 'ChangeLog',
- base_text, True)
+ base_text, True)
builder.change_contents('clog-id', other=other_text, this=this_text)
merger = builder.make_merger(merge.Merge3Merger, ['clog-id'])
# The following can't use config stacks until the plugin itself does
@@ -191,8 +190,8 @@
# won't write the new value to disk where get_user_option can get it).
merger.this_branch.get_config().set_user_option(
'changelog_merge_files', 'ChangeLog')
- merge_hook_params = merge.MergeFileHookParams(merger, 'clog-id', None,
- 'file', 'file', 'conflict')
+ merge_hook_params = merge.MergeFileHookParams(
+ merger, 'clog-id', None, 'file', 'file', 'conflict')
changelog_merger = changelog_merge.ChangeLogMerger(merger)
return changelog_merger, merge_hook_params
@@ -219,4 +218,3 @@
self.assertEqual(
('success', ['other text\n', 'this text\n']),
(status, list(lines)))
-
More information about the bazaar-commits
mailing list