This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5802

status: if ui.relative-paths=no, don't use relative paths even with patterns
ClosedPublic

Authored by martinvonz on Feb 2 2019, 2:12 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG5f827e9ce870: status: if ui.relative-paths=no, don't use relative paths even with patterns
rHG31ece2290403: status: if ui.relative-paths=no, don't use relative paths even with patterns
Summary

Without ui.relative-paths or command.status.relative set, you get this
behavior:

hgext$ hg st
M hgext/narrow/narrowrepo.py
hgext$ hg st .
M narrow/narrowrepo.py
hgext$ hg st narrow
M narrow/narrowrepo.py

I think it's surprising that some of those produce relative paths. I
suspect it works that way because "hg st ." was an easy way of getting
relative paths. Perhaps not much thought was given to how it should
behave when the pattern was not ".". It also feels wrong to conflate
the request for relative patterns with matching of of patterns.

Since we can now start fresh and define the behavior of
ui.relative-paths as we want, I suggest we make ui.relative-paths=no
consistently not give relative paths. So that's what this paths starts
doing for hg status.

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 2 2019, 2:12 AM
martinvonz updated this revision to Diff 13734.Feb 3 2019, 12:46 PM
martinvonz updated this revision to Diff 13813.Feb 5 2019, 12:48 PM
Closed by commit rHG31ece2290403: status: if ui.relative-paths=no, don't use relative paths even with patterns (authored by martinvonz). · Explain WhyFeb 5 2019, 5:45 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (11 lines)
Mtests/test-status.t (13 lines)

Diff 13838

mercurial/commands.py

elif change: elif change:
repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn') repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
ctx2 = scmutil.revsingle(repo, change, None) ctx2 = scmutil.revsingle(repo, change, None)
ctx1 = ctx2.p1() ctx1 = ctx2.p1()
else: else:
repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn') repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
ctx1, ctx2 = scmutil.revpair(repo, revs) ctx1, ctx2 = scmutil.revpair(repo, revs)
relative = None forcerelativevalue = None
if pats: if ui.hasconfig('commands', 'status.relative'):
relative = True forcerelativevalue = ui.configbool('commands', 'status.relative')
elif ui.hasconfig('commands', 'status.relative'): uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats),
relative = ui.configbool('commands', 'status.relative') forcerelativevalue=forcerelativevalue)
uipathfn = scmutil.getuipathfn(repo, forcerelativevalue=relative)
if opts.get('print0'): if opts.get('print0'):
end = '\0' end = '\0'
else: else:
end = '\n' end = '\n'
copy = {} copy = {}
states = 'modified added removed deleted unknown ignored clean'.split() states = 'modified added removed deleted unknown ignored clean'.split()
show = [k for k in states if opts.get(k)] show = [k for k in states if opts.get(k)]

tests/test-status.t

? in_a ? in_a
? ../b/1/in_b_1 ? ../b/1/in_b_1
? ../b/2/in_b_2 ? ../b/2/in_b_2
? ../b/in_b ? ../b/in_b
? ../in_root (glob) ? ../in_root (glob)
relative paths can be requested relative paths can be requested
$ cat >> $HGRCPATH <<EOF $ hg status --cwd a --config ui.relative-paths=yes
> [ui]
> relative-paths = True
> EOF
$ hg status --cwd a
? 1/in_a_1 ? 1/in_a_1
? in_a ? in_a
? ../b/1/in_b_1 ? ../b/1/in_b_1
? ../b/2/in_b_2 ? ../b/2/in_b_2
? ../b/in_b ? ../b/in_b
? ../in_root ? ../in_root
$ hg status --cwd a . --config ui.relative-paths=legacy
? 1/in_a_1
? in_a
$ hg status --cwd a . --config ui.relative-paths=no
? a/1/in_a_1
? a/in_a
commands.status.relative overrides ui.relative-paths commands.status.relative overrides ui.relative-paths
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [ui] > [ui]
> relative-paths = False > relative-paths = False
> [commands] > [commands]
> status.relative = True > status.relative = True
> EOF > EOF