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.
foo
% branch shadowing
abort: a branch of the same name already exists (use --force to override)
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
foo
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
foo
changeset: 5:5f8fb06e083e
branch: foo
tag: tip
parent: 4:4909a3732169
parent: 3:bf1bc2f45e83
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: merge
changeset: 4:4909a3732169
branch: foo
parent: 1:b699b1cec9c2
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: modify a branch
changeset: 3:bf1bc2f45e83
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: clear branch name
changeset: 2:67ec16bde7f1
branch: bar
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: change branch name
changeset: 1:b699b1cec9c2
branch: foo
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: add branch name
changeset: 0:be8523e69bf8
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: initial
foo 5:5f8fb06e083e
default 3:bf1bc2f45e83
bar 2:67ec16bde7f1
foo
default
bar
% test for invalid branch cache
rolling back last transaction
changeset: 4:4909a3732169
branch: foo
tag: tip
parent: 1:b699b1cec9c2
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: modify a branch
Invalid branch cache: unknown tip
changeset: 4:4909a3732169c0c20011c4f4b8fdff4e3d89b23f
branch: foo
tag: tip
parent: 1:b699b1cec9c2966b3700de4fef0dc123cd754c31
parent: -1:0000000000000000000000000000000000000000
manifest: 4:d01b250baaa05909152f7ae07d7a649deea0df9a
user: test
date: Mon Jan 12 13:46:40 1970 +0000
files: a
extra: branch=foo
description:
modify a branch
4:4909a3732169
4909a3732169c0c20011c4f4b8fdff4e3d89b23f 4
bf1bc2f45e834c75404d0ddab57d53beab56e2f8 default
4909a3732169c0c20011c4f4b8fdff4e3d89b23f foo
67ec16bde7f1575d523313b9bca000f6a6f12dca bar
% update with no arguments: tipmost revision of the current branch
bf1bc2f45e83
4909a3732169 (foo) tip
abort: branch foobar not found
% fastforward merge
adding ff
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
foo
changeset: 6:9cc105113eeb
branch: foo
tag: tip
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: Merge ff into foo
a
ff