##// END OF EJS Templates
hgweb: disable diff.noprefix option for diffstat...
hgweb: disable diff.noprefix option for diffstat Copied from cf1e15f91c90.

File last commit:

r32321:0e29ce16 default
r35445:0279c226 stable
Show More
test-diffstat.t
187 lines | 4.0 KiB | text/troff | Tads3Lexer
Adrian Buehlmann
tests: unify test-diffstat
r12147 $ hg init repo
$ cd repo
$ i=0; while [ "$i" -lt 213 ]; do echo a >> a; i=`expr $i + 1`; done
$ hg add a
Steven Brown
patch: restore the previous output of 'diff --stat'...
r14437 $ cp a b
$ hg add b
Adrian Buehlmann
tests: unify test-diffstat
r12147
Wide diffstat:
$ hg diff --stat
a | 213 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Steven Brown
patch: restore the previous output of 'diff --stat'...
r14437 b | 213 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 426 insertions(+), 0 deletions(-)
Adrian Buehlmann
tests: unify test-diffstat
r12147
diffstat width:
$ COLUMNS=24 hg diff --config ui.interactive=true --stat
a | 213 ++++++++++++++
Steven Brown
patch: restore the previous output of 'diff --stat'...
r14437 b | 213 ++++++++++++++
2 files changed, 426 insertions(+), 0 deletions(-)
Adrian Buehlmann
tests: unify test-diffstat
r12147
$ hg ci -m adda
$ cat >> a <<EOF
> a
> a
> a
> EOF
Narrow diffstat:
$ hg diff --stat
a | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
$ hg ci -m appenda
Jim Hague
tests: tighten checks for octal escapes in shell printf....
r16098 >>> open("c", "wb").write("\0")
Patrick Mezard
diffstat: be more picky when marking file as 'binary' (issue2816)...
r15363 $ touch d
$ hg add c d
Adrian Buehlmann
tests: unify test-diffstat
r12147
Binary diffstat:
$ hg diff --stat
Patrick Mezard
diffstat: be more picky when marking file as 'binary' (issue2816)...
r15363 c | Bin
Adrian Buehlmann
tests: unify test-diffstat
r12147 1 files changed, 0 insertions(+), 0 deletions(-)
Binary git diffstat:
$ hg diff --stat --git
Steven Brown
patch: restore the previous output of 'diff --stat'...
r14437 c | Bin
Patrick Mezard
diffstat: be more picky when marking file as 'binary' (issue2816)...
r15363 d | 0
2 files changed, 0 insertions(+), 0 deletions(-)
Adrian Buehlmann
tests: unify test-diffstat
r12147
Gastón Kleiman
diffstat: fix parsing of filenames with spaces...
r13395 $ hg ci -m createb
Jim Hague
tests: tighten checks for octal escapes in shell printf....
r16098 >>> open("file with spaces", "wb").write("\0")
Gastón Kleiman
diffstat: fix parsing of filenames with spaces...
r13395 $ hg add "file with spaces"
Filename with spaces diffstat:
$ hg diff --stat
Patrick Mezard
diffstat: be more picky when marking file as 'binary' (issue2816)...
r15363 file with spaces | Bin
Gastón Kleiman
diffstat: fix parsing of filenames with spaces...
r13395 1 files changed, 0 insertions(+), 0 deletions(-)
Filename with spaces git diffstat:
$ hg diff --stat --git
file with spaces | Bin
1 files changed, 0 insertions(+), 0 deletions(-)
Mads Kiilerich
check-code: fix check for trailing whitespace on empty lines...
r17346
Siddharth Agarwal
commands.diff: add support for diffs relative to a subdirectory...
r24432 diffstat within directories:
$ hg rm -f 'file with spaces'
$ mkdir dir1 dir2
$ echo new1 > dir1/new
$ echo new2 > dir2/new
$ hg add dir1/new dir2/new
$ hg diff --stat
dir1/new | 1 +
dir2/new | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
Sean Farley
diff: rename --relative option to --root...
r24455 $ hg diff --stat --root dir1
Siddharth Agarwal
commands.diff: add support for diffs relative to a subdirectory...
r24432 new | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
Sean Farley
diff: rename --relative option to --root...
r24455 $ hg diff --stat --root dir1 dir2
Siddharth Agarwal
commands.diff: add support for diffs relative to a subdirectory...
r24432 warning: dir2 not inside relative root dir1
Sean Farley
diff: rename --relative option to --root...
r24455 $ hg diff --stat --root dir1 -I dir1/old
Siddharth Agarwal
commands.diff: add support for diffs relative to a subdirectory...
r24432
$ cd dir1
$ hg diff --stat .
dir1/new | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
Sean Farley
diff: rename --relative option to --root...
r24455 $ hg diff --stat --root .
Siddharth Agarwal
commands.diff: add support for diffs relative to a subdirectory...
r24432 new | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
Sean Farley
diff: rename --relative option to --root...
r24455 $ hg diff --stat --root ../dir1 ../dir2
Matt Harbison
test-diffstat: add a glob the test runner wants on Windows...
r24497 warning: ../dir2 not inside relative root . (glob)
Siddharth Agarwal
commands.diff: add support for diffs relative to a subdirectory...
r24432
Sean Farley
diff: rename --relative option to --root...
r24455 $ hg diff --stat --root . -I old
Siddharth Agarwal
commands.diff: add support for diffs relative to a subdirectory...
r24432
Mads Kiilerich
tests: add missing trailing 'cd ..'...
r16913 $ cd ..
Andrew Zwicky
diffstat: properly count lines starting in '--' or '++' (issue5479)...
r32321
Files with lines beginning with '--' or '++' should be properly counted in diffstat
$ hg up -Cr tip
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm dir1/new
$ rm dir2/new
$ rm "file with spaces"
$ cat > file << EOF
> line 1
> line 2
> line 3
> EOF
$ hg commit -Am file
adding file
Lines added starting with '--' should count as additions
$ cat > file << EOF
> line 1
> -- line 2, with dashes
> line 3
> EOF
$ hg diff --root .
diff -r be1569354b24 file
--- a/file Thu Jan 01 00:00:00 1970 +0000
+++ b/file * (glob)
@@ -1,3 +1,3 @@
line 1
-line 2
+-- line 2, with dashes
line 3
$ hg diff --root . --stat
file | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Lines changed starting with '--' should count as deletions
$ hg commit -m filev2
$ cat > file << EOF
> line 1
> -- line 2, with dashes, changed again
> line 3
> EOF
$ hg diff --root .
diff -r 160f7c034df6 file
--- a/file Thu Jan 01 00:00:00 1970 +0000
+++ b/file * (glob)
@@ -1,3 +1,3 @@
line 1
--- line 2, with dashes
+-- line 2, with dashes, changed again
line 3
$ hg diff --root . --stat
file | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Lines changed starting with '--' should count as deletions
and starting with '++' should count as additions
$ cat > file << EOF
> line 1
> ++ line 2, switched dashes to plusses
> line 3
> EOF
$ hg diff --root .
diff -r 160f7c034df6 file
--- a/file Thu Jan 01 00:00:00 1970 +0000
+++ b/file * (glob)
@@ -1,3 +1,3 @@
line 1
--- line 2, with dashes
+++ line 2, switched dashes to plusses
line 3
$ hg diff --root . --stat
file | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)