mercurial-scm/hg: comparison mercurial/context.py

equal deleted inserted replaced

-:5fa019ceb499
+:d55b71393907
 import os
 import stat
 from .i18n import _
 from .node import (
-addednodeid,
 hex,
-modifiednodeid,
-nullid,
 nullrev,
 short,
-wdirfilenodeids,
-wdirhex,
 )
 from .pycompat import (
 getattr,
 open,
 )
 added.append(fn)
 elif node2 is None:
 removed.append(fn)
 elif flag1 != flag2:
 modified.append(fn)
-elif node2 not in wdirfilenodeids:
+elif node2 not in self._repo.nodeconstants.wdirfilenodeids:
 # When comparing files between two commits, we save time by
 # not comparing the file contents when the nodeids differ.
 # Note that this means we incorrectly report a reverted change
 # to a file as a modification.
 modified.append(fn)
 n2 = c2._node
 if n2 is None:
 n2 = c2._parents[0]._node
 cahs = self._repo.changelog.commonancestorsheads(self._node, n2)
 if not cahs:
-anc = nullid
+anc = self._repo.nodeconstants.nullid
 elif len(cahs) == 1:
 anc = cahs[0]
 else:
 # experimental config: merge.preferancestor
 for r in self._repo.ui.configlist(b'merge', b'preferancestor'):
 def parents(self):
 _path = self._path
 fl = self._filelog
 parents = self._filelog.parents(self._filenode)
-pl = [(_path, node, fl) for node in parents if node != nullid]
+pl = [
+(_path, node, fl)
+for node in parents
+if node != self._repo.nodeconstants.nullid
+]
 r = fl.renamed(self._filenode)
 if r:
 # - In the simple rename case, both parent are nullid, pl is empty.
 # - In case of merge, only one of the parent is null id and should
 def __contains__(self, key):
 return self._repo.dirstate[key] not in b"?r"
 def hex(self):
-return wdirhex
+return self._repo.nodeconstants.wdirhex
 @propertycache
 def _parents(self):
 p = self._repo.dirstate.parents()
-if p[1] == nullid:
+if p[1] == self._repo.nodeconstants.nullid:
 p = p[:-1]
 # use unfiltered repo to delay/avoid loading obsmarkers
 unfi = self._repo.unfiltered()
 return [
 changectx(
 self._repo, unfi.changelog.rev(n), n, maybe_filtered=False
 )
 for n in p
 ]
-def setparents(self, p1node, p2node=nullid):
+def setparents(self, p1node, p2node=None):
+if p2node is None:
+p2node = self._repo.nodeconstants.nullid
 dirstate = self._repo.dirstate
 with dirstate.parentchange():
 copies = dirstate.setparents(p1node, p2node)
 pctx = self._repo[p1node]
 if copies:
 # requires access to parents manifests. Preserve them
 # only for entries added to first parent.
 for f in copies:
 if f not in pctx and copies[f] in pctx:
 dirstate.copy(copies[f], f)
-if p2node == nullid:
+if p2node == self._repo.nodeconstants.nullid:
 for f, s in sorted(dirstate.copies().items()):
 if f not in pctx and s not in pctx:
 dirstate.copy(None, f)
 def _fileinfo(self, path):
 man = parents[0].manifest().copy()
 ff = self._flagfunc
 for i, l in (
-(addednodeid, status.added),
+(self._repo.nodeconstants.addednodeid, status.added),
-(modifiednodeid, status.modified),
+(self._repo.nodeconstants.modifiednodeid, status.modified),
 ):
 for f in l:
 man[f] = i
 try:
 man.setflag(f, ff(f))
 def renamed(self):
 path = self.copysource()
 if not path:
 return None
-return path, self._changectx._parents[0]._manifest.get(path, nullid)
+return (
+path,
+self._changectx._parents[0]._manifest.get(
+path, self._repo.nodeconstants.nullid
+),
+)
 def parents(self):
 '''return parent filectxs, following copies if necessary'''
 def filenode(ctx, path):
-return ctx._manifest.get(path, nullid)
+return ctx._manifest.get(path, self._repo.nodeconstants.nullid)
 path = self._path
 fl = self._filelog
 pcl = self._changectx._parents
 renamed = self.renamed()
 pl.append((path, filenode(pc, path), fl))
 return [
 self._parentfilectx(p, fileid=n, filelog=l)
 for p, n, l in pl
-if n != nullid
+if n != self._repo.nodeconstants.nullid
 ]
 def children(self):
 return []
 # Drop old manifest cache as it is now out of date.
 # This is necessary when, e.g., rebasing several nodes with one
 # ``overlayworkingctx`` (e.g. with --collapse).
 util.clearcachedproperty(self, b'_manifest')
-def setparents(self, p1node, p2node=nullid):
+def setparents(self, p1node, p2node=None):
+if p2node is None:
+p2node = self._repo.nodeconstants.nullid
 assert p1node == self._wrappedctx.node()
 self._parents = [self._wrappedctx, self._repo.unfiltered()[p2node]]
 def data(self, path):
 if self.isdirty(path):
 parents = self.parents()
 man = parents[0].manifest().copy()
 flag = self._flagfunc
 for path in self.added():
-man[path] = addednodeid
+man[path] = self._repo.nodeconstants.addednodeid
 man.setflag(path, flag(path))
 for path in self.modified():
-man[path] = modifiednodeid
+man[path] = self._repo.nodeconstants.modifiednodeid
 man.setflag(path, flag(path))
 for path in self.removed():
 del man[path]
 return man
 super(memctx, self).__init__(
 repo, text, user, date, extra, branch=branch
 )
 self._rev = None
 self._node = None
-parents = [(p or nullid) for p in parents]
+parents = [(p or self._repo.nodeconstants.nullid) for p in parents]
 p1, p2 = parents
 self._parents = [self._repo[p] for p in (p1, p2)]
 files = sorted(set(files))
 self._files = files
 self.substate = {}
 # keep this simple for now; just worry about p1
 pctx = self._parents[0]
 man = pctx.manifest().copy()
 for f in self._status.modified:
-man[f] = modifiednodeid
+man[f] = self._repo.nodeconstants.modifiednodeid
 for f in self._status.added:
-man[f] = addednodeid
+man[f] = self._repo.nodeconstants.addednodeid
 for f in self._status.removed:
 if f in man:
 del man[f]
 p1, p2 = self._parents = parents
 # sanity check to ensure that the reused manifest parents are
 # manifests of our commit parents
 mp1, mp2 = self.manifestctx().parents
-if p1 != nullid and p1.manifestnode() != mp1:
+if p1 != self._repo.nodeconstants.nullid and p1.manifestnode() != mp1:
 raise RuntimeError(
 r"can't reuse the manifest: its p1 "
 r"doesn't match the new ctx p1"
 )
-if p2 != nullid and p2.manifestnode() != mp2:
+if p2 != self._repo.nodeconstants.nullid and p2.manifestnode() != mp2:
 raise RuntimeError(
 r"can't reuse the manifest: "
 r"its p2 doesn't match the new ctx p2"
 )

changeset 47012	d55b71393907
parent 46843	728d89f6f9b1
child 47191	b338d831d18c