This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5896

diff: make --stat respect ui.relative-paths
ClosedPublic

Authored by martinvonz on Feb 8 2019, 3:30 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGdb69a763bc89: diff: make --stat respect ui.relative-paths
Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Feb 8 2019, 3:30 AM
yuja added a subscriber: yuja.Feb 9 2019, 10:45 PM
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.

Seems fine, but I'm not sure about the Windows behavior:

  • Do we want to see backslash paths on Windows?
  • Backslash paths are parsed correctly?
martinvonz added a comment.Feb 10 2019, 1:07 AM
In D5896#86559, @yuja wrote:
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.

Seems fine, but I'm not sure about the Windows behavior:

  • Do we want to see backslash paths on Windows?

I would assume that we want that.

  • Backslash paths are parsed correctly?

Good question! Some simple testing I just did suggests that it does work.

martinvonz updated this revision to Diff 14001.Feb 10 2019, 1:08 AM
Closed by commit rHGdb69a763bc89: diff: make --stat respect ui.relative-paths (authored by martinvonz). · Explain WhyFeb 10 2019, 8:59 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/logcmdutil.py (3 lines)
Mtests/test-diffstat.t (11 lines)

Diff 14011

mercurial/logcmdutil.py

return f[len(relroot):] return f[len(relroot):]
pathfn = compose(relrootpathfn, pathfn) pathfn = compose(relrootpathfn, pathfn)
if stat: if stat:
diffopts = diffopts.copy(context=0, noprefix=False) diffopts = diffopts.copy(context=0, noprefix=False)
width = 80 width = 80
if not ui.plain(): if not ui.plain():
width = ui.termwidth() - graphwidth width = ui.termwidth() - graphwidth
# If an explicit --root was given, don't respect ui.relative-paths
if not relroot:
pathfn = compose(scmutil.getuipathfn(repo), pathfn)
chunks = ctx2.diff(ctx1, match, changes, opts=diffopts, pathfn=pathfn, chunks = ctx2.diff(ctx1, match, changes, opts=diffopts, pathfn=pathfn,
copysourcematch=copysourcematch, copysourcematch=copysourcematch,
hunksfilterfn=hunksfilterfn) hunksfilterfn=hunksfilterfn)
if fp is not None or ui.canwritewithoutlabels(): if fp is not None or ui.canwritewithoutlabels():
out = fp or ui out = fp or ui
if stat: if stat:

tests/test-diffstat.t

warning: dir2 not inside relative root dir1 warning: dir2 not inside relative root dir1
$ hg diff --stat --root dir1 -I dir1/old $ hg diff --stat --root dir1 -I dir1/old
$ cd dir1 $ cd dir1
$ hg diff --stat . $ hg diff --stat .
dir1/new | 1 + dir1/new | 1 +
1 files changed, 1 insertions(+), 0 deletions(-) 1 files changed, 1 insertions(+), 0 deletions(-)
$ hg diff --stat . --config ui.relative-paths=yes
new | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
$ hg diff --stat --root . $ hg diff --stat --root .
new | 1 + new | 1 +
1 files changed, 1 insertions(+), 0 deletions(-) 1 files changed, 1 insertions(+), 0 deletions(-)
$ 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(-)
$ hg diff --stat --root ../dir1 ../dir2 $ hg diff --stat --root ../dir1 ../dir2
warning: ../dir2 not inside relative root . warning: ../dir2 not inside relative root .
$ hg diff --stat --root . -I old $ hg diff --stat --root . -I old
$ cd .. $ cd ..
Files with lines beginning with '--' or '++' should be properly counted in diffstat Files with lines beginning with '--' or '++' should be properly counted in diffstat