Mercurial > hg
annotate tests/test-fileset-generated.t @ 26228:0fd20a71abdb
extdiff: add a --patch argument for diffing changeset deltas
One of the things I missed the most when transitioning from versioned MQ to
evolve was the loss of being able to check that rebase conflicts were properly
resolved by:
$ hg ci --mq -m "before"
$ hg rebase -s qbase -d tip
$ hg bcompare --mq
The old csets stay in the tree with evolve, but a straight diff includes all of
the other changes that were pulled in, obscuring the code that was rebased.
Diffing deltas can be confusing, but unless radical changes were made during the
resolve, it is very clear when individual hunks are added, dropped or modified.
Unlike the MQ technique, this can only compare a single pair of csets/patches at
a time. Like the MQ method, this also highlights changes in the commit comment
and other metadata.
I originally tried monkey patching from the evolve extension, but that is too
complicated given that it depends on the order the two different extensions are
loaded. This functionality is also useful when comparing grafts however, so
implementing it in the core is more than just convenience.
The --change argument doesn't make much sense for this, but it isn't harmful so
I didn't bother blocking it. The -I/-X options are ignored because of a
limitation of cmdutil.export(). We'll fix that next.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Wed, 09 Sep 2015 21:07:38 -0400 |
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()' |