D5708: cleanup: use p1() instead of parents() when we only need the first parent
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Sat Jan 26 03:28:02 EST 2019
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG5cb8158a61f7: cleanup: use p1() instead of parents() when we only need the first parent (authored by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D5708?vs=13493&id=13497
REVISION DETAIL
https://phab.mercurial-scm.org/D5708
AFFECTED FILES
hgext/fetch.py
hgext/histedit.py
hgext/mq.py
hgext/transplant.py
CHANGE DETAILS
diff --git a/hgext/transplant.py b/hgext/transplant.py
--- a/hgext/transplant.py
+++ b/hgext/transplant.py
@@ -155,7 +155,7 @@
if opts is None:
opts = {}
revs = sorted(revmap)
- p1, p2 = repo.dirstate.parents()
+ p1 = repo.dirstate.p1()
pulls = []
diffopts = patch.difffeatureopts(self.ui, opts)
diffopts.git = True
@@ -186,7 +186,7 @@
exchange.pull(repo, source.peer(), heads=pulls)
merge.update(repo, pulls[-1], branchmerge=False,
force=False)
- p1, p2 = repo.dirstate.parents()
+ p1 = repo.dirstate.p1()
pulls = []
domerge = False
@@ -323,7 +323,7 @@
else:
files = None
if merge:
- p1, p2 = repo.dirstate.parents()
+ p1 = repo.dirstate.p1()
repo.setparents(p1, node)
m = match.always(repo.root, '')
else:
@@ -387,7 +387,7 @@
extra = {'transplant_source': node}
try:
- p1, p2 = repo.dirstate.parents()
+ p1 = repo.dirstate.p1()
if p1 != parent:
raise error.Abort(_('working directory not at transplant '
'parent %s') % nodemod.hex(parent))
@@ -668,7 +668,7 @@
tp = transplanter(ui, repo, opts)
- p1, p2 = repo.dirstate.parents()
+ p1 = repo.dirstate.p1()
if len(repo) > 0 and p1 == revlog.nullid:
raise error.Abort(_('no revision checked out'))
if opts.get('continue'):
diff --git a/hgext/mq.py b/hgext/mq.py
--- a/hgext/mq.py
+++ b/hgext/mq.py
@@ -970,7 +970,7 @@
repo.dirstate.remove(f)
for f in merged:
repo.dirstate.merge(f)
- p1, p2 = repo.dirstate.parents()
+ p1 = repo.dirstate.p1()
repo.setparents(p1, merge)
if all_files and '.hgsubstate' in all_files:
diff --git a/hgext/histedit.py b/hgext/histedit.py
--- a/hgext/histedit.py
+++ b/hgext/histedit.py
@@ -1459,7 +1459,7 @@
'exactly one common root'))
root = rr[0].node()
- topmost, empty = repo.dirstate.parents()
+ topmost = repo.dirstate.p1()
revs = between(repo, root, topmost, keep)
if not revs:
raise error.Abort(_('%s is not an ancestor of working directory') %
@@ -1873,7 +1873,7 @@
cmdutil.checkunfinished(repo)
cmdutil.bailifchanged(repo)
- topmost, empty = repo.dirstate.parents()
+ topmost = repo.dirstate.p1()
if outg:
if freeargs:
remote = freeargs[0]
diff --git a/hgext/fetch.py b/hgext/fetch.py
--- a/hgext/fetch.py
+++ b/hgext/fetch.py
@@ -68,7 +68,7 @@
if date:
opts['date'] = dateutil.parsedate(date)
- parent, _p2 = repo.dirstate.parents()
+ parent = repo.dirstate.p1()
branch = repo.dirstate.branch()
try:
branchnode = repo.branchtip(branch)
To: martinvonz, durin42, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list