This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12579

chg: make `chg --cwd $anything -R $relativepath` behave better
ClosedPublic

Authored by valentin.gatienbaron on Apr 20 2022, 11:34 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG22fc694572ea: chg: make `chg --cwd $anything -R $relativepath` behave better
Summary

We're seeing this kind of issue:

$ (cd repo1; chg --cwd ../repo2 -R .)
chg: abort: too many redirections.
Please make sure $path/hg is not a wrapper which changes sensitive environment variables before executing hg. If you have to use a wrapper, wrap chg instead of hg.
[255]

chgserver is interpreting -R as relative to its cwd, instead of
relative to --cwd like regular hg does, which I think causes an
inconsistency leading to the above.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

valentin.gatienbaron edited the summary of this revision. (Show Details)Apr 20 2022, 11:35 AM
Alphare accepted this revision.Apr 20 2022, 11:55 AM
This revision is now accepted and ready to land.Apr 20 2022, 11:55 AM
Alphare added a comment.Apr 20 2022, 11:56 AM

I'll queue this on stable.

Alphare added a comment.Apr 21 2022, 5:33 AM

Unfortunately, this breaks a lot of the tests. I think the condition is too wide since wd is always populated at the top of the function.
https://foss.heptapod.net/mercurial/mercurial-devel/-/pipelines/53316

I'll prune the change, you can send it again in a different revision.

valentin.gatienbaron added a comment.Apr 21 2022, 9:36 AM

Oops, clearly I should have run all the tests.
Although even though I didn't realize that wd was filled in by the function, this should have merely caused small differences of output. We see that in the failures, but we also errors with hg -R union:..., so the change is maybe not quite right.

Revision Contents
Changeset List

PathPackages
Mmercurial/dispatch.py (2 lines)
Mtests/test-chg.t (10 lines)

Diff 33297

mercurial/dispatch.py

else: else:
lui = ui.copy() lui = ui.copy()
if rcutil.use_repo_hgrc(): if rcutil.use_repo_hgrc():
_readsharedsourceconfig(lui, path) _readsharedsourceconfig(lui, path)
lui.readconfig(os.path.join(path, b".hg", b"hgrc"), path) lui.readconfig(os.path.join(path, b".hg", b"hgrc"), path)
lui.readconfig(os.path.join(path, b".hg", b"hgrc-not-shared"), path) lui.readconfig(os.path.join(path, b".hg", b"hgrc-not-shared"), path)
if rpath: if rpath:
if wd is not None:
rpath = os.path.join(wd, rpath)
path = urlutil.get_clone_path(lui, rpath)[0] path = urlutil.get_clone_path(lui, rpath)[0]
lui = ui.copy() lui = ui.copy()
if rcutil.use_repo_hgrc(): if rcutil.use_repo_hgrc():
_readsharedsourceconfig(lui, path) _readsharedsourceconfig(lui, path)
lui.readconfig(os.path.join(path, b".hg", b"hgrc"), path) lui.readconfig(os.path.join(path, b".hg", b"hgrc"), path)
lui.readconfig(os.path.join(path, b".hg", b"hgrc-not-shared"), path) lui.readconfig(os.path.join(path, b".hg", b"hgrc-not-shared"), path)
return path, lui return path, lui

tests/test-chg.t

YYYY/MM/DD HH:MM:SS (PID)> log -R cached YYYY/MM/DD HH:MM:SS (PID)> log -R cached
YYYY/MM/DD HH:MM:SS (PID)> loaded repo into cache: $TESTTMP/cached (in ...s) YYYY/MM/DD HH:MM:SS (PID)> loaded repo into cache: $TESTTMP/cached (in ...s)
YYYY/MM/DD HH:MM:SS (PID)> clone cached cached2 YYYY/MM/DD HH:MM:SS (PID)> clone cached cached2
YYYY/MM/DD HH:MM:SS (PID)> id -R cached2 YYYY/MM/DD HH:MM:SS (PID)> id -R cached2
YYYY/MM/DD HH:MM:SS (PID)> loaded repo into cache: $TESTTMP/cached2 (in ...s) YYYY/MM/DD HH:MM:SS (PID)> loaded repo into cache: $TESTTMP/cached2 (in ...s)
YYYY/MM/DD HH:MM:SS (PID)> log -R cached YYYY/MM/DD HH:MM:SS (PID)> log -R cached
YYYY/MM/DD HH:MM:SS (PID)> loaded repo into cache: $TESTTMP/cached (in ...s) YYYY/MM/DD HH:MM:SS (PID)> loaded repo into cache: $TESTTMP/cached (in ...s)
-R is interpreted relative to --cwd
$ hg init repo1
$ hg init repo2
$ printf "[alias]\nx=y\n" >> repo1/.hg/hgrc
$ printf "[alias]\nx=z\n" >> repo2/.hg/hgrc
$ (cd repo1; chg --cwd ../repo2 -R . show alias.x)
z
Test that chg works (sets to the user's actual LC_CTYPE) even when python Test that chg works (sets to the user's actual LC_CTYPE) even when python
"coerces" the locale (py3.7+) "coerces" the locale (py3.7+)
$ cat > $TESTTMP/debugenv.py <<EOF $ cat > $TESTTMP/debugenv.py <<EOF
> from mercurial import encoding > from mercurial import encoding
> from mercurial import registrar > from mercurial import registrar
> cmdtable = {} > cmdtable = {}
> command = registrar.command(cmdtable) > command = registrar.command(cmdtable)
Run 4 > 3 * Run 1: False Run 4 > 3 * Run 1: False
(Disabling with --no-profile on the commandline still works, but isn't permanent) (Disabling with --no-profile on the commandline still works, but isn't permanent)
$ newchg log -r . --no-profile $ newchg log -r . --no-profile
$ filteredchg log -r . $ filteredchg log -r .
Sample count: * (glob) Sample count: * (glob)
$ filteredchg log -r . --no-profile $ filteredchg log -r . --no-profile
$ filteredchg log -r . $ filteredchg log -r .
Sample count: * (glob) Sample count: * (glob)
$ cd ../