##// END OF EJS Templates
tagmerge: use workingfilectx to write merged tags...
Phil Cohen -
r33421:d1aa3fee default
parent child Browse files
Show More
@@ -136,7 +136,7 b' def grouptagnodesbyline(tagnodes):'
136 prevlinenum = linenum
136 prevlinenum = linenum
137 return groupednodes
137 return groupednodes
138
138
139 def writemergedtags(repo, mergedtags):
139 def writemergedtags(fcd, 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
@@ -169,9 +169,7 b' def writemergedtags(repo, mergedtags):'
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.wvfs('.hgtags', 'wb')
172 fcd.write(mergedtagstring + '\n', fcd.flags())
173 fp.write(mergedtagstring + '\n')
174 fp.close()
175
173
176 def singletagmerge(p1nodes, p2nodes):
174 def singletagmerge(p1nodes, p2nodes):
177 '''
175 '''
@@ -268,7 +266,7 b' def merge(repo, fcd, fco, fca):'
268 % (numconflicts, ', '.join(sorted(conflictedtags))))
266 % (numconflicts, ', '.join(sorted(conflictedtags))))
269 return True, 1
267 return True, 1
270
268
271 writemergedtags(repo, mergedtags)
269 writemergedtags(fcd, mergedtags)
272 ui.note(_('.hgtags merged successfully\n'))
270 ui.note(_('.hgtags merged successfully\n'))
273 return False, 0
271 return False, 0
274
272
General Comments 0
You need to be logged in to leave comments. Login now