Mercurial > hg
annotate tests/test-lrucachedict.py.out @ 26730:a1e43e85d294
merge-tools: allow marking a mergetool as completely disabled
Very often in my life I'm finding that the only configured merge tool
present on the system is vimdiff[0], and it's currently impossible (as
far as I can tell) short of specifying `ui.merge = `[1] to actually
*disable* a merge tool. This allows vimdiff-haters to put:
[merge-tools]
vimdiff.disable = yes
in their ~/.hgrc and never see vimdiff again. I'm stopping short of
putting this as a commented out entry in the sample new user hgrc
(seen when a user runs `hg config --edit` with no ~/.hgrc) for now,
but I might come back and do that later.
0: vimdiff is at an awkward intersection: it's usually installed by
the vim package which is often installed as a vi substitute, so it's
mere presence doesn't imply me wanting it, unlike (say) kdiff3.
1: There's a related problem I ran into today where specifying
`ui.merge = :merge` failed because :merge isn't a command, which I
think is a regression. I'll try and figure that out and at least file
a bug.
author | Augie Fackler <augie@google.com> |
---|---|
date | Wed, 14 Oct 2015 12:57:33 -0400 |
parents | 887ffa22fd0d |
children | 45d996a566d7 |
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 |