This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5746

status: introduce higher-level ui.relative-paths
ClosedPublic

Authored by martinvonz on Jan 30 2019, 3:19 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG02186c6871ac: status: introduce higher-level ui.relative-paths
rHG6007bd6b2646: status: introduce higher-level ui.relative-paths
rHG784594080ad4: status: introduce higher-level ui.relative-paths
Summary

The existing commands.status.relative trumps the new config. We need
to keep the existing config around for compatibility. However, I don't
think we need to introduce similar command-specific options for other
commands when they learn to respec ui.relative-paths.

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.Jan 30 2019, 3:19 PM
pulkit accepted this revision.Jan 31 2019, 3:56 PM
Closed by commit rHG784594080ad4: status: introduce higher-level ui.relative-paths (authored by martinvonz). · Explain WhyJan 31 2019, 4:26 PM
This revision was automatically updated to reflect the committed changes.
martinvonz added a subscriber: mharbison72.Feb 8 2019, 12:55 PM

Btw, @mharbison72, I think now that we have this new getuipathfn(), we have a single place to update to get \-separated paths on Windows. I believe we should replace the lambda f: f by platform.localpath. That should give you local paths in output from more and more commands as we switch them over to using the function.

Revision Contents
Changeset List

Diff 13650

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 = pats or ui.configbool('commands', 'status.relative'): relative = None
if pats:
relative = True
elif ui.hasconfig('commands', 'status.relative'):
relative = ui.configbool('commands', 'status.relative')
uipathfn = scmutil.getuipathfn(repo, relative) uipathfn = scmutil.getuipathfn(repo, 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()

mercurial/configitems.py

default=False, default=False,
) )
coreconfigitem('ui', 'quiet', coreconfigitem('ui', 'quiet',
default=False, default=False,
) )
coreconfigitem('ui', 'quietbookmarkmove', coreconfigitem('ui', 'quietbookmarkmove',
default=False, default=False,
) )
coreconfigitem('ui', 'relative-paths',
default=False,
)
coreconfigitem('ui', 'remotecmd', coreconfigitem('ui', 'remotecmd',
default='hg', default='hg',
) )
coreconfigitem('ui', 'report_untrusted', coreconfigitem('ui', 'report_untrusted',
default=True, default=True,
) )
coreconfigitem('ui', 'rollback', coreconfigitem('ui', 'rollback',
default=True, default=True,

mercurial/help/config.txt

Additional information is available in the ``local`, ``base``, and ``other`` Additional information is available in the ``local`, ``base``, and ``other``
dicts. For example: ``{local.label}``, ``{base.name}``, or dicts. For example: ``{local.label}``, ``{base.name}``, or
``{other.islink}``. ``{other.islink}``.
``quiet`` ``quiet``
Reduce the amount of output printed. Reduce the amount of output printed.
(default: False) (default: False)
``relative-paths``
Prefer relative paths in the UI.
``remotecmd`` ``remotecmd``
Remote command to use for clone/push/pull operations. Remote command to use for clone/push/pull operations.
(default: ``hg``) (default: ``hg``)
``report_untrusted`` ``report_untrusted``
Warn if a ``.hg/hgrc`` file is ignored due to not being owned by a Warn if a ``.hg/hgrc`` file is ignored due to not being owned by a
trusted user or group. trusted user or group.
(default: True) (default: True)

mercurial/scmutil.py

if len(parents) > 1: if len(parents) > 1:
return parents return parents
if repo.ui.debugflag: if repo.ui.debugflag:
return [parents[0], repo[nullrev]] return [parents[0], repo[nullrev]]
if parents[0].rev() >= intrev(ctx) - 1: if parents[0].rev() >= intrev(ctx) - 1:
return [] return []
return parents return parents
def getuipathfn(repo, relative): def getuipathfn(repo, relative=None):
if relative is None:
relative = repo.ui.configbool('ui', 'relative-paths')
if relative: if relative:
cwd = repo.getcwd() cwd = repo.getcwd()
pathto = repo.pathto pathto = repo.pathto
return lambda f: pathto(f, cwd) return lambda f: pathto(f, cwd)
else: else:
return lambda f: f return lambda f: f
def expandpats(pats): def expandpats(pats):

tests/test-status.t

? ../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 $ cat >> $HGRCPATH <<EOF
> [ui]
> relative-paths = True
> EOF
$ hg status --cwd a
? 1/in_a_1
? in_a
? ../b/1/in_b_1
? ../b/2/in_b_2
? ../b/in_b
? ../in_root
commands.status.relative overrides ui.relative-paths
$ cat >> $HGRCPATH <<EOF
> [ui]
> relative-paths = False
> [commands] > [commands]
> status.relative = True > status.relative = True
> EOF > EOF
$ hg status --cwd a $ 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