Mercurial > hg
annotate tests/test-fileset-generated.t @ 37132:a54113fcc8c9
lfs: move the 'supportedoutgoingversions' handling to changegroup.py
This handling already exists here for the narrow extension. We still need to
either figure out how to enable changegroup v3 without the extension, or figure
out how to let the server detect that the client doesn't have it loaded, and
emit a user friendly error[1]. I can't tell if D1944 is the appropriate vehicle
for the latter.
[1] https://www.mercurial-scm.org/pipermail/mercurial-devel/2018-January/109550.html
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Mon, 26 Mar 2018 23:02:50 -0400 |
parents | fe0667cc521e |
children | cb70501d8b71 |
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 |
32940
75be14993fda
cleanup: use $PYTHON to run python in many more tests
Augie Fackler <augie@google.com>
parents:
27024
diff
changeset
|
5 $ $PYTHON $TESTDIR/generate-working-copy-states.py state 2 1 |
23949
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 |
32940
75be14993fda
cleanup: use $PYTHON to run python in many more tests
Augie Fackler <augie@google.com>
parents:
27024
diff
changeset
|
9 $ $PYTHON $TESTDIR/generate-working-copy-states.py state 2 2 |
23949
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 |
32940
75be14993fda
cleanup: use $PYTHON to run python in many more tests
Augie Fackler <augie@google.com>
parents:
27024
diff
changeset
|
13 $ $PYTHON $TESTDIR/generate-working-copy-states.py state 2 wc |
23949
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 |
27024
ceef5fb14872
fileset: add missing() predicate (issue4925)
liscju <piotr.listkiewicz@gmail.com>
parents:
24813
diff
changeset
|
50 $ hg st -A 'set:missing()' |
ceef5fb14872
fileset: add missing() predicate (issue4925)
liscju <piotr.listkiewicz@gmail.com>
parents:
24813
diff
changeset
|
51 ! content1_content1_missing-tracked |
ceef5fb14872
fileset: add missing() predicate (issue4925)
liscju <piotr.listkiewicz@gmail.com>
parents:
24813
diff
changeset
|
52 ! content1_content2_missing-tracked |
ceef5fb14872
fileset: add missing() predicate (issue4925)
liscju <piotr.listkiewicz@gmail.com>
parents:
24813
diff
changeset
|
53 ! content1_missing_missing-tracked |
ceef5fb14872
fileset: add missing() predicate (issue4925)
liscju <piotr.listkiewicz@gmail.com>
parents:
24813
diff
changeset
|
54 ! missing_content2_missing-tracked |
ceef5fb14872
fileset: add missing() predicate (issue4925)
liscju <piotr.listkiewicz@gmail.com>
parents:
24813
diff
changeset
|
55 ! missing_missing_missing-tracked |
ceef5fb14872
fileset: add missing() predicate (issue4925)
liscju <piotr.listkiewicz@gmail.com>
parents:
24813
diff
changeset
|
56 |
23949
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
57 $ hg st -A 'set:unknown()' |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
58 ? content1_missing_content1-untracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
59 ? content1_missing_content3-untracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
60 ? missing_missing_content3-untracked |
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 st -A 'set:clean()' |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
63 C content1_content1_content1-tracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
64 C content1_content2_content2-tracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
65 C missing_content2_content2-tracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
66 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
67 Test log |
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 $ 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
|
70 1 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
71 content1_content2_content1-tracked | 2 +- |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
72 content1_content2_content3-tracked | 2 +- |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
73 missing_content2_content3-tracked | 1 + |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
74 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
|
75 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
76 0 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
77 content1_content1_content3-tracked | 1 + |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
78 content1_content2_content1-tracked | 1 + |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
79 content1_content2_content3-tracked | 1 + |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
80 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
|
81 |
24813
2553ef7355ab
largefiles: don't mangle filesets when fixing up the log matcher
Matt Harbison <matt_harbison@yahoo.com>
parents:
24438
diff
changeset
|
82 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
|
83 $ hg log -T '{rev}\n' --stat 'set:modified()' --config extensions.largefiles= |
33212
fe0667cc521e
tests: add fsmonitor specific output lines at enabling largefiles
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32940
diff
changeset
|
84 The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !) |
24813
2553ef7355ab
largefiles: don't mangle filesets when fixing up the log matcher
Matt Harbison <matt_harbison@yahoo.com>
parents:
24438
diff
changeset
|
85 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_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
|
87 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
|
88 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
|
89 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
|
90 |
2553ef7355ab
largefiles: don't mangle filesets when fixing up the log matcher
Matt Harbison <matt_harbison@yahoo.com>
parents:
24438
diff
changeset
|
91 0 |
2553ef7355ab
largefiles: don't mangle filesets when fixing up the log matcher
Matt Harbison <matt_harbison@yahoo.com>
parents:
24438
diff
changeset
|
92 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
|
93 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
|
94 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
|
95 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
|
96 |
23949
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
97 $ 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
|
98 1 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
99 content1_missing_content1-tracked | 1 - |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
100 content1_missing_content3-tracked | 1 - |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
101 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
|
102 |
23950
caff3675cba5
log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents:
23949
diff
changeset
|
103 0 |
caff3675cba5
log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents:
23949
diff
changeset
|
104 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
|
105 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
|
106 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
|
107 |
23949
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
108 $ 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
|
109 1 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
110 content1_content2_content1-untracked | 2 +- |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
111 content1_content2_content2-untracked | 2 +- |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
112 content1_content2_content3-untracked | 2 +- |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
113 content1_content2_missing-untracked | 2 +- |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
114 missing_content2_content2-untracked | 1 + |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
115 missing_content2_content3-untracked | 1 + |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
116 missing_content2_missing-untracked | 1 + |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
117 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
|
118 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
119 0 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
120 content1_content1_content1-untracked | 1 + |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
121 content1_content1_content3-untracked | 1 + |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
122 content1_content1_missing-untracked | 1 + |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
123 content1_content2_content1-untracked | 1 + |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
124 content1_content2_content2-untracked | 1 + |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
125 content1_content2_content3-untracked | 1 + |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
126 content1_content2_missing-untracked | 1 + |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
127 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
|
128 |
23949
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
129 $ 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
|
130 1 |
caff3675cba5
log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents:
23949
diff
changeset
|
131 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
|
132 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
|
133 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
|
134 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
|
135 |
caff3675cba5
log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents:
23949
diff
changeset
|
136 0 |
caff3675cba5
log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents:
23949
diff
changeset
|
137 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
|
138 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
|
139 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
|
140 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
|
141 |
23949
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
142 $ 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
|
143 1 |
caff3675cba5
log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents:
23949
diff
changeset
|
144 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
|
145 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
|
146 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
|
147 |
caff3675cba5
log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents:
23949
diff
changeset
|
148 0 |
caff3675cba5
log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents:
23949
diff
changeset
|
149 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
|
150 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
|
151 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
|
152 |
23949
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
153 $ 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
|
154 1 |
caff3675cba5
log: evaluate filesets on working copy, not its parent
Martin von Zweigbergk <martinvonz@google.com>
parents:
23949
diff
changeset
|
155 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
|
156 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
|
157 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
|
158 |
23949
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
159 0 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
160 content1_content1_content1-tracked | 1 + |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
161 content1_content2_content2-tracked | 1 + |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
162 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
|
163 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
164 Test revert |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
165 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
166 $ hg revert 'set:modified()' |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
167 reverting content1_content1_content3-tracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
168 reverting content1_content2_content1-tracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
169 reverting content1_content2_content3-tracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
170 reverting missing_content2_content3-tracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
171 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
172 $ hg revert 'set:added()' |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
173 forgetting content1_missing_content1-tracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
174 forgetting content1_missing_content3-tracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
175 forgetting missing_missing_content3-tracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
176 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
177 $ hg revert 'set:removed()' |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
178 undeleting content1_content1_content1-untracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
179 undeleting content1_content1_content3-untracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
180 undeleting content1_content1_missing-untracked |
24438
5b85a5bc5bbb
revert: evaluate filesets against working directory (issue4497)
Martin von Zweigbergk <martinvonz@google.com>
parents:
23950
diff
changeset
|
181 undeleting content1_content2_content1-untracked |
5b85a5bc5bbb
revert: evaluate filesets against working directory (issue4497)
Martin von Zweigbergk <martinvonz@google.com>
parents:
23950
diff
changeset
|
182 undeleting content1_content2_content2-untracked |
5b85a5bc5bbb
revert: evaluate filesets against working directory (issue4497)
Martin von Zweigbergk <martinvonz@google.com>
parents:
23950
diff
changeset
|
183 undeleting content1_content2_content3-untracked |
5b85a5bc5bbb
revert: evaluate filesets against working directory (issue4497)
Martin von Zweigbergk <martinvonz@google.com>
parents:
23950
diff
changeset
|
184 undeleting content1_content2_missing-untracked |
5b85a5bc5bbb
revert: evaluate filesets against working directory (issue4497)
Martin von Zweigbergk <martinvonz@google.com>
parents:
23950
diff
changeset
|
185 undeleting missing_content2_content2-untracked |
5b85a5bc5bbb
revert: evaluate filesets against working directory (issue4497)
Martin von Zweigbergk <martinvonz@google.com>
parents:
23950
diff
changeset
|
186 undeleting missing_content2_content3-untracked |
5b85a5bc5bbb
revert: evaluate filesets against working directory (issue4497)
Martin von Zweigbergk <martinvonz@google.com>
parents:
23950
diff
changeset
|
187 undeleting missing_content2_missing-untracked |
23949
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
188 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
189 $ hg revert 'set:deleted()' |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
190 reverting content1_content1_missing-tracked |
24438
5b85a5bc5bbb
revert: evaluate filesets against working directory (issue4497)
Martin von Zweigbergk <martinvonz@google.com>
parents:
23950
diff
changeset
|
191 reverting content1_content2_missing-tracked |
23949
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
192 forgetting content1_missing_missing-tracked |
24438
5b85a5bc5bbb
revert: evaluate filesets against working directory (issue4497)
Martin von Zweigbergk <martinvonz@google.com>
parents:
23950
diff
changeset
|
193 reverting missing_content2_missing-tracked |
23949
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
194 forgetting missing_missing_missing-tracked |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
195 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
196 $ hg revert 'set:unknown()' |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
197 |
8efb7130a519
fileset: add tests of generated working copy states
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
198 $ hg revert 'set:clean()' |