This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6534

strip: remove unused excsuffix argument from checklocalchanges()
ClosedPublic

Authored by martinvonz on Jun 17 2019, 1:59 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG3a1988e915f9: strip: remove unused excsuffix argument from checklocalchanges()
Summary

It was only used by mq, and mq now has its own copy of the function.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Jun 17 2019, 1:59 PM
martinvonz added a commit: rHG3a1988e915f9: strip: remove unused excsuffix argument from checklocalchanges().Jun 17 2019, 6:39 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG3a1988e915f9: strip: remove unused excsuffix argument from checklocalchanges() (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/strip.py (8 lines)

Diff 15548

hgext/strip.py

else: else:
bctx = wctx.p1() bctx = wctx.p1()
for s in sorted(wctx.substate): for s in sorted(wctx.substate):
wctx.sub(s).bailifchanged(True) wctx.sub(s).bailifchanged(True)
if s not in bctx.substate or bctx.sub(s).dirty(): if s not in bctx.substate or bctx.sub(s).dirty():
inclsubs.append(s) inclsubs.append(s)
return inclsubs return inclsubs
def checklocalchanges(repo, force=False, excsuffix=''): def checklocalchanges(repo, force=False):
cmdutil.checkunfinished(repo) cmdutil.checkunfinished(repo)
s = repo.status() s = repo.status()
if not force: if not force:
if len(repo[None].parents()) > 1: if len(repo[None].parents()) > 1:
_("outstanding uncommitted merge") #i18 tool detection _("outstanding uncommitted merge") #i18 tool detection
raise error.Abort(_("outstanding uncommitted merge"+ excsuffix)) raise error.Abort(_("outstanding uncommitted merge"))
if s.modified or s.added or s.removed or s.deleted: if s.modified or s.added or s.removed or s.deleted:
_("local changes found") # i18n tool detection _("local changes found") # i18n tool detection
raise error.Abort(_("local changes found" + excsuffix)) raise error.Abort(_("local changes found"))
if checksubstate(repo): if checksubstate(repo):
_("local changed subrepos found") # i18n tool detection _("local changed subrepos found") # i18n tool detection
raise error.Abort(_("local changed subrepos found" + excsuffix)) raise error.Abort(_("local changed subrepos found"))
return s return s
def _findupdatetarget(repo, nodes): def _findupdatetarget(repo, nodes):
unode, p2 = repo.changelog.parents(nodes[0]) unode, p2 = repo.changelog.parents(nodes[0])
currentbranch = repo[None].branch() currentbranch = repo[None].branch()
if (util.safehasattr(repo, 'mq') and p2 != nullid if (util.safehasattr(repo, 'mq') and p2 != nullid
and p2 in [x.node for x in repo.mq.applied]): and p2 in [x.node for x in repo.mq.applied]):