Show More
@@ -166,7 +166,7 b' def makepatch(ui, repo, patchlines, opts' | |||||
166 | while patchlines and not patchlines[0].strip(): |
|
166 | while patchlines and not patchlines[0].strip(): | |
167 | patchlines.pop(0) |
|
167 | patchlines.pop(0) | |
168 |
|
168 | |||
169 |
ds = patch.diffstat(patchlines |
|
169 | ds = patch.diffstat(patchlines) | |
170 | if opts.get('diffstat'): |
|
170 | if opts.get('diffstat'): | |
171 | body += ds + '\n\n' |
|
171 | body += ds + '\n\n' | |
172 |
|
172 |
@@ -505,8 +505,7 b' def listcmd(ui, repo, pats, opts):' | |||||
505 | for chunk, label in patch.difflabel(iter, difflines): |
|
505 | for chunk, label in patch.difflabel(iter, difflines): | |
506 | ui.write(chunk, label=label) |
|
506 | ui.write(chunk, label=label) | |
507 | if opts['stat']: |
|
507 | if opts['stat']: | |
508 |
for chunk, label in patch.diffstatui(difflines, width=width |
|
508 | for chunk, label in patch.diffstatui(difflines, width=width): | |
509 | git=True): |
|
|||
510 | ui.write(chunk, label=label) |
|
509 | ui.write(chunk, label=label) | |
511 |
|
510 | |||
512 | def singlepatchcmds(ui, repo, pats, opts, subcommand): |
|
511 | def singlepatchcmds(ui, repo, pats, opts, subcommand): |
@@ -1202,8 +1202,7 b' def diffordiffstat(ui, repo, diffopts, n' | |||||
1202 | chunks = patch.diff(repo, node1, node2, match, changes, diffopts, |
|
1202 | chunks = patch.diff(repo, node1, node2, match, changes, diffopts, | |
1203 | prefix=prefix, relroot=relroot) |
|
1203 | prefix=prefix, relroot=relroot) | |
1204 | for chunk, label in patch.diffstatui(util.iterlines(chunks), |
|
1204 | for chunk, label in patch.diffstatui(util.iterlines(chunks), | |
1205 |
width=width |
|
1205 | width=width): | |
1206 | git=diffopts.git): |
|
|||
1207 | write(chunk, label=label) |
|
1206 | write(chunk, label=label) | |
1208 | else: |
|
1207 | else: | |
1209 | for chunk, label in patch.diffui(repo, node1, node2, match, |
|
1208 | for chunk, label in patch.diffui(repo, node1, node2, match, |
@@ -2550,7 +2550,7 b' def diffstatdata(lines):' | |||||
2550 | addresult() |
|
2550 | addresult() | |
2551 | return results |
|
2551 | return results | |
2552 |
|
2552 | |||
2553 |
def diffstat(lines, width=80 |
|
2553 | def diffstat(lines, width=80): | |
2554 | output = [] |
|
2554 | output = [] | |
2555 | stats = diffstatdata(lines) |
|
2555 | stats = diffstatdata(lines) | |
2556 | maxname, maxtotal, totaladds, totalremoves, hasbinary = diffstatsum(stats) |
|
2556 | maxname, maxtotal, totaladds, totalremoves, hasbinary = diffstatsum(stats) |
General Comments 0
You need to be logged in to leave comments.
Login now