mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
test-glog: extend a test before fixing --follow issues
The changes add a lot of noise to the test output, I prefer to separate it from the changes which are to be introduced by --follow fixes.
This commit is contained in:
Patrick Mezard
parent
ea01a95d30
commit
989dc3e20e
@ -1,20 +1,28 @@
|
||||
$ "$TESTDIR/hghave" execbit || exit 80
|
||||
|
||||
$ hg init a
|
||||
The g is crafted to have 2 filelog topological heads in a linear
|
||||
changeset graph
|
||||
|
||||
$ hg init a
|
||||
$ cd a
|
||||
$ echo a > a
|
||||
$ echo f > f
|
||||
$ hg ci -Ama -d '1 0'
|
||||
adding a
|
||||
adding f
|
||||
|
||||
$ hg cp a b
|
||||
$ hg cp f g
|
||||
$ hg ci -mb -d '2 0'
|
||||
|
||||
$ mkdir dir
|
||||
$ hg mv b dir
|
||||
$ echo g >> g
|
||||
$ echo f >> f
|
||||
$ hg ci -mc -d '3 0'
|
||||
|
||||
$ hg mv a b
|
||||
$ hg cp -f f g
|
||||
$ echo a > d
|
||||
$ hg add d
|
||||
$ hg ci -md -d '4 0'
|
||||
@ -23,7 +31,7 @@
|
||||
$ hg ci -me -d '5 0'
|
||||
|
||||
$ hg log a
|
||||
changeset: 0:8580ff50825a
|
||||
changeset: 0:9161b9aeaf16
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:01 1970 +0000
|
||||
summary: a
|
||||
@ -38,28 +46,28 @@
|
||||
-f, but no args
|
||||
|
||||
$ hg log -f
|
||||
changeset: 4:66c1345dc4f9
|
||||
changeset: 4:7e4639b4691b
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:05 1970 +0000
|
||||
summary: e
|
||||
|
||||
changeset: 3:7c6c671bb7cc
|
||||
changeset: 3:2ca5ba701980
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:04 1970 +0000
|
||||
summary: d
|
||||
|
||||
changeset: 2:41dd4284081e
|
||||
changeset: 2:f8954cd4dc1f
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:03 1970 +0000
|
||||
summary: c
|
||||
|
||||
changeset: 1:784de7cef101
|
||||
changeset: 1:d89b0a12d229
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:02 1970 +0000
|
||||
summary: b
|
||||
|
||||
changeset: 0:8580ff50825a
|
||||
changeset: 0:9161b9aeaf16
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:01 1970 +0000
|
||||
summary: a
|
||||
@ -68,10 +76,10 @@
|
||||
one rename
|
||||
|
||||
$ hg log -vf a
|
||||
changeset: 0:8580ff50825a
|
||||
changeset: 0:9161b9aeaf16
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:01 1970 +0000
|
||||
files: a
|
||||
files: a f
|
||||
description:
|
||||
a
|
||||
|
||||
@ -80,7 +88,7 @@ one rename
|
||||
many renames
|
||||
|
||||
$ hg log -vf e
|
||||
changeset: 4:66c1345dc4f9
|
||||
changeset: 4:7e4639b4691b
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:05 1970 +0000
|
||||
@ -89,26 +97,26 @@ many renames
|
||||
e
|
||||
|
||||
|
||||
changeset: 2:41dd4284081e
|
||||
changeset: 2:f8954cd4dc1f
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:03 1970 +0000
|
||||
files: b dir/b
|
||||
files: b dir/b f g
|
||||
description:
|
||||
c
|
||||
|
||||
|
||||
changeset: 1:784de7cef101
|
||||
changeset: 1:d89b0a12d229
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:02 1970 +0000
|
||||
files: b
|
||||
files: b g
|
||||
description:
|
||||
b
|
||||
|
||||
|
||||
changeset: 0:8580ff50825a
|
||||
changeset: 0:9161b9aeaf16
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:01 1970 +0000
|
||||
files: a
|
||||
files: a f
|
||||
description:
|
||||
a
|
||||
|
||||
@ -118,34 +126,34 @@ many renames
|
||||
log -pf dir/b
|
||||
|
||||
$ hg log -pf dir/b
|
||||
changeset: 2:41dd4284081e
|
||||
changeset: 2:f8954cd4dc1f
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:03 1970 +0000
|
||||
summary: c
|
||||
|
||||
diff -r 784de7cef101 -r 41dd4284081e dir/b
|
||||
diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
|
||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
||||
+++ b/dir/b Thu Jan 01 00:00:03 1970 +0000
|
||||
@@ -0,0 +1,1 @@
|
||||
+a
|
||||
|
||||
changeset: 1:784de7cef101
|
||||
changeset: 1:d89b0a12d229
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:02 1970 +0000
|
||||
summary: b
|
||||
|
||||
diff -r 8580ff50825a -r 784de7cef101 b
|
||||
diff -r 9161b9aeaf16 -r d89b0a12d229 b
|
||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
||||
+++ b/b Thu Jan 01 00:00:02 1970 +0000
|
||||
@@ -0,0 +1,1 @@
|
||||
+a
|
||||
|
||||
changeset: 0:8580ff50825a
|
||||
changeset: 0:9161b9aeaf16
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:01 1970 +0000
|
||||
summary: a
|
||||
|
||||
diff -r 000000000000 -r 8580ff50825a a
|
||||
diff -r 000000000000 -r 9161b9aeaf16 a
|
||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
||||
+++ b/a Thu Jan 01 00:00:01 1970 +0000
|
||||
@@ -0,0 +1,1 @@
|
||||
@ -155,26 +163,26 @@ log -pf dir/b
|
||||
log -vf dir/b
|
||||
|
||||
$ hg log -vf dir/b
|
||||
changeset: 2:41dd4284081e
|
||||
changeset: 2:f8954cd4dc1f
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:03 1970 +0000
|
||||
files: b dir/b
|
||||
files: b dir/b f g
|
||||
description:
|
||||
c
|
||||
|
||||
|
||||
changeset: 1:784de7cef101
|
||||
changeset: 1:d89b0a12d229
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:02 1970 +0000
|
||||
files: b
|
||||
files: b g
|
||||
description:
|
||||
b
|
||||
|
||||
|
||||
changeset: 0:8580ff50825a
|
||||
changeset: 0:9161b9aeaf16
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:01 1970 +0000
|
||||
files: a
|
||||
files: a f
|
||||
description:
|
||||
a
|
||||
|
||||
@ -185,9 +193,9 @@ log copies with --copies
|
||||
|
||||
$ hg log -vC --template '{rev} {file_copies}\n'
|
||||
4 e (dir/b)
|
||||
3 b (a)
|
||||
3 b (a)g (f)
|
||||
2 dir/b (b)
|
||||
1 b (a)
|
||||
1 b (a)g (f)
|
||||
0
|
||||
|
||||
log copies switch without --copies, with old filecopy template
|
||||
@ -203,16 +211,16 @@ log copies switch with --copies
|
||||
|
||||
$ hg log -vC --template '{rev} {file_copies_switch}\n'
|
||||
4 e (dir/b)
|
||||
3 b (a)
|
||||
3 b (a)g (f)
|
||||
2 dir/b (b)
|
||||
1 b (a)
|
||||
1 b (a)g (f)
|
||||
0
|
||||
|
||||
|
||||
log copies with hardcoded style and with --style=default
|
||||
|
||||
$ hg log -vC -r4
|
||||
changeset: 4:66c1345dc4f9
|
||||
changeset: 4:7e4639b4691b
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:05 1970 +0000
|
||||
@ -223,7 +231,7 @@ log copies with hardcoded style and with --style=default
|
||||
|
||||
|
||||
$ hg log -vC -r4 --style=default
|
||||
changeset: 4:66c1345dc4f9
|
||||
changeset: 4:7e4639b4691b
|
||||
tag: tip
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:05 1970 +0000
|
||||
@ -259,15 +267,15 @@ log copies, execute bit set
|
||||
log -p d
|
||||
|
||||
$ hg log -pv d
|
||||
changeset: 3:7c6c671bb7cc
|
||||
changeset: 3:2ca5ba701980
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:04 1970 +0000
|
||||
files: a b d
|
||||
files: a b d g
|
||||
description:
|
||||
d
|
||||
|
||||
|
||||
diff -r 41dd4284081e -r 7c6c671bb7cc d
|
||||
diff -r f8954cd4dc1f -r 2ca5ba701980 d
|
||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
||||
+++ b/d Thu Jan 01 00:00:04 1970 +0000
|
||||
@@ -0,0 +1,1 @@
|
||||
@ -278,18 +286,18 @@ log -p d
|
||||
log --removed file
|
||||
|
||||
$ hg log --removed -v a
|
||||
changeset: 3:7c6c671bb7cc
|
||||
changeset: 3:2ca5ba701980
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:04 1970 +0000
|
||||
files: a b d
|
||||
files: a b d g
|
||||
description:
|
||||
d
|
||||
|
||||
|
||||
changeset: 0:8580ff50825a
|
||||
changeset: 0:9161b9aeaf16
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:01 1970 +0000
|
||||
files: a
|
||||
files: a f
|
||||
description:
|
||||
a
|
||||
|
||||
@ -298,10 +306,10 @@ log --removed file
|
||||
log --removed revrange file
|
||||
|
||||
$ hg log --removed -v -r0:2 a
|
||||
changeset: 0:8580ff50825a
|
||||
changeset: 0:9161b9aeaf16
|
||||
user: test
|
||||
date: Thu Jan 01 00:00:01 1970 +0000
|
||||
files: a
|
||||
files: a f
|
||||
description:
|
||||
a
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user