Mercurial > hg
annotate tests/test-websub.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 | 4d2b9b304ad0 |
rev | line source |
---|---|
22046
7a9cbb315d84
tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents:
18629
diff
changeset
|
1 #require serve |
15446
c5c9ca3719f9
tests: use 'hghave serve' to guard tests that requires serve daemon management
Mads Kiilerich <mads@kiilerich.com>
parents:
12126
diff
changeset
|
2 |
12126
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
3 $ hg init test |
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
4 $ cd test |
10473
634b0e7561ec
test-interhg: test the extension
Martin Geisler <mg@lazybytes.net>
parents:
diff
changeset
|
5 |
12126
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
6 $ cat > .hg/hgrc <<EOF |
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
7 > [extensions] |
18629
013fcd112f13
extensions: obsolete and remove interhg extension
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
17017
diff
changeset
|
8 > # this is only necessary to check that the mapping from |
013fcd112f13
extensions: obsolete and remove interhg extension
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
17017
diff
changeset
|
9 > # interhg to websub works |
12126
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
10 > interhg = |
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
11 > |
18629
013fcd112f13
extensions: obsolete and remove interhg extension
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
17017
diff
changeset
|
12 > [websub] |
013fcd112f13
extensions: obsolete and remove interhg extension
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
17017
diff
changeset
|
13 > issues = s|Issue(\d+)|<a href="http://bts.example.org/issue\1">Issue\1</a>| |
013fcd112f13
extensions: obsolete and remove interhg extension
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
17017
diff
changeset
|
14 > |
12126
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
15 > [interhg] |
18629
013fcd112f13
extensions: obsolete and remove interhg extension
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
17017
diff
changeset
|
16 > # check that we maintain some interhg backwards compatibility... |
12126
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
17 > # yes, 'x' is a weird delimiter... |
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
18 > markbugs = sxbugx<i class="\x">bug</i>x |
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
19 > EOF |
10473
634b0e7561ec
test-interhg: test the extension
Martin Geisler <mg@lazybytes.net>
parents:
diff
changeset
|
20 |
12126
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
21 $ touch foo |
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
22 $ hg add foo |
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
23 $ hg commit -d '1 0' -m 'Issue123: fixed the bug!' |
10473
634b0e7561ec
test-interhg: test the extension
Martin Geisler <mg@lazybytes.net>
parents:
diff
changeset
|
24 |
12126
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
25 $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log |
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
26 $ cat hg.pid >> $DAEMON_PIDS |
10473
634b0e7561ec
test-interhg: test the extension
Martin Geisler <mg@lazybytes.net>
parents:
diff
changeset
|
27 |
12126
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
28 log |
10473
634b0e7561ec
test-interhg: test the extension
Martin Geisler <mg@lazybytes.net>
parents:
diff
changeset
|
29 |
18629
013fcd112f13
extensions: obsolete and remove interhg extension
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
17017
diff
changeset
|
30 $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT "rev/tip" | grep bts |
013fcd112f13
extensions: obsolete and remove interhg extension
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
17017
diff
changeset
|
31 <div class="description"><a href="http://bts.example.org/issue123">Issue123</a>: fixed the <i class="x">bug</i>!</div> |
12126
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
32 errors |
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
33 |
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
34 $ cat errors.log |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15446
diff
changeset
|
35 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15446
diff
changeset
|
36 $ cd .. |