##// END OF EJS Templates
diff: disable diff.noprefix option for diffstat (issue5759)...
Yuya Nishihara -
r35446:058c7259 stable
parent child Browse files
Show More
@@ -1514,7 +1514,7 b' def diffordiffstat(ui, repo, diffopts, n'
1514 1514 match.uipath(matchroot), uirelroot))
1515 1515
1516 1516 if stat:
1517 diffopts = diffopts.copy(context=0)
1517 diffopts = diffopts.copy(context=0, noprefix=False)
1518 1518 width = 80
1519 1519 if not ui.plain():
1520 1520 width = ui.termwidth()
@@ -69,6 +69,57 b' Filename with spaces git diffstat:'
69 69 file with spaces | Bin
70 70 1 files changed, 0 insertions(+), 0 deletions(-)
71 71
72 Filename without "a/" or "b/" (issue5759):
73
74 $ hg diff --config 'diff.noprefix=1' -c1 --stat --git
75 a | 3 +++
76 1 files changed, 3 insertions(+), 0 deletions(-)
77 $ hg diff --config 'diff.noprefix=1' -c2 --stat --git
78 c | Bin
79 d | 0
80 2 files changed, 0 insertions(+), 0 deletions(-)
81
82 $ hg log --config 'diff.noprefix=1' -r '1:' -p --stat --git
83 changeset: 1:3a95b07bb77f
84 user: test
85 date: Thu Jan 01 00:00:00 1970 +0000
86 summary: appenda
87
88 a | 3 +++
89 1 files changed, 3 insertions(+), 0 deletions(-)
90
91 diff --git a a
92 --- a
93 +++ a
94 @@ -211,3 +211,6 @@
95 a
96 a
97 a
98 +a
99 +a
100 +a
101
102 changeset: 2:c60a6c753773
103 tag: tip
104 user: test
105 date: Thu Jan 01 00:00:00 1970 +0000
106 summary: createb
107
108 c | Bin
109 d | 0
110 2 files changed, 0 insertions(+), 0 deletions(-)
111
112 diff --git c c
113 new file mode 100644
114 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..f76dd238ade08917e6712764a16a22005a50573d
115 GIT binary patch
116 literal 1
117 Ic${MZ000310RR91
118
119 diff --git d d
120 new file mode 100644
121
122
72 123 diffstat within directories:
73 124
74 125 $ hg rm -f 'file with spaces'
General Comments 0
You need to be logged in to leave comments. Login now