Mercurial > hg
annotate tests/test-websub.t @ 22288:4e2559841d6c
largefiles: update largefiles even if rebase is aborted by conflict
Before this patch, largefiles in the working directory aren't updated
correctly, if rebase is aborted by conflict. This prevents users from
viewing appropriate largefiles while resolving conflicts.
While rebase, largefiles in the working directory are updated only at
successful committing in the special code path of
"lfilesrepo.commit()".
To update largefiles even if rebase is aborted by conflict, this patch
centralizes the logic of updating largefiles in the working directory
into the "mergeupdate" wrapping "merge.update".
This is a temporary way to fix with less changes. For fundamental
resolution of this kind of problems in the future, largefiles in the
working directory should be updated with other (normal) files
simultaneously while "merge.update" execution: maybe by hooking
"applyupdates".
"Action list based updating" introduced by hooking "applyupdates" will
also improve performance of updating, because it automatically
decreases target files to be checked.
Just after this patch, there are some improper things in "Case 0" code
path of "lfilesrepo.commit()":
- "updatelfiles" invocation is redundant for rebase
- detailed comment doesn't meet to rebase behavior
These will be resolved after the subsequent patch for transplant,
because this code path is shared with transplant.
Even though replacing "merge.update" in rebase extension by "hg.merge"
can also avoid this problem, this patch chooses centralizing the logic
into "mergeupdate", because:
- "merge.update" invocation in rebase extension can't be directly
replaced by "hg.merge", because:
- rebase requires some extra arguments, which "hg.merge" doesn't
take (e.g. "ancestor")
- rebase doesn't require statistics information forcibly displayed
in "hg.merge"
- introducing "mergeupdate" can resolve also problem of some other
code paths directly using "merge.update"
largefiles in the working directory aren't updated regardless of
the result of commands below, before this patch:
- backout (for revisions other than the parent revision of the
working directory without "--merge")
- graft
- histedit (for revisions other than the parent of the working
directory
When "partial" is specified, "merge.update" doesn't update dirstate
entries for standins, even though standins themselves are updated.
In this case, "normallookup" should be used to mark largefiles as
"possibly dirty" forcibly, because applying "normal" on lfdirstate
treats them as "clean" unexpectedly.
This is reason why "normallookup=partial" is specified for
"lfcommands.updatelfiles".
This patch doesn't test "hg rebase --continue", because it doesn't
work correctly if largefiles in the working directory are modified
manually while resolving conflicts. This will be fixed in the next
step of refactoring for largefiles.
All changes of tests/*.t files other than test-largefiles-update.t in
this patch come from invoking "updatelfiles" not after but before
statistics output of "hg.update", "hg.clean" and "hg.merge".
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Sun, 24 Aug 2014 23:47:26 +0900 |
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 .. |