This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3627

status: add a config knob for setting default of --terse
ClosedPublic

Authored by durin42 on May 20 2018, 1:57 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG18424aeece7f: status: add a config knob for setting default of --terse
Summary

I want --terse=u basically 100% of the time, but there's not a good
way to do that before this patch.

I'm very unhappy with how the default value for --terse looks rigt
now, but it does *work*. The alternative would be to define an
"optional string" flag type using fancyopts.customopt and then use
that, leaving the default as None. Does anyone have a strong
preference for that, or a better idea?

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 created this revision.May 20 2018, 1:57 AM
pulkit accepted this revision.May 20 2018, 4:06 PM
pulkit added a subscriber: pulkit.

I'm very unhappy with how the default value for --terse looks rigt
now, but it does *work*. The alternative would be to define an
"optional string" flag type using fancyopts.customopt and then use
that, leaving the default as None. Does anyone have a strong
preference for that, or a better idea?

I am fine with the current approach. Queued the series, many thanks!

Closed by commit rHG18424aeece7f: status: add a config knob for setting default of --terse (authored by durin42). · Explain WhyMay 20 2018, 4:15 PM
This revision was automatically updated to reflect the committed changes.
martinvonz added a subscriber: martinvonz.May 29 2018, 7:44 PM
In D3627#57185, @pulkit wrote:

I'm very unhappy with how the default value for --terse looks rigt
now, but it does *work*. The alternative would be to define an
"optional string" flag type using fancyopts.customopt and then use
that, leaving the default as None. Does anyone have a strong
preference for that, or a better idea?

I am fine with the current approach. Queued the series, many thanks!

Note that the current value is visible in hg help -v status:

-t --terse VALUE         show the terse output (EXPERIMENTAL) (default:
                         nothing)

Probably not a big deal, but I thought I'd mention it.

mercurial/help/config.txt
446

Typo in "condenes"

Revision Contents
Changeset List

Diff 8835

mercurial/commands.py

raise error.RepoError(_("there is no Mercurial repository here" raise error.RepoError(_("there is no Mercurial repository here"
" (.hg not found)")) " (.hg not found)"))
s = wireprotoserver.sshserver(ui, repo) s = wireprotoserver.sshserver(ui, repo)
s.serve_forever() s.serve_forever()
service = server.createservice(ui, repo, opts) service = server.createservice(ui, repo, opts)
return server.runservice(opts, initfn=service.init, runfn=service.run) return server.runservice(opts, initfn=service.init, runfn=service.run)
_NOTTERSE = 'nothing'
@command('^status|st', @command('^status|st',
[('A', 'all', None, _('show status of all files')), [('A', 'all', None, _('show status of all files')),
('m', 'modified', None, _('show only modified files')), ('m', 'modified', None, _('show only modified files')),
('a', 'added', None, _('show only added files')), ('a', 'added', None, _('show only added files')),
('r', 'removed', None, _('show only removed files')), ('r', 'removed', None, _('show only removed files')),
('d', 'deleted', None, _('show only deleted (but tracked) files')), ('d', 'deleted', None, _('show only deleted (but tracked) files')),
('c', 'clean', None, _('show only files without changes')), ('c', 'clean', None, _('show only files without changes')),
('u', 'unknown', None, _('show only unknown (not tracked) files')), ('u', 'unknown', None, _('show only unknown (not tracked) files')),
('i', 'ignored', None, _('show only ignored files')), ('i', 'ignored', None, _('show only ignored files')),
('n', 'no-status', None, _('hide status prefix')), ('n', 'no-status', None, _('hide status prefix')),
('t', 'terse', '', _('show the terse output (EXPERIMENTAL)')), ('t', 'terse', _NOTTERSE, _('show the terse output (EXPERIMENTAL)')),
('C', 'copies', None, _('show source of copied files')), ('C', 'copies', None, _('show source of copied files')),
('0', 'print0', None, _('end filenames with NUL, for use with xargs')), ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
('', 'rev', [], _('show difference from revision'), _('REV')), ('', 'rev', [], _('show difference from revision'), _('REV')),
('', 'change', '', _('list the changed files of a revision'), _('REV')), ('', 'change', '', _('list the changed files of a revision'), _('REV')),
] + walkopts + subrepoopts + formatteropts, ] + walkopts + subrepoopts + formatteropts,
_('[OPTION]... [FILE]...'), _('[OPTION]... [FILE]...'),
inferrepo=True, inferrepo=True,
intents={INTENT_READONLY}) intents={INTENT_READONLY})
Returns 0 on success. Returns 0 on success.
""" """
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
revs = opts.get('rev') revs = opts.get('rev')
change = opts.get('change') change = opts.get('change')
terse = opts.get('terse') terse = opts.get('terse')
if terse is _NOTTERSE:
if revs:
terse = ''
else:
terse = ui.config('commands', 'status.terse')
if revs and change: if revs and change:
msg = _('cannot specify --rev and --change at the same time') msg = _('cannot specify --rev and --change at the same time')
raise error.Abort(msg) raise error.Abort(msg)
elif revs and terse: elif revs and terse:
msg = _('cannot use --terse with --rev') msg = _('cannot use --terse with --rev')
raise error.Abort(msg) raise error.Abort(msg)
elif change: elif change:

mercurial/configitems.py

default=list, default=list,
) )
coreconfigitem('commands', 'status.relative', coreconfigitem('commands', 'status.relative',
default=False, default=False,
) )
coreconfigitem('commands', 'status.skipstates', coreconfigitem('commands', 'status.skipstates',
default=[], default=[],
) )
coreconfigitem('commands', 'status.terse',
default='',
)
coreconfigitem('commands', 'status.verbose', coreconfigitem('commands', 'status.verbose',
default=False, default=False,
) )
coreconfigitem('commands', 'update.check', coreconfigitem('commands', 'update.check',
default=None, default=None,
# Deprecated, remove after 4.4 release # Deprecated, remove after 4.4 release
alias=[('experimental', 'updatecheck')] alias=[('experimental', 'updatecheck')]
) )

mercurial/help/config.txt

``commands`` ``commands``
------------ ------------
``status.relative`` ``status.relative``
Make paths in :hg:`status` output relative to the current directory. Make paths in :hg:`status` output relative to the current directory.
(default: False) (default: False)
``status.terse``
Default value for the --terse flag, which condenes status output.
martinvonzUnsubmitted
Not Done

Typo in "condenes"

martinvonz: Typo in "condenes"
(default: empty)
``update.check`` ``update.check``
Determines what level of checking :hg:`update` will perform before moving Determines what level of checking :hg:`update` will perform before moving
to a destination revision. Valid values are ``abort``, ``none``, to a destination revision. Valid values are ``abort``, ``none``,
``linear``, and ``noconflict``. ``abort`` always fails if the working ``linear``, and ``noconflict``. ``abort`` always fails if the working
directory has uncommitted changes. ``none`` performs no checking, and may directory has uncommitted changes. ``none`` performs no checking, and may
result in a merge with uncommitted changes. ``linear`` allows any update result in a merge with uncommitted changes. ``linear`` allows any update
as long as it follows a straight line in the revision history, and may as long as it follows a straight line in the revision history, and may
trigger a merge with uncommitted changes. ``noconflict`` will allow any trigger a merge with uncommitted changes. ``noconflict`` will allow any

tests/test-status-terse.t

? x/n/ ? x/n/
? y/ ? y/
Trying with --rev Trying with --rev
$ hg status --terse marduic --rev 0 --rev 1 $ hg status --terse marduic --rev 0 --rev 1
abort: cannot use --terse with --rev abort: cannot use --terse with --rev
[255] [255]
Config item to set the default terseness
$ cat <<EOF >> $HGRCPATH
> [commands]
> status.terse = u
> EOF
$ hg status -mu
M x/aa
M x/bb
? a
? b
? x/l/
? x/m/
? x/n/
? y/
Command line flag overrides the default
$ hg status --terse=
M x/aa
M x/bb
? a
? b
? x/l/aa
? x/l/u/a/bb
? x/l/u/bb
? x/m/aa
? x/n/aa
? y/l
? y/m
$ hg status --terse=mardu
M x/aa
M x/bb
? a
? b
? x/l/
? x/m/
? x/n/
? y/
Specifying --rev should still work, with the terseness disabled.
$ hg status --rev 0
M x/aa
M x/bb
? a
? b
? x/l/aa
? x/l/u/a/bb
? x/l/u/bb
? x/m/aa
? x/n/aa
? y/l
? y/m