Mercurial > hg
annotate tests/test-paths.t @ 24787:9d5c27890790
largefiles: for update -C, only update largefiles when necessary
Before, a --clean update with largefiles would use the "optimization" that it
didn't read hashes from standin files before and after the update. Instead of
trusting the content of the standin files, it would rehash all the actual
largefiles that lfdirstate reported clean and update the standins that didn't
have the expected content. It could thus in some "impossible" situations
automatically recover from some "largefile got out sync with its standin"
issues (even there apparently still were weird corner cases where it could
fail). This extra checking is similar to what core --clean intentionally do
not do, and it made update --clean unbearable slow.
Usually in core Mercurial, --clean will rely on the dirstate to find the files
it should update. (It is thus intentionally possible (when trying to trick the
system or if there should be bugs) to end up in situations where --clean not
will restore the working directory content correctly.) Checking every file when
we "know" it is ok is however not an option - that would be too slow.
Instead, trust the content of the standin files. Use the same logic for --clean
as for linear updates and trust the dirstate and that our "logic" will keep
them in sync. It is much cheaper to just rehash the largefiles reported dirty
by a status walk and read all standins than to hash largefiles.
Most of the changes are just a change of indentation now when the different
kinds of updates no longer are handled that differently. Standins for added
files are however only written when doing a normal update, while deleted and
removed files only will be updated for --clean updates.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Wed, 15 Apr 2015 15:22:16 -0400 |
parents | f2719b387380 |
children | 4dccc37b87bd 59d5f619e69e |
rev | line source |
---|---|
11785
7d9be960cd9a
tests: unify test-paths
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5951
diff
changeset
|
1 $ hg init a |
7d9be960cd9a
tests: unify test-paths
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5951
diff
changeset
|
2 $ hg clone a b |
7d9be960cd9a
tests: unify test-paths
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5951
diff
changeset
|
3 updating to branch default |
7d9be960cd9a
tests: unify test-paths
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5951
diff
changeset
|
4 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
7d9be960cd9a
tests: unify test-paths
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5951
diff
changeset
|
5 $ cd a |
7d9be960cd9a
tests: unify test-paths
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5951
diff
changeset
|
6 $ echo '[paths]' >> .hg/hgrc |
7d9be960cd9a
tests: unify test-paths
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5951
diff
changeset
|
7 $ echo 'dupe = ../b' >> .hg/hgrc |
12662
7285b2824fb7
ui.paths: expand paths directly in fixconfig (issue2373)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12640
diff
changeset
|
8 $ echo 'expand = $SOMETHING/bar' >> .hg/hgrc |
11785
7d9be960cd9a
tests: unify test-paths
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5951
diff
changeset
|
9 $ hg in dupe |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
14331
diff
changeset
|
10 comparing with $TESTTMP/b (glob) |
11785
7d9be960cd9a
tests: unify test-paths
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5951
diff
changeset
|
11 no changes found |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11785
diff
changeset
|
12 [1] |
11785
7d9be960cd9a
tests: unify test-paths
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5951
diff
changeset
|
13 $ cd .. |
7d9be960cd9a
tests: unify test-paths
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5951
diff
changeset
|
14 $ hg -R a in dupe |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
14331
diff
changeset
|
15 comparing with $TESTTMP/b (glob) |
11785
7d9be960cd9a
tests: unify test-paths
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
5951
diff
changeset
|
16 no changes found |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11785
diff
changeset
|
17 [1] |
12662
7285b2824fb7
ui.paths: expand paths directly in fixconfig (issue2373)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12640
diff
changeset
|
18 $ cd a |
7285b2824fb7
ui.paths: expand paths directly in fixconfig (issue2373)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12640
diff
changeset
|
19 $ hg paths |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
14331
diff
changeset
|
20 dupe = $TESTTMP/b (glob) |
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
14331
diff
changeset
|
21 expand = $TESTTMP/a/$SOMETHING/bar (glob) |
12662
7285b2824fb7
ui.paths: expand paths directly in fixconfig (issue2373)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12640
diff
changeset
|
22 $ SOMETHING=foo hg paths |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
14331
diff
changeset
|
23 dupe = $TESTTMP/b (glob) |
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
14331
diff
changeset
|
24 expand = $TESTTMP/a/foo/bar (glob) |
16843
61f3ca8e4d39
test-paths.t: enable for Windows using #if
Adrian Buehlmann <adrian@cadifra.com>
parents:
15567
diff
changeset
|
25 #if msys |
61f3ca8e4d39
test-paths.t: enable for Windows using #if
Adrian Buehlmann <adrian@cadifra.com>
parents:
15567
diff
changeset
|
26 $ SOMETHING=//foo hg paths |
61f3ca8e4d39
test-paths.t: enable for Windows using #if
Adrian Buehlmann <adrian@cadifra.com>
parents:
15567
diff
changeset
|
27 dupe = $TESTTMP/b (glob) |
61f3ca8e4d39
test-paths.t: enable for Windows using #if
Adrian Buehlmann <adrian@cadifra.com>
parents:
15567
diff
changeset
|
28 expand = /foo/bar |
61f3ca8e4d39
test-paths.t: enable for Windows using #if
Adrian Buehlmann <adrian@cadifra.com>
parents:
15567
diff
changeset
|
29 #else |
12662
7285b2824fb7
ui.paths: expand paths directly in fixconfig (issue2373)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12640
diff
changeset
|
30 $ SOMETHING=/foo hg paths |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
14331
diff
changeset
|
31 dupe = $TESTTMP/b (glob) |
12662
7285b2824fb7
ui.paths: expand paths directly in fixconfig (issue2373)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12640
diff
changeset
|
32 expand = /foo/bar |
16843
61f3ca8e4d39
test-paths.t: enable for Windows using #if
Adrian Buehlmann <adrian@cadifra.com>
parents:
15567
diff
changeset
|
33 #endif |
14331
3b9a896af09c
paths: Add support for -q/--quiet
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13797
diff
changeset
|
34 $ hg paths -q |
3b9a896af09c
paths: Add support for -q/--quiet
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13797
diff
changeset
|
35 dupe |
3b9a896af09c
paths: Add support for -q/--quiet
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13797
diff
changeset
|
36 expand |
3b9a896af09c
paths: Add support for -q/--quiet
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13797
diff
changeset
|
37 $ hg paths dupe |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
14331
diff
changeset
|
38 $TESTTMP/b (glob) |
14331
3b9a896af09c
paths: Add support for -q/--quiet
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13797
diff
changeset
|
39 $ hg paths -q dupe |
3b9a896af09c
paths: Add support for -q/--quiet
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13797
diff
changeset
|
40 $ hg paths unknown |
3b9a896af09c
paths: Add support for -q/--quiet
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13797
diff
changeset
|
41 not found! |
3b9a896af09c
paths: Add support for -q/--quiet
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13797
diff
changeset
|
42 [1] |
3b9a896af09c
paths: Add support for -q/--quiet
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13797
diff
changeset
|
43 $ hg paths -q unknown |
3b9a896af09c
paths: Add support for -q/--quiet
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13797
diff
changeset
|
44 [1] |
13797
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
45 $ cd .. |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
46 |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
47 'file:' disables [paths] entries for clone destination |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
48 |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
49 $ cat >> $HGRCPATH <<EOF |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
50 > [paths] |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
51 > gpath1 = http://hg.example.com |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
52 > EOF |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
53 |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
54 $ hg clone a gpath1 |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
55 abort: cannot create new http repository |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
56 [255] |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
57 |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
58 $ hg clone a file:gpath1 |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
59 updating to branch default |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
60 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
61 $ cd gpath1 |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
62 $ hg -q id |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
63 000000000000 |
16d5e80876de
test-paths.t: 'file:' disables [paths] entries for clone dest
Adrian Buehlmann <adrian@cadifra.com>
parents:
12662
diff
changeset
|
64 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16843
diff
changeset
|
65 $ cd .. |