2010-08-31 13:57:02 +04:00
|
|
|
$ 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'
|
2010-09-17 02:51:32 +04:00
|
|
|
[255]
|
2010-08-31 13:57:02 +04:00
|
|
|
|
|
|
|
|
|
|
|
$ 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'
|
2010-09-17 02:51:32 +04:00
|
|
|
[255]
|
2010-08-31 13:57:02 +04:00
|
|
|
|
2014-11-13 11:13:48 +03:00
|
|
|
noprefix config and option
|
2014-11-13 11:08:44 +03:00
|
|
|
|
|
|
|
$ hg --config diff.noprefix=True diff --nodates
|
|
|
|
diff -r cf9f4ba66af2 a
|
2014-11-13 10:29:14 +03:00
|
|
|
--- a
|
|
|
|
+++ a
|
2014-11-13 11:08:44 +03:00
|
|
|
@@ -2,7 +2,7 @@
|
|
|
|
c
|
|
|
|
a
|
|
|
|
a
|
|
|
|
-b
|
|
|
|
+dd
|
|
|
|
a
|
|
|
|
a
|
|
|
|
c
|
2014-11-13 11:13:48 +03:00
|
|
|
$ hg diff --noprefix --nodates
|
|
|
|
diff -r cf9f4ba66af2 a
|
2014-11-13 10:29:14 +03:00
|
|
|
--- a
|
|
|
|
+++ a
|
2014-11-13 11:13:48 +03:00
|
|
|
@@ -2,7 +2,7 @@
|
|
|
|
c
|
|
|
|
a
|
|
|
|
a
|
|
|
|
-b
|
|
|
|
+dd
|
|
|
|
a
|
|
|
|
a
|
|
|
|
c
|
2014-11-13 11:08:44 +03:00
|
|
|
|
2014-11-13 11:13:48 +03:00
|
|
|
noprefix config disabled in plain mode, but option still enabled
|
2014-11-13 11:08:44 +03:00
|
|
|
|
|
|
|
$ HGPLAIN=1 hg --config diff.noprefix=True diff --nodates
|
|
|
|
diff -r cf9f4ba66af2 a
|
|
|
|
--- a/a
|
|
|
|
+++ b/a
|
|
|
|
@@ -2,7 +2,7 @@
|
|
|
|
c
|
|
|
|
a
|
|
|
|
a
|
|
|
|
-b
|
2014-11-13 11:13:48 +03:00
|
|
|
+dd
|
|
|
|
a
|
|
|
|
a
|
|
|
|
c
|
|
|
|
$ HGPLAIN=1 hg diff --noprefix --nodates
|
|
|
|
diff -r cf9f4ba66af2 a
|
2014-11-13 10:29:14 +03:00
|
|
|
--- a
|
|
|
|
+++ a
|
2014-11-13 11:13:48 +03:00
|
|
|
@@ -2,7 +2,7 @@
|
|
|
|
c
|
|
|
|
a
|
|
|
|
a
|
|
|
|
-b
|
2014-11-13 11:08:44 +03:00
|
|
|
+dd
|
|
|
|
a
|
|
|
|
a
|
|
|
|
c
|
|
|
|
|
2012-06-11 03:38:32 +04:00
|
|
|
$ cd ..
|
|
|
|
|
|
|
|
|
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Prior to this patch "hg diff -U0", i.e., zero lines of context, would
output hunk headers with a start line one greater than what GNU patch
and git output. Guido van Rossum documents the unified diff format[1]
as having a start line value "one lower than one would expect" for
zero length hunks.
Comparing the behaviour of the three systems prior to this patch in
transforming
c1
c3
to
c1
c2
c3
- GNU "diff -U0" reports the hunk as "@@ -1,0 +2 @@"
- "git diff -U0" reports the hunk as "@@ -1,0 +2 @@"
- "hg diff -U0" reports the hunk as "@@ -2,0 +2,1 @@"
After this patch, "hg diff -U0" reports "@@ -1,0 +2,1 @@".
Since "hg export --config diff.unified=0" outputs zero-context unified
diffs, "hg import" has also been updated to account for start lines
one less than expected for zero length hunk ranges.
[1]: http://www.artima.com/weblogs/viewpost.jsp?thread=164293
2011-11-10 04:55:59 +04:00
|
|
|
0 lines of context hunk header matches gnu diff hunk header
|
2010-08-31 13:57:02 +04:00
|
|
|
|
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Prior to this patch "hg diff -U0", i.e., zero lines of context, would
output hunk headers with a start line one greater than what GNU patch
and git output. Guido van Rossum documents the unified diff format[1]
as having a start line value "one lower than one would expect" for
zero length hunks.
Comparing the behaviour of the three systems prior to this patch in
transforming
c1
c3
to
c1
c2
c3
- GNU "diff -U0" reports the hunk as "@@ -1,0 +2 @@"
- "git diff -U0" reports the hunk as "@@ -1,0 +2 @@"
- "hg diff -U0" reports the hunk as "@@ -2,0 +2,1 @@"
After this patch, "hg diff -U0" reports "@@ -1,0 +2,1 @@".
Since "hg export --config diff.unified=0" outputs zero-context unified
diffs, "hg import" has also been updated to account for start lines
one less than expected for zero length hunk ranges.
[1]: http://www.artima.com/weblogs/viewpost.jsp?thread=164293
2011-11-10 04:55:59 +04:00
|
|
|
$ 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
|
|
|
|
$ 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
|
|
|
|
|
|
|
|
$ 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
|
2010-08-31 13:57:02 +04:00
|
|
|
|
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Prior to this patch "hg diff -U0", i.e., zero lines of context, would
output hunk headers with a start line one greater than what GNU patch
and git output. Guido van Rossum documents the unified diff format[1]
as having a start line value "one lower than one would expect" for
zero length hunks.
Comparing the behaviour of the three systems prior to this patch in
transforming
c1
c3
to
c1
c2
c3
- GNU "diff -U0" reports the hunk as "@@ -1,0 +2 @@"
- "git diff -U0" reports the hunk as "@@ -1,0 +2 @@"
- "hg diff -U0" reports the hunk as "@@ -2,0 +2,1 @@"
After this patch, "hg diff -U0" reports "@@ -1,0 +2,1 @@".
Since "hg export --config diff.unified=0" outputs zero-context unified
diffs, "hg import" has also been updated to account for start lines
one less than expected for zero length hunk ranges.
[1]: http://www.artima.com/weblogs/viewpost.jsp?thread=164293
2011-11-10 04:55:59 +04:00
|
|
|
$ 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
|
2012-04-05 17:39:07 +04:00
|
|
|
|
|
|
|
$ echo a > f1
|
|
|
|
$ hg ci -m movef2
|
|
|
|
|
|
|
|
Test diff headers terminating with TAB when necessary (issue3357)
|
|
|
|
Regular diff --nodates, file creation
|
|
|
|
|
|
|
|
$ hg mv f1 'f 1'
|
|
|
|
$ echo b > 'f 1'
|
|
|
|
$ hg diff --nodates 'f 1'
|
|
|
|
diff -r 7574207d0d15 f 1
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/f 1
|
|
|
|
@@ -0,0 +1,1 @@
|
|
|
|
+b
|
|
|
|
|
|
|
|
Git diff, adding space
|
|
|
|
|
|
|
|
$ hg diff --git
|
|
|
|
diff --git a/f1 b/f 1
|
|
|
|
rename from f1
|
|
|
|
rename to f 1
|
|
|
|
--- a/f1
|
|
|
|
+++ b/f 1
|
|
|
|
@@ -1,1 +1,1 @@
|
|
|
|
-a
|
|
|
|
+b
|
|
|
|
|
2017-01-09 22:24:18 +03:00
|
|
|
Git diff, adding extended headers
|
|
|
|
|
|
|
|
$ hg diff --git --config experimental.extendedheader.index=7 --config experimental.extendedheader.similarity=True
|
|
|
|
diff --git a/f1 b/f 1
|
|
|
|
similarity index 0%
|
|
|
|
rename from f1
|
|
|
|
rename to f 1
|
|
|
|
index 7898192..6178079 100644
|
|
|
|
--- a/f1
|
|
|
|
+++ b/f 1
|
|
|
|
@@ -1,1 +1,1 @@
|
|
|
|
-a
|
|
|
|
+b
|
|
|
|
|
2017-01-15 10:33:15 +03:00
|
|
|
$ hg diff --git --config experimental.extendedheader.index=-1
|
|
|
|
invalid length for extendedheader.index: '-1'
|
|
|
|
diff --git a/f1 b/f 1
|
|
|
|
rename from f1
|
|
|
|
rename to f 1
|
|
|
|
--- a/f1
|
|
|
|
+++ b/f 1
|
|
|
|
@@ -1,1 +1,1 @@
|
|
|
|
-a
|
|
|
|
+b
|
|
|
|
|
|
|
|
$ hg diff --git --config experimental.extendedheader.index=whatever
|
|
|
|
invalid value for extendedheader.index: 'whatever'
|
|
|
|
diff --git a/f1 b/f 1
|
|
|
|
rename from f1
|
|
|
|
rename to f 1
|
|
|
|
--- a/f1
|
|
|
|
+++ b/f 1
|
|
|
|
@@ -1,1 +1,1 @@
|
|
|
|
-a
|
|
|
|
+b
|
|
|
|
|
2014-11-13 11:08:44 +03:00
|
|
|
Git diff with noprefix
|
|
|
|
|
|
|
|
$ hg --config diff.noprefix=True diff --git --nodates
|
2014-11-13 10:50:21 +03:00
|
|
|
diff --git f1 f 1
|
2014-11-13 11:08:44 +03:00
|
|
|
rename from f1
|
|
|
|
rename to f 1
|
2014-11-13 10:29:14 +03:00
|
|
|
--- f1
|
|
|
|
+++ f 1
|
2014-11-13 11:08:44 +03:00
|
|
|
@@ -1,1 +1,1 @@
|
|
|
|
-a
|
|
|
|
+b
|
|
|
|
|
2014-11-13 11:13:48 +03:00
|
|
|
noprefix config disabled in plain mode, but option still enabled
|
2014-11-13 11:08:44 +03:00
|
|
|
|
|
|
|
$ HGPLAIN=1 hg --config diff.noprefix=True diff --git --nodates
|
|
|
|
diff --git a/f1 b/f 1
|
|
|
|
rename from f1
|
|
|
|
rename to f 1
|
|
|
|
--- a/f1
|
|
|
|
+++ b/f 1
|
|
|
|
@@ -1,1 +1,1 @@
|
|
|
|
-a
|
|
|
|
+b
|
2014-11-13 11:13:48 +03:00
|
|
|
$ HGPLAIN=1 hg diff --git --noprefix --nodates
|
2014-11-13 10:50:21 +03:00
|
|
|
diff --git f1 f 1
|
2014-11-13 11:13:48 +03:00
|
|
|
rename from f1
|
|
|
|
rename to f 1
|
2014-11-13 10:29:14 +03:00
|
|
|
--- f1
|
|
|
|
+++ f 1
|
2014-11-13 11:13:48 +03:00
|
|
|
@@ -1,1 +1,1 @@
|
|
|
|
-a
|
|
|
|
+b
|
2014-11-13 11:08:44 +03:00
|
|
|
|
2012-04-05 17:39:07 +04:00
|
|
|
Regular diff --nodates, file deletion
|
|
|
|
|
|
|
|
$ hg ci -m addspace
|
|
|
|
$ hg mv 'f 1' f1
|
|
|
|
$ echo a > f1
|
|
|
|
$ hg diff --nodates 'f 1'
|
|
|
|
diff -r ca50fe67c9c7 f 1
|
|
|
|
--- a/f 1
|
|
|
|
+++ /dev/null
|
|
|
|
@@ -1,1 +0,0 @@
|
|
|
|
-b
|
|
|
|
|
|
|
|
Git diff, removing space
|
|
|
|
|
|
|
|
$ hg diff --git
|
|
|
|
diff --git a/f 1 b/f1
|
|
|
|
rename from f 1
|
|
|
|
rename to f1
|
|
|
|
--- a/f 1
|
|
|
|
+++ b/f1
|
|
|
|
@@ -1,1 +1,1 @@
|
|
|
|
-b
|
|
|
|
+a
|
2012-06-11 03:38:32 +04:00
|
|
|
|
2015-03-24 23:36:38 +03:00
|
|
|
showfunc diff
|
|
|
|
$ cat > f1 << EOF
|
|
|
|
> int main() {
|
|
|
|
> int a = 0;
|
|
|
|
> int b = 1;
|
|
|
|
> int c = 2;
|
|
|
|
> int d = 3;
|
|
|
|
> return a + b + c + d;
|
|
|
|
> }
|
|
|
|
> EOF
|
|
|
|
$ hg commit -m addfunction
|
|
|
|
$ cat > f1 << EOF
|
|
|
|
> int main() {
|
|
|
|
> int a = 0;
|
|
|
|
> int b = 1;
|
|
|
|
> int c = 2;
|
|
|
|
> int e = 3;
|
|
|
|
> return a + b + c + e;
|
|
|
|
> }
|
|
|
|
> EOF
|
|
|
|
$ hg diff --git
|
|
|
|
diff --git a/f1 b/f1
|
|
|
|
--- a/f1
|
|
|
|
+++ b/f1
|
|
|
|
@@ -2,6 +2,6 @@
|
|
|
|
int a = 0;
|
|
|
|
int b = 1;
|
|
|
|
int c = 2;
|
|
|
|
- int d = 3;
|
|
|
|
- return a + b + c + d;
|
|
|
|
+ int e = 3;
|
|
|
|
+ return a + b + c + e;
|
|
|
|
}
|
|
|
|
$ hg diff --config diff.showfunc=True --git
|
|
|
|
diff --git a/f1 b/f1
|
|
|
|
--- a/f1
|
|
|
|
+++ b/f1
|
|
|
|
@@ -2,6 +2,6 @@ int main() {
|
|
|
|
int a = 0;
|
|
|
|
int b = 1;
|
|
|
|
int c = 2;
|
|
|
|
- int d = 3;
|
|
|
|
- return a + b + c + d;
|
|
|
|
+ int e = 3;
|
|
|
|
+ return a + b + c + e;
|
|
|
|
}
|
|
|
|
|
2016-08-30 22:55:07 +03:00
|
|
|
If [diff] git is set to true, but the user says --no-git, we should
|
|
|
|
*not* get git diffs
|
|
|
|
$ hg diff --nodates --config diff.git=1 --no-git
|
|
|
|
diff -r f2c7c817fa55 f1
|
|
|
|
--- a/f1
|
|
|
|
+++ b/f1
|
|
|
|
@@ -2,6 +2,6 @@
|
|
|
|
int a = 0;
|
|
|
|
int b = 1;
|
|
|
|
int c = 2;
|
|
|
|
- int d = 3;
|
|
|
|
- return a + b + c + d;
|
|
|
|
+ int e = 3;
|
|
|
|
+ return a + b + c + e;
|
|
|
|
}
|
|
|
|
|
2012-06-11 03:38:32 +04:00
|
|
|
$ cd ..
|