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

branching: merge stable into default

author	Rapha?l Gom?s <rgomes@octobus.net>
date	Mon, 21 Mar 2022 10:55:50 +0100
parents	642e31cb55f0 877d7e1a4223
children	9be7da341885

comparison

equal deleted inserted replaced

-:6b31c0676147
+:c80544aa4971
 mergeutil.checkunresolved(ms)
 filestoamend = {f for f in wctx.files() if matcher(f)}
 changes = len(filestoamend) > 0
-if changes:
+changeset_copies = (
+repo.ui.config(b'experimental', b'copies.read-from')
+!= b'filelog-only'
+)
+# If there are changes to amend or if copy information needs to be read
+# from the changeset extras, we cannot take the fast path of using
+# filectxs from the old commit.
+if changes or changeset_copies:
 # Recompute copies (avoid recording a -> b -> a)
 copied = copies.pathcopies(base, wctx, matcher)
 if old.p2:
 copied.update(copies.pathcopies(old.p2(), wctx, matcher))
 if (f not in filestoamend or not samefile(f, wctx, base))
 ]
 def filectxfn(repo, ctx_, path):
 try:
+# Return None for removed files.
+if path in wctx.removed():
+return None
 # If the file being considered is not amongst the files
-# to be amended, we should return the file context from the
+# to be amended, we should use the file context from the
 # old changeset. This avoids issues when only some files in
 # the working copy are being amended but there are also
 # changes to other files from the old changeset.
-if path not in filestoamend:
+if path in filestoamend:
-return old.filectx(path)
+fctx = wctx[path]
+else:
-# Return None for removed files.
+fctx = old.filectx(path)
-if path in wctx.removed():
-return None
-fctx = wctx[path]
 flags = fctx.flags()
 mctx = context.memfilectx(
 repo,
 ctx_,
 fctx.path(),

Mercurial > public > mercurial-scm > hg