facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-06 23:07:18 +03:00
Code Issues Projects Releases Wiki Activity

misc: replace .parents()[0] with p1()

Browse Source
This commit is contained in:
Matt Mackall 2011-04-04 16:21:59 -05:00
parent d4af650e6a
commit a8dd64dcb0
16 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/python-hook-examples.py
View File

@ -13,7 +13,7 @@ def diffstat(ui, repo, **kwargs):
if kwargs.get('parent2'):
return
node = kwargs['node']
first = repo[node].parents()[0].node()
first = repo[node].p1().node()
if 'url' in kwargs:
last = repo['tip'].node()
else:

2
hgext/extdiff.py
View File

@ -126,7 +126,7 @@ def dodiff(ui, repo, diffcmd, diffopts, pats, opts):
else:
node1a, node2 = cmdutil.revpair(repo, revs)
if not revs:
node1b = repo.dirstate.parents()[1]
node1b = repo.dirstate.p2()
else:
node1b = nullid

2
hgext/hgcia.py
View File

@ -75,7 +75,7 @@ class ciamsg(object):
def fileelems(self):
n = self.ctx.node()
f = self.cia.repo.status(self.ctx.parents()[0].node(), n)
f = self.cia.repo.status(self.ctx.p1().node(), n)
url = self.url or ''
elems = []
for path in f[0]:

6
hgext/mq.py
View File

@ -899,7 +899,7 @@ class queue(object):
else:
p.write("# HG changeset patch\n")
p.write("# Parent "
+ hex(repo[None].parents()[0].node()) + "\n")
+ hex(repo[None].p1().node()) + "\n")
if user:
p.write("# User " + user + "\n")
if date:
@ -1054,7 +1054,7 @@ class queue(object):
heads += ls
if not heads:
heads = [nullid]
if repo.dirstate.parents()[0] not in heads and not exact:
if repo.dirstate.p1() not in heads and not exact:
self.ui.status(_("(working directory not at a head)\n"))
if not self.series:
@ -1148,7 +1148,7 @@ class queue(object):
ret = self.apply(repo, s, list, all_files=all_files)
except:
self.ui.warn(_('cleaning up working directory...'))
node = repo.dirstate.parents()[0]
node = repo.dirstate.p1()
hg.revert(repo, node, None)
# only remove unknown files that we know we touched or
# created while patching

2
hgext/notify.py
View File

@ -249,7 +249,7 @@ class notifier(object):
def diff(self, ctx, ref=None):
maxdiff = int(self.ui.config('notify', 'maxdiff', 300))
prev = ctx.parents()[0].node()
prev = ctx.p1().node()
ref = ref and ref.node() or ctx.node()
chunks = patch.diff(self.repo, prev, ref, opts=patch.diffopts(self.ui))
difflines = ''.join(chunks).splitlines()

2
hgext/rebase.py
View File

@ -300,7 +300,7 @@ def rebasenode(repo, rev, p1, p2, state):
repo.ui.debug(" merge against %d:%s\n" % (repo[rev].rev(), repo[rev]))
base = None
if repo[rev].rev() != repo[min(state)].rev():
base = repo[rev].parents()[0].node()
base = repo[rev].p1().node()
return merge.update(repo, rev, True, True, False, base)
def defineparents(repo, rev, target, state, targetancestors):

2
hgext/record.py
View File

@ -469,7 +469,7 @@ def dorecord(ui, repo, commitfunc, *pats, **opts):
# 3a. apply filtered patch to clean repo (clean)
if backups:
hg.revert(repo, repo.dirstate.parents()[0],
hg.revert(repo, repo.dirstate.p1(),
lambda key: key in backups)
# 3b. (apply)

2
hgext/transplant.py
View File

@ -237,7 +237,7 @@ class transplanter(object):
seriespath = os.path.join(self.path, 'series')
if os.path.exists(seriespath):
os.unlink(seriespath)
p1 = repo.dirstate.parents()[0]
p1 = repo.dirstate.p1()
p2 = node
self.log(user, date, message, p1, p2, merge=merge)
self.ui.write(str(inst) + '\n')

6
mercurial/cmdutil.py
View File

@ -72,7 +72,7 @@ def findrepo(p):
return p
def bail_if_changed(repo):
if repo.dirstate.parents()[1] != nullid:
if repo.dirstate.p2() != nullid:
raise util.Abort(_('outstanding uncommitted merge'))
modified, added, removed, deleted = repo.status()[:4]
if modified or added or removed or deleted:
@ -122,12 +122,12 @@ def revsingle(repo, revspec, default='.'):
def revpair(repo, revs):
if not revs:
return repo.dirstate.parents()[0], None
return repo.dirstate.p1(), None
l = revrange(repo, revs)
if len(l) == 0:
return repo.dirstate.parents()[0], None
return repo.dirstate.p1(), None
if len(l) == 1:
return repo.lookup(l[0]), None

12
mercurial/commands.py
View File

@ -596,7 +596,7 @@ def branch(ui, repo, label=None, **opts):
"""
if opts.get('clean'):
label = repo[None].parents()[0].branch()
label = repo[None].p1().branch()
repo.dirstate.setbranch(label)
ui.status(_('reset working directory to branch %s\n') % label)
elif label:
@ -1678,7 +1678,7 @@ def diff(ui, repo, *pats, **opts):
raise util.Abort(msg)
elif change:
node2 = cmdutil.revsingle(repo, change, None).node()
node1 = repo[node2].parents()[0].node()
node1 = repo[node2].p1().node()
else:
node1, node2 = cmdutil.revpair(repo, revs)
@ -1905,7 +1905,7 @@ def grep(ui, repo, pattern, *pats, **opts):
def prep(ctx, fns):
rev = ctx.rev()
pctx = ctx.parents()[0]
pctx = ctx.p1()
parent = pctx.rev()
matches.setdefault(rev, {})
matches.setdefault(parent, {})
@ -1940,7 +1940,7 @@ def grep(ui, repo, pattern, *pats, **opts):
for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
rev = ctx.rev()
parent = ctx.parents()[0].rev()
parent = ctx.p1().rev()
for fn in sorted(revfiles.get(rev, [])):
states = matches[rev][fn]
copy = copies.get(rev, {}).get(fn)
@ -2840,7 +2840,7 @@ def merge(ui, repo, node=None, **opts):
'(run \'hg heads .\' to see heads)')
% (branch, len(bheads)))
parent = repo.dirstate.parents()[0]
parent = repo.dirstate.p1()
if len(bheads) == 1:
if len(repo.heads()) > 1:
raise util.Abort(_(
@ -3751,7 +3751,7 @@ def status(ui, repo, *pats, **opts):
raise util.Abort(msg)
elif change:
node2 = repo.lookup(change)
node1 = repo[node2].parents()[0].node()
node1 = repo[node2].p1().node()
else:
node1, node2 = cmdutil.revpair(repo, revs)

2
mercurial/copies.py
View File

@ -93,7 +93,7 @@ def copies(repo, c1, c2, ca, checkdirs=False):
return {}, {}
# avoid silly behavior for parent -> working dir
if c2.node() is None and c1.node() == repo.dirstate.parents()[0]:
if c2.node() is None and c1.node() == repo.dirstate.p1():
return repo.dirstate.copies(), {}
limit = _findlimit(repo, c1.rev(), c2.rev())

2
mercurial/localrepo.py
View File

@ -522,7 +522,7 @@ class localrepository(repo.repository):
if isinstance(key, int):
return self.changelog.node(key)
elif key == '.':
return self.dirstate.parents()[0]
return self.dirstate.p1()
elif key == 'null':
return nullid
elif key == 'tip':

4
mercurial/merge.py
View File

@ -268,7 +268,7 @@ def applyupdates(repo, action, wctx, mctx, actx, overwrite):
updated, merged, removed, unresolved = 0, 0, 0, 0
ms = mergestate(repo)
ms.reset(wctx.parents()[0].node())
ms.reset(wctx.p1().node())
moves = []
action.sort(key=actionkey)
substate = wctx.substate # prime
@ -286,7 +286,7 @@ def applyupdates(repo, action, wctx, mctx, actx, overwrite):
fco = mctx[f2]
if mctx == actx: # backwards, use working dir parent as ancestor
if fcl.parents():
fca = fcl.parents()[0]
fca = fcl.p1()
else:
fca = repo.filectx(f, fileid=nullrev)
else:

2
mercurial/patch.py
View File

@ -1324,7 +1324,7 @@ def diff(repo, node1=None, node2=None, match=None, changes=None, opts=None,
opts = mdiff.defaultopts
if not node1 and not node2:
node1 = repo.dirstate.parents()[0]
node1 = repo.dirstate.p1()
def lrugetfilectx():
cache = {}

2
mercurial/revset.py
View File

@ -207,7 +207,7 @@ def p1(repo, subset, x):
First parent of changesets in set, or the working directory.
"""
if x is None:
p = repo[x].parents()[0].rev()
p = repo[x].p1().rev()
return [r for r in subset if r == p]
ps = set()

3
mercurial/templatekw.py
View File

@ -73,8 +73,7 @@ def showlist(name, values, plural=None, **args):
def getfiles(repo, ctx, revcache):
if 'files' not in revcache:
revcache['files'] = repo.status(ctx.parents()[0].node(),
ctx.node())[:3]
revcache['files'] = repo.status(ctx.p1().node(), ctx.node())[:3]
return revcache['files']
def getlatesttags(repo, ctx, cache):