tests/test-mq-qdiff.t
author |
Yuya Nishihara <yuya@tcha.org> |
|
Sat, 13 Jun 2015 19:49:54 +0900 |
changeset 25596 |
c1975809a6b5 |
parent 23172 |
e955549cd045
|
permissions |
-rw-r--r-- |
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.
$ cat <<EOF >> $HGRCPATH
> [extensions]
> mq =
> [mq]
> git = keep
> EOF
$ hg init a
$ cd a
$ echo 'base' > base
$ hg ci -Ambase
adding base
$ hg qnew -mmqbase mqbase
$ echo 'patched' > base
$ hg qrefresh
qdiff:
$ hg qdiff
diff -r d20a80d4def3 base
--- a/base Thu Jan 01 00:00:00 1970 +0000
+++ b/base* (glob)
@@ -1,1 +1,1 @@
-base
+patched
qdiff dirname:
$ hg qdiff --nodates .
diff -r d20a80d4def3 base
--- a/base
+++ b/base
@@ -1,1 +1,1 @@
-base
+patched
qdiff filename:
$ hg qdiff --nodates base
diff -r d20a80d4def3 base
--- a/base
+++ b/base
@@ -1,1 +1,1 @@
-base
+patched
$ hg revert -a
$ hg qpop
popping mqbase
patch queue now empty
$ hg qdelete mqbase
$ printf '1\n2\n3\n4\nhello world\ngoodbye world\n7\n8\n9\n' > lines
$ hg ci -Amlines -d '2 0'
adding lines
$ hg qnew -mmqbase2 mqbase2
$ printf '\n\n1\n2\n3\n4\nhello world\n goodbye world\n7\n8\n9\n' > lines
$ hg qdiff --nodates -U 1
diff -r b0c220e1cf43 lines
--- a/lines
+++ b/lines
@@ -1,1 +1,3 @@
+
+
1
@@ -4,4 +6,4 @@
4
-hello world
-goodbye world
+hello world
+ goodbye world
7
$ hg qdiff --nodates -b
diff -r b0c220e1cf43 lines
--- a/lines
+++ b/lines
@@ -1,9 +1,11 @@
+
+
1
2
3
4
hello world
-goodbye world
+ goodbye world
7
8
9
$ hg qdiff --nodates -U 1 -B
diff -r b0c220e1cf43 lines
--- a/lines
+++ b/lines
@@ -4,4 +4,4 @@
4
-hello world
-goodbye world
+hello world
+ goodbye world
7
$ hg qdiff --nodates -w
diff -r b0c220e1cf43 lines
--- a/lines
+++ b/lines
@@ -1,3 +1,5 @@
+
+
1
2
3
$ hg qdiff --nodates --reverse
diff -r b0c220e1cf43 lines
--- a/lines
+++ b/lines
@@ -1,11 +1,9 @@
-
-
1
2
3
4
-hello world
- goodbye world
+hello world
+goodbye world
7
8
9
qdiff preserve existing git flag:
$ hg qrefresh --git
$ echo a >> lines
$ hg qdiff
diff --git a/lines b/lines
--- a/lines
+++ b/lines
@@ -1,9 +1,12 @@
+
+
1
2
3
4
-hello world
-goodbye world
+hello world
+ goodbye world
7
8
9
+a
$ hg qdiff --stat
lines | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
$ hg qrefresh
qdiff when file deleted (but not removed) in working dir:
$ hg qnew deleted-file
$ echo a > newfile
$ hg add newfile
$ hg qrefresh
$ rm newfile
$ hg qdiff
$ cd ..