Submitter | Anton Shestakov |
---|---|
Date | Nov. 14, 2018, 12:42 p.m. |
Message ID | <f1e3f2baa3c222a256c2.1542199343@neuro> |
Download | mbox | patch |
Permalink | /patch/36571/ |
State | Accepted |
Headers | show |
Comments
On Wed, 14 Nov 2018 20:42:23 +0800, Anton Shestakov wrote: > # HG changeset patch > # User Anton Shestakov <av6@dwimlabs.net> > # Date 1542179138 -28800 > # Wed Nov 14 15:05:38 2018 +0800 > # Node ID f1e3f2baa3c222a256c2bb91b95a8368c8d10366 > # Parent b93157f69f46a1359726be32bde4afb1e5af4384 > # EXP-Topic misc > rewriteutil: move publicrevs closer to where it's used Queued, thanks.
Patch
diff --git a/mercurial/rewriteutil.py b/mercurial/rewriteutil.py --- a/mercurial/rewriteutil.py +++ b/mercurial/rewriteutil.py @@ -27,10 +27,10 @@ def precheck(repo, revs, action='rewrite hint = _("no changeset checked out") raise error.Abort(msg, hint=hint) - publicrevs = repo.revs('%ld and public()', revs) if len(repo[None].parents()) > 1: raise error.Abort(_("cannot %s while merging") % action) + publicrevs = repo.revs('%ld and public()', revs) if publicrevs: msg = _("cannot %s public changesets") % (action) hint = _("see 'hg help phases' for details")