# HG changeset patch # User Gregory Szorc # Date 1519498427 28800 # Node ID 6905c4ec312cc0a66ea5f9a9332c39f786414422 # Parent 10de411d7207e1608869cb9a8c47254d1a2a7cb7 histedit: use ctx.rev() instead of %d % ctx Weaning off basectx.__int__. Differential Revision: https://phab.mercurial-scm.org/D2426 diff -r 10de411d7207 -r 6905c4ec312c hgext/histedit.py --- a/hgext/histedit.py Sat Feb 24 10:56:15 2018 -0800 +++ b/hgext/histedit.py Sat Feb 24 10:53:47 2018 -0800 @@ -577,7 +577,7 @@ Commit message is edited in all cases. 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: return None for c in ctxs: @@ -730,8 +730,9 @@ return ctx, [(self.node, (parentctxnode,))] parentctx = repo[parentctxnode] - newcommits = set(c.node() for c in repo.set('(%d::. - %d)', parentctx, - parentctx)) + newcommits = set(c.node() for c in repo.set('(%d::. - %d)', + parentctx.rev(), + parentctx.rev())) if not newcommits: repo.ui.warn(_('%s: cannot fold - working copy is not a ' 'descendant of previous commit %s\n') %