comparison hgext/show.py @ 31768:264baeef3588

show: new extension for displaying various repository data Currently, Mercurial has a number of commands to show information. And, there are features coming down the pipe that will introduce more commands for showing information. Currently, when introducing a new class of data or a view that we wish to expose to the user, the strategy is to introduce a new command or overload an existing command, sometimes both. For example, there is a desire to formalize the wip/smartlog/underway/mine functionality that many have devised. There is also a desire to introduce a "topics" concept. Others would like views of "the current stack." In the current model, we'd need a new command for wip/smartlog/etc (that behaves a lot like a pre-defined alias of `hg log`). For topics, we'd likely overload `hg topic[s]` to both display and manipulate topics. Adding new commands for every pre-defined query doesn't scale well and pollutes `hg help`. Overloading commands to perform read-only and write operations is arguably an UX anti-pattern: while having all functionality for a given concept in one command is nice, having a single command doing multiple discrete operations is not. Furthermore, a user may be surprised that a command they thought was read-only actually changes something. We discussed this at the Mercurial 4.0 Sprint in Paris and decided that having a single command where we could hang pre-defined views of various data would be a good idea. Having such a command would: * Help prevent an explosion of new query-related commands * Create a clear separation between read and write operations (mitigates footguns) * Avoids overloading the meaning of commands that manipulate data (bookmark, tag, branch, etc) (while we can't take away the existing behavior for BC reasons, we now won't introduce this behavior on new commands) * Allows users to discover informational views more easily by aggregating them in a single location * Lowers the barrier to creating the new views (since the barrier to creating a top-level command is relatively high) So, this commit introduces the `hg show` command via the "show" extension. This command accepts a positional argument of the "view" to show. New views can be registered with a decorator. To prove it works, we implement the "bookmarks" view, which shows a table of bookmarks and their associated nodes. We introduce a new style to hold everything used by `hg show`. For our initial bookmarks view, the output varies from `hg bookmarks`: * Padding is performed in the template itself as opposed to Python * Revision integers are not shown * shortest() is used to display a 5 character node by default (as opposed to static 12 characters) I chose to implement the "bookmarks" view first because it is simple and shouldn't invite too much bikeshedding that detracts from the evaluation of `hg show` itself. But there is an important point to consider: we now have 2 ways to show a list of bookmarks. I'm not a fan of introducing multiple ways to do very similar things. So it might be worth discussing how we wish to tackle this issue for bookmarks, tags, branches, MQ series, etc. I also made the choice of explicitly declaring the default show template not part of the standard BC guarantees. History has shown that we make mistakes and poor choices with output formatting but can't fix these mistakes later because random tools are parsing output and we don't want to break these tools. Optimizing for human consumption is one of my goals for `hg show`. So, by not covering the formatting as part of BC, the barrier to future change is much lower and humans benefit. There are some improvements that can be made to formatting. For example, we don't yet use label() in the templates. We obviously want this for color. But I'm not sure if we should reuse the existing log.* labels or invent new ones. I figure we can punt that to a follow-up. At the aforementioned Sprint, we discussed and discarded various alternatives to `hg show`. We considered making `hg log <view>` perform this behavior. The main reason we can't do this is because a positional argument to `hg log` can be a file path and if there is a conflict between a path name and a view name, behavior is ambiguous. We could have introduced `hg log --view` or similar, but we felt that required too much typing (we don't want to require a command flag to show a view) and wasn't very discoverable. Furthermore, `hg log` is optimized for showing changelog data and there are things that `hg display` could display that aren't changelog centric. There were concerns about using "show" as the command name. Some users already have a "show" alias that is similar to `hg export`. There were also concerns that Git users adapted to `git show` would be confused by `hg show`'s different behavior. The main difference here is `git show` prints an `hg export` like view of the current commit by default and `hg show` requires an argument. `git show` can also display any Git object. `git show` does not support displaying more complex views: just single objects. If we implemented `hg show <hash>` or `hg show <identifier>`, `hg show` would be a superset of `git show`. Although, I'm hesitant to do that at this time because I view `hg show` as a higher-level querying command and there are namespace collisions between valid identifiers and registered views. There is also a prefix collision with `hg showconfig`, which is an alias of `hg config`. We also considered `hg view`, but that is already used by the "hgk" extension. `hg display` was also proposed at one point. It has a prefix collision with `hg diff`. General consensus was "show" or "view" are the best verbs. And since "view" was taken, "show" was chosen. There are a number of inline TODOs in this patch. Some of these represent decisions yet to be made. Others represent features requiring non-trivial complexity. Rather than bloat the patch or invite additional bikeshedding, I figured I'd document future enhancements via TODO so we can get a minimal implmentation landed. Something is better than nothing.
author Gregory Szorc <gregory.szorc@gmail.com>
date Fri, 24 Mar 2017 19:19:00 -0700
parents
children 45761ef1bc93
comparison
equal deleted inserted replaced
31767:15707e58fc3d 31768:264baeef3588
1 # show.py - Extension implementing `hg show`
2 #
3 # Copyright 2017 Gregory Szorc <gregory.szorc@gmail.com>
4 #
5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version.
7
8 """unified command to show various repository information (EXPERIMENTAL)
9
10 This extension provides the :hg:`show` command, which provides a central
11 command for displaying commonly-accessed repository data and views of that
12 data.
13 """
14
15 from __future__ import absolute_import
16
17 from mercurial.i18n import _
18 from mercurial import (
19 cmdutil,
20 commands,
21 error,
22 registrar,
23 )
24
25 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
26 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
27 # be specifying the version(s) of Mercurial they are tested with, or
28 # leave the attribute unspecified.
29 testedwith = 'ships-with-hg-core'
30
31 cmdtable = {}
32 command = cmdutil.command(cmdtable)
33
34 class showcmdfunc(registrar._funcregistrarbase):
35 """Register a function to be invoked for an `hg show <thing>`."""
36
37 # Used by _formatdoc().
38 _docformat = '%s -- %s'
39
40 def _extrasetup(self, name, func, fmtopic=None):
41 """Called with decorator arguments to register a show view.
42
43 ``name`` is the sub-command name.
44
45 ``func`` is the function being decorated.
46
47 ``fmtopic`` is the topic in the style that will be rendered for
48 this view.
49 """
50 func._fmtopic = fmtopic
51
52 showview = showcmdfunc()
53
54 @command('show', commands.formatteropts, _('VIEW'))
55 def show(ui, repo, view=None, template=None):
56 """show various repository information
57
58 A requested view of repository data is displayed.
59
60 If no view is requested, the list of available views is shown and the
61 command aborts.
62
63 .. note::
64
65 There are no backwards compatibility guarantees for the output of this
66 command. Output may change in any future Mercurial release.
67
68 Consumers wanting stable command output should specify a template via
69 ``-T/--template``.
70
71 List of available views:
72
73 """
74 if ui.plain() and not template:
75 raise error.Abort(_('"hg show" cannot be used in plain mode because '
76 'output is not stable'),
77 hint=_('unset HGPLAIN and invoke with -T/--template '
78 'to control output'))
79
80 views = showview._table
81
82 if not view:
83 ui.pager('show')
84 # TODO consider using formatter here so available views can be
85 # rendered to custom format.
86 ui.write(_('available views:\n'))
87 ui.write('\n')
88
89 for name, func in sorted(views.items()):
90 ui.write(('%s\n') % func.__doc__)
91
92 ui.write('\n')
93 raise error.Abort(_('no view requested'),
94 hint=_('use "hg show VIEW" to choose a view'))
95
96 # TODO use same logic as dispatch to perform prefix matching.
97 if view not in views:
98 raise error.Abort(_('unknown view: %s') % view,
99 hint=_('run "hg show" to see available views'))
100
101 template = template or 'show'
102 fmtopic = 'show%s' % views[view]._fmtopic
103
104 ui.pager('show')
105 with ui.formatter(fmtopic, {'template': template}) as fm:
106 return views[view](ui, repo, fm)
107
108 @showview('bookmarks', fmtopic='bookmarks')
109 def showbookmarks(ui, repo, fm):
110 """bookmarks and their associated changeset"""
111 marks = repo._bookmarks
112 if not len(marks):
113 # TODO json output is corrupted; consider using formatter
114 ui.write(_('(no bookmarks set)\n'))
115 return
116
117 active = repo._activebookmark
118 longestname = max(len(b) for b in marks)
119 # TODO consider exposing longest shortest(node).
120
121 for bm, node in sorted(marks.items()):
122 fm.startitem()
123 fm.context(ctx=repo[node])
124 fm.write('bookmark', '%s', bm)
125 fm.write('node', fm.hexfunc(node), fm.hexfunc(node))
126 fm.data(active=bm == active,
127 longestbookmarklen=longestname)
128
129 # Adjust the docstring of the show command so it shows all registered views.
130 # This is a bit hacky because it runs at the end of module load. When moved
131 # into core or when another extension wants to provide a view, we'll need
132 # to do this more robustly.
133 # TODO make this more robust.
134 longest = max(map(len, showview._table.keys()))
135 for key in sorted(showview._table.keys()):
136 cmdtable['show'][0].__doc__ += ' %s %s\n' % (
137 key.ljust(longest), showview._table[key]._origdoc)