mercurial-scm/hg-stable: mercurial/patch.py comparison

dirstate: use `dirstate.change_files` to scope the change in `import` This is the way.

author	Pierre-Yves David <pierre-yves.david@octobus.net>
date	Wed, 14 Dec 2022 00:43:24 +0100
parents	2e726c934fcd
children	1c810421a82f

comparison

equal deleted inserted replaced

-:5cfc48354d0f
+:e8c170a6571d
 super(workingbackend, self).unlink(fname)
 self.removed.add(fname)
 self.changed.add(fname)
 def close(self):
-wctx = self.repo[None]
+with self.repo.dirstate.changing_files(self.repo):
-changed = set(self.changed)
+wctx = self.repo[None]
-for src, dst in self.copied:
+changed = set(self.changed)
-scmutil.dirstatecopy(self.ui, self.repo, wctx, src, dst)
+for src, dst in self.copied:
-if self.removed:
+scmutil.dirstatecopy(self.ui, self.repo, wctx, src, dst)
-wctx.forget(sorted(self.removed))
+if self.removed:
-for f in self.removed:
+wctx.forget(sorted(self.removed))
-if f not in self.repo.dirstate:
+for f in self.removed:
-# File was deleted and no longer belongs to the
+if f not in self.repo.dirstate:
-# dirstate, it was probably marked added then
+# File was deleted and no longer belongs to the
-# deleted, and should not be considered by
+# dirstate, it was probably marked added then
-# marktouched().
+# deleted, and should not be considered by
-changed.discard(f)
+# marktouched().
-if changed:
+changed.discard(f)
-scmutil.marktouched(self.repo, changed, self.similarity)
+if changed:
-return sorted(self.changed)
+scmutil.marktouched(self.repo, changed, self.similarity)
+return sorted(self.changed)
 class filestore:
 def __init__(self, maxsize=None):
 self.opener = None

Mercurial > public > mercurial-scm > hg-stable