Mercurial > hg
annotate tests/test-hup.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 | 581d3bc03aad |
children |
rev | line source |
---|---|
22046
7a9cbb315d84
tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents:
20896
diff
changeset
|
1 #require serve fifo |
7a9cbb315d84
tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents:
20896
diff
changeset
|
2 |
12413 | 3 Test hangup signal in the middle of transaction |
642 | 4 |
12413 | 5 $ hg init |
6 $ mkfifo p | |
16342
7e24d34837a9
tests: make test-hup more race-proof
Matt Mackall <mpm@selenic.com>
parents:
16299
diff
changeset
|
7 $ hg serve --stdio < p 1>out 2>&1 & |
12413 | 8 $ P=$! |
16299
853ffcafecfa
tests: remove sleep/startup/shutdown races from test-hup
Matt Mackall <mpm@selenic.com>
parents:
15455
diff
changeset
|
9 |
853ffcafecfa
tests: remove sleep/startup/shutdown races from test-hup
Matt Mackall <mpm@selenic.com>
parents:
15455
diff
changeset
|
10 Do test while holding fifo open |
853ffcafecfa
tests: remove sleep/startup/shutdown races from test-hup
Matt Mackall <mpm@selenic.com>
parents:
15455
diff
changeset
|
11 |
853ffcafecfa
tests: remove sleep/startup/shutdown races from test-hup
Matt Mackall <mpm@selenic.com>
parents:
15455
diff
changeset
|
12 $ ( |
853ffcafecfa
tests: remove sleep/startup/shutdown races from test-hup
Matt Mackall <mpm@selenic.com>
parents:
15455
diff
changeset
|
13 > echo lock |
853ffcafecfa
tests: remove sleep/startup/shutdown races from test-hup
Matt Mackall <mpm@selenic.com>
parents:
15455
diff
changeset
|
14 > echo addchangegroup |
20896
9fae01831dea
tests: prevent test-hup from hanging forever if the transaction does not start
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16364
diff
changeset
|
15 > start=`date +%s` |
9fae01831dea
tests: prevent test-hup from hanging forever if the transaction does not start
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16364
diff
changeset
|
16 > # 10 second seems much enough to let the server catch up |
9fae01831dea
tests: prevent test-hup from hanging forever if the transaction does not start
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16364
diff
changeset
|
17 > deadline=`expr $start + 10` |
9fae01831dea
tests: prevent test-hup from hanging forever if the transaction does not start
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16364
diff
changeset
|
18 > while [ ! -s .hg/store/journal ]; do |
9fae01831dea
tests: prevent test-hup from hanging forever if the transaction does not start
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16364
diff
changeset
|
19 > sleep 0; |
9fae01831dea
tests: prevent test-hup from hanging forever if the transaction does not start
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16364
diff
changeset
|
20 > if [ `date +%s` -gt $deadline ]; then |
9fae01831dea
tests: prevent test-hup from hanging forever if the transaction does not start
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16364
diff
changeset
|
21 > echo "transaction did not start after 10 seconds" >&2; |
9fae01831dea
tests: prevent test-hup from hanging forever if the transaction does not start
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16364
diff
changeset
|
22 > exit 1; |
9fae01831dea
tests: prevent test-hup from hanging forever if the transaction does not start
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16364
diff
changeset
|
23 > fi |
9fae01831dea
tests: prevent test-hup from hanging forever if the transaction does not start
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
16364
diff
changeset
|
24 > done |
16299
853ffcafecfa
tests: remove sleep/startup/shutdown races from test-hup
Matt Mackall <mpm@selenic.com>
parents:
15455
diff
changeset
|
25 > kill -HUP $P |
853ffcafecfa
tests: remove sleep/startup/shutdown races from test-hup
Matt Mackall <mpm@selenic.com>
parents:
15455
diff
changeset
|
26 > ) > p |
16342
7e24d34837a9
tests: make test-hup more race-proof
Matt Mackall <mpm@selenic.com>
parents:
16299
diff
changeset
|
27 |
16344
fb765286f2f9
tests: avoid zombie lockup with test-hup
Matt Mackall <mpm@selenic.com>
parents:
16342
diff
changeset
|
28 $ wait |
16342
7e24d34837a9
tests: make test-hup more race-proof
Matt Mackall <mpm@selenic.com>
parents:
16299
diff
changeset
|
29 $ cat out |
12413 | 30 0 |
31 0 | |
32 adding changesets | |
33 transaction abort! | |
34 rollback completed | |
35 killed! | |
16299
853ffcafecfa
tests: remove sleep/startup/shutdown races from test-hup
Matt Mackall <mpm@selenic.com>
parents:
15455
diff
changeset
|
36 |
23277
581d3bc03aad
test-hup: use ls instead of echo
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22046
diff
changeset
|
37 $ ls -1d .hg/* .hg/store/* |
581d3bc03aad
test-hup: use ls instead of echo
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22046
diff
changeset
|
38 .hg/00changelog.i |
581d3bc03aad
test-hup: use ls instead of echo
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22046
diff
changeset
|
39 .hg/journal.bookmarks |
581d3bc03aad
test-hup: use ls instead of echo
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22046
diff
changeset
|
40 .hg/journal.branch |
581d3bc03aad
test-hup: use ls instead of echo
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22046
diff
changeset
|
41 .hg/journal.desc |
581d3bc03aad
test-hup: use ls instead of echo
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22046
diff
changeset
|
42 .hg/journal.dirstate |
581d3bc03aad
test-hup: use ls instead of echo
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22046
diff
changeset
|
43 .hg/requires |
581d3bc03aad
test-hup: use ls instead of echo
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22046
diff
changeset
|
44 .hg/store |
581d3bc03aad
test-hup: use ls instead of echo
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22046
diff
changeset
|
45 .hg/store/00changelog.i |
581d3bc03aad
test-hup: use ls instead of echo
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22046
diff
changeset
|
46 .hg/store/00changelog.i.a |
581d3bc03aad
test-hup: use ls instead of echo
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22046
diff
changeset
|
47 .hg/store/journal.phaseroots |