equal
deleted
inserted
replaced
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 import tags |
74 import tags as tagsmod |
75 import util |
75 import util |
76 from node import nullid, hex |
76 from node import nullid, hex |
77 from i18n import _ |
77 from i18n import _ |
78 import operator |
78 import operator |
79 hexnullid = hex(nullid) |
79 hexnullid = hex(nullid) |
83 |
83 |
84 Sepending on the keeplinenumbers flag, clear the line numbers associated |
84 Sepending on the keeplinenumbers flag, clear the line numbers associated |
85 with each tag. Rhis is done because only the line numbers of the first |
85 with each tag. Rhis is done because only the line numbers of the first |
86 parent are useful for merging |
86 parent are useful for merging |
87 ''' |
87 ''' |
88 filetags = tags._readtaghist(ui, repo, lines, fn=fn, recode=None, |
88 filetags = tagsmod._readtaghist(ui, repo, lines, fn=fn, recode=None, |
89 calcnodelines=True)[1] |
89 calcnodelines=True)[1] |
90 for tagname, taginfo in filetags.items(): |
90 for tagname, taginfo in filetags.items(): |
91 if not keeplinenums: |
91 if not keeplinenums: |
92 for el in taginfo: |
92 for el in taginfo: |
93 el[1] = None |
93 el[1] = None |
94 return filetags |
94 return filetags |