Mercurial > hg
annotate tests/test-schemes.t @ 23923:ab6fd3205dad stable
largefiles: fix commit of a directory with no largefile changes (issue4330)
When a directory is named in the commit file list, the previous behavior was to
walk the list, and if no normal files in the directory were also named, add the
corresponding standin for each largefile in that directory. The directory is
then dropped from the list, so that committing a directory with no normal file
changes works. It then added the corresponding standin directory for the first
largefile seen, by prefixing it with '.hglf/'.
The latter is unnecessary since each affected largefile is explicitly referenced
by its standin in the list. It also caused an abort if there were no changed
largefiles in the directory, because none of its standins changed:
abort: .hglf/foo/bar: no match under directory!
This list of files is used to tweak a matcher in lfutil.updatestandinsbymatch(),
which is what is passed to commit().
The status() call that is ultimately done in the commit code with this matcher
seems to have some OS specific differences. It is not necessary to append '.'
for Windows to run the largefiles tests cleanly. But if '.' is not added to the
list, the match function isn't called on Linux, so status() would miss any
normal files that were also in a named directory. The commit then proceeds
without those normal files, or says "nothing changed" if there were no changed
largefiles in the directory. This is not filesystem specific, as VFAT on Linux
had the same behavior as when run on ext4. It is also not an issue with
lfilesrepo.status(), since that only calls the overridden implementation when
paths are passed to commit. I dont have access to an OS X machine ATM to test
there.
Maybe there's a better way to do this. But since the standin directory for the
first largefile was previously being added, and that caused the same walk in
status(), there's no preformance change to this. There is no danger of
erroneously committing files in '.', because the original match function is
called, and if it fails, the lfutil.updatestandinsbymatch() tweaked matcher only
indicates a match if the file is in the list of standins- and '.' never is. The
added tests confirm this.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sun, 18 Jan 2015 15:15:40 -0500 |
parents | 7a9cbb315d84 |
children | bf1d5c223ac0 |
rev | line source |
---|---|
22046
7a9cbb315d84
tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents:
18910
diff
changeset
|
1 #require serve |
9964 | 2 |
12486 | 3 $ cat <<EOF >> $HGRCPATH |
4 > [extensions] | |
5 > schemes= | |
6 > | |
7 > [schemes] | |
8 > l = http://localhost:$HGPORT/ | |
9 > parts = http://{1}:$HGPORT/ | |
10 > z = file:\$PWD/ | |
11 > EOF | |
12 $ hg init test | |
13 $ cd test | |
14 $ echo a > a | |
15 $ hg ci -Am initial | |
16 adding a | |
18910
b52404a914a9
scheme: don't crash on invalid URLs
Mads Kiilerich <madski@unity3d.com>
parents:
16913
diff
changeset
|
17 |
b52404a914a9
scheme: don't crash on invalid URLs
Mads Kiilerich <madski@unity3d.com>
parents:
16913
diff
changeset
|
18 invalid scheme |
b52404a914a9
scheme: don't crash on invalid URLs
Mads Kiilerich <madski@unity3d.com>
parents:
16913
diff
changeset
|
19 |
b52404a914a9
scheme: don't crash on invalid URLs
Mads Kiilerich <madski@unity3d.com>
parents:
16913
diff
changeset
|
20 $ hg log -R z:z |
b52404a914a9
scheme: don't crash on invalid URLs
Mads Kiilerich <madski@unity3d.com>
parents:
16913
diff
changeset
|
21 abort: no '://' in scheme url 'z:z' |
b52404a914a9
scheme: don't crash on invalid URLs
Mads Kiilerich <madski@unity3d.com>
parents:
16913
diff
changeset
|
22 [255] |
b52404a914a9
scheme: don't crash on invalid URLs
Mads Kiilerich <madski@unity3d.com>
parents:
16913
diff
changeset
|
23 |
b52404a914a9
scheme: don't crash on invalid URLs
Mads Kiilerich <madski@unity3d.com>
parents:
16913
diff
changeset
|
24 http scheme |
b52404a914a9
scheme: don't crash on invalid URLs
Mads Kiilerich <madski@unity3d.com>
parents:
16913
diff
changeset
|
25 |
12486 | 26 $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log |
27 $ cat hg.pid >> $DAEMON_PIDS | |
28 $ hg incoming l:// | |
29 comparing with l:// | |
30 searching for changes | |
31 no changes found | |
32 [1] | |
9964 | 33 |
12486 | 34 check that {1} syntax works |
9964 | 35 |
12486 | 36 $ hg incoming --debug parts://localhost |
12643
d08bb64888bc
tests: reintroduce ":$HGPORT" in test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12486
diff
changeset
|
37 using http://localhost:$HGPORT/ |
13603
395a84f78736
httprepo: use caps instead of between for compat check
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
12643
diff
changeset
|
38 sending capabilities command |
13815
d066d8d652c8
url: add trailing slashes to URLs with hostnames that don't have one
Brodie Rao <brodie@bitheap.org>
parents:
13742
diff
changeset
|
39 comparing with parts://localhost/ |
14164
cb98fed52495
discovery: add new set-based discovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
13815
diff
changeset
|
40 query 1; heads |
14624
f03c82d1f50a
setdiscovery: batch heads and known(ownheads)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14164
diff
changeset
|
41 sending batch command |
12486 | 42 searching for changes |
14164
cb98fed52495
discovery: add new set-based discovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
13815
diff
changeset
|
43 all remote heads known locally |
12486 | 44 no changes found |
45 [1] | |
9964 | 46 |
12486 | 47 check that paths are expanded |
10070
9d1195b2f00d
schemes: url parts are counted from 1
Alexander Solovyov <piranha@piranha.org.ua>
parents:
9964
diff
changeset
|
48 |
12486 | 49 $ PWD=`pwd` hg incoming z:// |
50 comparing with z:// | |
51 searching for changes | |
52 no changes found | |
53 [1] | |
11154
17031fea4e95
expand paths to local repository or bundle in appropriate classes
Alexander Solovyov <piranha@piranha.org.ua>
parents:
10070
diff
changeset
|
54 |
12486 | 55 errors |
56 | |
57 $ cat errors.log | |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15446
diff
changeset
|
58 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15446
diff
changeset
|
59 $ cd .. |