Show More
@@ -1,274 +1,274 | |||||
1 | # tagmerge.py - merge .hgtags files |
|
1 | # tagmerge.py - merge .hgtags files | |
2 | # |
|
2 | # | |
3 | # Copyright 2014 Angel Ezquerra <angel.ezquerra@gmail.com> |
|
3 | # Copyright 2014 Angel Ezquerra <angel.ezquerra@gmail.com> | |
4 | # |
|
4 | # | |
5 | # This software may be used and distributed according to the terms of the |
|
5 | # This software may be used and distributed according to the terms of the | |
6 | # GNU General Public License version 2 or any later version. |
|
6 | # GNU General Public License version 2 or any later version. | |
7 |
|
7 | |||
8 | # This module implements an automatic merge algorithm for mercurial's tag files |
|
8 | # This module implements an automatic merge algorithm for mercurial's tag files | |
9 | # |
|
9 | # | |
10 | # The tagmerge algorithm implemented in this module is able to resolve most |
|
10 | # The tagmerge algorithm implemented in this module is able to resolve most | |
11 | # merge conflicts that currently would trigger a .hgtags merge conflict. The |
|
11 | # merge conflicts that currently would trigger a .hgtags merge conflict. The | |
12 | # only case that it does not (and cannot) handle is that in which two tags point |
|
12 | # only case that it does not (and cannot) handle is that in which two tags point | |
13 | # to different revisions on each merge parent _and_ their corresponding tag |
|
13 | # to different revisions on each merge parent _and_ their corresponding tag | |
14 | # histories have the same rank (i.e. the same length). In all other cases the |
|
14 | # histories have the same rank (i.e. the same length). In all other cases the | |
15 | # merge algorithm will choose the revision belonging to the parent with the |
|
15 | # merge algorithm will choose the revision belonging to the parent with the | |
16 | # highest ranked tag history. The merged tag history is the combination of both |
|
16 | # highest ranked tag history. The merged tag history is the combination of both | |
17 | # tag histories (special care is taken to try to combine common tag histories |
|
17 | # tag histories (special care is taken to try to combine common tag histories | |
18 | # where possible). |
|
18 | # where possible). | |
19 | # |
|
19 | # | |
20 | # In addition to actually merging the tags from two parents, taking into |
|
20 | # In addition to actually merging the tags from two parents, taking into | |
21 | # account the base, the algorithm also tries to minimize the difference |
|
21 | # account the base, the algorithm also tries to minimize the difference | |
22 | # between the merged tag file and the first parent's tag file (i.e. it tries to |
|
22 | # between the merged tag file and the first parent's tag file (i.e. it tries to | |
23 | # make the merged tag order as as similar as possible to the first parent's tag |
|
23 | # make the merged tag order as as similar as possible to the first parent's tag | |
24 | # file order). |
|
24 | # file order). | |
25 | # |
|
25 | # | |
26 | # The algorithm works as follows: |
|
26 | # The algorithm works as follows: | |
27 | # 1. read the tags from p1, p2 and the base |
|
27 | # 1. read the tags from p1, p2 and the base | |
28 | # - when reading the p1 tags, also get the line numbers associated to each |
|
28 | # - when reading the p1 tags, also get the line numbers associated to each | |
29 | # tag node (these will be used to sort the merged tags in a way that |
|
29 | # tag node (these will be used to sort the merged tags in a way that | |
30 | # minimizes the diff to p1). Ignore the file numbers when reading p2 and |
|
30 | # minimizes the diff to p1). Ignore the file numbers when reading p2 and | |
31 | # the base |
|
31 | # the base | |
32 | # 2. recover the "lost tags" (i.e. those that are found in the base but not on |
|
32 | # 2. recover the "lost tags" (i.e. those that are found in the base but not on | |
33 | # p1 or p2) and add them back to p1 and/or p2 |
|
33 | # p1 or p2) and add them back to p1 and/or p2 | |
34 | # - at this point the only tags that are on p1 but not on p2 are those new |
|
34 | # - at this point the only tags that are on p1 but not on p2 are those new | |
35 | # tags that were introduced in p1. Same thing for the tags that are on p2 |
|
35 | # tags that were introduced in p1. Same thing for the tags that are on p2 | |
36 | # but not on p2 |
|
36 | # but not on p2 | |
37 | # 3. take all tags that are only on p1 or only on p2 (but not on the base) |
|
37 | # 3. take all tags that are only on p1 or only on p2 (but not on the base) | |
38 | # - Note that these are the tags that were introduced between base and p1 |
|
38 | # - Note that these are the tags that were introduced between base and p1 | |
39 | # and between base and p2, possibly on separate clones |
|
39 | # and between base and p2, possibly on separate clones | |
40 | # 4. for each tag found both on p1 and p2 perform the following merge algorithm: |
|
40 | # 4. for each tag found both on p1 and p2 perform the following merge algorithm: | |
41 | # - the tags conflict if their tag "histories" have the same "rank" (i.e. |
|
41 | # - the tags conflict if their tag "histories" have the same "rank" (i.e. | |
42 | # length) AND the last (current) tag is NOT the same |
|
42 | # length) AND the last (current) tag is NOT the same | |
43 | # - for non conflicting tags: |
|
43 | # - for non conflicting tags: | |
44 | # - choose which are the high and the low ranking nodes |
|
44 | # - choose which are the high and the low ranking nodes | |
45 | # - the high ranking list of nodes is the one that is longer. |
|
45 | # - the high ranking list of nodes is the one that is longer. | |
46 | # In case of draw favor p1 |
|
46 | # In case of draw favor p1 | |
47 | # - the merged node list is made of 3 parts: |
|
47 | # - the merged node list is made of 3 parts: | |
48 | # - first the nodes that are common to the beginning of both |
|
48 | # - first the nodes that are common to the beginning of both | |
49 | # the low and the high ranking nodes |
|
49 | # the low and the high ranking nodes | |
50 | # - second the non common low ranking nodes |
|
50 | # - second the non common low ranking nodes | |
51 | # - finally the non common high ranking nodes (with the last |
|
51 | # - finally the non common high ranking nodes (with the last | |
52 | # one being the merged tag node) |
|
52 | # one being the merged tag node) | |
53 | # - note that this is equivalent to putting the whole low ranking |
|
53 | # - note that this is equivalent to putting the whole low ranking | |
54 | # node list first, followed by the non common high ranking nodes |
|
54 | # node list first, followed by the non common high ranking nodes | |
55 | # - note that during the merge we keep the "node line numbers", which will |
|
55 | # - note that during the merge we keep the "node line numbers", which will | |
56 | # be used when writing the merged tags to the tag file |
|
56 | # be used when writing the merged tags to the tag file | |
57 | # 5. write the merged tags taking into account to their positions in the first |
|
57 | # 5. write the merged tags taking into account to their positions in the first | |
58 | # parent (i.e. try to keep the relative ordering of the nodes that come |
|
58 | # parent (i.e. try to keep the relative ordering of the nodes that come | |
59 | # from p1). This minimizes the diff between the merged and the p1 tag files |
|
59 | # from p1). This minimizes the diff between the merged and the p1 tag files | |
60 | # This is done by using the following algorithm |
|
60 | # This is done by using the following algorithm | |
61 | # - group the nodes for a given tag that must be written next to each other |
|
61 | # - group the nodes for a given tag that must be written next to each other | |
62 | # - A: nodes that come from consecutive lines on p1 |
|
62 | # - A: nodes that come from consecutive lines on p1 | |
63 | # - B: nodes that come from p2 (i.e. whose associated line number is |
|
63 | # - B: nodes that come from p2 (i.e. whose associated line number is | |
64 | # None) and are next to one of the a nodes in A |
|
64 | # None) and are next to one of the a nodes in A | |
65 | # - each group is associated with a line number coming from p1 |
|
65 | # - each group is associated with a line number coming from p1 | |
66 | # - generate a "tag block" for each of the groups |
|
66 | # - generate a "tag block" for each of the groups | |
67 | # - a tag block is a set of consecutive "node tag" lines belonging to |
|
67 | # - a tag block is a set of consecutive "node tag" lines belonging to | |
68 | # the same tag and which will be written next to each other on the |
|
68 | # the same tag and which will be written next to each other on the | |
69 | # merged tags file |
|
69 | # merged tags file | |
70 | # - sort the "tag blocks" according to their associated number line |
|
70 | # - sort the "tag blocks" according to their associated number line | |
71 | # - put blocks whose nodes come all from p2 first |
|
71 | # - put blocks whose nodes come all from p2 first | |
72 | # - write the tag blocks in the sorted order |
|
72 | # - write the tag blocks in the sorted order | |
73 |
|
73 | |||
74 | from __future__ import absolute_import |
|
74 | from __future__ import absolute_import | |
75 |
|
75 | |||
76 | import operator |
|
76 | import operator | |
77 |
|
77 | |||
78 | from .i18n import _ |
|
78 | from .i18n import _ | |
79 | from .node import ( |
|
79 | from .node import ( | |
80 | hex, |
|
80 | hex, | |
81 | nullid, |
|
81 | nullid, | |
82 | ) |
|
82 | ) | |
83 | from .import ( |
|
83 | from .import ( | |
84 | tags as tagsmod, |
|
84 | tags as tagsmod, | |
85 | util, |
|
85 | util, | |
86 | ) |
|
86 | ) | |
87 |
|
87 | |||
88 | hexnullid = hex(nullid) |
|
88 | hexnullid = hex(nullid) | |
89 |
|
89 | |||
90 | def readtagsformerge(ui, repo, lines, fn='', keeplinenums=False): |
|
90 | def readtagsformerge(ui, repo, lines, fn='', keeplinenums=False): | |
91 | '''read the .hgtags file into a structure that is suitable for merging |
|
91 | '''read the .hgtags file into a structure that is suitable for merging | |
92 |
|
92 | |||
93 | Depending on the keeplinenums flag, clear the line numbers associated |
|
93 | Depending on the keeplinenums flag, clear the line numbers associated | |
94 | with each tag. This is done because only the line numbers of the first |
|
94 | with each tag. This is done because only the line numbers of the first | |
95 | parent are useful for merging. |
|
95 | parent are useful for merging. | |
96 | ''' |
|
96 | ''' | |
97 | filetags = tagsmod._readtaghist(ui, repo, lines, fn=fn, recode=None, |
|
97 | filetags = tagsmod._readtaghist(ui, repo, lines, fn=fn, recode=None, | |
98 | calcnodelines=True)[1] |
|
98 | calcnodelines=True)[1] | |
99 | for tagname, taginfo in filetags.items(): |
|
99 | for tagname, taginfo in filetags.items(): | |
100 | if not keeplinenums: |
|
100 | if not keeplinenums: | |
101 | for el in taginfo: |
|
101 | for el in taginfo: | |
102 | el[1] = None |
|
102 | el[1] = None | |
103 | return filetags |
|
103 | return filetags | |
104 |
|
104 | |||
105 | def grouptagnodesbyline(tagnodes): |
|
105 | def grouptagnodesbyline(tagnodes): | |
106 | ''' |
|
106 | ''' | |
107 | Group nearby nodes (i.e. those that must be written next to each other) |
|
107 | Group nearby nodes (i.e. those that must be written next to each other) | |
108 |
|
108 | |||
109 | The input is a list of [node, position] pairs, corresponding to a given tag |
|
109 | The input is a list of [node, position] pairs, corresponding to a given tag | |
110 | The position is the line number where the node was found on the first parent |
|
110 | The position is the line number where the node was found on the first parent | |
111 | .hgtags file, or None for those nodes that came from the base or the second |
|
111 | .hgtags file, or None for those nodes that came from the base or the second | |
112 | parent .hgtags files. |
|
112 | parent .hgtags files. | |
113 |
|
113 | |||
114 | This function groups those [node, position] pairs, returning a list of |
|
114 | This function groups those [node, position] pairs, returning a list of | |
115 | groups of nodes that must be written next to each other because their |
|
115 | groups of nodes that must be written next to each other because their | |
116 | positions are consecutive or have no position preference (because their |
|
116 | positions are consecutive or have no position preference (because their | |
117 | position is None). |
|
117 | position is None). | |
118 |
|
118 | |||
119 | The result is a list of [position, [consecutive node list]] |
|
119 | The result is a list of [position, [consecutive node list]] | |
120 | ''' |
|
120 | ''' | |
121 | firstlinenum = None |
|
121 | firstlinenum = None | |
122 | for hexnode, linenum in tagnodes: |
|
122 | for hexnode, linenum in tagnodes: | |
123 | firstlinenum = linenum |
|
123 | firstlinenum = linenum | |
124 | if firstlinenum is not None: |
|
124 | if firstlinenum is not None: | |
125 | break |
|
125 | break | |
126 | if firstlinenum is None: |
|
126 | if firstlinenum is None: | |
127 | return [[None, [el[0] for el in tagnodes]]] |
|
127 | return [[None, [el[0] for el in tagnodes]]] | |
128 | tagnodes[0][1] = firstlinenum |
|
128 | tagnodes[0][1] = firstlinenum | |
129 | groupednodes = [[firstlinenum, []]] |
|
129 | groupednodes = [[firstlinenum, []]] | |
130 | prevlinenum = firstlinenum |
|
130 | prevlinenum = firstlinenum | |
131 | for hexnode, linenum in tagnodes: |
|
131 | for hexnode, linenum in tagnodes: | |
132 | if linenum is not None and linenum - prevlinenum > 1: |
|
132 | if linenum is not None and linenum - prevlinenum > 1: | |
133 | groupednodes.append([linenum, []]) |
|
133 | groupednodes.append([linenum, []]) | |
134 | groupednodes[-1][1].append(hexnode) |
|
134 | groupednodes[-1][1].append(hexnode) | |
135 | if linenum is not None: |
|
135 | if linenum is not None: | |
136 | prevlinenum = linenum |
|
136 | prevlinenum = linenum | |
137 | return groupednodes |
|
137 | return groupednodes | |
138 |
|
138 | |||
139 | def writemergedtags(repo, mergedtags): |
|
139 | def writemergedtags(repo, mergedtags): | |
140 | ''' |
|
140 | ''' | |
141 | write the merged tags while trying to minimize the diff to the first parent |
|
141 | write the merged tags while trying to minimize the diff to the first parent | |
142 |
|
142 | |||
143 | This function uses the ordering info stored on the merged tags dict to |
|
143 | This function uses the ordering info stored on the merged tags dict to | |
144 | generate an .hgtags file which is correct (in the sense that its contents |
|
144 | generate an .hgtags file which is correct (in the sense that its contents | |
145 | correspond to the result of the tag merge) while also being as close as |
|
145 | correspond to the result of the tag merge) while also being as close as | |
146 | possible to the first parent's .hgtags file. |
|
146 | possible to the first parent's .hgtags file. | |
147 | ''' |
|
147 | ''' | |
148 | # group the node-tag pairs that must be written next to each other |
|
148 | # group the node-tag pairs that must be written next to each other | |
149 | for tname, taglist in mergedtags.items(): |
|
149 | for tname, taglist in mergedtags.items(): | |
150 | mergedtags[tname] = grouptagnodesbyline(taglist) |
|
150 | mergedtags[tname] = grouptagnodesbyline(taglist) | |
151 |
|
151 | |||
152 | # convert the grouped merged tags dict into a format that resembles the |
|
152 | # convert the grouped merged tags dict into a format that resembles the | |
153 | # final .hgtags file (i.e. a list of blocks of 'node tag' pairs) |
|
153 | # final .hgtags file (i.e. a list of blocks of 'node tag' pairs) | |
154 | def taglist2string(tlist, tname): |
|
154 | def taglist2string(tlist, tname): | |
155 | return '\n'.join(['%s %s' % (hexnode, tname) for hexnode in tlist]) |
|
155 | return '\n'.join(['%s %s' % (hexnode, tname) for hexnode in tlist]) | |
156 |
|
156 | |||
157 | finaltags = [] |
|
157 | finaltags = [] | |
158 | for tname, tags in mergedtags.items(): |
|
158 | for tname, tags in mergedtags.items(): | |
159 | for block in tags: |
|
159 | for block in tags: | |
160 | block[1] = taglist2string(block[1], tname) |
|
160 | block[1] = taglist2string(block[1], tname) | |
161 | finaltags += tags |
|
161 | finaltags += tags | |
162 |
|
162 | |||
163 | # the tag groups are linked to a "position" that can be used to sort them |
|
163 | # the tag groups are linked to a "position" that can be used to sort them | |
164 | # before writing them |
|
164 | # before writing them | |
165 | # the position is calculated to ensure that the diff of the merged .hgtags |
|
165 | # the position is calculated to ensure that the diff of the merged .hgtags | |
166 | # file to the first parent's .hgtags file is as small as possible |
|
166 | # file to the first parent's .hgtags file is as small as possible | |
167 | finaltags.sort(key=operator.itemgetter(0)) |
|
167 | finaltags.sort(key=operator.itemgetter(0)) | |
168 |
|
168 | |||
169 | # finally we can join the sorted groups to get the final contents of the |
|
169 | # finally we can join the sorted groups to get the final contents of the | |
170 | # merged .hgtags file, and then write it to disk |
|
170 | # merged .hgtags file, and then write it to disk | |
171 | mergedtagstring = '\n'.join([tags for rank, tags in finaltags if tags]) |
|
171 | mergedtagstring = '\n'.join([tags for rank, tags in finaltags if tags]) | |
172 |
fp = repo.w |
|
172 | fp = repo.wvfs('.hgtags', 'wb') | |
173 | fp.write(mergedtagstring + '\n') |
|
173 | fp.write(mergedtagstring + '\n') | |
174 | fp.close() |
|
174 | fp.close() | |
175 |
|
175 | |||
176 | def singletagmerge(p1nodes, p2nodes): |
|
176 | def singletagmerge(p1nodes, p2nodes): | |
177 | ''' |
|
177 | ''' | |
178 | merge the nodes corresponding to a single tag |
|
178 | merge the nodes corresponding to a single tag | |
179 |
|
179 | |||
180 | Note that the inputs are lists of node-linenum pairs (i.e. not just lists |
|
180 | Note that the inputs are lists of node-linenum pairs (i.e. not just lists | |
181 | of nodes) |
|
181 | of nodes) | |
182 | ''' |
|
182 | ''' | |
183 | if not p2nodes: |
|
183 | if not p2nodes: | |
184 | return p1nodes |
|
184 | return p1nodes | |
185 | if not p1nodes: |
|
185 | if not p1nodes: | |
186 | return p2nodes |
|
186 | return p2nodes | |
187 |
|
187 | |||
188 | # there is no conflict unless both tags point to different revisions |
|
188 | # there is no conflict unless both tags point to different revisions | |
189 | # and have a non identical tag history |
|
189 | # and have a non identical tag history | |
190 | p1currentnode = p1nodes[-1][0] |
|
190 | p1currentnode = p1nodes[-1][0] | |
191 | p2currentnode = p2nodes[-1][0] |
|
191 | p2currentnode = p2nodes[-1][0] | |
192 | if p1currentnode != p2currentnode and len(p1nodes) == len(p2nodes): |
|
192 | if p1currentnode != p2currentnode and len(p1nodes) == len(p2nodes): | |
193 | # cannot merge two tags with same rank pointing to different nodes |
|
193 | # cannot merge two tags with same rank pointing to different nodes | |
194 | return None |
|
194 | return None | |
195 |
|
195 | |||
196 | # which are the highest ranking (hr) / lowest ranking (lr) nodes? |
|
196 | # which are the highest ranking (hr) / lowest ranking (lr) nodes? | |
197 | if len(p1nodes) >= len(p2nodes): |
|
197 | if len(p1nodes) >= len(p2nodes): | |
198 | hrnodes, lrnodes = p1nodes, p2nodes |
|
198 | hrnodes, lrnodes = p1nodes, p2nodes | |
199 | else: |
|
199 | else: | |
200 | hrnodes, lrnodes = p2nodes, p1nodes |
|
200 | hrnodes, lrnodes = p2nodes, p1nodes | |
201 |
|
201 | |||
202 | # the lowest ranking nodes will be written first, followed by the highest |
|
202 | # the lowest ranking nodes will be written first, followed by the highest | |
203 | # ranking nodes |
|
203 | # ranking nodes | |
204 | # to avoid unwanted tag rank explosion we try to see if there are some |
|
204 | # to avoid unwanted tag rank explosion we try to see if there are some | |
205 | # common nodes that can be written only once |
|
205 | # common nodes that can be written only once | |
206 | commonidx = len(lrnodes) |
|
206 | commonidx = len(lrnodes) | |
207 | for n in range(len(lrnodes)): |
|
207 | for n in range(len(lrnodes)): | |
208 | if hrnodes[n][0] != lrnodes[n][0]: |
|
208 | if hrnodes[n][0] != lrnodes[n][0]: | |
209 | commonidx = n |
|
209 | commonidx = n | |
210 | break |
|
210 | break | |
211 | lrnodes[n][1] = p1nodes[n][1] |
|
211 | lrnodes[n][1] = p1nodes[n][1] | |
212 |
|
212 | |||
213 | # the merged node list has 3 parts: |
|
213 | # the merged node list has 3 parts: | |
214 | # - common nodes |
|
214 | # - common nodes | |
215 | # - non common lowest ranking nodes |
|
215 | # - non common lowest ranking nodes | |
216 | # - non common highest ranking nodes |
|
216 | # - non common highest ranking nodes | |
217 | # note that the common nodes plus the non common lowest ranking nodes is the |
|
217 | # note that the common nodes plus the non common lowest ranking nodes is the | |
218 | # whole list of lr nodes |
|
218 | # whole list of lr nodes | |
219 | return lrnodes + hrnodes[commonidx:] |
|
219 | return lrnodes + hrnodes[commonidx:] | |
220 |
|
220 | |||
221 | def merge(repo, fcd, fco, fca): |
|
221 | def merge(repo, fcd, fco, fca): | |
222 | ''' |
|
222 | ''' | |
223 | Merge the tags of two revisions, taking into account the base tags |
|
223 | Merge the tags of two revisions, taking into account the base tags | |
224 | Try to minimize the diff between the merged tags and the first parent tags |
|
224 | Try to minimize the diff between the merged tags and the first parent tags | |
225 | ''' |
|
225 | ''' | |
226 | ui = repo.ui |
|
226 | ui = repo.ui | |
227 | # read the p1, p2 and base tags |
|
227 | # read the p1, p2 and base tags | |
228 | # only keep the line numbers for the p1 tags |
|
228 | # only keep the line numbers for the p1 tags | |
229 | p1tags = readtagsformerge( |
|
229 | p1tags = readtagsformerge( | |
230 | ui, repo, fcd.data().splitlines(), fn="p1 tags", |
|
230 | ui, repo, fcd.data().splitlines(), fn="p1 tags", | |
231 | keeplinenums=True) |
|
231 | keeplinenums=True) | |
232 | p2tags = readtagsformerge( |
|
232 | p2tags = readtagsformerge( | |
233 | ui, repo, fco.data().splitlines(), fn="p2 tags", |
|
233 | ui, repo, fco.data().splitlines(), fn="p2 tags", | |
234 | keeplinenums=False) |
|
234 | keeplinenums=False) | |
235 | basetags = readtagsformerge( |
|
235 | basetags = readtagsformerge( | |
236 | ui, repo, fca.data().splitlines(), fn="base tags", |
|
236 | ui, repo, fca.data().splitlines(), fn="base tags", | |
237 | keeplinenums=False) |
|
237 | keeplinenums=False) | |
238 |
|
238 | |||
239 | # recover the list of "lost tags" (i.e. those that were found on the base |
|
239 | # recover the list of "lost tags" (i.e. those that were found on the base | |
240 | # revision but not on one of the revisions being merged) |
|
240 | # revision but not on one of the revisions being merged) | |
241 | basetagset = set(basetags) |
|
241 | basetagset = set(basetags) | |
242 | for n, pntags in enumerate((p1tags, p2tags)): |
|
242 | for n, pntags in enumerate((p1tags, p2tags)): | |
243 | pntagset = set(pntags) |
|
243 | pntagset = set(pntags) | |
244 | pnlosttagset = basetagset - pntagset |
|
244 | pnlosttagset = basetagset - pntagset | |
245 | for t in pnlosttagset: |
|
245 | for t in pnlosttagset: | |
246 | pntags[t] = basetags[t] |
|
246 | pntags[t] = basetags[t] | |
247 | if pntags[t][-1][0] != hexnullid: |
|
247 | if pntags[t][-1][0] != hexnullid: | |
248 | pntags[t].append([hexnullid, None]) |
|
248 | pntags[t].append([hexnullid, None]) | |
249 |
|
249 | |||
250 | conflictedtags = [] # for reporting purposes |
|
250 | conflictedtags = [] # for reporting purposes | |
251 | mergedtags = util.sortdict(p1tags) |
|
251 | mergedtags = util.sortdict(p1tags) | |
252 | # sortdict does not implement iteritems() |
|
252 | # sortdict does not implement iteritems() | |
253 | for tname, p2nodes in p2tags.items(): |
|
253 | for tname, p2nodes in p2tags.items(): | |
254 | if tname not in mergedtags: |
|
254 | if tname not in mergedtags: | |
255 | mergedtags[tname] = p2nodes |
|
255 | mergedtags[tname] = p2nodes | |
256 | continue |
|
256 | continue | |
257 | p1nodes = mergedtags[tname] |
|
257 | p1nodes = mergedtags[tname] | |
258 | mergednodes = singletagmerge(p1nodes, p2nodes) |
|
258 | mergednodes = singletagmerge(p1nodes, p2nodes) | |
259 | if mergednodes is None: |
|
259 | if mergednodes is None: | |
260 | conflictedtags.append(tname) |
|
260 | conflictedtags.append(tname) | |
261 | continue |
|
261 | continue | |
262 | mergedtags[tname] = mergednodes |
|
262 | mergedtags[tname] = mergednodes | |
263 |
|
263 | |||
264 | if conflictedtags: |
|
264 | if conflictedtags: | |
265 | numconflicts = len(conflictedtags) |
|
265 | numconflicts = len(conflictedtags) | |
266 | ui.warn(_('automatic .hgtags merge failed\n' |
|
266 | ui.warn(_('automatic .hgtags merge failed\n' | |
267 | 'the following %d tags are in conflict: %s\n') |
|
267 | 'the following %d tags are in conflict: %s\n') | |
268 | % (numconflicts, ', '.join(sorted(conflictedtags)))) |
|
268 | % (numconflicts, ', '.join(sorted(conflictedtags)))) | |
269 | return True, 1 |
|
269 | return True, 1 | |
270 |
|
270 | |||
271 | writemergedtags(repo, mergedtags) |
|
271 | writemergedtags(repo, mergedtags) | |
272 | ui.note(_('.hgtags merged successfully\n')) |
|
272 | ui.note(_('.hgtags merged successfully\n')) | |
273 | return False, 0 |
|
273 | return False, 0 | |
274 |
|
274 |
General Comments 0
You need to be logged in to leave comments.
Login now