| durin42 | |
| yuja |
| hg-reviewers |
Weaning off basectx.int.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Expected commit options are: | Expected commit options are: | ||||
| - message | - message | ||||
| - date | - date | ||||
| - username | - username | ||||
| Commit message is edited in all cases. | Commit message is edited in all cases. | ||||
| This function works in memory.""" | This function works in memory.""" | ||||
| ctxs = list(repo.set('%d::%d', firstctx, lastctx)) | ctxs = list(repo.set('%d::%d', firstctx.rev(), lastctx.rev())) | ||||
| if not ctxs: | if not ctxs: | ||||
| return None | return None | ||||
| for c in ctxs: | for c in ctxs: | ||||
| if not c.mutable(): | if not c.mutable(): | ||||
| raise error.ParseError( | raise error.ParseError( | ||||
| _("cannot fold into public change %s") % node.short(c.node())) | _("cannot fold into public change %s") % node.short(c.node())) | ||||
| base = firstctx.parents()[0] | base = firstctx.parents()[0] | ||||
| rulectx = repo[self.node] | rulectx = repo[self.node] | ||||
| parentctxnode = self.state.parentctxnode | parentctxnode = self.state.parentctxnode | ||||
| if ctx.node() == parentctxnode: | if ctx.node() == parentctxnode: | ||||
| repo.ui.warn(_('%s: empty changeset\n') % | repo.ui.warn(_('%s: empty changeset\n') % | ||||
| node.short(self.node)) | node.short(self.node)) | ||||
| return ctx, [(self.node, (parentctxnode,))] | return ctx, [(self.node, (parentctxnode,))] | ||||
| parentctx = repo[parentctxnode] | parentctx = repo[parentctxnode] | ||||
| newcommits = set(c.node() for c in repo.set('(%d::. - %d)', parentctx, | newcommits = set(c.node() for c in repo.set('(%d::. - %d)', | ||||
| parentctx)) | parentctx.rev(), | ||||
| parentctx.rev())) | |||||
| if not newcommits: | if not newcommits: | ||||
| repo.ui.warn(_('%s: cannot fold - working copy is not a ' | repo.ui.warn(_('%s: cannot fold - working copy is not a ' | ||||
| 'descendant of previous commit %s\n') % | 'descendant of previous commit %s\n') % | ||||
| (node.short(self.node), node.short(parentctxnode))) | (node.short(self.node), node.short(parentctxnode))) | ||||
| return ctx, [(self.node, (ctx.node(),))] | return ctx, [(self.node, (ctx.node(),))] | ||||
| middlecommits = newcommits.copy() | middlecommits = newcommits.copy() | ||||
| middlecommits.discard(ctx.node()) | middlecommits.discard(ctx.node()) | ||||