mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
a3e35890c8
`opts['unified'] = '0'` tries to reduce the number of lines to be processed by patch.diffstat, but here it does not affect diffopts, thus it does not make sense. Instead, we can change `diffopts.context` directly. Added test case for qdiff --stat.
128 lines
1.4 KiB
Plaintext
128 lines
1.4 KiB
Plaintext
% init
|
|
% commit
|
|
adding base
|
|
% qnew mqbase
|
|
% qrefresh
|
|
% qdiff
|
|
diff -r 67e992f2c4f3 base
|
|
--- a/base
|
|
+++ b/base
|
|
@@ -1,1 +1,1 @@
|
|
-base
|
|
+patched
|
|
% qdiff dirname
|
|
diff -r 67e992f2c4f3 base
|
|
--- a/base
|
|
+++ b/base
|
|
@@ -1,1 +1,1 @@
|
|
-base
|
|
+patched
|
|
% qdiff filename
|
|
diff -r 67e992f2c4f3 base
|
|
--- a/base
|
|
+++ b/base
|
|
@@ -1,1 +1,1 @@
|
|
-base
|
|
+patched
|
|
% revert
|
|
% qpop
|
|
popping mqbase
|
|
patch queue now empty
|
|
% qdelete mqbase
|
|
% commit 2
|
|
adding lines
|
|
% qnew 2
|
|
% qdiff -U 1
|
|
diff -r 35fb829491c1 lines
|
|
--- a/lines
|
|
+++ b/lines
|
|
@@ -1,1 +1,3 @@
|
|
+
|
|
+
|
|
1
|
|
@@ -4,4 +6,4 @@
|
|
4
|
|
-hello world
|
|
-goodbye world
|
|
+hello world
|
|
+ goodbye world
|
|
7
|
|
% qdiff -b
|
|
diff -r 35fb829491c1 lines
|
|
--- a/lines
|
|
+++ b/lines
|
|
@@ -1,9 +1,11 @@
|
|
+
|
|
+
|
|
1
|
|
2
|
|
3
|
|
4
|
|
hello world
|
|
-goodbye world
|
|
+ goodbye world
|
|
7
|
|
8
|
|
9
|
|
% qdiff -U 1 -B
|
|
diff -r 35fb829491c1 lines
|
|
--- a/lines
|
|
+++ b/lines
|
|
@@ -4,4 +6,4 @@
|
|
4
|
|
-hello world
|
|
-goodbye world
|
|
+hello world
|
|
+ goodbye world
|
|
7
|
|
% qdiff -w
|
|
diff -r 35fb829491c1 lines
|
|
--- a/lines
|
|
+++ b/lines
|
|
@@ -1,3 +1,5 @@
|
|
+
|
|
+
|
|
1
|
|
2
|
|
3
|
|
% qdiff --reverse
|
|
diff -r 35fb829491c1 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
|
|
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
|
|
% qdiff --stat
|
|
lines | 7 +++++--
|
|
1 files changed, 5 insertions(+), 2 deletions(-)
|