This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3141

mq: avoid a silly conversion from binary nodeid to hex
ClosedPublic

Authored by martinvonz on Apr 5 2018, 3:16 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG76823340a899: mq: avoid a silly conversion from binary nodeid to hex
Summary

We generally deal with binary nodeids in code. In this case the hex
nodeid was passed to strip.checksubstate() where it was passed to
repo.getitem, which of course accepts a binary nodeid.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Apr 5 2018, 3:16 PM
indygreg accepted this revision.Apr 5 2018, 7:42 PM
This revision is now accepted and ready to land.Apr 5 2018, 7:42 PM
Closed by commit rHG76823340a899: mq: avoid a silly conversion from binary nodeid to hex (authored by martinvonz). · Explain WhyApr 5 2018, 7:44 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/mq.py (2 lines)

Diff 7759

hgext/mq.py

raise error.Abort(_("cannot qrefresh a revision with children")) raise error.Abort(_("cannot qrefresh a revision with children"))
if not repo[top].mutable(): if not repo[top].mutable():
raise error.Abort(_("cannot qrefresh public revision"), raise error.Abort(_("cannot qrefresh public revision"),
hint=_("see 'hg help phases' for details")) hint=_("see 'hg help phases' for details"))
cparents = repo.changelog.parents(top) cparents = repo.changelog.parents(top)
patchparent = self.qparents(repo, top) patchparent = self.qparents(repo, top)
inclsubs = checksubstate(repo, hex(patchparent)) inclsubs = checksubstate(repo, patchparent)
if inclsubs: if inclsubs:
substatestate = repo.dirstate['.hgsubstate'] substatestate = repo.dirstate['.hgsubstate']
ph = patchheader(self.join(patchfn), self.plainmode) ph = patchheader(self.join(patchfn), self.plainmode)
diffopts = self.diffopts({'git': opts.get('git')}, patchfn, diffopts = self.diffopts({'git': opts.get('git')}, patchfn,
plain=True) plain=True)
if newuser: if newuser:
ph.setuser(newuser) ph.setuser(newuser)