1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
|
# Copyright (C) 2010 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
"""Merge logic for news_merge plugin."""
from bzrlib.plugins.news_merge.parser import simple_parse
from bzrlib import merge, merge3
magic_marker = '|NEWS-MERGE-MAGIC-MARKER|'
class NewsMerger(merge.ConfigurableFileMerger):
"""Merge bzr NEWS files."""
name_prefix = "news"
def merge_text(self, params):
"""Perform a simple 3-way merge of a bzr NEWS file.
Each section of a bzr NEWS file is essentially an ordered set of bullet
points, so we can simply take a set of bullet points, determine which
bullets to add and which to remove, sort, and reserialize.
"""
# Transform the different versions of the NEWS file into a bunch of
# text lines where each line matches one part of the overall
# structure, e.g. a heading or bullet.
def munge(lines):
return list(blocks_to_fakelines(simple_parse(''.join(lines))))
this_lines = munge(params.this_lines)
other_lines = munge(params.other_lines)
base_lines = munge(params.base_lines)
m3 = merge3.Merge3(base_lines, this_lines, other_lines)
result_lines = []
for group in m3.merge_groups():
if group[0] == 'conflict':
_, base, a, b = group
# Are all the conflicting lines bullets? If so, we can merge
# this.
for line_set in [base, a, b]:
for line in line_set:
if not line.startswith('bullet'):
# Something else :(
# Maybe the default merge can cope.
return 'not_applicable', None
# Calculate additions and deletions.
new_in_a = set(a).difference(base)
new_in_b = set(b).difference(base)
all_new = new_in_a.union(new_in_b)
deleted_in_a = set(base).difference(a)
deleted_in_b = set(base).difference(b)
# Combine into the final set of bullet points.
final = all_new.difference(deleted_in_a).difference(
deleted_in_b)
# Sort, and emit.
final = sorted(final, key=sort_key)
result_lines.extend(final)
else:
result_lines.extend(group[1])
# Transform the merged elements back into real blocks of lines.
return 'success', list(fakelines_to_blocks(result_lines))
def blocks_to_fakelines(blocks):
for kind, text in blocks:
yield '%s%s%s' % (kind, magic_marker, text)
def fakelines_to_blocks(fakelines):
fakelines = list(fakelines)
# Strip out the magic_marker, and reinstate the \n\n between blocks
for fakeline in fakelines[:-1]:
yield fakeline.split(magic_marker, 1)[1] + '\n\n'
# The final block doesn't have a trailing \n\n.
for fakeline in fakelines[-1:]:
yield fakeline.split(magic_marker, 1)[1]
def sort_key(s):
return s.replace('`', '').lower()
|