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

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

mdiff: split lines in allblocks() only when necessary...
mdiff: split lines in allblocks() only when necessary These are only required to handle the --ignore-blank-lines case
Nicolas Venegas - - Load All Authors

File last commit:

r15462:2b1ec74c stable
r15529:b35cf472 default
Show More
test-diff-unified.t
153 lines | 1.8 KiB | text/troff | Tads3Lexer
/ tests / test-diff-unified.t
History | Source | Raw |Copy content |Copy permalink
Adrian Buehlmann
tests: unify test-diff-unified
 r12141 $ hg init repo
$ cd repo
$ cat > a <<EOF
> c
> c
> a
> a
> b
> a
> a
> c
> c
> EOF
$ hg ci -Am adda
adding a
$ cat > a <<EOF
> c
> c
> a
> a
> dd
> a
> a
> c
> c
> EOF
default context
$ hg diff --nodates
diff -r cf9f4ba66af2 a
--- a/a
+++ b/a
@@ -2,7 +2,7 @@
c
a
a
-b
+dd
a
a
c
invalid --unified
$ hg diff --nodates -U foo
abort: diff context lines count must be an integer, not 'foo'
Matt Mackall
tests: add exit codes to unified tests
 r12316 [255]
Adrian Buehlmann
tests: unify test-diff-unified
 r12141
$ hg diff --nodates -U 2
diff -r cf9f4ba66af2 a
--- a/a
+++ b/a
@@ -3,5 +3,5 @@
a
a
-b
+dd
a
a
$ hg --config diff.unified=2 diff --nodates
diff -r cf9f4ba66af2 a
--- a/a
+++ b/a
@@ -3,5 +3,5 @@
a
a
-b
+dd
a
a
$ hg diff --nodates -U 1
diff -r cf9f4ba66af2 a
--- a/a
+++ b/a
@@ -4,3 +4,3 @@
a
-b
+dd
a
invalid diff.unified
$ hg --config diff.unified=foo diff --nodates
abort: diff context lines count must be an integer, not 'foo'
Matt Mackall
tests: add exit codes to unified tests
 r12316 [255]
Adrian Buehlmann
tests: unify test-diff-unified
 r12141
Nicolas Venegas
mdiff/patch: fix bad hunk handling for unified diffs with zero context...
 r15462 0 lines of context hunk header matches gnu diff hunk header
$ hg init diffzero
$ cd diffzero
$ cat > f1 << EOF
> c2
> c4
> c5
> EOF
$ hg commit -Am0
adding f1
$ cat > f2 << EOF
> c1
> c2
> c3
> c4
> EOF
$ diff -U0 f1 f2
--- f1 * (glob)
+++ f2 * (glob)
@@ -0,0 +1 @@
+c1
@@ -1,0 +3 @@
+c3
@@ -3 +4,0 @@
-c5
[1]
Adrian Buehlmann
tests: unify test-diff-unified
 r12141
Nicolas Venegas
mdiff/patch: fix bad hunk handling for unified diffs with zero context...
 r15462 $ mv f2 f1
$ hg diff -U0 --nodates
diff -r 55d8ff78db23 f1
--- a/f1
+++ b/f1
@@ -0,0 +1,1 @@
+c1
@@ -1,0 +3,1 @@
+c3
@@ -3,1 +4,0 @@
-c5
Adrian Buehlmann
tests: unify test-diff-unified
 r12141
Nicolas Venegas
mdiff/patch: fix bad hunk handling for unified diffs with zero context...
 r15462 $ hg diff -U0 --nodates --git
diff --git a/f1 b/f1
--- a/f1
+++ b/f1
@@ -0,0 +1,1 @@
+c1
@@ -1,0 +3,1 @@
+c3
@@ -3,1 +4,0 @@
-c5
$ hg diff -U0 --nodates -p
diff -r 55d8ff78db23 f1
--- a/f1
+++ b/f1
@@ -0,0 +1,1 @@
+c1
@@ -1,0 +3,1 @@ c2
+c3
@@ -3,1 +4,0 @@ c4
-c5