Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/logcmdutil.py @ 41681:db69a763bc89
diff: make --stat respect ui.relative-paths
It would have been easy to make all diffs respect ui.relative-paths,
but we don't want that since it makes the diff invalid. Perhaps it
makes sense to do that with --noprefix since the point of that is to
make paths that are easy to copy&paste, and the diff is already
invalid anyway. But this patch just makes the --stat version respect
the config option. The --stat view is not even close to a valid diff,
so I think it makes sense to show the paths in more human-friendly
form.
Differential Revision: https://phab.mercurial-scm.org/D5896
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 31 Jan 2019 15:35:51 -0800 |
| parents | df59b1078983 |
| children | 77ef3498ceb3 |
comparison
equal
deleted
inserted
replaced
| 41680:a13268524c25 | 41681:db69a763bc89 |
|---|---|
| 97 if stat: | 97 if stat: |
| 98 diffopts = diffopts.copy(context=0, noprefix=False) | 98 diffopts = diffopts.copy(context=0, noprefix=False) |
| 99 width = 80 | 99 width = 80 |
| 100 if not ui.plain(): | 100 if not ui.plain(): |
| 101 width = ui.termwidth() - graphwidth | 101 width = ui.termwidth() - graphwidth |
| 102 # If an explicit --root was given, don't respect ui.relative-paths | |
| 103 if not relroot: | |
| 104 pathfn = compose(scmutil.getuipathfn(repo), pathfn) | |
| 102 | 105 |
| 103 chunks = ctx2.diff(ctx1, match, changes, opts=diffopts, pathfn=pathfn, | 106 chunks = ctx2.diff(ctx1, match, changes, opts=diffopts, pathfn=pathfn, |
| 104 copysourcematch=copysourcematch, | 107 copysourcematch=copysourcematch, |
| 105 hunksfilterfn=hunksfilterfn) | 108 hunksfilterfn=hunksfilterfn) |
| 106 | 109 |