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.

Download Raw Diff

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

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

martinvonz created this revision.Feb 8 2019, 3:30 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptFeb 8 2019, 3:30 AM

Herald added a subscriber: mercurial-devel. · View Herald Transcript

martinvonz added a child revision: D5899: subrepo: use relative path for "already tracked" message.Feb 9 2019, 5:21 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?

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

martinvonz added a child revision: D5921: scmutil: remove special handling of pats==("",) in matchandpats() (API).Feb 10 2019, 1:19 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

			Path	Packages
M			mercurial/logcmdutil.py (3 lines)
M			tests/test-diffstat.t (11 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	13910		Feb 8 2019, 3:30 AM	★	★
Diff 2	14001		Feb 10 2019, 1:08 AM	★	★
Diff 3	14011	rHGdb69a763bc893e06b1ae338ba9719c60970ecfe3	Jan 31 2019, 6:35 PM	★	★

Commit	Parents	Author	Summary	Date
		Martin von Zweigbergk		Jan 31 2019, 6:35 PM

Status	Author	Revision
Closed	martinvonz	D5916 scmutil: respect ui.relative-paths in default match.badfn
Closed	martinvonz	D5915 cmdutil: migrate previously missed instances to uipathfn
Closed	martinvonz	D5914 cat: respect ui.relative-paths for "skipping missing subrepository"
Closed	martinvonz	D5913 addremove: use uipathfn instead of m.rel() for recorded similatity message
Closed	martinvonz	D5912 forget: use relative paths for --interactive
Closed	martinvonz	D5910 automv: respect ui.relative-paths
Closed	martinvonz	D5909 debugwalk: avoid match.rel() and use repo.pathto() instead
Closed	martinvonz	D5908 match: delete unused abs() (API)
Closed	martinvonz	D5907 copy: respect ui.relative-paths in copy/rename
Closed	martinvonz	D5906 match: delete unused uipath() and _uipathrelative (API)
Closed	martinvonz	D5905 diff: respect ui.relative-paths for warning about path outside --root
Closed	martinvonz	D5904 largefiles: use uipathfn instead of match.{rel,uipath}() (API)
Closed	martinvonz	D5911 forget: pass around uipathfn and use instead of m.rel() (API)
Closed	martinvonz	D5903 addremove: pass around uipathfn and use instead of m.uipath() (API)
Closed	martinvonz	D5902 remove: pass around uipathfn and use instead of m.rel() (API)
Closed	martinvonz	D5901 add: pass around uipathfn and use instead of m.rel() (API)
Closed	martinvonz	D5900 subrepo: (mostly) use relative path in "skipping missing subrepository"
Closed	martinvonz	D5899 subrepo: use relative path for "already tracked" message
Closed	martinvonz	D5924 match: delete unused argument "listsubrepos" from _buildmatch()
Closed	martinvonz	D5923 match: delete unused rel() (API)
Closed	martinvonz	D5922 largefiles: get cwd and relative paths from repo instead of matcher
Closed	martinvonz	D5921 scmutil: remove special handling of pats==("",) in matchandpats() (API)
Closed	martinvonz	D5896 diff: make --stat respect ui.relative-paths
Closed	martinvonz	D5895 diff: make `hg diff --root=subrepo` work
Closed	martinvonz	D5894 patch: replace "prefix" and "relroot" arguments by "pathfn" (API)
Closed	martinvonz	D5893 patch: accept second matcher that applies only to copy sources (API)
Closed	martinvonz	D5892 patch: let caller pass in root-filtering matcher (API)
Closed	martinvonz	D5891 patch: pass in context objects into diffhunks() (API)

Diff 13910

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