Mercurial > hg
annotate tests/test-586.t @ 25596:c1975809a6b5
templater: take any string literals as template, but not for rawstring (BC)
This patch series is intended to unify the interpretation of string literals.
It is breaking change that boldly assumes
a. string literal "..." never contains template-like fragment or it is
intended to be a template
b. we tend to use raw string literal r"..." for regexp pattern in which "{"
should have different meaning
Currently, we don't have a comprehensible rule how string literals are
evaluated in template functions. For example, fill() takes "initialindent"
and "hangindent" as templates, but not for "text", whereas "text" is a
template in pad() function.
date(date, fmt)
diff(includepattern, excludepattern)
fill(text, width, initialident: T, hangindent: T)
get(dict, key)
if(expr, then: T, else: T)
ifcontains(search, thing, then: T, else: T)
ifeq(expr1, expr2, then: T, else: T)
indent(text, indentchars, firstline)
join(list, sep)
label(label: T, expr: T)
pad(text: T, width, fillchar, right)
revset(query, formatargs...])
rstdoc(text, style)
shortest(node, minlength)
startswith(pattern, text)
strip(text, chars)
sub(pattern, replacement, expression: T)
word(number, text, separator)
expr % template: T
T: interpret "string" or r"rawstring" as template
This patch series adjusts the rule as follows:
a. string literal, '' or "", starts template processing (BC)
b. raw string literal, r'' or r"", disables both \-escape and template
processing (BC, done by subsequent patches)
c. fragment not surrounded by {} is non-templated string
"ccc{'aaa'}{r'bbb'}"
------------------ *: template
--- c: string
--- a: template
--- b: rawstring
Because this can eliminate the compilation of template arguments from the
evaluation phase, "hg log -Tdefault" gets faster.
% cd mozilla-central
% LANG=C HGRCPATH=/dev/null hg log -Tdefault -r0:10000 --time > /dev/null
before: real 4.870 secs (user 4.860+0.000 sys 0.010+0.000)
after: real 3.480 secs (user 3.440+0.000 sys 0.030+0.000)
Also, this will allow us to parse nested templates at once for better error
indication.
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Sat, 13 Jun 2015 19:49:54 +0900 |
parents | f2719b387380 |
children |
rev | line source |
---|---|
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
11846
diff
changeset
|
1 Issue586: removing remote files after merge appears to corrupt the |
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
11846
diff
changeset
|
2 dirstate |
4535
720ae5085ee3
commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
3 |
11846 | 4 $ hg init a |
5 $ cd a | |
6 $ echo a > a | |
7 $ hg ci -Ama | |
8 adding a | |
9 | |
10 $ hg init ../b | |
11 $ cd ../b | |
12 $ echo b > b | |
13 $ hg ci -Amb | |
14 adding b | |
4535
720ae5085ee3
commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
15 |
11846 | 16 $ hg pull -f ../a |
17 pulling from ../a | |
18 searching for changes | |
19 warning: repository is unrelated | |
13742
7abab875e647
discovery: avoid discovery when local graph is a subset of remote
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
12399
diff
changeset
|
20 requesting all changes |
11846 | 21 adding changesets |
22 adding manifests | |
23 adding file changes | |
24 added 1 changesets with 1 changes to 1 files (+1 heads) | |
25 (run 'hg heads' to see heads, 'hg merge' to merge) | |
26 $ hg merge | |
27 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
28 (branch merge, don't forget to commit) | |
29 $ hg rm -f a | |
30 $ hg ci -Amc | |
4535
720ae5085ee3
commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
31 |
11846 | 32 $ hg st -A |
33 C b | |
34 $ cd .. | |
35 | |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
11846
diff
changeset
|
36 Issue1433: Traceback after two unrelated pull, two move, a merge and |
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
11846
diff
changeset
|
37 a commit (related to issue586) |
4535
720ae5085ee3
commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
38 |
11846 | 39 create test repos |
40 | |
41 $ hg init repoa | |
42 $ touch repoa/a | |
43 $ hg -R repoa ci -Am adda | |
44 adding a | |
7564
f1af59451c0c
localrepo: fix bad manifest delta generation (issue1433)
Patrick Mezard <pmezard@gmail.com>
parents:
4535
diff
changeset
|
45 |
11846 | 46 $ hg init repob |
47 $ touch repob/b | |
48 $ hg -R repob ci -Am addb | |
49 adding b | |
7564
f1af59451c0c
localrepo: fix bad manifest delta generation (issue1433)
Patrick Mezard <pmezard@gmail.com>
parents:
4535
diff
changeset
|
50 |
11846 | 51 $ hg init repoc |
52 $ cd repoc | |
53 $ hg pull ../repoa | |
54 pulling from ../repoa | |
55 requesting all changes | |
56 adding changesets | |
57 adding manifests | |
58 adding file changes | |
59 added 1 changesets with 1 changes to 1 files | |
60 (run 'hg update' to get a working copy) | |
61 $ hg update | |
62 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
63 $ mkdir tst | |
64 $ hg mv * tst | |
65 $ hg ci -m "import a in tst" | |
66 $ hg pull -f ../repob | |
67 pulling from ../repob | |
68 searching for changes | |
69 warning: repository is unrelated | |
13742
7abab875e647
discovery: avoid discovery when local graph is a subset of remote
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
12399
diff
changeset
|
70 requesting all changes |
11846 | 71 adding changesets |
72 adding manifests | |
73 adding file changes | |
74 added 1 changesets with 1 changes to 1 files (+1 heads) | |
75 (run 'hg heads' to see heads, 'hg merge' to merge) | |
7564
f1af59451c0c
localrepo: fix bad manifest delta generation (issue1433)
Patrick Mezard <pmezard@gmail.com>
parents:
4535
diff
changeset
|
76 |
11846 | 77 merge both repos |
7564
f1af59451c0c
localrepo: fix bad manifest delta generation (issue1433)
Patrick Mezard <pmezard@gmail.com>
parents:
4535
diff
changeset
|
78 |
11846 | 79 $ hg merge |
80 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
81 (branch merge, don't forget to commit) | |
82 $ mkdir src | |
7564
f1af59451c0c
localrepo: fix bad manifest delta generation (issue1433)
Patrick Mezard <pmezard@gmail.com>
parents:
4535
diff
changeset
|
83 |
11846 | 84 move b content |
85 | |
86 $ hg mv b src | |
87 $ hg ci -m "import b in src" | |
88 $ hg manifest | |
89 src/b | |
90 tst/a | |
91 | |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
13742
diff
changeset
|
92 $ cd .. |