hgext/convert/hg.py
changeset 25697 1538e72209fd
parent 25660 328739ea70c3
child 25748 baea47cafe75
equal deleted inserted replaced
25696:c1cac25ad1a6 25697:1538e72209fd
   282                 tr.close()
   282                 tr.close()
   283             finally:
   283             finally:
   284                 tr.release()
   284                 tr.release()
   285 
   285 
   286             text = "(octopus merge fixup)\n"
   286             text = "(octopus merge fixup)\n"
   287             p2 = hex(self.repo.changelog.tip())
   287             p2 = node
   288 
   288 
   289         if self.filemapmode and nparents == 1:
   289         if self.filemapmode and nparents == 1:
   290             man = self.repo.manifest
   290             man = self.repo.manifest
   291             mnode = self.repo.changelog.read(bin(p2))[0]
   291             mnode = self.repo.changelog.read(bin(p2))[0]
   292             closed = 'close' in commit.extra
   292             closed = 'close' in commit.extra
   342         date = "%s 0" % int(time.mktime(time.gmtime()))
   342         date = "%s 0" % int(time.mktime(time.gmtime()))
   343         extra = {'branch': self.tagsbranch}
   343         extra = {'branch': self.tagsbranch}
   344         ctx = context.memctx(self.repo, (tagparent, None), "update tags",
   344         ctx = context.memctx(self.repo, (tagparent, None), "update tags",
   345                              [".hgtags"], getfilectx, "convert-repo", date,
   345                              [".hgtags"], getfilectx, "convert-repo", date,
   346                              extra)
   346                              extra)
   347         self.repo.commitctx(ctx)
   347         node = self.repo.commitctx(ctx)
   348         return hex(self.repo.changelog.tip()), hex(tagparent)
   348         return hex(node), hex(tagparent)
   349 
   349 
   350     def setfilemapmode(self, active):
   350     def setfilemapmode(self, active):
   351         self.filemapmode = active
   351         self.filemapmode = active
   352 
   352 
   353     def putbookmarks(self, updatedbookmark):
   353     def putbookmarks(self, updatedbookmark):