hgext/git/gitlog.py
changeset 44844 8bfc6cc8e480
parent 44484 ec54b3d2af0b
child 44845 3e09d22a0bf5
equal deleted inserted replaced
44843:288328c6711b 44844:8bfc6cc8e480
   268         return bool(self.reachableroots(a, [b], [a], includepath=False))
   268         return bool(self.reachableroots(a, [b], [a], includepath=False))
   269 
   269 
   270     def parentrevs(self, rev):
   270     def parentrevs(self, rev):
   271         n = self.node(rev)
   271         n = self.node(rev)
   272         hn = gitutil.togitnode(n)
   272         hn = gitutil.togitnode(n)
   273         c = self.gitrepo[hn]
   273         if hn != gitutil.nullgit:
       
   274             c = self.gitrepo[hn]
       
   275         else:
       
   276             return nodemod.nullrev, nodemod.nullrev
   274         p1 = p2 = nodemod.nullrev
   277         p1 = p2 = nodemod.nullrev
   275         if c.parents:
   278         if c.parents:
   276             p1 = self.rev(c.parents[0].id.raw)
   279             p1 = self.rev(c.parents[0].id.raw)
   277             if len(c.parents) > 2:
   280             if len(c.parents) > 2:
   278                 raise error.Abort(b'TODO octopus merge handling')
   281                 raise error.Abort(b'TODO octopus merge handling')