##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

patch: support diff data loss detection and upgrade...
patch: support diff data loss detection and upgrade In worst case, generating diff in upgrade mode can be two times more expensive than generating it in git mode directly: we may have to regenerate the whole diff again whenever a git feature is detected. Also, the first diff attempt is completely buffered instead of being streamed. That said, even without having profiled it yet, I am convinced we can fast-path the upgrade mode if necessary were it to be used in regular diff commands, and not only in mq where avoiding data loss is worth the price.
Martin Geisler - - Load All Authors

File last commit:

r9857:24bc6e41 default
r10189:e451e599 default
Show More
test-mq-qdiff.out
105 lines | 1.1 KiB | text/plain | TextLexer
/ tests / test-mq-qdiff.out
History | Source | Raw |Copy content |Copy permalink
Giorgos Keramidas
tests: new test for mq qdiff command...
 r2916 % init
% commit
adding base
% qnew mqbase
% qrefresh
% qdiff
diff -r 67e992f2c4f3 base
--- a/base
+++ b/base
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,1 +1,1 @@
Giorgos Keramidas
tests: new test for mq qdiff command...
 r2916 -base
+patched
% qdiff dirname
diff -r 67e992f2c4f3 base
--- a/base
+++ b/base
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,1 +1,1 @@
Giorgos Keramidas
tests: new test for mq qdiff command...
 r2916 -base
+patched
Jason Orendorff
mq: qdiff: support all diffopts
 r6668 % qdiff filename
diff -r 67e992f2c4f3 base
--- a/base
+++ b/base
@@ -1,1 +1,1 @@
-base
+patched
% revert
% qpop
Mads Kiilerich
mq: qpop now tells which patches are popped...
 r9110 popping mqbase
Martin Geisler
mq: lowercase output...
 r7627 patch queue now empty
Jason Orendorff
mq: qdiff: support all diffopts
 r6668 % 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
Patrick Mezard
mdiff: fix diff -b/B/w on mixed whitespace hunks (issue127)...
 r9827 hello world
Jason Orendorff
mq: qdiff: support all diffopts
 r6668 -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
Yannick Gingras
diff: add --inverse option...
 r9725 % qdiff -w
Jason Orendorff
mq: qdiff: support all diffopts
 r6668 diff -r 35fb829491c1 lines
--- a/lines
+++ b/lines
@@ -1,3 +1,5 @@
+
+
1
2
3
Martin Geisler
diff: change --inverse to --reverse...
 r9857 % qdiff --reverse
Yannick Gingras
diff: add --inverse option...
 r9725 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