Mercurial > hg
annotate tests/test-fileset-generated.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 | 2553ef7355ab |
children | ceef5fb14872 |
rev | line source |
---|---|
23949
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
1 $ hg init |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
2 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
3 Set up history and working copy |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
4 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
5 $ python $TESTDIR/generate-working-copy-states.py state 2 1 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
6 $ hg addremove -q --similarity 0 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
7 $ hg commit -m first |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
8 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
9 $ python $TESTDIR/generate-working-copy-states.py state 2 2 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
10 $ hg addremove -q --similarity 0 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
11 $ hg commit -m second |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
12 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
13 $ python $TESTDIR/generate-working-copy-states.py state 2 wc |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
14 $ hg addremove -q --similarity 0 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
15 $ hg forget *_*_*-untracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
16 $ rm *_*_missing-* |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
17 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
18 Test status |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
19 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
20 $ hg st -A 'set:modified()' |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
21 M content1_content1_content3-tracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
22 M content1_content2_content1-tracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
23 M content1_content2_content3-tracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
24 M missing_content2_content3-tracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
25 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
26 $ hg st -A 'set:added()' |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
27 A content1_missing_content1-tracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
28 A content1_missing_content3-tracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
29 A missing_missing_content3-tracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
30 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
31 $ hg st -A 'set:removed()' |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
32 R content1_content1_content1-untracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
33 R content1_content1_content3-untracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
34 R content1_content1_missing-untracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
35 R content1_content2_content1-untracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
36 R content1_content2_content2-untracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
37 R content1_content2_content3-untracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
38 R content1_content2_missing-untracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
39 R missing_content2_content2-untracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
40 R missing_content2_content3-untracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
41 R missing_content2_missing-untracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
42 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
43 $ hg st -A 'set:deleted()' |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
44 ! content1_content1_missing-tracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
45 ! content1_content2_missing-tracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
46 ! content1_missing_missing-tracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
47 ! missing_content2_missing-tracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
48 ! missing_missing_missing-tracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
49 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
50 $ hg st -A 'set:unknown()' |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
51 ? content1_missing_content1-untracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
52 ? content1_missing_content3-untracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
53 ? missing_missing_content3-untracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
54 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
55 $ hg st -A 'set:clean()' |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
56 C content1_content1_content1-tracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
57 C content1_content2_content2-tracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
58 C missing_content2_content2-tracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
59 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
60 Test log |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
61 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
62 $ hg log -T '{rev}\n' --stat 'set:modified()' |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
63 1 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
64 content1_content2_content1-tracked | 2 +- |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
65 content1_content2_content3-tracked | 2 +- |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
66 missing_content2_content3-tracked | 1 + |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
67 3 files changed, 3 insertions(+), 2 deletions(-) |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
68 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
69 0 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
70 content1_content1_content3-tracked | 1 + |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
71 content1_content2_content1-tracked | 1 + |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
72 content1_content2_content3-tracked | 1 + |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
73 3 files changed, 3 insertions(+), 0 deletions(-) |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
74 |
24813
2553ef7355ab
largefiles: don't mangle filesets when fixing up the log matcher
Matt Harbison <matt_harbison@yahoo.com>
parents:
24438
diff
changeset
|
75 Largefiles doesn't crash |
2553ef7355ab
largefiles: don't mangle filesets when fixing up the log matcher
Matt Harbison <matt_harbison@yahoo.com>
parents:
24438
diff
changeset
|
76 $ hg log -T '{rev}\n' --stat 'set:modified()' --config extensions.largefiles= |
2553ef7355ab
largefiles: don't mangle filesets when fixing up the log matcher
Matt Harbison <matt_harbison@yahoo.com>
parents:
24438
diff
changeset
|
77 1 |
2553ef7355ab
largefiles: don't mangle filesets when fixing up the log matcher
Matt Harbison <matt_harbison@yahoo.com>
parents:
24438
diff
changeset
|
78 content1_content2_content1-tracked | 2 +- |
2553ef7355ab
largefiles: don't mangle filesets when fixing up the log matcher
Matt Harbison <matt_harbison@yahoo.com>
parents:
24438
diff
changeset
|
79 content1_content2_content3-tracked | 2 +- |
2553ef7355ab
largefiles: don't mangle filesets when fixing up the log matcher
Matt Harbison <matt_harbison@yahoo.com>
parents:
24438
diff
changeset
|
80 missing_content2_content3-tracked | 1 + |
2553ef7355ab
largefiles: don't mangle filesets when fixing up the log matcher
Matt Harbison <matt_harbison@yahoo.com>
parents:
24438
diff
changeset
|
81 3 files changed, 3 insertions(+), 2 deletions(-) |
2553ef7355ab
largefiles: don't mangle filesets when fixing up the log matcher
Matt Harbison <matt_harbison@yahoo.com>
parents:
24438
diff
changeset
|
82 |
2553ef7355ab
largefiles: don't mangle filesets when fixing up the log matcher
Matt Harbison <matt_harbison@yahoo.com>
parents:
24438
diff
changeset
|
83 0 |
2553ef7355ab
largefiles: don't mangle filesets when fixing up the log matcher
Matt Harbison <matt_harbison@yahoo.com>
parents:
24438
diff
changeset
|
84 content1_content1_content3-tracked | 1 + |
2553ef7355ab
largefiles: don't mangle filesets when fixing up the log matcher
Matt Harbison <matt_harbison@yahoo.com>
parents:
24438
diff
changeset
|
85 content1_content2_content1-tracked | 1 + |
2553ef7355ab
largefiles: don't mangle filesets when fixing up the log matcher
Matt Harbison <matt_harbison@yahoo.com>
parents:
24438
diff
changeset
|
86 content1_content2_content3-tracked | 1 + |
2553ef7355ab
largefiles: don't mangle filesets when fixing up the log matcher
Matt Harbison <matt_harbison@yahoo.com>
parents:
24438
diff
changeset
|
87 3 files changed, 3 insertions(+), 0 deletions(-) |
2553ef7355ab
largefiles: don't mangle filesets when fixing up the log matcher
Matt Harbison <matt_harbison@yahoo.com>
parents:
24438
diff
changeset
|
88 |
23949
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
89 $ hg log -T '{rev}\n' --stat 'set:added()' |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
90 1 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
91 content1_missing_content1-tracked | 1 - |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
92 content1_missing_content3-tracked | 1 - |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
93 2 files changed, 0 insertions(+), 2 deletions(-) |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
94 |
23950
caff3675cba5
log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents:
23949
diff
changeset
|
95 0 |
caff3675cba5
log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents:
23949
diff
changeset
|
96 content1_missing_content1-tracked | 1 + |
caff3675cba5
log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents:
23949
diff
changeset
|
97 content1_missing_content3-tracked | 1 + |
caff3675cba5
log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents:
23949
diff
changeset
|
98 2 files changed, 2 insertions(+), 0 deletions(-) |
caff3675cba5
log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents:
23949
diff
changeset
|
99 |
23949
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
100 $ hg log -T '{rev}\n' --stat 'set:removed()' |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
101 1 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
102 content1_content2_content1-untracked | 2 +- |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
103 content1_content2_content2-untracked | 2 +- |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
104 content1_content2_content3-untracked | 2 +- |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
105 content1_content2_missing-untracked | 2 +- |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
106 missing_content2_content2-untracked | 1 + |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
107 missing_content2_content3-untracked | 1 + |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
108 missing_content2_missing-untracked | 1 + |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
109 7 files changed, 7 insertions(+), 4 deletions(-) |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
110 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
111 0 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
112 content1_content1_content1-untracked | 1 + |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
113 content1_content1_content3-untracked | 1 + |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
114 content1_content1_missing-untracked | 1 + |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
115 content1_content2_content1-untracked | 1 + |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
116 content1_content2_content2-untracked | 1 + |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
117 content1_content2_content3-untracked | 1 + |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
118 content1_content2_missing-untracked | 1 + |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
119 7 files changed, 7 insertions(+), 0 deletions(-) |
23950
caff3675cba5
log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents:
23949
diff
changeset
|
120 |
23949
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
121 $ hg log -T '{rev}\n' --stat 'set:deleted()' |
23950
caff3675cba5
log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents:
23949
diff
changeset
|
122 1 |
caff3675cba5
log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents:
23949
diff
changeset
|
123 content1_content2_missing-tracked | 2 +- |
caff3675cba5
log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents:
23949
diff
changeset
|
124 content1_missing_missing-tracked | 1 - |
caff3675cba5
log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents:
23949
diff
changeset
|
125 missing_content2_missing-tracked | 1 + |
caff3675cba5
log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents:
23949
diff
changeset
|
126 3 files changed, 2 insertions(+), 2 deletions(-) |
caff3675cba5
log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents:
23949
diff
changeset
|
127 |
caff3675cba5
log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents:
23949
diff
changeset
|
128 0 |
caff3675cba5
log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents:
23949
diff
changeset
|
129 content1_content1_missing-tracked | 1 + |
caff3675cba5
log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents:
23949
diff
changeset
|
130 content1_content2_missing-tracked | 1 + |
caff3675cba5
log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents:
23949
diff
changeset
|
131 content1_missing_missing-tracked | 1 + |
caff3675cba5
log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents:
23949
diff
changeset
|
132 3 files changed, 3 insertions(+), 0 deletions(-) |
caff3675cba5
log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents:
23949
diff
changeset
|
133 |
23949
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
134 $ hg log -T '{rev}\n' --stat 'set:unknown()' |
23950
caff3675cba5
log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents:
23949
diff
changeset
|
135 1 |
caff3675cba5
log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents:
23949
diff
changeset
|
136 content1_missing_content1-untracked | 1 - |
caff3675cba5
log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents:
23949
diff
changeset
|
137 content1_missing_content3-untracked | 1 - |
caff3675cba5
log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents:
23949
diff
changeset
|
138 2 files changed, 0 insertions(+), 2 deletions(-) |
caff3675cba5
log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents:
23949
diff
changeset
|
139 |
caff3675cba5
log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents:
23949
diff
changeset
|
140 0 |
caff3675cba5
log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents:
23949
diff
changeset
|
141 content1_missing_content1-untracked | 1 + |
caff3675cba5
log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents:
23949
diff
changeset
|
142 content1_missing_content3-untracked | 1 + |
caff3675cba5
log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents:
23949
diff
changeset
|
143 2 files changed, 2 insertions(+), 0 deletions(-) |
caff3675cba5
log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents:
23949
diff
changeset
|
144 |
23949
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
145 $ hg log -T '{rev}\n' --stat 'set:clean()' |
23950
caff3675cba5
log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents:
23949
diff
changeset
|
146 1 |
caff3675cba5
log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents:
23949
diff
changeset
|
147 content1_content2_content2-tracked | 2 +- |
caff3675cba5
log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents:
23949
diff
changeset
|
148 missing_content2_content2-tracked | 1 + |
caff3675cba5
log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents:
23949
diff
changeset
|
149 2 files changed, 2 insertions(+), 1 deletions(-) |
caff3675cba5
log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents:
23949
diff
changeset
|
150 |
23949
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
151 0 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
152 content1_content1_content1-tracked | 1 + |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
153 content1_content2_content2-tracked | 1 + |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
154 2 files changed, 2 insertions(+), 0 deletions(-) |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
155 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
156 Test revert |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
157 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
158 $ hg revert 'set:modified()' |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
159 reverting content1_content1_content3-tracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
160 reverting content1_content2_content1-tracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
161 reverting content1_content2_content3-tracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
162 reverting missing_content2_content3-tracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
163 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
164 $ hg revert 'set:added()' |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
165 forgetting content1_missing_content1-tracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
166 forgetting content1_missing_content3-tracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
167 forgetting missing_missing_content3-tracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
168 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
169 $ hg revert 'set:removed()' |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
170 undeleting content1_content1_content1-untracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
171 undeleting content1_content1_content3-untracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
172 undeleting content1_content1_missing-untracked |
24438
5b85a5bc5bbb
revert: evaluate filesets against working directory (issue4497)
Martin von Zweigbergk <martinvonz@google.com>
parents:
23950
diff
changeset
|
173 undeleting content1_content2_content1-untracked |
5b85a5bc5bbb
revert: evaluate filesets against working directory (issue4497)
Martin von Zweigbergk <martinvonz@google.com>
parents:
23950
diff
changeset
|
174 undeleting content1_content2_content2-untracked |
5b85a5bc5bbb
revert: evaluate filesets against working directory (issue4497)
Martin von Zweigbergk <martinvonz@google.com>
parents:
23950
diff
changeset
|
175 undeleting content1_content2_content3-untracked |
5b85a5bc5bbb
revert: evaluate filesets against working directory (issue4497)
Martin von Zweigbergk <martinvonz@google.com>
parents:
23950
diff
changeset
|
176 undeleting content1_content2_missing-untracked |
5b85a5bc5bbb
revert: evaluate filesets against working directory (issue4497)
Martin von Zweigbergk <martinvonz@google.com>
parents:
23950
diff
changeset
|
177 undeleting missing_content2_content2-untracked |
5b85a5bc5bbb
revert: evaluate filesets against working directory (issue4497)
Martin von Zweigbergk <martinvonz@google.com>
parents:
23950
diff
changeset
|
178 undeleting missing_content2_content3-untracked |
5b85a5bc5bbb
revert: evaluate filesets against working directory (issue4497)
Martin von Zweigbergk <martinvonz@google.com>
parents:
23950
diff
changeset
|
179 undeleting missing_content2_missing-untracked |
23949
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
180 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
181 $ hg revert 'set:deleted()' |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
182 reverting content1_content1_missing-tracked |
24438
5b85a5bc5bbb
revert: evaluate filesets against working directory (issue4497)
Martin von Zweigbergk <martinvonz@google.com>
parents:
23950
diff
changeset
|
183 reverting content1_content2_missing-tracked |
23949
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
184 forgetting content1_missing_missing-tracked |
24438
5b85a5bc5bbb
revert: evaluate filesets against working directory (issue4497)
Martin von Zweigbergk <martinvonz@google.com>
parents:
23950
diff
changeset
|
185 reverting missing_content2_missing-tracked |
23949
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
186 forgetting missing_missing_missing-tracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
187 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
188 $ hg revert 'set:unknown()' |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
189 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
190 $ hg revert 'set:clean()' |