strip: make checklocalchanges() return full status tuple
By making checklocalchanges() return the full instance of the status
class instead of just the first 4 elements of it, we can take
advantage of the field names and not require the caller to remember
the element indices.
--- a/hgext/mq.py Sat Oct 04 21:58:01 2014 -0700
+++ b/hgext/mq.py Sat Oct 04 20:53:05 2014 -0700
@@ -1359,11 +1359,12 @@
tobackup = set()
if (not nobackup and force) or keepchanges:
- m, a, r, d = self.checklocalchanges(repo, force=True)
+ status = self.checklocalchanges(repo, force=True)
if keepchanges:
- tobackup.update(m + a + r + d)
+ tobackup.update(status.modified + status.added +
+ status.removed + status.deleted)
else:
- tobackup.update(m + a)
+ tobackup.update(status.modified + status.added)
s = self.series[start:end]
all_files = set()
@@ -1447,13 +1448,13 @@
tobackup = set()
if update:
- m, a, r, d = self.checklocalchanges(
- repo, force=force or keepchanges)
+ s = self.checklocalchanges(repo, force=force or keepchanges)
if force:
if not nobackup:
- tobackup.update(m + a)
+ tobackup.update(s.modified + s.added)
elif keepchanges:
- tobackup.update(m + a + r + d)
+ tobackup.update(s.modified + s.added +
+ s.removed + s.deleted)
self.applieddirty = True
end = len(self.applied)
--- a/hgext/strip.py Sat Oct 04 21:58:01 2014 -0700
+++ b/hgext/strip.py Sat Oct 04 20:53:05 2014 -0700
@@ -32,15 +32,15 @@
def checklocalchanges(repo, force=False, excsuffix=''):
cmdutil.checkunfinished(repo)
- m, a, r, d = repo.status()[:4]
+ s = repo.status()
if not force:
- if (m or a or r or d):
+ if s.modified or s.added or s.removed or s.deleted:
_("local changes found") # i18n tool detection
raise util.Abort(_("local changes found" + excsuffix))
if checksubstate(repo):
_("local changed subrepos found") # i18n tool detection
raise util.Abort(_("local changed subrepos found" + excsuffix))
- return m, a, r, d
+ return s
def strip(ui, repo, revs, update=True, backup=True, force=None, bookmark=None):
wlock = lock = None