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.
#!/bin/sh
mkdir test
cd test
hg init
for i in 0 1 2 3 4 5 6 7 8; do
echo $i >> foo
hg commit -A -m $i -d "1000000 0"
done
hg verify
hg serve -p 20059 -d --pid-file=hg.pid
cat hg.pid >> $DAEMON_PIDS
cd ..
hg init new
# http incoming
http_proxy= hg -R new incoming http://localhost:20059/
http_proxy= hg -R new incoming -r 4 http://localhost:20059/
# local incoming
hg -R new incoming test
hg -R new incoming -r 4 test
# test with --bundle
http_proxy= hg -R new incoming --bundle test.hg http://localhost:20059/
hg -R new incoming --bundle test2.hg test
# test the resulting bundles
hg init temp
hg init temp2
hg -R temp unbundle test.hg
hg -R temp2 unbundle test2.hg
hg -R temp tip
hg -R temp2 tip
rm -r temp temp2 new
# test outgoing
hg clone test test-dev
cd test-dev
for i in 9 10 11 12 13; do
echo $i >> foo
hg commit -A -m $i -d "1000000 0"
done
hg verify
cd ..
hg -R test-dev outgoing test
http_proxy= hg -R test-dev outgoing http://localhost:20059/
http_proxy= hg -R test-dev outgoing -r 11 http://localhost:20059/