test-log-linerange.t
1153 lines
| 18.4 KiB
| text/troff
|
Tads3Lexer
/ tests / test-log-linerange.t
|
r34858 | $ cat >> $HGRCPATH << EOF | ||
> [diff] | ||||
> git = true | ||||
> EOF | ||||
$ hg init | ||||
$ cat > foo << EOF | ||||
> 0 | ||||
> 1 | ||||
> 2 | ||||
> 3 | ||||
> 4 | ||||
> EOF | ||||
$ hg ci -Am init | ||||
adding foo | ||||
$ cat > foo << EOF | ||||
> 0 | ||||
> 0 | ||||
> 0 | ||||
> 0 | ||||
> 1 | ||||
> 2 | ||||
> 3 | ||||
> 4 | ||||
> EOF | ||||
$ hg ci -m 'more 0' | ||||
$ sed 's/2/2+/' foo > foo.new | ||||
$ mv foo.new foo | ||||
$ cat > bar << EOF | ||||
> a | ||||
> b | ||||
> c | ||||
> d | ||||
> e | ||||
> EOF | ||||
$ hg add bar | ||||
$ hg ci -Am "2 -> 2+; added bar" | ||||
$ cat >> foo << EOF | ||||
> 5 | ||||
> 6 | ||||
> 7 | ||||
> 8 | ||||
> 9 | ||||
> 10 | ||||
> 11 | ||||
> EOF | ||||
$ hg ci -m "to 11" | ||||
Add some changes with two diff hunks | ||||
$ sed 's/^1$/ 1/' foo > foo.new | ||||
$ mv foo.new foo | ||||
$ sed 's/^11$/11+/' foo > foo.new | ||||
$ mv foo.new foo | ||||
$ hg ci -m '11 -> 11+; leading space before "1"' | ||||
(make sure there are two hunks in "foo") | ||||
$ hg diff -c . | ||||
diff --git a/foo b/foo | ||||
--- a/foo | ||||
+++ b/foo | ||||
@@ -2,7 +2,7 @@ | ||||
0 | ||||
0 | ||||
0 | ||||
-1 | ||||
+ 1 | ||||
2+ | ||||
3 | ||||
4 | ||||
@@ -12,4 +12,4 @@ | ||||
8 | ||||
9 | ||||
10 | ||||
-11 | ||||
+11+ | ||||
$ sed 's/3/3+/' foo > foo.new | ||||
$ mv foo.new foo | ||||
$ sed 's/^11+$/11-/' foo > foo.new | ||||
$ mv foo.new foo | ||||
$ sed 's/a/a+/' bar > bar.new | ||||
$ mv bar.new bar | ||||
$ hg ci -m 'foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+' | ||||
(make sure there are two hunks in "foo") | ||||
$ hg diff -c . foo | ||||
diff --git a/foo b/foo | ||||
--- a/foo | ||||
+++ b/foo | ||||
@@ -4,7 +4,7 @@ | ||||
0 | ||||
1 | ||||
2+ | ||||
-3 | ||||
+3+ | ||||
4 | ||||
5 | ||||
6 | ||||
@@ -12,4 +12,4 @@ | ||||
8 | ||||
9 | ||||
10 | ||||
-11+ | ||||
+11- | ||||
|
r34906 | $ hg log -f -L foo,5:7 -p | ||
|
r34858 | changeset: 5:cfdf972b3971 | ||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+ | ||||
diff --git a/foo b/foo | ||||
--- a/foo | ||||
+++ b/foo | ||||
@@ -4,7 +4,7 @@ | ||||
0 | ||||
1 | ||||
2+ | ||||
-3 | ||||
+3+ | ||||
4 | ||||
5 | ||||
6 | ||||
changeset: 4:eaec41c1a0c9 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: 11 -> 11+; leading space before "1" | ||||
diff --git a/foo b/foo | ||||
--- a/foo | ||||
+++ b/foo | ||||
@@ -2,7 +2,7 @@ | ||||
0 | ||||
0 | ||||
0 | ||||
-1 | ||||
+ 1 | ||||
2+ | ||||
3 | ||||
4 | ||||
changeset: 2:63a884426fd0 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: 2 -> 2+; added bar | ||||
diff --git a/foo b/foo | ||||
--- a/foo | ||||
+++ b/foo | ||||
@@ -3,6 +3,6 @@ | ||||
0 | ||||
0 | ||||
1 | ||||
-2 | ||||
+2+ | ||||
3 | ||||
4 | ||||
changeset: 0:5ae1f82b9a00 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: init | ||||
diff --git a/foo b/foo | ||||
new file mode 100644 | ||||
--- /dev/null | ||||
+++ b/foo | ||||
@@ -0,0 +1,5 @@ | ||||
+0 | ||||
+1 | ||||
+2 | ||||
+3 | ||||
+4 | ||||
|
r36050 | $ hg log -f --graph -L foo,5:7 -p | ||
|
r36215 | @ changeset: 5:cfdf972b3971 | ||
| tag: tip | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+ | ||||
| | ||||
| diff --git a/foo b/foo | ||||
| --- a/foo | ||||
| +++ b/foo | ||||
| @@ -4,7 +4,7 @@ | ||||
| 0 | ||||
| 1 | ||||
| 2+ | ||||
| -3 | ||||
| +3+ | ||||
| 4 | ||||
| 5 | ||||
| 6 | ||||
| | ||||
o changeset: 4:eaec41c1a0c9 | ||||
: user: test | ||||
: date: Thu Jan 01 00:00:00 1970 +0000 | ||||
: summary: 11 -> 11+; leading space before "1" | ||||
: | ||||
: diff --git a/foo b/foo | ||||
: --- a/foo | ||||
: +++ b/foo | ||||
: @@ -2,7 +2,7 @@ | ||||
: 0 | ||||
: 0 | ||||
: 0 | ||||
: -1 | ||||
: + 1 | ||||
: 2+ | ||||
: 3 | ||||
: 4 | ||||
: | ||||
o changeset: 2:63a884426fd0 | ||||
: user: test | ||||
: date: Thu Jan 01 00:00:00 1970 +0000 | ||||
: summary: 2 -> 2+; added bar | ||||
: | ||||
: diff --git a/foo b/foo | ||||
: --- a/foo | ||||
: +++ b/foo | ||||
: @@ -3,6 +3,6 @@ | ||||
: 0 | ||||
: 0 | ||||
: 1 | ||||
: -2 | ||||
: +2+ | ||||
: 3 | ||||
: 4 | ||||
: | ||||
o changeset: 0:5ae1f82b9a00 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: init | ||||
diff --git a/foo b/foo | ||||
new file mode 100644 | ||||
--- /dev/null | ||||
+++ b/foo | ||||
@@ -0,0 +1,5 @@ | ||||
+0 | ||||
+1 | ||||
+2 | ||||
+3 | ||||
+4 | ||||
|
r34858 | |||
With --template. | ||||
|
r34906 | $ hg log -f -L foo,5:7 -T '{rev}:{node|short} {desc|firstline}\n' | ||
|
r34858 | 5:cfdf972b3971 foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+ | ||
4:eaec41c1a0c9 11 -> 11+; leading space before "1" | ||||
2:63a884426fd0 2 -> 2+; added bar | ||||
0:5ae1f82b9a00 init | ||||
|
r34906 | $ hg log -f -L foo,5:7 -T json | ||
|
r34858 | [ | ||
{ | ||||
|
r37790 | "bookmarks": [], | ||
|
r34858 | "branch": "default", | ||
"date": [0, 0], | ||||
"desc": "foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+", | ||||
|
r37790 | "node": "cfdf972b3971a2a59638bf9583c0debbffee5404", | ||
"parents": ["eaec41c1a0c9ad0a5e999611d0149d171beffb8c"], | ||||
"phase": "draft", | ||||
"rev": 5, | ||||
|
r34858 | "tags": ["tip"], | ||
|
r37790 | "user": "test" | ||
|
r34858 | }, | ||
{ | ||||
|
r37790 | "bookmarks": [], | ||
|
r34858 | "branch": "default", | ||
"date": [0, 0], | ||||
"desc": "11 -> 11+; leading space before \"1\"", | ||||
|
r37790 | "node": "eaec41c1a0c9ad0a5e999611d0149d171beffb8c", | ||
"parents": ["730a61fbaecf426c17c2c66bc42d195b5d5b0ba8"], | ||||
"phase": "draft", | ||||
"rev": 4, | ||||
|
r34858 | "tags": [], | ||
|
r37790 | "user": "test" | ||
|
r34858 | }, | ||
{ | ||||
|
r37790 | "bookmarks": [], | ||
|
r34858 | "branch": "default", | ||
"date": [0, 0], | ||||
"desc": "2 -> 2+; added bar", | ||||
|
r37790 | "node": "63a884426fd0b277fcd55895bbb2f230434576eb", | ||
"parents": ["29a1e7c6b80024f63f310a2d71de979e9d2996d7"], | ||||
"phase": "draft", | ||||
"rev": 2, | ||||
|
r34858 | "tags": [], | ||
|
r37790 | "user": "test" | ||
|
r34858 | }, | ||
{ | ||||
|
r37790 | "bookmarks": [], | ||
|
r34858 | "branch": "default", | ||
"date": [0, 0], | ||||
"desc": "init", | ||||
|
r37790 | "node": "5ae1f82b9a000ff1e0967d0dac1c58b9d796e1b4", | ||
"parents": ["0000000000000000000000000000000000000000"], | ||||
"phase": "draft", | ||||
"rev": 0, | ||||
|
r34858 | "tags": [], | ||
|
r37790 | "user": "test" | ||
|
r34858 | } | ||
] | ||||
With some white-space diff option, respective revisions are skipped. | ||||
|
r34906 | $ hg log -f -L foo,5:7 -p --config diff.ignorews=true | ||
|
r34858 | changeset: 5:cfdf972b3971 | ||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+ | ||||
diff --git a/foo b/foo | ||||
--- a/foo | ||||
+++ b/foo | ||||
@@ -4,7 +4,7 @@ | ||||
0 | ||||
1 | ||||
2+ | ||||
-3 | ||||
+3+ | ||||
4 | ||||
5 | ||||
6 | ||||
changeset: 2:63a884426fd0 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: 2 -> 2+; added bar | ||||
diff --git a/foo b/foo | ||||
--- a/foo | ||||
+++ b/foo | ||||
@@ -3,6 +3,6 @@ | ||||
0 | ||||
0 | ||||
1 | ||||
-2 | ||||
+2+ | ||||
3 | ||||
4 | ||||
changeset: 0:5ae1f82b9a00 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: init | ||||
diff --git a/foo b/foo | ||||
new file mode 100644 | ||||
--- /dev/null | ||||
+++ b/foo | ||||
@@ -0,0 +1,5 @@ | ||||
+0 | ||||
+1 | ||||
+2 | ||||
+3 | ||||
+4 | ||||
|
r34907 | Regular file patterns are not allowed. | ||
|
r34858 | |||
|
r34906 | $ hg log -f -L foo,5:7 -p bar | ||
|
r34907 | abort: FILE arguments are not compatible with --line-range option | ||
|
r46431 | [10] | ||
|
r34858 | |||
Option --rev acts as a restriction. | ||||
|
r34906 | $ hg log -f -L foo,5:7 -p -r 'desc(2)' | ||
|
r34858 | changeset: 2:63a884426fd0 | ||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: 2 -> 2+; added bar | ||||
diff --git a/foo b/foo | ||||
--- a/foo | ||||
+++ b/foo | ||||
@@ -3,6 +3,6 @@ | ||||
0 | ||||
0 | ||||
1 | ||||
-2 | ||||
+2+ | ||||
3 | ||||
4 | ||||
changeset: 0:5ae1f82b9a00 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: init | ||||
diff --git a/foo b/foo | ||||
new file mode 100644 | ||||
--- /dev/null | ||||
+++ b/foo | ||||
@@ -0,0 +1,5 @@ | ||||
+0 | ||||
+1 | ||||
+2 | ||||
+3 | ||||
+4 | ||||
With several -L patterns, changes touching any files in their respective line | ||||
range are show. | ||||
|
r34906 | $ hg log -f -L foo,5:7 -L bar,1:2 -p | ||
|
r34858 | changeset: 5:cfdf972b3971 | ||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+ | ||||
diff --git a/bar b/bar | ||||
--- a/bar | ||||
+++ b/bar | ||||
@@ -1,4 +1,4 @@ | ||||
-a | ||||
+a+ | ||||
b | ||||
c | ||||
d | ||||
diff --git a/foo b/foo | ||||
--- a/foo | ||||
+++ b/foo | ||||
@@ -4,7 +4,7 @@ | ||||
0 | ||||
1 | ||||
2+ | ||||
-3 | ||||
+3+ | ||||
4 | ||||
5 | ||||
6 | ||||
changeset: 4:eaec41c1a0c9 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: 11 -> 11+; leading space before "1" | ||||
diff --git a/foo b/foo | ||||
--- a/foo | ||||
+++ b/foo | ||||
@@ -2,7 +2,7 @@ | ||||
0 | ||||
0 | ||||
0 | ||||
-1 | ||||
+ 1 | ||||
2+ | ||||
3 | ||||
4 | ||||
changeset: 2:63a884426fd0 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: 2 -> 2+; added bar | ||||
diff --git a/bar b/bar | ||||
new file mode 100644 | ||||
--- /dev/null | ||||
+++ b/bar | ||||
@@ -0,0 +1,5 @@ | ||||
+a | ||||
+b | ||||
+c | ||||
+d | ||||
+e | ||||
diff --git a/foo b/foo | ||||
--- a/foo | ||||
+++ b/foo | ||||
@@ -3,6 +3,6 @@ | ||||
0 | ||||
0 | ||||
1 | ||||
-2 | ||||
+2+ | ||||
3 | ||||
4 | ||||
changeset: 0:5ae1f82b9a00 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: init | ||||
diff --git a/foo b/foo | ||||
new file mode 100644 | ||||
--- /dev/null | ||||
+++ b/foo | ||||
@@ -0,0 +1,5 @@ | ||||
+0 | ||||
+1 | ||||
+2 | ||||
+3 | ||||
+4 | ||||
Multiple -L options with the same file yields changes touching any of | ||||
specified line ranges. | ||||
|
r34906 | $ hg log -f -L foo,5:7 -L foo,14:15 -p | ||
|
r34858 | changeset: 5:cfdf972b3971 | ||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+ | ||||
diff --git a/foo b/foo | ||||
--- a/foo | ||||
+++ b/foo | ||||
@@ -4,7 +4,7 @@ | ||||
0 | ||||
1 | ||||
2+ | ||||
-3 | ||||
+3+ | ||||
4 | ||||
5 | ||||
6 | ||||
@@ -12,4 +12,4 @@ | ||||
8 | ||||
9 | ||||
10 | ||||
-11+ | ||||
+11- | ||||
changeset: 4:eaec41c1a0c9 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: 11 -> 11+; leading space before "1" | ||||
diff --git a/foo b/foo | ||||
--- a/foo | ||||
+++ b/foo | ||||
@@ -2,7 +2,7 @@ | ||||
0 | ||||
0 | ||||
0 | ||||
-1 | ||||
+ 1 | ||||
2+ | ||||
3 | ||||
4 | ||||
@@ -12,4 +12,4 @@ | ||||
8 | ||||
9 | ||||
10 | ||||
-11 | ||||
+11+ | ||||
changeset: 3:730a61fbaecf | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: to 11 | ||||
diff --git a/foo b/foo | ||||
--- a/foo | ||||
+++ b/foo | ||||
@@ -6,3 +6,10 @@ | ||||
2+ | ||||
3 | ||||
4 | ||||
+5 | ||||
+6 | ||||
+7 | ||||
+8 | ||||
+9 | ||||
+10 | ||||
+11 | ||||
changeset: 2:63a884426fd0 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: 2 -> 2+; added bar | ||||
diff --git a/foo b/foo | ||||
--- a/foo | ||||
+++ b/foo | ||||
@@ -3,6 +3,6 @@ | ||||
0 | ||||
0 | ||||
1 | ||||
-2 | ||||
+2+ | ||||
3 | ||||
4 | ||||
changeset: 0:5ae1f82b9a00 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: init | ||||
diff --git a/foo b/foo | ||||
new file mode 100644 | ||||
--- /dev/null | ||||
+++ b/foo | ||||
@@ -0,0 +1,5 @@ | ||||
+0 | ||||
+1 | ||||
+2 | ||||
+3 | ||||
+4 | ||||
A file with a comma in its name. | ||||
$ cat > ba,z << EOF | ||||
> q | ||||
> w | ||||
> e | ||||
> r | ||||
> t | ||||
> y | ||||
> EOF | ||||
$ hg ci -Am 'querty' | ||||
adding ba,z | ||||
$ cat >> ba,z << EOF | ||||
> u | ||||
> i | ||||
> o | ||||
> p | ||||
> EOF | ||||
$ hg ci -m 'more keys' | ||||
$ cat > ba,z << EOF | ||||
> a | ||||
> z | ||||
> e | ||||
> r | ||||
> t | ||||
> y | ||||
> u | ||||
> i | ||||
> o | ||||
> p | ||||
> EOF | ||||
$ hg ci -m 'azerty' | ||||
|
r34906 | $ hg log -f -L ba,z,1:2 -p | ||
|
r34858 | changeset: 8:52373265138b | ||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: azerty | ||||
diff --git a/ba,z b/ba,z | ||||
--- a/ba,z | ||||
+++ b/ba,z | ||||
@@ -1,5 +1,5 @@ | ||||
-q | ||||
-w | ||||
+a | ||||
+z | ||||
e | ||||
r | ||||
t | ||||
changeset: 6:96ba8850f316 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: querty | ||||
diff --git a/ba,z b/ba,z | ||||
new file mode 100644 | ||||
--- /dev/null | ||||
+++ b/ba,z | ||||
@@ -0,0 +1,6 @@ | ||||
+q | ||||
+w | ||||
+e | ||||
+r | ||||
+t | ||||
+y | ||||
Exact prefix kinds work in -L options. | ||||
$ mkdir dir | ||||
$ cd dir | ||||
|
r34906 | $ hg log -f -L path:foo,5:7 -p | ||
|
r34858 | changeset: 5:cfdf972b3971 | ||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+ | ||||
diff --git a/foo b/foo | ||||
--- a/foo | ||||
+++ b/foo | ||||
@@ -4,7 +4,7 @@ | ||||
0 | ||||
1 | ||||
2+ | ||||
-3 | ||||
+3+ | ||||
4 | ||||
5 | ||||
6 | ||||
changeset: 4:eaec41c1a0c9 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: 11 -> 11+; leading space before "1" | ||||
diff --git a/foo b/foo | ||||
--- a/foo | ||||
+++ b/foo | ||||
@@ -2,7 +2,7 @@ | ||||
0 | ||||
0 | ||||
0 | ||||
-1 | ||||
+ 1 | ||||
2+ | ||||
3 | ||||
4 | ||||
changeset: 2:63a884426fd0 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: 2 -> 2+; added bar | ||||
diff --git a/foo b/foo | ||||
--- a/foo | ||||
+++ b/foo | ||||
@@ -3,6 +3,6 @@ | ||||
0 | ||||
0 | ||||
1 | ||||
-2 | ||||
+2+ | ||||
3 | ||||
4 | ||||
changeset: 0:5ae1f82b9a00 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: init | ||||
diff --git a/foo b/foo | ||||
new file mode 100644 | ||||
--- /dev/null | ||||
+++ b/foo | ||||
@@ -0,0 +1,5 @@ | ||||
+0 | ||||
+1 | ||||
+2 | ||||
+3 | ||||
+4 | ||||
Renames are followed. | ||||
$ hg mv ../foo baz | ||||
$ sed 's/1/1+/' baz > baz.new | ||||
$ mv baz.new baz | ||||
$ hg ci -m 'foo -> dir/baz; 1-1+' | ||||
$ hg diff -c . | ||||
diff --git a/foo b/dir/baz | ||||
rename from foo | ||||
rename to dir/baz | ||||
--- a/foo | ||||
+++ b/dir/baz | ||||
@@ -2,7 +2,7 @@ | ||||
0 | ||||
0 | ||||
0 | ||||
- 1 | ||||
+ 1+ | ||||
2+ | ||||
3+ | ||||
4 | ||||
@@ -11,5 +11,5 @@ | ||||
7 | ||||
8 | ||||
9 | ||||
-10 | ||||
-11- | ||||
+1+0 | ||||
+1+1- | ||||
|
r34906 | $ hg log -f -L relpath:baz,5:7 -p | ||
|
r34858 | changeset: 9:6af29c3a778f | ||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: foo -> dir/baz; 1-1+ | ||||
diff --git a/foo b/dir/baz | ||||
copy from foo | ||||
copy to dir/baz | ||||
--- a/foo | ||||
+++ b/dir/baz | ||||
@@ -2,7 +2,7 @@ | ||||
0 | ||||
0 | ||||
0 | ||||
- 1 | ||||
+ 1+ | ||||
2+ | ||||
3+ | ||||
4 | ||||
changeset: 5:cfdf972b3971 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+ | ||||
diff --git a/foo b/foo | ||||
--- a/foo | ||||
+++ b/foo | ||||
@@ -4,7 +4,7 @@ | ||||
0 | ||||
1 | ||||
2+ | ||||
-3 | ||||
+3+ | ||||
4 | ||||
5 | ||||
6 | ||||
changeset: 4:eaec41c1a0c9 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: 11 -> 11+; leading space before "1" | ||||
diff --git a/foo b/foo | ||||
--- a/foo | ||||
+++ b/foo | ||||
@@ -2,7 +2,7 @@ | ||||
0 | ||||
0 | ||||
0 | ||||
-1 | ||||
+ 1 | ||||
2+ | ||||
3 | ||||
4 | ||||
changeset: 2:63a884426fd0 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: 2 -> 2+; added bar | ||||
diff --git a/foo b/foo | ||||
--- a/foo | ||||
+++ b/foo | ||||
@@ -3,6 +3,6 @@ | ||||
0 | ||||
0 | ||||
1 | ||||
-2 | ||||
+2+ | ||||
3 | ||||
4 | ||||
changeset: 0:5ae1f82b9a00 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: init | ||||
diff --git a/foo b/foo | ||||
new file mode 100644 | ||||
--- /dev/null | ||||
+++ b/foo | ||||
@@ -0,0 +1,5 @@ | ||||
+0 | ||||
+1 | ||||
+2 | ||||
+3 | ||||
+4 | ||||
|
r34905 | |||
|
r44172 | Uncommitted changes with a rename | ||
$ hg mv baz bazn | ||||
$ hg log -f -L bazn,5:7 | ||||
changeset: 9:6af29c3a778f | ||||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: foo -> dir/baz; 1-1+ | ||||
changeset: 5:cfdf972b3971 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+ | ||||
changeset: 4:eaec41c1a0c9 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: 11 -> 11+; leading space before "1" | ||||
changeset: 2:63a884426fd0 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: 2 -> 2+; added bar | ||||
changeset: 0:5ae1f82b9a00 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: init | ||||
|
r44173 | |||
Uncommitted changes in requested line range | ||||
$ sed 's/2/ /' bazn > bazn.new | ||||
$ mv bazn.new bazn | ||||
$ hg diff | ||||
diff --git a/dir/baz b/dir/bazn | ||||
rename from dir/baz | ||||
rename to dir/bazn | ||||
--- a/dir/baz | ||||
+++ b/dir/bazn | ||||
@@ -3,7 +3,7 @@ | ||||
0 | ||||
0 | ||||
1+ | ||||
-2+ | ||||
+ + | ||||
3+ | ||||
4 | ||||
5 | ||||
$ hg log -f -L bazn,5:7 | ||||
changeset: 9:6af29c3a778f | ||||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: foo -> dir/baz; 1-1+ | ||||
changeset: 5:cfdf972b3971 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+ | ||||
changeset: 4:eaec41c1a0c9 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: 11 -> 11+; leading space before "1" | ||||
changeset: 2:63a884426fd0 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: 2 -> 2+; added bar | ||||
changeset: 0:5ae1f82b9a00 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: init | ||||
Uncommitted changes in line-range + wdir() | ||||
$ hg log -r 'wdir()' -f -L bazn,5:7 --limit 2 -p | ||||
changeset: 2147483647:ffffffffffff | ||||
parent: 9:6af29c3a778f | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
diff --git a/dir/baz b/dir/bazn | ||||
copy from dir/baz | ||||
copy to dir/bazn | ||||
--- a/dir/baz | ||||
+++ b/dir/bazn | ||||
@@ -3,7 +3,7 @@ | ||||
0 | ||||
0 | ||||
1+ | ||||
-2+ | ||||
+ + | ||||
3+ | ||||
4 | ||||
5 | ||||
changeset: 9:6af29c3a778f | ||||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: foo -> dir/baz; 1-1+ | ||||
diff --git a/foo b/dir/baz | ||||
copy from foo | ||||
copy to dir/baz | ||||
--- a/foo | ||||
+++ b/dir/baz | ||||
@@ -2,7 +2,7 @@ | ||||
0 | ||||
0 | ||||
0 | ||||
- 1 | ||||
+ 1+ | ||||
2+ | ||||
3+ | ||||
4 | ||||
|
r44172 | $ hg revert -a -C -q | ||
|
r44030 | Copies. | ||
$ hg copy baz bbaz | ||||
$ sed 's/6/6+/' bbaz > bbaz.new | ||||
$ mv bbaz.new bbaz | ||||
$ hg commit -m 'cp baz bbaz; 6-6+' | ||||
$ hg diff -c . | ||||
diff --git a/dir/baz b/dir/bbaz | ||||
copy from dir/baz | ||||
copy to dir/bbaz | ||||
--- a/dir/baz | ||||
+++ b/dir/bbaz | ||||
@@ -7,7 +7,7 @@ | ||||
3+ | ||||
4 | ||||
5 | ||||
-6 | ||||
+6+ | ||||
7 | ||||
8 | ||||
9 | ||||
$ hg log --copies -f -L bbaz,10:11 -p | ||||
changeset: 10:91a3d3b6c546 | ||||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: cp baz bbaz; 6-6+ | ||||
diff --git a/dir/baz b/dir/bbaz | ||||
copy from dir/baz | ||||
copy to dir/bbaz | ||||
--- a/dir/baz | ||||
+++ b/dir/bbaz | ||||
@@ -7,7 +7,7 @@ | ||||
3+ | ||||
4 | ||||
5 | ||||
-6 | ||||
+6+ | ||||
7 | ||||
8 | ||||
9 | ||||
changeset: 3:730a61fbaecf | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: to 11 | ||||
diff --git a/foo b/foo | ||||
--- a/foo | ||||
+++ b/foo | ||||
@@ -6,3 +6,10 @@ | ||||
2+ | ||||
3 | ||||
4 | ||||
+5 | ||||
+6 | ||||
+7 | ||||
+8 | ||||
+9 | ||||
+10 | ||||
+11 | ||||
$ hg log -f -L bbaz,10:11 -p | ||||
changeset: 10:91a3d3b6c546 | ||||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: cp baz bbaz; 6-6+ | ||||
diff --git a/dir/baz b/dir/bbaz | ||||
copy from dir/baz | ||||
copy to dir/bbaz | ||||
--- a/dir/baz | ||||
+++ b/dir/bbaz | ||||
@@ -7,7 +7,7 @@ | ||||
3+ | ||||
4 | ||||
5 | ||||
-6 | ||||
+6+ | ||||
7 | ||||
8 | ||||
9 | ||||
changeset: 3:730a61fbaecf | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: to 11 | ||||
diff --git a/foo b/foo | ||||
--- a/foo | ||||
+++ b/foo | ||||
@@ -6,3 +6,10 @@ | ||||
2+ | ||||
3 | ||||
4 | ||||
+5 | ||||
+6 | ||||
+7 | ||||
+8 | ||||
+9 | ||||
+10 | ||||
+11 | ||||
|
r34905 | Binary files work but without diff hunks filtering. | ||
(Checking w/ and w/o diff.git option.) | ||||
|
r37009 | >>> open('binary', 'wb').write(b'this\nis\na\nbinary\0') and None | ||
|
r34905 | $ hg add binary | ||
$ hg ci -m 'add a binary file' --quiet | ||||
|
r34906 | $ hg log -f -L binary,1:2 -p | ||
|
r44030 | changeset: 11:dc865b608edf | ||
|
r34905 | tag: tip | ||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: add a binary file | ||||
diff --git a/dir/binary b/dir/binary | ||||
new file mode 100644 | ||||
|
r47350 | index 0000000000000000000000000000000000000000..c2e1fbed209fe919b3f189a6a31950e9adf61e45 | ||
|
r34905 | GIT binary patch | ||
literal 17 | ||||
Wc$_QA$SmdpqC~Ew%)G>+N(KNlNClYy | ||||
|
r34906 | $ hg log -f -L binary,1:2 -p --config diff.git=false | ||
|
r44030 | changeset: 11:dc865b608edf | ||
|
r34905 | tag: tip | ||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: add a binary file | ||||
|
r44030 | diff -r 91a3d3b6c546 -r dc865b608edf dir/binary | ||
|
r34905 | Binary file dir/binary has changed | ||
|
r34858 | Option --follow is required. | ||
|
r34906 | $ hg log -L foo,5:7 | ||
|
r34858 | abort: --line-range requires --follow | ||
|
r46431 | [10] | ||
|
r34858 | |||
Non-exact pattern kinds are not allowed. | ||||
$ cd .. | ||||
|
r34906 | $ hg log -f -L glob:*a*,1:2 | ||
|
r34858 | hg: parse error: line range pattern 'glob:*a*' must match exactly one file | ||
|
r46507 | [10] | ||
|
r34858 | |||
|
r34908 | We get an error for removed files. | ||
$ hg rm dir/baz | ||||
$ hg ci -m 'remove baz' --quiet | ||||
$ hg log -f -L dir/baz,5:7 -p | ||||
abort: cannot follow file not in parent revision: "dir/baz" | ||||
[255] | ||||