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

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

grep: reuse getrenamedfn() from scmutil...
grep: reuse getrenamedfn() from scmutil My motivation is to reduce uses of filectx.renamed(). Reusing scmutil.getrenamedfn() also means that we get some caching of copy information per file and revision. I don't think that matters for `hg grep` (I doubt it speeds up significantly, and I doubt it wastes significant memory), but I'm not sure. Differential Revision: https://phab.mercurial-scm.org/D6022
Martin von Zweigbergk - - Load All Authors

File last commit:

r41819:db69a763 default
r41948:cecdf741 default
Show More
test-diffstat.t
284 lines | 6.2 KiB | text/troff | Tads3Lexer
/ tests / test-diffstat.t
History | Source | Raw |Copy content |Copy permalink
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
Pulkit Goyal
py3: suppress the output of open() using `and None`...
 r37385 >>> open("c", "wb").write(b"\0") and None
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
Pulkit Goyal
py3: suppress the output of open() using `and None`...
 r37385 >>> open("file with spaces", "wb").write(b"\0") and None
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
Yuya Nishihara
diff: disable diff.noprefix option for diffstat (issue5759)...
 r35446 Filename without "a/" or "b/" (issue5759):
$ hg diff --config 'diff.noprefix=1' -c1 --stat --git
a | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
$ hg diff --config 'diff.noprefix=1' -c2 --stat --git
c | Bin
d | 0
2 files changed, 0 insertions(+), 0 deletions(-)
$ hg log --config 'diff.noprefix=1' -r '1:' -p --stat --git
changeset: 1:3a95b07bb77f
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: appenda
a | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a a
--- a
+++ a
@@ -211,3 +211,6 @@
a
a
a
+a
+a
+a
changeset: 2:c60a6c753773
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: createb
c | Bin
d | 0
2 files changed, 0 insertions(+), 0 deletions(-)
diff --git c c
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..f76dd238ade08917e6712764a16a22005a50573d
GIT binary patch
literal 1
Ic${MZ000310RR91
diff --git d d
new file mode 100644
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(-)
Martin von Zweigbergk
diff: make --stat respect ui.relative-paths...
 r41819 $ hg diff --stat . --config ui.relative-paths=yes
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(-)
Martin von Zweigbergk
diff: make --stat respect ui.relative-paths...
 r41819 $ hg diff --stat --root . --config ui.relative-paths=yes
new | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
--root trumps ui.relative-paths
$ hg diff --stat --root .. --config ui.relative-paths=yes
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 ../dir2
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
 r35394 warning: ../dir2 not inside relative root .
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(-)
Navaneeth Suresh
diffstat: make --git work properly on renames (issue6025)...
 r41420
When a file is renamed, --git shouldn't loss the info about old file
$ hg init issue6025
$ cd issue6025
$ echo > a
$ hg ci -Am 'add a'
adding a
$ hg mv a b
$ hg diff --git
diff --git a/a b/b
rename from a
rename to b
$ hg diff --stat
a | 1 -
b | 1 +
2 files changed, 1 insertions(+), 1 deletions(-)
$ hg diff --stat --git
a => b | 0
1 files changed, 0 insertions(+), 0 deletions(-)
Navaneeth Suresh
diffstat: support filenames with whitespaces on renames...
 r41446 -- filename may contain whitespaces
$ echo > c
$ hg ci -Am 'add c'
adding c
$ hg mv c 'new c'
$ hg diff --git
diff --git a/c b/new c
rename from c
rename to new c
$ hg diff --stat
c | 1 -
new c | 1 +
2 files changed, 1 insertions(+), 1 deletions(-)
$ hg diff --stat --git
c => new c | 0
1 files changed, 0 insertions(+), 0 deletions(-)