annotate tests/test-schemes.t @ 26750:9f9ec4abe700

cmdutil: make in-memory changes visible to external editor (issue4378) Before this patch, external editor process for the commit log can't view some in-memory changes (especially, of dirstate), because they aren't written out until the end of transaction (or wlock). This causes unexpected output of Mercurial commands spawned from that editor process. To make in-memory changes visible to external editor process, this patch does: - write (or schedule to write) in-memory dirstate changes, and - set HG_PENDING environment variable, if: - a transaction is running, and - there are in-memory changes to be visible "hg diff" spawned from external editor process for "hg qrefresh" shows: - "changes newly imported into the topmost" before 49148d7868df(*) - "all changes recorded in the topmost by refreshing" after this patch (*) 49148d7868df changed steps invoking editor process Even though backward compatibility may be broken, the latter behavior looks reasonable, because "hg diff" spawned from the editor process consistently shows "what changes new revision records" regardless of invocation context. In fact, issue4378 itself should be resolved by 800e090e9c64, which made 'repo.transaction()' write in-memory dirstate changes out explicitly before starting transaction. It also made "hg qrefresh" imply 'dirstate.write()' before external editor invocation in call chain below. - mq.queue.refresh - strip.strip - repair.strip - localrepository.transaction - dirstate.write - localrepository.commit - invoke external editor Though, this patch has '(issue4378)' in own summary line to indicate that issues like issue4378 should be fixed by this. BTW, this patch adds '-m' option to a 'hg ci --amend' execution in 'test-commit-amend.t', to avoid invoking external editor process. In this case, "unsure" states may be changed to "clean" according to timestamp or so on. These changes should be written into pending file, if external editor invocation is required, Then, writing dirstate changes out breaks stability of test, because it shows "transaction abort!/rollback completed" occasionally. Aborting after editor process invocation while commands below may cause similar instability of tests, too (AFAIK, there is no more such one, at this revision) - commit --amend - without --message/--logfile - import - without --message/--logfile, - without --no-commit, - without --bypass, - one of below, and - patch has no description text, or - with --edit - aborting at the 1st patch, which adds or removes file(s) - if it only changes existing files, status is checked only for changed files by 'scmutil.matchfiles()', and transition from "unsure" to "normal" in dirstate doesn't occur (= dirstate isn't changed, and written out) - aborting at the 2nd or later patch implies other pending changes (e.g. changelog), and always causes showing "transaction abort!/rollback completed"
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Sat, 17 Oct 2015 01:15:34 +0900
parents 7a9cbb315d84
children bf1d5c223ac0
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
22046
7a9cbb315d84 tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents: 18910
diff changeset
1 #require serve
9964
e600ad9bc257 schemes extension
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff changeset
2
12486
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
3 $ cat <<EOF >> $HGRCPATH
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
4 > [extensions]
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
5 > schemes=
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
6 >
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
7 > [schemes]
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
8 > l = http://localhost:$HGPORT/
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
9 > parts = http://{1}:$HGPORT/
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
10 > z = file:\$PWD/
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
11 > EOF
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
12 $ hg init test
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
13 $ cd test
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
14 $ echo a > a
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
15 $ hg ci -Am initial
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
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
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
26 $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
27 $ cat hg.pid >> $DAEMON_PIDS
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
28 $ hg incoming l://
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
29 comparing with l://
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
30 searching for changes
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
31 no changes found
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
32 [1]
9964
e600ad9bc257 schemes extension
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff changeset
33
12486
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
34 check that {1} syntax works
9964
e600ad9bc257 schemes extension
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff changeset
35
12486
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
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
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
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
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
44 no changes found
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
45 [1]
9964
e600ad9bc257 schemes extension
Alexander Solovyov <piranha@piranha.org.ua>
parents:
diff changeset
46
12486
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
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
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
49 $ PWD=`pwd` hg incoming z://
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
50 comparing with z://
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
51 searching for changes
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
52 no changes found
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
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
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
55 errors
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
56
95b4af4eaa06 tests: unify test-schemes
Matt Mackall <mpm@selenic.com>
parents: 11154
diff changeset
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 ..