mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 00:14:35 +03:00
effa0da8de
Summary:
The helper could be used in individual tests to enable chg if chg exists.
This allows us to have more precise control on what tests to use chg instead
of using a global flag in run-tests.py.
This makes certain tests containing many hg commands much faster. For example,
`test-revset.t` took 99 seconds before:
% ./run-tests.py test-revset.t --time
.
# Ran 1 tests, 0 skipped, 0 failed.
# Producing time report
start end cuser csys real Test
0.000 99.990 86.410 12.000 99.990 test-revset.t
And 10 seconds after:
% ./run-tests.py test-revset.t --time
.
# Ran 1 tests, 0 skipped, 0 failed.
# Producing time report
start end cuser csys real Test
0.000 10.080 0.380 0.130 10.080 test-revset.t
Also enable it for some other tests. Note the whitelist is not complete. We
probably want to whitelist more tests in the future.
The feature could be opted out by deleting `contrib/chg/chg`.
Reviewed By: phillco
Differential Revision: D6767036
fbshipit-source-id: 8220cf408aa198d5d8e2ca5127ca60e2070d3444
182 lines
2.5 KiB
Perl
182 lines
2.5 KiB
Perl
$ . helpers-usechg.sh
|
|
|
|
$ 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 ..
|