Mercurial > hg
annotate tests/test-check-code-hg.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 | 8fb6844a4ff1 |
children |
rev | line source |
---|---|
22047
8fb6844a4ff1
tests: change some #ifs to #requires
Matt Mackall <mpm@selenic.com>
parents:
21225
diff
changeset
|
1 #require test-repo |
21223
c35c027f5f43
test-check-code-hg: use test-repo check
Matt Mackall <mpm@selenic.com>
parents:
20239
diff
changeset
|
2 |
15557
7bb5ed61b74c
tests: convert test-check-code-hg.py to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
11771
diff
changeset
|
3 $ check_code="$TESTDIR"/../contrib/check-code.py |
7bb5ed61b74c
tests: convert test-check-code-hg.py to .t
Mads Kiilerich <mads@kiilerich.com>
parents:
11771
diff
changeset
|
4 $ cd "$TESTDIR"/.. |
15558
c6b600d2348c
tests: run check-code with warnings and maintain a whitelist
Mads Kiilerich <mads@kiilerich.com>
parents:
15557
diff
changeset
|
5 |
19384
96fd9af75834
tests: check-code all python files in one run
Simon Heimberg <simohe@besonet.ch>
parents:
19321
diff
changeset
|
6 New errors are not allowed. Warnings are strongly discouraged. |
20239
16b5f498f49c
check-code: always report when a file is skipped by "no-check-code"
Simon Heimberg <simohe@besonet.ch>
parents:
19495
diff
changeset
|
7 (The writing "no-che?k-code" is for not skipping this file when checking.) |
19384
96fd9af75834
tests: check-code all python files in one run
Simon Heimberg <simohe@besonet.ch>
parents:
19321
diff
changeset
|
8 |
21225
c58aa73bf0b9
test-check-code-hg: use locate instead of manifest
Matt Mackall <mpm@selenic.com>
parents:
21224
diff
changeset
|
9 $ hg locate | sed 's-\\-/-g' | |
19495
9aee3d014394
tests: test-check-code-hg.t works for all files to check
Simon Heimberg <simohe@besonet.ch>
parents:
19386
diff
changeset
|
10 > xargs "$check_code" --warnings --per-file=0 || false |
20239
16b5f498f49c
check-code: always report when a file is skipped by "no-check-code"
Simon Heimberg <simohe@besonet.ch>
parents:
19495
diff
changeset
|
11 Skipping hgext/zeroconf/Zeroconf.py it has no-che?k-code (glob) |
16b5f498f49c
check-code: always report when a file is skipped by "no-check-code"
Simon Heimberg <simohe@besonet.ch>
parents:
19495
diff
changeset
|
12 Skipping i18n/polib.py it has no-che?k-code (glob) |
16b5f498f49c
check-code: always report when a file is skipped by "no-check-code"
Simon Heimberg <simohe@besonet.ch>
parents:
19495
diff
changeset
|
13 Skipping mercurial/httpclient/__init__.py it has no-che?k-code (glob) |
16b5f498f49c
check-code: always report when a file is skipped by "no-check-code"
Simon Heimberg <simohe@besonet.ch>
parents:
19495
diff
changeset
|
14 Skipping mercurial/httpclient/_readers.py it has no-che?k-code (glob) |
16b5f498f49c
check-code: always report when a file is skipped by "no-check-code"
Simon Heimberg <simohe@besonet.ch>
parents:
19495
diff
changeset
|
15 Skipping mercurial/httpclient/socketutil.py it has no-che?k-code (glob) |