hgext/convert/hg.py
changeset 49005 417a1691a273
parent 49004 f254fc73d956
child 49948 2ac60a71c240
equal deleted inserted replaced
49004:f254fc73d956 49005:417a1691a273
    37     lock as lockmod,
    37     lock as lockmod,
    38     logcmdutil,
    38     logcmdutil,
    39     merge as mergemod,
    39     merge as mergemod,
    40     mergestate,
    40     mergestate,
    41     phases,
    41     phases,
    42     pycompat,
       
    43     util,
    42     util,
    44 )
    43 )
    45 from mercurial.utils import dateutil
    44 from mercurial.utils import dateutil
    46 
    45 
    47 stringio = util.stringio
    46 stringio = util.stringio
   421     def puttags(self, tags):
   420     def puttags(self, tags):
   422         tagparent = self.repo.branchtip(self.tagsbranch, ignoremissing=True)
   421         tagparent = self.repo.branchtip(self.tagsbranch, ignoremissing=True)
   423         tagparent = tagparent or self.repo.nullid
   422         tagparent = tagparent or self.repo.nullid
   424 
   423 
   425         oldlines = set()
   424         oldlines = set()
   426         for branch, heads in pycompat.iteritems(self.repo.branchmap()):
   425         for branch, heads in self.repo.branchmap().items():
   427             for h in heads:
   426             for h in heads:
   428                 if b'.hgtags' in self.repo[h]:
   427                 if b'.hgtags' in self.repo[h]:
   429                     oldlines.update(
   428                     oldlines.update(
   430                         set(self.repo[h][b'.hgtags'].data().splitlines(True))
   429                         set(self.repo[h][b'.hgtags'].data().splitlines(True))
   431                     )
   430                     )