mercurial: comparison mercurial/metadata.py

equal deleted inserted replaced

-:d6afa9c149c3
+:59fa3890d40a
 from __future__ import absolute_import, print_function
 import multiprocessing
 import struct
+from .node import (
+nullid,
+nullrev,
+)
 from . import (
 error,
-node,
 pycompat,
 util,
 )
 from .revlogutils import (
 def compute_all_files_changes(ctx):
 """compute the files changed by a revision"""
 p1 = ctx.p1()
 p2 = ctx.p2()
-if p1.rev() == node.nullrev and p2.rev() == node.nullrev:
+if p1.rev() == nullrev and p2.rev() == nullrev:
 return _process_root(ctx)
-elif p1.rev() != node.nullrev and p2.rev() == node.nullrev:
+elif p1.rev() != nullrev and p2.rev() == nullrev:
 return _process_linear(p1, ctx)
-elif p1.rev() == node.nullrev and p2.rev() != node.nullrev:
+elif p1.rev() == nullrev and p2.rev() != nullrev:
 # In the wild, one can encounter changeset where p1 is null but p2 is not
 return _process_linear(p1, ctx, parent=2)
 elif p1.rev() == p2.rev():
 # In the wild, one can encounter such "non-merge"
 return _process_linear(p1, ctx)
 cahs = ctx.repo().changelog.commonancestorsheads(
 p1_ctx.node(), p2_ctx.node()
 )
 if not cahs:
-cahs = [node.nullrev]
+cahs = [nullrev]
 mas = [ctx.repo()[r].manifest() for r in cahs]
 copy_candidates = []
 # Dealing with case 🄰 happens automatically.  Since there are no entry in
 def mas():
 p1n = p1.node()
 p2n = p2.node()
 cahs = ctx.repo().changelog.commonancestorsheads(p1n, p2n)
 if not cahs:
-cahs = [node.nullrev]
+cahs = [nullrev]
 return [ctx.repo()[r].manifest() for r in cahs]
 def deletionfromparent(f):
 if f in m1:
 return f not in m2 and all(
 return merged
 for f in ctx.files():
 if f in ctx:
 fctx = ctx[f]
 parents = fctx._filelog.parents(fctx._filenode)
-if parents[1] != node.nullid:
+if parents[1] != nullid:
 merged.append(f)
 return merged
 def computechangesetcopies(ctx):

changeset 46113	59fa3890d40a
parent 45942	89a2afe31e82
child 46618	dde86beca388