This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11529

dirstate-item: use item's property to deal with hgsubstate in mq
ClosedPublic

Authored by marmoute on Oct 1 2021, 5:38 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG0dc9ced02a3b: dirstate-item: use item's property to deal with hgsubstate in mq
Summary

This is clearer than processing the state.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mhgext/mq.py (8 lines)

Diff 30529

hgext/mq.py

def putsubstate2changes(self, substatestate, changes): def putsubstate2changes(self, substatestate, changes):
if isinstance(changes, list): if isinstance(changes, list):
mar = changes[:3] mar = changes[:3]
else: else:
mar = (changes.modified, changes.added, changes.removed) mar = (changes.modified, changes.added, changes.removed)
if any((b'.hgsubstate' in files for files in mar)): if any((b'.hgsubstate' in files for files in mar)):
return # already listed up return # already listed up
# not yet listed up # not yet listed up
if substatestate in b'a?': if substatestate.added or not substatestate.any_tracked:
mar[1].append(b'.hgsubstate') mar[1].append(b'.hgsubstate')
elif substatestate in b'r': elif substatestate.removed:
mar[2].append(b'.hgsubstate') mar[2].append(b'.hgsubstate')
else: # modified else: # modified
mar[0].append(b'.hgsubstate') mar[0].append(b'.hgsubstate')
def checklocalchanges(self, repo, force=False, refresh=True): def checklocalchanges(self, repo, force=False, refresh=True):
excsuffix = b'' excsuffix = b''
if refresh: if refresh:
excsuffix = b', qrefresh first' excsuffix = b', qrefresh first'
date = opts.get(b'date') date = opts.get(b'date')
if date: if date:
date = dateutil.parsedate(date) date = dateutil.parsedate(date)
diffopts = self.diffopts({b'git': opts.get(b'git')}, plain=True) diffopts = self.diffopts({b'git': opts.get(b'git')}, plain=True)
if opts.get(b'checkname', True): if opts.get(b'checkname', True):
self.checkpatchname(patchfn) self.checkpatchname(patchfn)
inclsubs = checksubstate(repo) inclsubs = checksubstate(repo)
if inclsubs: if inclsubs:
substatestate = repo.dirstate[b'.hgsubstate'] substatestate = repo.dirstate.get_entry(b'.hgsubstate')
if opts.get(b'include') or opts.get(b'exclude') or pats: if opts.get(b'include') or opts.get(b'exclude') or pats:
# detect missing files in pats # detect missing files in pats
def badfn(f, msg): def badfn(f, msg):
if f != b'.hgsubstate': # .hgsubstate is auto-created if f != b'.hgsubstate': # .hgsubstate is auto-created
raise error.Abort(b'%s: %s' % (f, msg)) raise error.Abort(b'%s: %s' % (f, msg))
match = scmutil.match(repo[None], pats, opts, badfn=badfn) match = scmutil.match(repo[None], pats, opts, badfn=badfn)
changes = repo.status(match=match) changes = repo.status(match=match)
hint=_(b"see 'hg help phases' for details"), hint=_(b"see 'hg help phases' for details"),
) )
cparents = repo.changelog.parents(top) cparents = repo.changelog.parents(top)
patchparent = self.qparents(repo, top) patchparent = self.qparents(repo, top)
inclsubs = checksubstate(repo, patchparent) inclsubs = checksubstate(repo, patchparent)
if inclsubs: if inclsubs:
substatestate = repo.dirstate[b'.hgsubstate'] substatestate = repo.dirstate.get_entry(b'.hgsubstate')
ph = patchheader(self.join(patchfn), self.plainmode) ph = patchheader(self.join(patchfn), self.plainmode)
diffopts = self.diffopts( diffopts = self.diffopts(
{b'git': opts.get(b'git')}, patchfn, plain=True {b'git': opts.get(b'git')}, patchfn, plain=True
) )
if newuser: if newuser:
ph.setuser(newuser) ph.setuser(newuser)
if newdate: if newdate: