( )⚙ D5708 cleanup: use p1() instead of parents() when we only need the first parent

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5708

cleanup: use p1() instead of parents() when we only need the first parent
ClosedPublic

Authored by martinvonz on Jan 26 2019, 3:00 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG5cb8158a61f7: cleanup: use p1() instead of parents() when we only need the first parent
Summary

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.

Event Timeline

martinvonz created this revision.Jan 26 2019, 3:00 AM
Closed by commit rHG5cb8158a61f7: cleanup: use p1() instead of parents() when we only need the first parent (authored by martinvonz). · Explain WhyJan 26 2019, 3:26 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/fetch.py (2 lines)
Mhgext/histedit.py (4 lines)
Mhgext/mq.py (2 lines)
Mhgext/transplant.py (10 lines)

Diff 13497

hgext/fetch.py

Returns 0 on success. Returns 0 on success.
''' '''
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
date = opts.get('date') date = opts.get('date')
if date: if date:
opts['date'] = dateutil.parsedate(date) opts['date'] = dateutil.parsedate(date)
parent, _p2 = repo.dirstate.parents() parent = repo.dirstate.p1()
branch = repo.dirstate.branch() branch = repo.dirstate.branch()
try: try:
branchnode = repo.branchtip(branch) branchnode = repo.branchtip(branch)
except error.RepoLookupError: except error.RepoLookupError:
branchnode = None branchnode = None
if parent != branchnode: if parent != branchnode:
raise error.Abort(_('working directory not at branch tip'), raise error.Abort(_('working directory not at branch tip'),
hint=_("use 'hg update' to check out branch tip")) hint=_("use 'hg update' to check out branch tip"))

hgext/histedit.py

_('histedit requires exactly one ancestor revision')) _('histedit requires exactly one ancestor revision'))
rr = list(repo.set('roots(%ld)', scmutil.revrange(repo, revs))) rr = list(repo.set('roots(%ld)', scmutil.revrange(repo, revs)))
if len(rr) != 1: if len(rr) != 1:
raise error.Abort(_('The specified revisions must have ' raise error.Abort(_('The specified revisions must have '
'exactly one common root')) 'exactly one common root'))
root = rr[0].node() root = rr[0].node()
topmost, empty = repo.dirstate.parents() topmost = repo.dirstate.p1()
revs = between(repo, root, topmost, keep) revs = between(repo, root, topmost, keep)
if not revs: if not revs:
raise error.Abort(_('%s is not an ancestor of working directory') % raise error.Abort(_('%s is not an ancestor of working directory') %
node.short(root)) node.short(root))
ctxs = [] ctxs = []
for i, r in enumerate(revs): for i, r in enumerate(revs):
ctxs.append(histeditrule(repo[r], i)) ctxs.append(histeditrule(repo[r], i))
def _newhistedit(ui, repo, state, revs, freeargs, opts): def _newhistedit(ui, repo, state, revs, freeargs, opts):
outg = opts.get('outgoing') outg = opts.get('outgoing')
rules = opts.get('commands', '') rules = opts.get('commands', '')
force = opts.get('force') force = opts.get('force')
cmdutil.checkunfinished(repo) cmdutil.checkunfinished(repo)
cmdutil.bailifchanged(repo) cmdutil.bailifchanged(repo)
topmost, empty = repo.dirstate.parents() topmost = repo.dirstate.p1()
if outg: if outg:
if freeargs: if freeargs:
remote = freeargs[0] remote = freeargs[0]
else: else:
remote = None remote = None
root = findoutgoing(ui, repo, remote, force, opts) root = findoutgoing(ui, repo, remote, force, opts)
else: else:
rr = list(repo.set('roots(%ld)', scmutil.revrange(repo, revs))) rr = list(repo.set('roots(%ld)', scmutil.revrange(repo, revs)))

hgext/mq.py

merged.append(f) merged.append(f)
else: else:
removed.append(f) removed.append(f)
with repo.dirstate.parentchange(): with repo.dirstate.parentchange():
for f in removed: for f in removed:
repo.dirstate.remove(f) repo.dirstate.remove(f)
for f in merged: for f in merged:
repo.dirstate.merge(f) repo.dirstate.merge(f)
p1, p2 = repo.dirstate.parents() p1 = repo.dirstate.p1()
repo.setparents(p1, merge) repo.setparents(p1, merge)
if all_files and '.hgsubstate' in all_files: if all_files and '.hgsubstate' in all_files:
wctx = repo[None] wctx = repo[None]
pctx = repo['.'] pctx = repo['.']
overwrite = False overwrite = False
mergedsubstate = subrepoutil.submerge(repo, pctx, wctx, wctx, mergedsubstate = subrepoutil.submerge(repo, pctx, wctx, wctx,
overwrite) overwrite)

hgext/transplant.py

return True return True
return False return False
def apply(self, repo, source, revmap, merges, opts=None): def apply(self, repo, source, revmap, merges, opts=None):
'''apply the revisions in revmap one by one in revision order''' '''apply the revisions in revmap one by one in revision order'''
if opts is None: if opts is None:
opts = {} opts = {}
revs = sorted(revmap) revs = sorted(revmap)
p1, p2 = repo.dirstate.parents() p1 = repo.dirstate.p1()
pulls = [] pulls = []
diffopts = patch.difffeatureopts(self.ui, opts) diffopts = patch.difffeatureopts(self.ui, opts)
diffopts.git = True diffopts.git = True
lock = tr = None lock = tr = None
try: try:
lock = repo.lock() lock = repo.lock()
tr = repo.transaction('transplant') tr = repo.transaction('transplant')
pulls.append(node) pulls.append(node)
p1 = node p1 = node
continue continue
if pulls: if pulls:
if source != repo: if source != repo:
exchange.pull(repo, source.peer(), heads=pulls) exchange.pull(repo, source.peer(), heads=pulls)
merge.update(repo, pulls[-1], branchmerge=False, merge.update(repo, pulls[-1], branchmerge=False,
force=False) force=False)
p1, p2 = repo.dirstate.parents() p1 = repo.dirstate.p1()
pulls = [] pulls = []
domerge = False domerge = False
if node in merges: if node in merges:
# pulling all the merge revs at once would mean we # pulling all the merge revs at once would mean we
# couldn't transplant after the latest even if # couldn't transplant after the latest even if
# transplants before them fail. # transplants before them fail.
domerge = True domerge = True
p2 = node p2 = node
self.log(user, date, message, p1, p2, merge=merge) self.log(user, date, message, p1, p2, merge=merge)
self.ui.write(stringutil.forcebytestr(inst) + '\n') self.ui.write(stringutil.forcebytestr(inst) + '\n')
raise TransplantError(_('fix up the working directory and run ' raise TransplantError(_('fix up the working directory and run '
'hg transplant --continue')) 'hg transplant --continue'))
else: else:
files = None files = None
if merge: if merge:
p1, p2 = repo.dirstate.parents() p1 = repo.dirstate.p1()
repo.setparents(p1, node) repo.setparents(p1, node)
m = match.always(repo.root, '') m = match.always(repo.root, '')
else: else:
m = match.exact(repo.root, '', files) m = match.exact(repo.root, '', files)
n = repo.commit(message, user, date, extra=extra, match=m, n = repo.commit(message, user, date, extra=extra, match=m,
editor=self.getcommiteditor()) editor=self.getcommiteditor())
if not n: if not n:
raise error.Abort(_('%s is not a parent of %s') % raise error.Abort(_('%s is not a parent of %s') %
(nodemod.short(parent), (nodemod.short(parent),
nodemod.short(node))) nodemod.short(node)))
else: else:
merge = True merge = True
extra = {'transplant_source': node} extra = {'transplant_source': node}
try: try:
p1, p2 = repo.dirstate.parents() p1 = repo.dirstate.p1()
if p1 != parent: if p1 != parent:
raise error.Abort(_('working directory not at transplant ' raise error.Abort(_('working directory not at transplant '
'parent %s') % nodemod.hex(parent)) 'parent %s') % nodemod.hex(parent))
if merge: if merge:
repo.setparents(p1, parents[1]) repo.setparents(p1, parents[1])
modified, added, removed, deleted = repo.status()[:4] modified, added, removed, deleted = repo.status()[:4]
if merge or modified or added or removed or deleted: if merge or modified or added or removed or deleted:
n = repo.commit(message, user, date, extra=extra, n = repo.commit(message, user, date, extra=extra,
# deprecated config: transplant.log # deprecated config: transplant.log
opts['log'] = ui.config('transplant', 'log') opts['log'] = ui.config('transplant', 'log')
if not opts.get('filter'): if not opts.get('filter'):
# deprecated config: transplant.filter # deprecated config: transplant.filter
opts['filter'] = ui.config('transplant', 'filter') opts['filter'] = ui.config('transplant', 'filter')
tp = transplanter(ui, repo, opts) tp = transplanter(ui, repo, opts)
p1, p2 = repo.dirstate.parents() p1 = repo.dirstate.p1()
if len(repo) > 0 and p1 == revlog.nullid: if len(repo) > 0 and p1 == revlog.nullid:
raise error.Abort(_('no revision checked out')) raise error.Abort(_('no revision checked out'))
if opts.get('continue'): if opts.get('continue'):
if not tp.canresume(): if not tp.canresume():
raise error.Abort(_('no transplant to continue')) raise error.Abort(_('no transplant to continue'))
else: else:
cmdutil.checkunfinished(repo) cmdutil.checkunfinished(repo)
cmdutil.bailifchanged(repo) cmdutil.bailifchanged(repo)