This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8999

git: fix index handling of removed files during commit (issue6398)
ClosedPublic

Authored by durin42 on Sep 7 2020, 5:31 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGd4cf80341589: git: fix index handling of removed files during commit (issue6398)
rHG8e997c5da2f3: git: fix index handling of removed files during commit (issue6398)
Summary

Other changes in this series also changed the behavior here in
positive ways, but this was the final step that actually fixed things.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Revision Contents
Changeset List

PathPackages
Mhgext/git/dirstate.py (6 lines)
Mtests/test-git-interop.t (5 lines)

Diff 22564

hgext/git/dirstate.py

index = self.git.index index = self.git.index
index.read() index.read()
index.add(pycompat.fsdecode(f)) index.add(pycompat.fsdecode(f))
index.write() index.write()
def drop(self, f): def drop(self, f):
index = self.git.index index = self.git.index
index.read() index.read()
index.remove(pycompat.fsdecode(f)) fs = pycompat.fsdecode(f)
if fs in index:
index.remove(fs)
index.write() index.write()
def remove(self, f): def remove(self, f):
index = self.git.index index = self.git.index
index.read() index.read()
index.remove(pycompat.fsdecode(f)) index.remove(pycompat.fsdecode(f))
index.write() index.write()
def copied(self, path): def copied(self, path):

tests/test-git-interop.t

This covers manifest.diff() This covers manifest.diff()
$ hg diff -c 3d9be8deba43 $ hg diff -c 3d9be8deba43
diff -r c5864c9d16fb -r 3d9be8deba43 beta diff -r c5864c9d16fb -r 3d9be8deba43 beta
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/beta Mon Jan 01 00:00:11 2007 +0000 +++ b/beta Mon Jan 01 00:00:11 2007 +0000
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+beta +beta
Deleting files should also work (this was issue6398)
$ hg rm beta
$ hg ci -m 'remove beta'