##// END OF EJS Templates
strip: remove unused excsuffix argument from checklocalchanges()...
Martin von Zweigbergk -
r42690:3a1988e9 default
parent child Browse files
Show More
@@ -46,19 +46,19 b' def checksubstate(repo, baserev=None):'
46 inclsubs.append(s)
46 inclsubs.append(s)
47 return inclsubs
47 return inclsubs
48
48
49 def checklocalchanges(repo, force=False, excsuffix=''):
49 def checklocalchanges(repo, force=False):
50 cmdutil.checkunfinished(repo)
50 cmdutil.checkunfinished(repo)
51 s = repo.status()
51 s = repo.status()
52 if not force:
52 if not force:
53 if len(repo[None].parents()) > 1:
53 if len(repo[None].parents()) > 1:
54 _("outstanding uncommitted merge") #i18 tool detection
54 _("outstanding uncommitted merge") #i18 tool detection
55 raise error.Abort(_("outstanding uncommitted merge"+ excsuffix))
55 raise error.Abort(_("outstanding uncommitted merge"))
56 if s.modified or s.added or s.removed or s.deleted:
56 if s.modified or s.added or s.removed or s.deleted:
57 _("local changes found") # i18n tool detection
57 _("local changes found") # i18n tool detection
58 raise error.Abort(_("local changes found" + excsuffix))
58 raise error.Abort(_("local changes found"))
59 if checksubstate(repo):
59 if checksubstate(repo):
60 _("local changed subrepos found") # i18n tool detection
60 _("local changed subrepos found") # i18n tool detection
61 raise error.Abort(_("local changed subrepos found" + excsuffix))
61 raise error.Abort(_("local changed subrepos found"))
62 return s
62 return s
63
63
64 def _findupdatetarget(repo, nodes):
64 def _findupdatetarget(repo, nodes):
General Comments 0
You need to be logged in to leave comments. Login now