Mercurial > hg > mercurial-source
annotate tests/test-lrucachedict.py.out @ 38706:ea63a2004d09
update: print warning about hidden changeset after update
When an attempt to update to a hidden changeset fails because the
working copy is dirty, you may get a message like this:
updating to a hidden changeset 343f6de32686
(hidden revision '343f6de32686' was rewritten as: 4ab941244072)
abort: conflicting changes
(commit or update --clean to discard changes)
It's easy to miss the real error here. This patch moves the warning
about the hidden changeset to after the update has happened. It
changes the verb tense accordingly (and drops the "a" that I think it
sounds better without). Of course, this means that the commit isn't
actually hidden anymore when the message is printed. I think that's
fine.
Differential Revision: https://phab.mercurial-scm.org/D3479
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 07 May 2018 19:43:43 -0700 |
parents | 6cd3044985c2 |
children |
rev | line source |
---|---|
18603 | 1 'a' in d: True |
2 d['a']: va | |
3 'b' in d: True | |
4 d['b']: vb | |
5 'c' in d: True | |
6 d['c']: vc | |
7 'd' in d: True | |
8 d['d']: vd | |
9 'a' in d: False | |
10 'b' in d: True | |
11 d['b']: vb | |
12 'c' in d: True | |
13 d['c']: vc | |
14 'd' in d: True | |
15 d['d']: vd | |
16 'e' in d: True | |
17 d['e']: ve | |
18 'b' in d: True | |
19 d['b']: vb2 | |
20 'c' in d: True | |
21 d['c']: vc2 | |
22 'd' in d: True | |
23 d['d']: vd | |
24 'e' in d: False | |
25 'f' in d: True | |
26 d['f']: vf | |
19710
887ffa22fd0d
lrucachedict: implement clear()
Siddharth Agarwal <sid0@fb.com>
parents:
18603
diff
changeset
|
27 'b' in d: False |
887ffa22fd0d
lrucachedict: implement clear()
Siddharth Agarwal <sid0@fb.com>
parents:
18603
diff
changeset
|
28 'c' in d: False |
887ffa22fd0d
lrucachedict: implement clear()
Siddharth Agarwal <sid0@fb.com>
parents:
18603
diff
changeset
|
29 'd' in d: False |
887ffa22fd0d
lrucachedict: implement clear()
Siddharth Agarwal <sid0@fb.com>
parents:
18603
diff
changeset
|
30 'e' in d: False |
887ffa22fd0d
lrucachedict: implement clear()
Siddharth Agarwal <sid0@fb.com>
parents:
18603
diff
changeset
|
31 'f' in d: False |
28018
45d996a566d7
util: reimplement lrucachedict
Gregory Szorc <gregory.szorc@gmail.com>
parents:
19710
diff
changeset
|
32 'a' in d: True |
45d996a566d7
util: reimplement lrucachedict
Gregory Szorc <gregory.szorc@gmail.com>
parents:
19710
diff
changeset
|
33 d['a']: 1 |
45d996a566d7
util: reimplement lrucachedict
Gregory Szorc <gregory.szorc@gmail.com>
parents:
19710
diff
changeset
|
34 'b' in d: True |
45d996a566d7
util: reimplement lrucachedict
Gregory Szorc <gregory.szorc@gmail.com>
parents:
19710
diff
changeset
|
35 d['b']: 2 |
28231
6cd3044985c2
lrucachedict: add copy method
Eric Sumner <ericsumner@fb.com>
parents:
28018
diff
changeset
|
36 |
6cd3044985c2
lrucachedict: add copy method
Eric Sumner <ericsumner@fb.com>
parents:
28018
diff
changeset
|
37 All of these should be present: |
6cd3044985c2
lrucachedict: add copy method
Eric Sumner <ericsumner@fb.com>
parents:
28018
diff
changeset
|
38 'a' in dc: True |
6cd3044985c2
lrucachedict: add copy method
Eric Sumner <ericsumner@fb.com>
parents:
28018
diff
changeset
|
39 dc['a']: va3 |
6cd3044985c2
lrucachedict: add copy method
Eric Sumner <ericsumner@fb.com>
parents:
28018
diff
changeset
|
40 'b' in dc: True |
6cd3044985c2
lrucachedict: add copy method
Eric Sumner <ericsumner@fb.com>
parents:
28018
diff
changeset
|
41 dc['b']: vb3 |
6cd3044985c2
lrucachedict: add copy method
Eric Sumner <ericsumner@fb.com>
parents:
28018
diff
changeset
|
42 'c' in dc: True |
6cd3044985c2
lrucachedict: add copy method
Eric Sumner <ericsumner@fb.com>
parents:
28018
diff
changeset
|
43 dc['c']: vc3 |
6cd3044985c2
lrucachedict: add copy method
Eric Sumner <ericsumner@fb.com>
parents:
28018
diff
changeset
|
44 'd' in dc: True |
6cd3044985c2
lrucachedict: add copy method
Eric Sumner <ericsumner@fb.com>
parents:
28018
diff
changeset
|
45 dc['d']: vd3 |
6cd3044985c2
lrucachedict: add copy method
Eric Sumner <ericsumner@fb.com>
parents:
28018
diff
changeset
|
46 |
6cd3044985c2
lrucachedict: add copy method
Eric Sumner <ericsumner@fb.com>
parents:
28018
diff
changeset
|
47 All of these except 'a' should be present: |
6cd3044985c2
lrucachedict: add copy method
Eric Sumner <ericsumner@fb.com>
parents:
28018
diff
changeset
|
48 'a' in dc: False |
6cd3044985c2
lrucachedict: add copy method
Eric Sumner <ericsumner@fb.com>
parents:
28018
diff
changeset
|
49 'b' in dc: True |
6cd3044985c2
lrucachedict: add copy method
Eric Sumner <ericsumner@fb.com>
parents:
28018
diff
changeset
|
50 dc['b']: vb3 |
6cd3044985c2
lrucachedict: add copy method
Eric Sumner <ericsumner@fb.com>
parents:
28018
diff
changeset
|
51 'c' in dc: True |
6cd3044985c2
lrucachedict: add copy method
Eric Sumner <ericsumner@fb.com>
parents:
28018
diff
changeset
|
52 dc['c']: vc3 |
6cd3044985c2
lrucachedict: add copy method
Eric Sumner <ericsumner@fb.com>
parents:
28018
diff
changeset
|
53 'd' in dc: True |
6cd3044985c2
lrucachedict: add copy method
Eric Sumner <ericsumner@fb.com>
parents:
28018
diff
changeset
|
54 dc['d']: vd3 |
6cd3044985c2
lrucachedict: add copy method
Eric Sumner <ericsumner@fb.com>
parents:
28018
diff
changeset
|
55 'e' in dc: True |
6cd3044985c2
lrucachedict: add copy method
Eric Sumner <ericsumner@fb.com>
parents:
28018
diff
changeset
|
56 dc['e']: ve3 |
6cd3044985c2
lrucachedict: add copy method
Eric Sumner <ericsumner@fb.com>
parents:
28018
diff
changeset
|
57 |
6cd3044985c2
lrucachedict: add copy method
Eric Sumner <ericsumner@fb.com>
parents:
28018
diff
changeset
|
58 These should be in reverse alphabetical order and read 'v?3': |
6cd3044985c2
lrucachedict: add copy method
Eric Sumner <ericsumner@fb.com>
parents:
28018
diff
changeset
|
59 d['d']: vd3 |
6cd3044985c2
lrucachedict: add copy method
Eric Sumner <ericsumner@fb.com>
parents:
28018
diff
changeset
|
60 d['c']: vc3 |
6cd3044985c2
lrucachedict: add copy method
Eric Sumner <ericsumner@fb.com>
parents:
28018
diff
changeset
|
61 d['b']: vb3 |
6cd3044985c2
lrucachedict: add copy method
Eric Sumner <ericsumner@fb.com>
parents:
28018
diff
changeset
|
62 d['a']: va3 |