##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

largefiles: factor out procedures to update standins for pre-committing...
largefiles: factor out procedures to update standins for pre-committing This patch factors out procedures to update standins for pre-committing. This is one of preparations to avoid execution of such procedures according to invocation context. For example, resuming automated committing (e.g. "hg rebase --continue") should update standins at the 1st commit, because largefiles in the working directory may be modified manually. But on the other hand, it should avoid updating standins at subsequent committings for efficiency reason. For simplicity, this patch just moves procedures mechanically only with replacing below. - "self" => "repo" - "lfutil." => (none) - "orig" invocation => returning "match" Using "fstandin" instead "standin" as the name of local variable for the loop below is the only special care, because the latter shadows the same name function in "lfutil.py". [before] for standin in standins: lfile = lfutil.splitstandin(standin) if lfdirstate[lfile] != 'r': lfutil.updatestandin(self, standin) [after] for fstandin in standins: lfile = splitstandin(fstandin) if lfdirstate[lfile] != 'r': updatestandin(repo, fstandin)
Pierre-Yves David - - Load All Authors

File last commit:

r23130:ced63239 3.2 stable
r23185:9870173e default
Show More
test-setdiscovery.t
359 lines | 9.6 KiB | text/troff | Tads3Lexer
/ tests / test-setdiscovery.t
History | Source | Raw |Copy content |Copy permalink
Peter Arrenbrecht
discovery: add new set-based discovery...
 r14164
Function to test discovery between two repos in both directions, using both the local shortcut
(which is currently not activated by default) and the full remotable protocol:
$ testdesc() { # revs_a, revs_b, dagdesc
Mads Kiilerich
tests: solaris [ doesn't know -e
 r14736 > if [ -d foo ]; then rm -rf foo; fi
Peter Arrenbrecht
discovery: add new set-based discovery...
 r14164 > hg init foo
> cd foo
> hg debugbuilddag "$3"
> hg clone . a $1 --quiet
> hg clone . b $2 --quiet
> echo
> echo "% -- a -> b tree"
> hg -R a debugdiscovery b --verbose --old
> echo
> echo "% -- a -> b set"
> hg -R a debugdiscovery b --verbose --debug
> echo
> echo "% -- b -> a tree"
> hg -R b debugdiscovery a --verbose --old
> echo
> echo "% -- b -> a set"
> hg -R b debugdiscovery a --verbose --debug
> cd ..
> }
Small superset:
$ testdesc '-ra1 -ra2' '-rb1 -rb2 -rb3' '
> +2:f +1:a1:b1
> <f +4 :a2
> +5 :b2
> <f +3 :b3'
% -- a -> b tree
comparing with b
searching for changes
Mads Kiilerich <mads at kiilerich.com>
debugdiscovery: report heads in sorted order
 r18254 unpruned common: 01241442b3c2 66f7d451a68b b5714e113bc0
common heads: 01241442b3c2 b5714e113bc0
Peter Arrenbrecht
discovery: add new set-based discovery...
 r14164 local is subset
% -- a -> b set
comparing with b
query 1; heads
searching for changes
Peter Arrenbrecht
setdiscovery: batch heads and known(ownheads)...
 r14624 all local heads known remotely
Mads Kiilerich <mads at kiilerich.com>
debugdiscovery: report heads in sorted order
 r18254 common heads: 01241442b3c2 b5714e113bc0
Peter Arrenbrecht
discovery: add new set-based discovery...
 r14164 local is subset
% -- b -> a tree
comparing with a
searching for changes
Mads Kiilerich <mads at kiilerich.com>
debugdiscovery: report heads in sorted order
 r18254 unpruned common: 01241442b3c2 b5714e113bc0
common heads: 01241442b3c2 b5714e113bc0
Peter Arrenbrecht
discovery: add new set-based discovery...
 r14164 remote is subset
% -- b -> a set
comparing with a
query 1; heads
searching for changes
all remote heads known locally
Mads Kiilerich <mads at kiilerich.com>
debugdiscovery: report heads in sorted order
 r18254 common heads: 01241442b3c2 b5714e113bc0
Peter Arrenbrecht
discovery: add new set-based discovery...
 r14164 remote is subset
Many new:
$ testdesc '-ra1 -ra2' '-rb' '
> +2:f +3:a1 +3:b
> <f +30 :a2'
% -- a -> b tree
comparing with b
searching for changes
unpruned common: bebd167eb94d
common heads: bebd167eb94d
% -- a -> b set
comparing with b
query 1; heads
searching for changes
Peter Arrenbrecht
setdiscovery: batch heads and known(ownheads)...
 r14624 taking initial sample
Peter Arrenbrecht
discovery: add new set-based discovery...
 r14164 searching: 2 queries
Peter Arrenbrecht
setdiscovery: batch heads and known(ownheads)...
 r14624 query 2; still undecided: 29, sample size is: 29
Peter Arrenbrecht
discovery: add new set-based discovery...
 r14164 2 total queries
common heads: bebd167eb94d
% -- b -> a tree
comparing with a
searching for changes
Mads Kiilerich <mads at kiilerich.com>
debugdiscovery: report heads in sorted order
 r18254 unpruned common: 66f7d451a68b bebd167eb94d
Peter Arrenbrecht
discovery: add new set-based discovery...
 r14164 common heads: bebd167eb94d
% -- b -> a set
comparing with a
query 1; heads
searching for changes
taking initial sample
searching: 2 queries
Peter Arrenbrecht
setdiscovery: batch heads and known(ownheads)...
 r14624 query 2; still undecided: 2, sample size is: 2
Peter Arrenbrecht
discovery: add new set-based discovery...
 r14164 2 total queries
common heads: bebd167eb94d
Both sides many new with stub:
$ testdesc '-ra1 -ra2' '-rb' '
> +2:f +2:a1 +30 :b
> <f +30 :a2'
% -- a -> b tree
comparing with b
searching for changes
unpruned common: 2dc09a01254d
common heads: 2dc09a01254d
% -- a -> b set
comparing with b
query 1; heads
searching for changes
Peter Arrenbrecht
setdiscovery: batch heads and known(ownheads)...
 r14624 taking initial sample
Peter Arrenbrecht
discovery: add new set-based discovery...
 r14164 searching: 2 queries
Peter Arrenbrecht
setdiscovery: batch heads and known(ownheads)...
 r14624 query 2; still undecided: 29, sample size is: 29
Peter Arrenbrecht
discovery: add new set-based discovery...
 r14164 2 total queries
common heads: 2dc09a01254d
% -- b -> a tree
comparing with a
searching for changes
Mads Kiilerich <mads at kiilerich.com>
debugdiscovery: report heads in sorted order
 r18254 unpruned common: 2dc09a01254d 66f7d451a68b
Peter Arrenbrecht
discovery: add new set-based discovery...
 r14164 common heads: 2dc09a01254d
% -- b -> a set
comparing with a
query 1; heads
searching for changes
taking initial sample
searching: 2 queries
Peter Arrenbrecht
setdiscovery: batch heads and known(ownheads)...
 r14624 query 2; still undecided: 29, sample size is: 29
Peter Arrenbrecht
discovery: add new set-based discovery...
 r14164 2 total queries
common heads: 2dc09a01254d
Both many new:
$ testdesc '-ra' '-rb' '
> +2:f +30 :b
> <f +30 :a'
% -- a -> b tree
comparing with b
searching for changes
unpruned common: 66f7d451a68b
common heads: 66f7d451a68b
% -- a -> b set
comparing with b
query 1; heads
searching for changes
taking quick initial sample
searching: 2 queries
Peter Arrenbrecht
setdiscovery: batch heads and known(ownheads)...
 r14624 query 2; still undecided: 31, sample size is: 31
Peter Arrenbrecht
discovery: add new set-based discovery...
 r14164 2 total queries
common heads: 66f7d451a68b
% -- b -> a tree
comparing with a
searching for changes
unpruned common: 66f7d451a68b
common heads: 66f7d451a68b
% -- b -> a set
comparing with a
query 1; heads
searching for changes
taking quick initial sample
searching: 2 queries
Peter Arrenbrecht
setdiscovery: batch heads and known(ownheads)...
 r14624 query 2; still undecided: 31, sample size is: 31
Peter Arrenbrecht
discovery: add new set-based discovery...
 r14164 2 total queries
common heads: 66f7d451a68b
Both many new skewed:
$ testdesc '-ra' '-rb' '
> +2:f +30 :b
> <f +50 :a'
% -- a -> b tree
comparing with b
searching for changes
unpruned common: 66f7d451a68b
common heads: 66f7d451a68b
% -- a -> b set
comparing with b
query 1; heads
searching for changes
taking quick initial sample
searching: 2 queries
Peter Arrenbrecht
setdiscovery: batch heads and known(ownheads)...
 r14624 query 2; still undecided: 51, sample size is: 51
Peter Arrenbrecht
discovery: add new set-based discovery...
 r14164 2 total queries
common heads: 66f7d451a68b
% -- b -> a tree
comparing with a
searching for changes
unpruned common: 66f7d451a68b
common heads: 66f7d451a68b
% -- b -> a set
comparing with a
query 1; heads
searching for changes
taking quick initial sample
searching: 2 queries
Peter Arrenbrecht
setdiscovery: batch heads and known(ownheads)...
 r14624 query 2; still undecided: 31, sample size is: 31
Peter Arrenbrecht
discovery: add new set-based discovery...
 r14164 2 total queries
common heads: 66f7d451a68b
Both many new on top of long history:
$ testdesc '-ra' '-rb' '
> +1000:f +30 :b
> <f +50 :a'
% -- a -> b tree
comparing with b
searching for changes
unpruned common: 7ead0cba2838
common heads: 7ead0cba2838
% -- a -> b set
comparing with b
query 1; heads
searching for changes
taking quick initial sample
searching: 2 queries
Peter Arrenbrecht
setdiscovery: batch heads and known(ownheads)...
 r14624 query 2; still undecided: 1049, sample size is: 11
Peter Arrenbrecht
discovery: add new set-based discovery...
 r14164 sampling from both directions
searching: 3 queries
query 3; still undecided: 31, sample size is: 31
3 total queries
common heads: 7ead0cba2838
% -- b -> a tree
comparing with a
searching for changes
unpruned common: 7ead0cba2838
common heads: 7ead0cba2838
% -- b -> a set
comparing with a
query 1; heads
searching for changes
taking quick initial sample
searching: 2 queries
Peter Arrenbrecht
setdiscovery: batch heads and known(ownheads)...
 r14624 query 2; still undecided: 1029, sample size is: 11
Peter Arrenbrecht
discovery: add new set-based discovery...
 r14164 sampling from both directions
searching: 3 queries
Peter Arrenbrecht
dagutil: fix off-by-one in inverserevlogdag buildup
 r15052 query 3; still undecided: 15, sample size is: 15
Peter Arrenbrecht
discovery: add new set-based discovery...
 r14164 3 total queries
common heads: 7ead0cba2838
Peter Arrenbrecht
setdiscovery: fix hang when #heads>200 (issue2971)...
 r15063 One with >200 heads, which used to use up all of the sample:
Peter Arrenbrecht
discovery: add new set-based discovery...
 r14164
Peter Arrenbrecht
setdiscovery: fix hang when #heads>200 (issue2971)...
 r15063 $ hg init manyheads
$ cd manyheads
$ echo "+300:r @a" >dagdesc
$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads
$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads
$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads
$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads
$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads
$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads
$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads
$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads
$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads
$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads
$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads
$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads
$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads
$ echo "@b *r+3" >>dagdesc # one more head
$ hg debugbuilddag <dagdesc
reading DAG from stdin
$ hg heads -t --template . | wc -c
Lee Cantey
test-setdiscovery: allow for leading space in output of wc
 r15090 \s*261 (re)
Peter Arrenbrecht
setdiscovery: fix hang when #heads>200 (issue2971)...
 r15063
$ hg clone -b a . a
adding changesets
adding manifests
adding file changes
added 1340 changesets with 0 changes to 0 files (+259 heads)
updating to branch a
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg clone -b b . b
adding changesets
adding manifests
adding file changes
added 304 changesets with 0 changes to 0 files
updating to branch b
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R a debugdiscovery b --debug --verbose
comparing with b
query 1; heads
searching for changes
taking quick initial sample
searching: 2 queries
Pierre-Yves David
setdiscovery: limit the size of all sample (issue4411)...
 r23130 query 2; still undecided: 1240, sample size is: 100
Peter Arrenbrecht
setdiscovery: fix hang when #heads>200 (issue2971)...
 r15063 sampling from both directions
searching: 3 queries
Pierre-Yves David
setdiscovery: limit the size of all sample (issue4411)...
 r23130 query 3; still undecided: 1140, sample size is: 200
Peter Arrenbrecht
setdiscovery: fix hang when #heads>200 (issue2971)...
 r15063 sampling from both directions
searching: 4 queries
Pierre-Yves David
setdiscovery: limit the size of all sample (issue4411)...
 r23130 query 4; still undecided: 940, sample size is: 200
Peter Arrenbrecht
setdiscovery: fix hang when #heads>200 (issue2971)...
 r15063 sampling from both directions
searching: 5 queries
Pierre-Yves David
setdiscovery: limit the size of all sample (issue4411)...
 r23130 query 5; still undecided: 740, sample size is: 200
sampling from both directions
searching: 6 queries
query 6; still undecided: 540, sample size is: 200
sampling from both directions
searching: 7 queries
query 7; still undecided: 44, sample size is: 44
7 total queries
Peter Arrenbrecht
setdiscovery: fix hang when #heads>200 (issue2971)...
 r15063 common heads: 3ee37d65064a
Mads Kiilerich
tests: improve test coverage for discovery and actual parameters for pulling
 r22181 Test actual protocol when pulling one new head in addition to common heads
$ hg clone -U b c
$ hg -R c id -ir tip
513314ca8b3a
$ hg -R c up -qr default
$ touch c/f
$ hg -R c ci -Aqm "extra head"
$ hg -R c id -i
e64a39e7da8b
$ hg serve -R c -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
$ cat hg.pid >> $DAEMON_PIDS
$ hg -R b incoming http://localhost:$HGPORT/ -T '{node|short}\n'
comparing with http://localhost:$HGPORT/
searching for changes
e64a39e7da8b
$ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
$ cut -d' ' -f6- access.log | grep -v cmd=known # cmd=known uses random sampling
"GET /?cmd=capabilities HTTP/1.1" 200 -
"GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D513314ca8b3ae4dac8eec56966265b00fcf866db
Mads Kiilerich
incoming: don't request heads that already are common...
 r22182 "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:common=513314ca8b3ae4dac8eec56966265b00fcf866db&heads=e64a39e7da8b0d54bc63e81169aff001c13b3477
Mads Kiilerich
tests: improve test coverage for discovery and actual parameters for pulling
 r22181 $ cat errors.log
Mads Kiilerich
tests: add missing trailing 'cd ..'...
 r16913 $ cd ..