Mercurial > hg
annotate tests/test-push-hook-lock.t @ 24213:e0c1328df872
workingctx: use normal dirs() instead of dirstate.dirs()
The workingctx class was using dirstate.dirs() as it's implementation. The
sparse extension maintains a pruned down version of the dirstate, so this
resulted in the workingctx reporting an incorrect listing of directories
during merge calculations (it was detecting directory renames when it
shouldn't have).
The fix is to use the default implementation, which uses workingctx._manifest,
which unions the manifest with the dirstate to produce the correct overall
picture. This also produces more accurate output since it will no longer
return directories that have been entirely deleted in the dirstate.
Tests will be added to the sparse extension to detect regressions for this.
author | Durham Goode <durham@fb.com> |
---|---|
date | Thu, 05 Mar 2015 22:16:28 -0800 |
parents | 7dd1870120b2 |
children | 00e4c5601c74 |
rev | line source |
---|---|
12279 | 1 $ hg init 1 |
2 | |
3 $ echo '[ui]' >> 1/.hg/hgrc | |
4 $ echo 'timeout = 10' >> 1/.hg/hgrc | |
5 | |
6 $ echo foo > 1/foo | |
7 $ hg --cwd 1 ci -A -m foo | |
8 adding foo | |
9 | |
10 $ hg clone 1 2 | |
11 updating to branch default | |
12 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
13 | |
14 $ hg clone 2 3 | |
15 updating to branch default | |
16 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
17 | |
23349
7dd1870120b2
tests: move a multi-statement debuglocks hook into a shell script for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
22559
diff
changeset
|
18 $ cat <<EOF > $TESTTMP/debuglocks-pretxn-hook.sh |
7dd1870120b2
tests: move a multi-statement debuglocks hook into a shell script for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
22559
diff
changeset
|
19 > hg debuglocks |
7dd1870120b2
tests: move a multi-statement debuglocks hook into a shell script for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
22559
diff
changeset
|
20 > true |
7dd1870120b2
tests: move a multi-statement debuglocks hook into a shell script for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
22559
diff
changeset
|
21 > EOF |
12279 | 22 $ echo '[hooks]' >> 2/.hg/hgrc |
23349
7dd1870120b2
tests: move a multi-statement debuglocks hook into a shell script for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
22559
diff
changeset
|
23 $ echo "pretxnchangegroup.a = sh $TESTTMP/debuglocks-pretxn-hook.sh" >> 2/.hg/hgrc |
12279 | 24 $ echo 'changegroup.push = hg push -qf ../1' >> 2/.hg/hgrc |
25 | |
26 $ echo bar >> 3/foo | |
27 $ hg --cwd 3 ci -m bar | |
28 | |
29 $ hg --cwd 3 push ../2 | |
30 pushing to ../2 | |
31 searching for changes | |
32 adding changesets | |
33 adding manifests | |
34 adding file changes | |
35 added 1 changesets with 1 changes to 1 files | |
22559
4e0b696a1cb3
commands: add debuglocks to report/clear lock state
Matt Mackall <mpm@selenic.com>
parents:
12279
diff
changeset
|
36 lock: user *, process * (*s) (glob) |
4e0b696a1cb3
commands: add debuglocks to report/clear lock state
Matt Mackall <mpm@selenic.com>
parents:
12279
diff
changeset
|
37 wlock: free |
12279 | 38 |