Avoid extra filelogs entries.
Right now, there are some situations in which localrepo.filecommit can
create filelog entries even though they're not needed. For example:
- permissions for a file have changed;
- qrefresh can create a filelog entry identical to its parent (see the
added test);
- convert-repo creates extra filelog entries in every merge where the
first parent has added files (for example, changeset ebebe9577a1a of
the kernel repo added extra filelog entries to files in the
arch/blackfin directory, even though the merge should only touch the
drivers/ata directory). This makes "hg log file" in a converted repo
less useful than it could be, since it may mention many merges that
don't actually touch that specific file.
They all come from the same basic problem: localrepo.commit (through
filecommit) creates new filelog entries for all files passed to it
(except for some cases during a merge).
Patch and test case provided by Benoit.
This should fix issue351.
not removing foo: file is not managed
abort: no files specified
undeleting foo
removing foo
# HG changeset patch
# User test
# Date 1000000 0
# Node ID 8ba83d44753d6259db5ce6524974dd1174e90f47
# Parent 0000000000000000000000000000000000000000
1
diff -r 000000000000 -r 8ba83d44753d foo
--- /dev/null
+++ b/foo
@@ -0,0 +1,1 @@
+a
# HG changeset patch
# User test
# Date 1000000 0
# Node ID a1fce69c50d97881c5c014ab23f580f720c78678
# Parent 8ba83d44753d6259db5ce6524974dd1174e90f47
2
diff -r 8ba83d44753d -r a1fce69c50d9 foo
--- a/foo
+++ /dev/null
@@ -1,1 +0,0 @@
-a
changeset: 0:8ba83d44753d
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 1
diff -r 000000000000 -r 8ba83d44753d foo
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/foo Mon Jan 12 13:46:40 1970 +0000
@@ -0,0 +1,1 @@
+a
changeset: 1:a1fce69c50d9
tag: tip
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 2
diff -r 8ba83d44753d -r a1fce69c50d9 foo
--- a/foo Mon Jan 12 13:46:40 1970 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-a
not removing a: file has been marked for add (use -f to force removal)
adding a
adding b
adding c/d
not removing b: file is modified (use -f to force removal)
R b
R c/d
d
undeleting c/d
R b
R b
removing c/d
R b
R c/d
3 files updated, 0 files merged, 0 files removed, 0 files unresolved