Mercurial > hg
annotate tests/test-hgweb-raw.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 | 4d2b9b304ad0 |
children | 636cf3f7620d |
rev | line source |
---|---|
22046
7a9cbb315d84
tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents:
18589
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:
15004
diff
changeset
|
2 |
12441
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
3 Test raw style of hgweb |
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
4 |
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
5 $ hg init test |
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
6 $ cd test |
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
7 $ mkdir sub |
16973
3d71807c3a48
tests: use a different evil name in test-hgweb-raw.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16913
diff
changeset
|
8 $ cat >'sub/some text%.txt' <<ENDSOME |
12441
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
9 > This is just some random text |
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
10 > that will go inside the file and take a few lines. |
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
11 > It is very boring to read, but computers don't |
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
12 > care about things like that. |
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
13 > ENDSOME |
16973
3d71807c3a48
tests: use a different evil name in test-hgweb-raw.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16913
diff
changeset
|
14 $ hg add 'sub/some text%.txt' |
12441
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
15 $ hg commit -d "1 0" -m "Just some text" |
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
16 |
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
17 $ hg serve -p $HGPORT -A access.log -E error.log -d --pid-file=hg.pid |
2532
84655f721f39
Add a test for getting raw files via the web UI.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
18 |
12441
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
19 $ cat hg.pid >> $DAEMON_PIDS |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
22046
diff
changeset
|
20 $ (get-with-headers.py localhost:$HGPORT '?f=bf0ff59095c9;file=sub/some%20text%25.txt;style=raw' content-type content-length content-disposition) >getoutput.txt |
16298
0eefd118f27e
tests: fix shutdown race in test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
15446
diff
changeset
|
21 |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
22046
diff
changeset
|
22 $ killdaemons.py hg.pid |
16298
0eefd118f27e
tests: fix shutdown race in test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
15446
diff
changeset
|
23 |
12441
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
24 $ cat getoutput.txt |
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
25 200 Script output follows |
15004
d06b9c55ddab
hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923)
Matt Mackall <mpm@selenic.com>
parents:
13962
diff
changeset
|
26 content-type: application/binary |
d06b9c55ddab
hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923)
Matt Mackall <mpm@selenic.com>
parents:
13962
diff
changeset
|
27 content-length: 157 |
16973
3d71807c3a48
tests: use a different evil name in test-hgweb-raw.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16913
diff
changeset
|
28 content-disposition: inline; filename="some text%.txt" |
15004
d06b9c55ddab
hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923)
Matt Mackall <mpm@selenic.com>
parents:
13962
diff
changeset
|
29 |
d06b9c55ddab
hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923)
Matt Mackall <mpm@selenic.com>
parents:
13962
diff
changeset
|
30 This is just some random text |
d06b9c55ddab
hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923)
Matt Mackall <mpm@selenic.com>
parents:
13962
diff
changeset
|
31 that will go inside the file and take a few lines. |
d06b9c55ddab
hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923)
Matt Mackall <mpm@selenic.com>
parents:
13962
diff
changeset
|
32 It is very boring to read, but computers don't |
d06b9c55ddab
hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923)
Matt Mackall <mpm@selenic.com>
parents:
13962
diff
changeset
|
33 care about things like that. |
d06b9c55ddab
hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923)
Matt Mackall <mpm@selenic.com>
parents:
13962
diff
changeset
|
34 $ cat access.log error.log |
16973
3d71807c3a48
tests: use a different evil name in test-hgweb-raw.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16913
diff
changeset
|
35 127.0.0.1 - - [*] "GET /?f=bf0ff59095c9;file=sub/some%20text%25.txt;style=raw HTTP/1.1" 200 - (glob) |
15004
d06b9c55ddab
hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923)
Matt Mackall <mpm@selenic.com>
parents:
13962
diff
changeset
|
36 |
d06b9c55ddab
hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923)
Matt Mackall <mpm@selenic.com>
parents:
13962
diff
changeset
|
37 $ rm access.log error.log |
d06b9c55ddab
hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923)
Matt Mackall <mpm@selenic.com>
parents:
13962
diff
changeset
|
38 $ hg serve -p $HGPORT -A access.log -E error.log -d --pid-file=hg.pid \ |
d06b9c55ddab
hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923)
Matt Mackall <mpm@selenic.com>
parents:
13962
diff
changeset
|
39 > --config web.guessmime=True |
d06b9c55ddab
hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923)
Matt Mackall <mpm@selenic.com>
parents:
13962
diff
changeset
|
40 |
d06b9c55ddab
hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923)
Matt Mackall <mpm@selenic.com>
parents:
13962
diff
changeset
|
41 $ cat hg.pid >> $DAEMON_PIDS |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
22046
diff
changeset
|
42 $ (get-with-headers.py localhost:$HGPORT '?f=bf0ff59095c9;file=sub/some%20text%25.txt;style=raw' content-type content-length content-disposition) >getoutput.txt |
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
22046
diff
changeset
|
43 $ killdaemons.py hg.pid |
16298
0eefd118f27e
tests: fix shutdown race in test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
15446
diff
changeset
|
44 |
15004
d06b9c55ddab
hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923)
Matt Mackall <mpm@selenic.com>
parents:
13962
diff
changeset
|
45 $ cat getoutput.txt |
d06b9c55ddab
hgweb: raw file mimetype guessing configurable, off by default (BC) (issue2923)
Matt Mackall <mpm@selenic.com>
parents:
13962
diff
changeset
|
46 200 Script output follows |
12441
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
47 content-type: text/plain; charset="ascii" |
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
48 content-length: 157 |
16973
3d71807c3a48
tests: use a different evil name in test-hgweb-raw.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16913
diff
changeset
|
49 content-disposition: inline; filename="some text%.txt" |
12441
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
50 |
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
51 This is just some random text |
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
52 that will go inside the file and take a few lines. |
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
53 It is very boring to read, but computers don't |
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
54 care about things like that. |
cb1e33a41d13
tests: unify test-hgweb-raw
Matt Mackall <mpm@selenic.com>
parents:
11617
diff
changeset
|
55 $ cat access.log error.log |
16973
3d71807c3a48
tests: use a different evil name in test-hgweb-raw.t
Mads Kiilerich <mads@kiilerich.com>
parents:
16913
diff
changeset
|
56 127.0.0.1 - - [*] "GET /?f=bf0ff59095c9;file=sub/some%20text%25.txt;style=raw HTTP/1.1" 200 - (glob) |
2532
84655f721f39
Add a test for getting raw files via the web UI.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
57 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16496
diff
changeset
|
58 $ cd .. |