Mercurial > hg
annotate tests/test-strict.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 | 3bd577a3283e |
children | 7109d5ddeb0c |
rev | line source |
---|---|
12097
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
1 $ hg init |
2988
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
2 |
12097
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
3 $ echo a > a |
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
4 $ hg ci -Ama |
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
5 adding a |
2988
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
6 |
12097
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
7 $ hg an a |
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
8 0: a |
2988
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
9 |
16591
46e9ed223d2c
commands: parse ui.strict config item as bool
Yuya Nishihara <yuya@tcha.org>
parents:
15862
diff
changeset
|
10 $ hg --config ui.strict=False an a |
46e9ed223d2c
commands: parse ui.strict config item as bool
Yuya Nishihara <yuya@tcha.org>
parents:
15862
diff
changeset
|
11 0: a |
46e9ed223d2c
commands: parse ui.strict config item as bool
Yuya Nishihara <yuya@tcha.org>
parents:
15862
diff
changeset
|
12 |
12097
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
13 $ echo "[ui]" >> $HGRCPATH |
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
14 $ echo "strict=True" >> $HGRCPATH |
2988
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
15 |
12097
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
16 $ hg an a |
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
17 hg: unknown command 'an' |
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
18 Mercurial Distributed SCM |
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
19 |
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
20 basic commands: |
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
21 |
16853
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
22 add add the specified files on the next commit |
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
23 annotate show changeset information by line for each file |
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
24 clone make a copy of an existing repository |
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
25 commit commit the specified files or all outstanding changes |
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
26 diff diff repository (or selected files) |
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
27 export dump the header and diffs for one or more changesets |
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
28 forget forget the specified files on the next commit |
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
29 init create a new repository in the given directory |
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
30 log show revision history of entire repository or files |
23400
3bd577a3283e
merge: be precise about what merged into what in short desc
anatoly techtonik <techtonik@gmail.com>
parents:
22118
diff
changeset
|
31 merge merge another revision into working directory |
16853
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
32 pull pull changes from the specified source |
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
33 push push changes to the specified destination |
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
34 remove remove the specified files on the next commit |
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
35 serve start stand-alone webserver |
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
36 status show changed files in the working directory |
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
37 summary summarize working directory state |
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
38 update update working directory (or switch revisions) |
12097
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
39 |
22118
9a299c39de01
help: normalize helplist hints
Matt Mackall <mpm@selenic.com>
parents:
17981
diff
changeset
|
40 (use "hg help" for the full list of commands or "hg -v" for details) |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12097
diff
changeset
|
41 [255] |
12097
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
42 $ hg annotate a |
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
43 0: a |
2988
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
44 |
12097
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
45 should succeed - up is an alias, not an abbreviation |
2988
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
46 |
12097
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
47 $ hg up |
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
48 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |