mercurial: comparison mercurial/localrepo.py

equal deleted inserted replaced

-:5fa019ceb499
+:d55b71393907
 from .i18n import _
 from .node import (
 bin,
 hex,
-nullid,
 nullrev,
 sha1nodeconstants,
 short,
 )
 from .pycompat import (
 self._dirstatevalidatewarned = True
 self.ui.warn(
 _(b"warning: ignoring unknown working parent %s!\n")
 % short(node)
 )
-return nullid
+return self.nullid
 @storecache(narrowspec.FILENAME)
 def narrowpats(self):
 """matcher patterns for this repository's narrowspec
 self.invalidate(clearfilecache=True)
 @unfilteredpropertycache
 def _quick_access_changeid_null(self):
 return {
-b'null': (nullrev, nullid),
+b'null': (nullrev, self.nodeconstants.nullid),
-nullrev: (nullrev, nullid),
+nullrev: (nullrev, self.nodeconstants.nullid),
-nullid: (nullrev, nullid),
+self.nullid: (nullrev, self.nullid),
 }
 @unfilteredpropertycache
 def _quick_access_changeid_wc(self):
 # also fast path access to the working copy parents
 # however, only do it for filter that ensure wc is visible.
 quick = self._quick_access_changeid_null.copy()
 cl = self.unfiltered().changelog
 for node in self.dirstate.parents():
-if node == nullid:
+if node == self.nullid:
 continue
 rev = cl.index.get_rev(node)
 if rev is None:
 # unknown working copy parent case:
 #
 n = cl.node(r)
 pair = (r, n)
 quick[r] = pair
 quick[n] = pair
 p1node = self.dirstate.p1()
-if p1node != nullid:
+if p1node != self.nullid:
 quick[b'.'] = quick[p1node]
 return quick
 @unfilteredmethod
 def _quick_access_changeid_invalidate(self):
 # the tags module always uses UTF-8 (in order not to lose info
 # writing to the cache), but the rest of Mercurial wants them in
 # local encoding.
 tags = {}
 for (name, (node, hist)) in pycompat.iteritems(alltags):
-if node != nullid:
+if node != self.nullid:
 tags[encoding.tolocal(name)] = node
 tags[b'tip'] = self.changelog.tip()
 tagtypes = {
 encoding.tolocal(name): value
 for (name, value) in pycompat.iteritems(tagtypes)
 return None
 def wjoin(self, f, *insidef):
 return self.vfs.reljoin(self.root, f, *insidef)
-def setparents(self, p1, p2=nullid):
+def setparents(self, p1, p2=None):
+if p2 is None:
+p2 = self.nullid
 self[None].setparents(p1, p2)
 self._quick_access_changeid_invalidate()
 def filectx(self, path, changeid=None, fileid=None, changectx=None):
 """changeid must be a changeset revision, if specified.
 sr = sub.commit(cctx._text, user, date)
 newstate[s] = (newstate[s][0], sr)
 subrepoutil.writestate(self, newstate)
 p1, p2 = self.dirstate.parents()
-hookp1, hookp2 = hex(p1), (p2 != nullid and hex(p2) or b'')
+hookp1, hookp2 = hex(p1), (p2 != self.nullid and hex(p2) or b'')
 try:
 self.hook(
 b"precommit", throw=True, parent1=hookp1, parent2=hookp2
 )
 with self.transaction(b'commit'):
 b = []
 for n in nodes:
 t = n
 while True:
 p = self.changelog.parents(n)
-if p[1] != nullid or p[0] == nullid:
+if p[1] != self.nullid or p[0] == self.nullid:
 b.append((t, n, p[0], p[1]))
 break
 n = p[0]
 return b
 for top, bottom in pairs:
 n, l, i = top, [], 0
 f = 1
-while n != bottom and n != nullid:
+while n != bottom and n != self.nullid:
 p = self.changelog.parents(n)[0]
 if i == f:
 l.append(n)
 f = f * 2
 n = p

changeset 47012	d55b71393907
parent 46907	ffd3e823a7e5
child 47041	a407fe56d6e8