a/mercurial/scmutil.py

+++ b/mercurial/scmutil.py
@@ -51,8 +51,10 @@
)
if pycompat.iswindows:
+ from . import windows as platform
from . import scmwindows as scmplatform
else:
+ from . import posix as platform
from . import scmposix as scmplatform

It's util.localpath().

@@ -757,7 +759,7 @@
    pathto = repo.pathto
    return lambda f: pathto(f, cwd)
else:
return lambda f: f

+ return platform.localpath

I've removed this since it seemed unrelated to this specific patch. It might
break some Windows tests, but it should already be broken since a997163e7fae.
Some (or all?) uipathfn()s have to respect ui.slash config on Windows.

In D5907#86561, @yuja wrote:
a/mercurial/scmutil.py

+++ b/mercurial/scmutil.py
@@ -51,8 +51,10 @@
)
if pycompat.iswindows:
+ from . import windows as platform
from . import scmwindows as scmplatform
else:
+ from . import posix as platform
from . import scmposix as scmplatform
It's util.localpath().
@@ -757,7 +759,7 @@
    pathto = repo.pathto
    return lambda f: pathto(f, cwd)
else:
return lambda f: f

+ return platform.localpath
I've removed this since it seemed unrelated to this specific patch.

That was just something I was experimenting with and must have accidentally amended in. Thanks for fixing!

It might
break some Windows tests, but it should already be broken since a997163e7fae.
Some (or all?) uipathfn()s have to respect ui.slash config on Windows.

Did that commit change any behavior on Windows? I was trying to figure out where the conversion to Windows paths was done and thought it seemed like it was mostly just done in util.pathto(), so e.g. m.rel() would use backslashes and m.abs() would use slashes. (I just learned that there is a deprecated ui.slash config too, but that doesn't seem to change much.)

> It might
>  break some Windows tests, but it should already be broken since https://phab.mercurial-scm.org/rHGa997163e7fae2fe933f8d0c6d1013205befd1ee4.
>  Some (or all?) `uipathfn()`s have to respect `ui.slash` config on Windows.
Did that commit change any behavior on Windows?

Probably. pathto(f, cwd='') would return backslash path on Windows.

I was trying to figure out where the conversion to Windows paths was done and thought it seemed like it was mostly just done in util.pathto(), so e.g. m.rel() would use backslashes and m.abs() would use slashes. (I just learned that there is a deprecated ui.slash config too, but that doesn't seem to change much.)

Correct. Path handling on Windows seemed inconsistent from the start. Some
commands used to use dirstate.pathto() which always returns backslash/slash
paths depending on ui.slash, and the others using m.rel|abs|uipath() don't.

Since we have scmutil.getuipathfn() now, maybe we can fix the inconsistency?

In D5907#86625, @yuja wrote:

> It might
>  break some Windows tests, but it should already be broken since https://phab.mercurial-scm.org/rHGa997163e7fae2fe933f8d0c6d1013205befd1ee4.
>  Some (or all?) `uipathfn()`s have to respect `ui.slash` config on Windows.
Did that commit change any behavior on Windows?

Probably. pathto(f, cwd='') would return backslash path on Windows.

getuipathfn() uses repo.pathto() when a relative path was requested (including by setting legacyrelativevalue=True or forcerelativevalue=True), so I think there shouldn't be much change in behavior with that commit.

I was trying to figure out where the conversion to Windows paths was done and thought it seemed like it was mostly just done in util.pathto(), so e.g. m.rel() would use backslashes and m.abs() would use slashes. (I just learned that there is a deprecated ui.slash config too, but that doesn't seem to change much.)

Correct. Path handling on Windows seemed inconsistent from the start. Some
commands used to use dirstate.pathto() which always returns backslash/slash
paths depending on ui.slash, and the others using m.rel|abs|uipath() don't.
Since we have scmutil.getuipathfn() now, maybe we can fix the inconsistency?

Yep, I was going to switch from lambda f: f to util.localpath for repo-relative paths. I was leaving that for when I'm done with the rest in case it affects tests on Windows, so they don't need to be updated several times.

In D5907#86625, @yuja wrote:
> It might
>  break some Windows tests, but it should already be broken since https://phab.mercurial-scm.org/rHGa997163e7fae2fe933f8d0c6d1013205befd1ee4.
>  Some (or all?) `uipathfn()`s have to respect `ui.slash` config on Windows.
Did that commit change any behavior on Windows?
Probably. pathto(f, cwd='') would return backslash path on Windows.

I was trying to figure out where the conversion to Windows paths was done and thought it seemed like it was mostly just done in util.pathto(), so e.g. m.rel() would use backslashes and m.abs() would use slashes. (I just learned that there is a deprecated ui.slash config too, but that doesn't seem to change much.)

Correct. Path handling on Windows seemed inconsistent from the start. Some
commands used to use dirstate.pathto() which always returns backslash/slash
paths depending on ui.slash, and the others using m.rel|abs|uipath() don't.
Since we have scmutil.getuipathfn() now, maybe we can fix the inconsistency?

`getuipathfn()` uses `repo.pathto()` when a relative path was requested (including by setting `legacyrelativevalue=True` or `forcerelativevalue=True`), so I think there shouldn't be much change in behavior with that commit.

But the default of hg status is relative=False, so the status output
would have significant change on Windows.

In D5907#86706, @yuja wrote:
`getuipathfn()` uses `repo.pathto()` when a relative path was requested (including by setting `legacyrelativevalue=True` or `forcerelativevalue=True`), so I think there shouldn't be much change in behavior with that commit.
But the default of hg status is relative=False, so the status output
would have significant change on Windows.

Ohhh, now I see! hg status changed because it used repo.pathto(f, cwd='') in the non-relative case, and repo.pathto() calls uitil.localpath(). I think most or all of the other commands I've changed with recent patches simply use f the non-relative case. So I have hopefully only broken hg status. But I'll hopefully fix almost all of them to use native paths soon :)

			Path	Packages
M			mercurial/cmdutil.py (3 lines)
M			tests/test-copy.t (17 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	13932		Feb 8 2019, 3:46 PM	★	★
Diff 2	13933		Feb 8 2019, 3:59 PM	★	★
Diff 3	13934		Feb 8 2019, 4:00 PM	★	★
Diff 4	13977		Feb 9 2019, 5:25 PM	★	★
Diff 5	13989	rHGe41449818bee3c3251e6b2c9c895e9dfaf70ebb1	Feb 8 2019, 4:00 PM	★	★

	# hgsep => pathname that uses "/" to separate directories			# hgsep => pathname that uses "/" to separate directories
	# ossep => pathname that uses os.sep to separate directories			# ossep => pathname that uses os.sep to separate directories
	cwd = repo.getcwd()			cwd = repo.getcwd()
	targets = {}			targets = {}
	after = opts.get("after")			after = opts.get("after")
	dryrun = opts.get("dry_run")			dryrun = opts.get("dry_run")
	wctx = repo[None]			wctx = repo[None]

				uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
	def walkpat(pat):			def walkpat(pat):
	srcs = []			srcs = []
	if after:			if after:
	badstates = '?'			badstates = '?'
	else:			else:
	badstates = '?r'			badstates = '?r'
	m = scmutil.match(wctx, [pat], opts, globbed=True)			m = scmutil.match(wctx, [pat], opts, globbed=True)
	for abs in wctx.walk(m):			for abs in wctx.walk(m):
	state = repo.dirstate[abs]			state = repo.dirstate[abs]
	rel = m.rel(abs)			rel = uipathfn(abs)
	exact = m.exact(abs)			exact = m.exact(abs)
	if state in badstates:			if state in badstates:
	if exact and state == '?':			if exact and state == '?':
	ui.warn(_('%s: not copying - file is not managed\n') % rel)			ui.warn(_('%s: not copying - file is not managed\n') % rel)
	if exact and state == 'r':			if exact and state == 'r':
	ui.warn(_('%s: not copying - file has been marked for'			ui.warn(_('%s: not copying - file has been marked for'
	' remove\n') % rel)			' remove\n') % rel)
	continue			continue

	$ echo foo > foo			$ echo foo > foo
	should fail - foo is not managed			should fail - foo is not managed
	$ hg mv foo bar			$ hg mv foo bar
	foo: not copying - file is not managed			foo: not copying - file is not managed
	abort: no files to copy			abort: no files to copy
	[255]			[255]
	$ hg st -A			$ hg st -A
	? foo			? foo
				respects ui.relative-paths
				$ mkdir dir
				$ cd dir
				$ hg mv ../foo ../bar
				../foo: not copying - file is not managed
				abort: no files to copy
				[255]
				$ hg mv ../foo ../bar --config ui.relative-paths=yes
				../foo: not copying - file is not managed
				abort: no files to copy
				[255]
				$ hg mv ../foo ../bar --config ui.relative-paths=no
				foo: not copying - file is not managed
				abort: no files to copy
				[255]
				$ cd ..
				$ rmdir dir
	$ hg add foo			$ hg add foo
	dry-run; print a warning that this is not a real copy; foo is added			dry-run; print a warning that this is not a real copy; foo is added
	$ hg mv --dry-run foo bar			$ hg mv --dry-run foo bar
	foo has not been committed yet, so no copy data will be stored for bar.			foo has not been committed yet, so no copy data will be stored for bar.
	$ hg st -A			$ hg st -A
	A foo			A foo
	should print a warning that this is not a real copy; bar is added			should print a warning that this is not a real copy; bar is added
	$ hg mv foo bar			$ hg mv foo bar

This is an archive of the discontinued Mercurial Phabricator instance.

copy: respect ui.relative-paths in copy/rename
ClosedPublic

Details

Diff Detail

Event Timeline

Revision Contents
Changeset List

Diff 13989

mercurial/cmdutil.py

tests/test-copy.t