equal
deleted
inserted
replaced
580 self.ui.warn(_('ignoring: %s\n') % e) |
580 self.ui.warn(_('ignoring: %s\n') % e) |
581 return copies |
581 return copies |
582 |
582 |
583 def getcommit(self, rev): |
583 def getcommit(self, rev): |
584 ctx = self._changectx(rev) |
584 ctx = self._changectx(rev) |
585 parents = [p.hex() for p in self._parents(ctx)] |
585 _parents = self._parents(ctx) |
|
586 parents = [p.hex() for p in _parents] |
|
587 optparents = [p.hex() for p in ctx.parents() if p and p not in _parents] |
586 crev = rev |
588 crev = rev |
587 |
589 |
588 return common.commit(author=ctx.user(), |
590 return common.commit(author=ctx.user(), |
589 date=util.datestr(ctx.date(), |
591 date=util.datestr(ctx.date(), |
590 '%Y-%m-%d %H:%M:%S %1%2'), |
592 '%Y-%m-%d %H:%M:%S %1%2'), |
591 desc=ctx.description(), |
593 desc=ctx.description(), |
592 rev=crev, |
594 rev=crev, |
593 parents=parents, |
595 parents=parents, |
|
596 optparents=optparents, |
594 branch=ctx.branch(), |
597 branch=ctx.branch(), |
595 extra=ctx.extra(), |
598 extra=ctx.extra(), |
596 sortkey=ctx.rev(), |
599 sortkey=ctx.rev(), |
597 saverev=self.saverev, |
600 saverev=self.saverev, |
598 phase=ctx.phase()) |
601 phase=ctx.phase()) |