D6534: strip: remove unused excsuffix argument from checklocalchanges()
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Mon Jun 17 18:39:53 EDT 2019
Closed by commit rHG3a1988e915f9: strip: remove unused excsuffix argument from checklocalchanges() (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.
This revision was not accepted when it landed; it landed in state "Needs Review".
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6534?vs=15548&id=15559
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D6534/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D6534
AFFECTED FILES
hgext/strip.py
CHANGE DETAILS
diff --git a/hgext/strip.py b/hgext/strip.py
--- a/hgext/strip.py
+++ b/hgext/strip.py
@@ -46,19 +46,19 @@
inclsubs.append(s)
return inclsubs
-def checklocalchanges(repo, force=False, excsuffix=''):
+def checklocalchanges(repo, force=False):
cmdutil.checkunfinished(repo)
s = repo.status()
if not force:
if len(repo[None].parents()) > 1:
_("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:
_("local changes found") # i18n tool detection
- raise error.Abort(_("local changes found" + excsuffix))
+ raise error.Abort(_("local changes found"))
if checksubstate(repo):
_("local changed subrepos found") # i18n tool detection
- raise error.Abort(_("local changed subrepos found" + excsuffix))
+ raise error.Abort(_("local changed subrepos found"))
return s
def _findupdatetarget(repo, nodes):
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list