This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6533

mq: remove dependency on strip's checklocalchanges()
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGcf445a212b9c: mq: remove dependency on strip's checklocalchanges()
Summary

Some of the functionality in strip.checklocalchanges() was only used
by mq, so let's move it to mq so we can clean up strip.

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: rHGcf445a212b9c: mq: remove dependency on strip's checklocalchanges().Jun 17 2019, 6:39 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGcf445a212b9c: mq: remove dependency on strip's checklocalchanges() (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/mq.py (17 lines)

Diff 15547

hgext/mq.py

def debug(self, msg): def debug(self, msg):
pass pass
def log(self, event, msgfmt, *msgargs, **opts): def log(self, event, msgfmt, *msgargs, **opts):
pass pass
stripext = extensions.load(dummyui(), 'strip', '') stripext = extensions.load(dummyui(), 'strip', '')
strip = stripext.strip strip = stripext.strip
checksubstate = stripext.checksubstate checksubstate = stripext.checksubstate
checklocalchanges = stripext.checklocalchanges
# Patch names looks like unix-file names. # Patch names looks like unix-file names.
# They must be joinable with queue directory and result in the patch path. # They must be joinable with queue directory and result in the patch path.
normname = util.normpath normname = util.normpath
class statusentry(object): class statusentry(object):
def __init__(self, node, name): def __init__(self, node, name):
self.node, self.name = node, name self.node, self.name = node, name
def checklocalchanges(self, repo, force=False, refresh=True): def checklocalchanges(self, repo, force=False, refresh=True):
excsuffix = '' excsuffix = ''
if refresh: if refresh:
excsuffix = ', qrefresh first' excsuffix = ', qrefresh first'
# plain versions for i18n tool to detect them # plain versions for i18n tool to detect them
_("local changes found, qrefresh first") _("local changes found, qrefresh first")
_("local changed subrepos found, qrefresh first") _("local changed subrepos found, qrefresh first")
return checklocalchanges(repo, force, excsuffix)
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))
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))
if checksubstate(repo):
_("local changed subrepos found") # i18n tool detection
raise error.Abort(_("local changed subrepos found" + excsuffix))
return s
_reserved = ('series', 'status', 'guards', '.', '..') _reserved = ('series', 'status', 'guards', '.', '..')
def checkreservedname(self, name): def checkreservedname(self, name):
if name in self._reserved: if name in self._reserved:
raise error.Abort(_('"%s" cannot be used as the name of a patch') raise error.Abort(_('"%s" cannot be used as the name of a patch')
% name) % name)
if name != name.strip(): if name != name.strip():
# whitespace is stripped by parseseries() # whitespace is stripped by parseseries()