This is an archive of the discontinued Mercurial Phabricator instance.

Differential D558

show: use consistent (and possibly shorter) node lengths
ClosedPublic

Authored by indygreg on Aug 28 2017, 11:55 PM.

Details

Reviewers
quark
durham
Group Reviewers
hg-reviewers
Commits
rHGe6b5e7329ff2: show: use consistent (and possibly shorter) node lengths
rHG98010c7a5745: show: use consistent (and possibly shorter) node lengths
Summary

hg show makes heavy use of shortest() to limit the length of the node
hash.

For the "stack" and "work" views, you are often looking at multiple
lines of similar output for "lines" of work. It is visually appeasing
for things to vertically align. A naive use of {shortest(node, N)}
could result in variable length nodes and for the first character of
the description to vary by a column or two.

We implement a function to determine the longest shortest prefix for
a set of revisions. The new function is used to determine the printed
node length for all hg show views.

.. feature::

show: use consistent node length in views

Our previous shortest node length of 5 was arbitrarily chosen.

shortest() already does the work of ensuring that a partial node
isn't ambiguous with an integer revision, which is our primary risk
of a collision for very short nodes. It should be safe to go with the
shortest node possible.

Existing code is also optimized to handle nodes as short as 4.

So, we decrease the minimum hash length from 5 to 4.

We also add a test demonstrating that prefix collisions increase the
node length.

.. feature::

show: decrease minimum displayed hash length from 5 to 4

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

indygreg created this revision.Aug 28 2017, 11:55 PM
quark requested changes to this revision.Aug 29 2017, 8:04 PM
quark added a subscriber: quark.

As Yuya said in another thread. 4 is more friendly to the C code.

This revision now requires changes to proceed.Aug 29 2017, 8:04 PM
durham added a subscriber: durham.Sep 1 2017, 2:55 PM

And 4 will make the hash be unique a little longer, in case people copy old output and expect it to work on a more recent repo.

indygreg edited the summary of this revision. (Show Details)Sep 14 2017, 12:19 AM
indygreg retitled this revision from show: decrease minimum node length from 5 to 3 to show: use consistent (and possibly shorter) node lengths.
indygreg updated this revision to Diff 1811.
durham accepted this revision.Sep 14 2017, 12:33 PM
Closed by commit rHG98010c7a5745: show: use consistent (and possibly shorter) node lengths (authored by indygreg). · Explain WhySep 15 2017, 10:14 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/show.py (40 lines)
Mtests/test-show-stack.t (110 lines)
Mtests/test-show-work.t (108 lines)
Mtests/test-show.t (26 lines)

Diff 1845

hgext/show.py

if not len(marks): if not len(marks):
# This is a bit hacky. Ideally, templates would have a way to # This is a bit hacky. Ideally, templates would have a way to
# specify an empty output, but we shouldn't corrupt JSON while # specify an empty output, but we shouldn't corrupt JSON while
# waiting for this functionality. # waiting for this functionality.
if not isinstance(fm, formatter.jsonformatter): if not isinstance(fm, formatter.jsonformatter):
ui.write(_('(no bookmarks set)\n')) ui.write(_('(no bookmarks set)\n'))
return return
revs = [repo[node].rev() for node in marks.values()]
active = repo._activebookmark active = repo._activebookmark
longestname = max(len(b) for b in marks) longestname = max(len(b) for b in marks)
# TODO consider exposing longest shortest(node). nodelen = longestshortest(repo, revs)
for bm, node in sorted(marks.items()): for bm, node in sorted(marks.items()):
fm.startitem() fm.startitem()
fm.context(ctx=repo[node]) fm.context(ctx=repo[node])
fm.write('bookmark', '%s', bm) fm.write('bookmark', '%s', bm)
fm.write('node', fm.hexfunc(node), fm.hexfunc(node)) fm.write('node', fm.hexfunc(node), fm.hexfunc(node))
fm.data(active=bm == active, fm.data(active=bm == active,
longestbookmarklen=longestname, longestbookmarklen=longestname,
nodelen=5) nodelen=nodelen)
@showview('stack', csettopic='stack') @showview('stack', csettopic='stack')
def showstack(ui, repo, displayer): def showstack(ui, repo, displayer):
"""current line of work""" """current line of work"""
wdirctx = repo['.'] wdirctx = repo['.']
if wdirctx.rev() == nullrev: if wdirctx.rev() == nullrev:
raise error.Abort(_('stack view only available when there is a ' raise error.Abort(_('stack view only available when there is a '
'working directory')) 'working directory'))
# merge or rebase targets. # merge or rebase targets.
if basectx: if basectx:
# TODO make this customizable? # TODO make this customizable?
newheads = set(repo.revs('heads(%d::) - %ld - not public()', newheads = set(repo.revs('heads(%d::) - %ld - not public()',
basectx.rev(), stackrevs)) basectx.rev(), stackrevs))
else: else:
newheads = set() newheads = set()
allrevs = set(stackrevs) | newheads | set([baserev])
nodelen = longestshortest(repo, allrevs)
try: try:
cmdutil.findcmd('rebase', commands.table) cmdutil.findcmd('rebase', commands.table)
haverebase = True haverebase = True
except (error.AmbiguousCommand, error.UnknownCommand): except (error.AmbiguousCommand, error.UnknownCommand):
haverebase = False haverebase = False
# TODO use templating. # TODO use templating.
# TODO consider using graphmod. But it may not be necessary given # TODO consider using graphmod. But it may not be necessary given
# our simplicity and the customizations required. # our simplicity and the customizations required.
# TODO use proper graph symbols from graphmod # TODO use proper graph symbols from graphmod
shortesttmpl = formatter.maketemplater(ui, '{shortest(node, 5)}') shortesttmpl = formatter.maketemplater(ui, '{shortest(node, %d)}' % nodelen)
def shortest(ctx): def shortest(ctx):
return shortesttmpl.render({'ctx': ctx, 'node': ctx.hex()}) return shortesttmpl.render({'ctx': ctx, 'node': ctx.hex()})
# We write out new heads to aid in DAG awareness and to help with decision # We write out new heads to aid in DAG awareness and to help with decision
# making on how the stack should be reconciled with commits made since the # making on how the stack should be reconciled with commits made since the
# branch point. # branch point.
if newheads: if newheads:
# Calculate distance from base so we can render the count and so we can # Calculate distance from base so we can render the count and so we can
ctx = repo[rev] ctx = repo[rev]
if i: if i:
ui.write(': ') ui.write(': ')
else: else:
ui.write(' ') ui.write(' ')
ui.write(('o ')) ui.write(('o '))
displayer.show(ctx, nodelen=5) displayer.show(ctx, nodelen=nodelen)
displayer.flush(ctx) displayer.flush(ctx)
ui.write('\n') ui.write('\n')
if i: if i:
ui.write(':/') ui.write(':/')
else: else:
ui.write(' /') ui.write(' /')
symbol = '@' if rev == wdirctx.rev() else 'o' symbol = '@' if rev == wdirctx.rev() else 'o'
if newheads: if newheads:
ui.write(': ') ui.write(': ')
else: else:
ui.write(' ') ui.write(' ')
ui.write(symbol, ' ') ui.write(symbol, ' ')
displayer.show(ctx, nodelen=5) displayer.show(ctx, nodelen=nodelen)
displayer.flush(ctx) displayer.flush(ctx)
ui.write('\n') ui.write('\n')
# TODO display histedit hint? # TODO display histedit hint?
if basectx: if basectx:
# Vertically and horizontally separate stack base from parent # Vertically and horizontally separate stack base from parent
# to reinforce stack boundary. # to reinforce stack boundary.
if newheads: if newheads:
ui.write(':/ ') ui.write(':/ ')
else: else:
ui.write(' / ') ui.write(' / ')
ui.write(_('(stack base)'), '\n', label='stack.label') ui.write(_('(stack base)'), '\n', label='stack.label')
ui.write(('o ')) ui.write(('o '))
displayer.show(basectx, nodelen=5) displayer.show(basectx, nodelen=nodelen)
displayer.flush(basectx) displayer.flush(basectx)
ui.write('\n') ui.write('\n')
@revsetpredicate('_underway([commitage[, headage]])') @revsetpredicate('_underway([commitage[, headage]])')
def underwayrevset(repo, subset, x): def underwayrevset(repo, subset, x):
args = revset.getargsdict(x, 'underway', 'commitage headage') args = revset.getargsdict(x, 'underway', 'commitage headage')
if 'commitage' not in args: if 'commitage' not in args:
args['commitage'] = None args['commitage'] = None
return subset & relevant return subset & relevant
@showview('work', csettopic='work') @showview('work', csettopic='work')
def showwork(ui, repo, displayer): def showwork(ui, repo, displayer):
"""changesets that aren't finished""" """changesets that aren't finished"""
# TODO support date-based limiting when calling revset. # TODO support date-based limiting when calling revset.
revs = repo.revs('sort(_underway(), topo)') revs = repo.revs('sort(_underway(), topo)')
nodelen = longestshortest(repo, revs)
revdag = graphmod.dagwalker(repo, revs) revdag = graphmod.dagwalker(repo, revs)
ui.setconfig('experimental', 'graphshorten', True) ui.setconfig('experimental', 'graphshorten', True)
cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges, cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges,
props={'nodelen': 5}) props={'nodelen': nodelen})
def extsetup(ui): def extsetup(ui):
# Alias `hg <prefix><view>` to `hg show <view>`. # Alias `hg <prefix><view>` to `hg show <view>`.
for prefix in ui.configlist('commands', 'show.aliasprefix'): for prefix in ui.configlist('commands', 'show.aliasprefix'):
for view in showview._table: for view in showview._table:
name = '%s%s' % (prefix, view) name = '%s%s' % (prefix, view)
choice, allcommands = cmdutil.findpossible(name, commands.table, choice, allcommands = cmdutil.findpossible(name, commands.table,
strict=True) strict=True)
# This alias is already a command name. Don't set it. # This alias is already a command name. Don't set it.
if name in choice: if name in choice:
continue continue
# Same for aliases. # Same for aliases.
if ui.config('alias', name): if ui.config('alias', name):
continue continue
ui.setconfig('alias', name, 'show %s' % view, source='show') ui.setconfig('alias', name, 'show %s' % view, source='show')
def longestshortest(repo, revs, minlen=4):
"""Return the length of the longest shortest node to identify revisions.
The result of this function can be used with the ``shortest()`` template
function to ensure that a value is unique and unambiguous for a given
set of nodes.
The number of revisions in the repo is taken into account to prevent
a numeric node prefix from conflicting with an integer revision number.
If we fail to do this, a value of e.g. ``10023`` could mean either
revision 10023 or node ``10023abc...``.
"""
tmpl = formatter.maketemplater(repo.ui, '{shortest(node, %d)}' % minlen)
lens = [minlen]
for rev in revs:
ctx = repo[rev]
shortest = tmpl.render({'ctx': ctx, 'node': ctx.hex()})
lens.append(len(shortest))
return max(lens)
# Adjust the docstring of the show command so it shows all registered views. # Adjust the docstring of the show command so it shows all registered views.
# This is a bit hacky because it runs at the end of module load. When moved # This is a bit hacky because it runs at the end of module load. When moved
# into core or when another extension wants to provide a view, we'll need # into core or when another extension wants to provide a view, we'll need
# to do this more robustly. # to do this more robustly.
# TODO make this more robust. # TODO make this more robust.
def _updatedocstring(): def _updatedocstring():
longest = max(map(len, showview._table.keys())) longest = max(map(len, showview._table.keys()))
entries = [] entries = []

tests/test-show-stack.t

abort: stack view only available when there is a working directory abort: stack view only available when there is a working directory
[255] [255]
Stack displays single draft changeset as root revision Stack displays single draft changeset as root revision
$ echo 0 > foo $ echo 0 > foo
$ hg -q commit -A -m 'commit 0' $ hg -q commit -A -m 'commit 0'
$ hg show stack $ hg show stack
@ 9f171 commit 0 @ 9f17 commit 0
Stack displays multiple draft changesets Stack displays multiple draft changesets
$ echo 1 > foo $ echo 1 > foo
$ hg commit -m 'commit 1' $ hg commit -m 'commit 1'
$ echo 2 > foo $ echo 2 > foo
$ hg commit -m 'commit 2' $ hg commit -m 'commit 2'
$ echo 3 > foo $ echo 3 > foo
$ hg commit -m 'commit 3' $ hg commit -m 'commit 3'
$ echo 4 > foo $ echo 4 > foo
$ hg commit -m 'commit 4' $ hg commit -m 'commit 4'
$ hg show stack $ hg show stack
@ 2737b commit 4 @ 2737 commit 4
o d1a69 commit 3 o d1a6 commit 3
o 128c8 commit 2 o 128c commit 2
o 181cc commit 1 o 181c commit 1
o 9f171 commit 0 o 9f17 commit 0
Public parent of draft base is displayed, separated from stack Public parent of draft base is displayed, separated from stack
$ hg phase --public -r 0 $ hg phase --public -r 0
$ hg show stack $ hg show stack
@ 2737b commit 4 @ 2737 commit 4
o d1a69 commit 3 o d1a6 commit 3
o 128c8 commit 2 o 128c commit 2
o 181cc commit 1 o 181c commit 1
/ (stack base) / (stack base)
o 9f171 commit 0 o 9f17 commit 0
$ hg phase --public -r 1 $ hg phase --public -r 1
$ hg show stack $ hg show stack
@ 2737b commit 4 @ 2737 commit 4
o d1a69 commit 3 o d1a6 commit 3
o 128c8 commit 2 o 128c commit 2
/ (stack base) / (stack base)
o 181cc commit 1 o 181c commit 1
Draft descendants are shown Draft descendants are shown
$ hg -q up 2 $ hg -q up 2
$ hg show stack $ hg show stack
o 2737b commit 4 o 2737 commit 4
o d1a69 commit 3 o d1a6 commit 3
@ 128c8 commit 2 @ 128c commit 2
/ (stack base) / (stack base)
o 181cc commit 1 o 181c commit 1
$ hg -q up 3 $ hg -q up 3
$ hg show stack $ hg show stack
o 2737b commit 4 o 2737 commit 4
@ d1a69 commit 3 @ d1a6 commit 3
o 128c8 commit 2 o 128c commit 2
/ (stack base) / (stack base)
o 181cc commit 1 o 181c commit 1
working dir on public changeset should display special message working dir on public changeset should display special message
$ hg -q up 1 $ hg -q up 1
$ hg show stack $ hg show stack
(empty stack; working directory parent is a published changeset) (empty stack; working directory parent is a published changeset)
Branch point in descendants displayed at top of graph Branch point in descendants displayed at top of graph
$ hg -q up 3 $ hg -q up 3
$ echo b > foo $ echo b > foo
$ hg commit -m 'commit 5 (new dag branch)' $ hg commit -m 'commit 5 (new dag branch)'
created new head created new head
$ hg -q up 2 $ hg -q up 2
$ hg show stack $ hg show stack
\ / (multiple children) \ / (multiple children)
| |
o d1a69 commit 3 o d1a6 commit 3
@ 128c8 commit 2 @ 128c commit 2
/ (stack base) / (stack base)
o 181cc commit 1 o 181c commit 1
$ cd .. $ cd ..
Base is stopped at merges Base is stopped at merges
$ hg init merge-base $ hg init merge-base
$ cd merge-base $ cd merge-base
$ echo 0 > foo $ echo 0 > foo
$ hg -q commit -A -m initial $ hg -q commit -A -m initial
$ echo h1 > foo $ echo h1 > foo
$ hg commit -m 'head 1' $ hg commit -m 'head 1'
$ hg -q up 0 $ hg -q up 0
$ echo h2 > foo $ echo h2 > foo
$ hg -q commit -m 'head 2' $ hg -q commit -m 'head 2'
$ hg phase --public -r 0:tip $ hg phase --public -r 0:tip
$ hg -q up 1 $ hg -q up 1
$ hg merge -t :local 2 $ hg merge -t :local 2
0 files updated, 1 files merged, 0 files removed, 0 files unresolved 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg commit -m 'merge heads' $ hg commit -m 'merge heads'
TODO doesn't yet handle case where wdir is a draft merge TODO doesn't yet handle case where wdir is a draft merge
$ hg show stack $ hg show stack
@ 8ee90 merge heads @ 8ee9 merge heads
/ (stack base) / (stack base)
o 59478 head 1 o 5947 head 1
$ echo d1 > foo $ echo d1 > foo
$ hg commit -m 'draft 1' $ hg commit -m 'draft 1'
$ echo d2 > foo $ echo d2 > foo
$ hg commit -m 'draft 2' $ hg commit -m 'draft 2'
$ hg show stack $ hg show stack
@ 430d5 draft 2 @ 430d draft 2
o 787b1 draft 1 o 787b draft 1
/ (stack base) / (stack base)
o 8ee90 merge heads o 8ee9 merge heads
$ cd .. $ cd ..
Now move on to stacks when there are more commits after the base branchpoint Now move on to stacks when there are more commits after the base branchpoint
$ hg init public-rebase $ hg init public-rebase
$ cd public-rebase $ cd public-rebase
$ echo 0 > foo $ echo 0 > foo
created new head created new head
$ echo 2 > foo $ echo 2 > foo
$ hg commit -m 'new 2' $ hg commit -m 'new 2'
$ hg -q up 2 $ hg -q up 2
Newer draft heads don't impact output Newer draft heads don't impact output
$ hg show stack $ hg show stack
@ eaffc draft 2 @ eaff draft 2
o 2b218 draft 1 o 2b21 draft 1
/ (stack base) / (stack base)
o b66bb base o b66b base
Newer public heads are rendered Newer public heads are rendered
$ hg phase --public -r '::tip' $ hg phase --public -r '::tip'
$ hg show stack $ hg show stack
o baa4b new 2 o baa4 new 2
/ (2 commits ahead) / (2 commits ahead)
: :
: (stack head) : (stack head)
: @ eaffc draft 2 : @ eaff draft 2
: o 2b218 draft 1 : o 2b21 draft 1
:/ (stack base) :/ (stack base)
o b66bb base o b66b base
If rebase is available, we show a hint how to rebase to that head If rebase is available, we show a hint how to rebase to that head
$ hg --config extensions.rebase= show stack $ hg --config extensions.rebase= show stack
o baa4b new 2 o baa4 new 2
/ (2 commits ahead; hg rebase --source 2b218 --dest baa4b) / (2 commits ahead; hg rebase --source 2b21 --dest baa4)
: :
: (stack head) : (stack head)
: @ eaffc draft 2 : @ eaff draft 2
: o 2b218 draft 1 : o 2b21 draft 1
:/ (stack base) :/ (stack base)
o b66bb base o b66b base
Similar tests but for multiple heads Similar tests but for multiple heads
$ hg -q up 0 $ hg -q up 0
$ echo h2 > foo $ echo h2 > foo
$ hg -q commit -m 'new head 2' $ hg -q commit -m 'new head 2'
$ hg phase --public -r . $ hg phase --public -r .
$ hg -q up 2 $ hg -q up 2
$ hg show stack $ hg show stack
o baa4b new 2 o baa4 new 2
/ (2 commits ahead) / (2 commits ahead)
: o 9a848 new head 2 : o 9a84 new head 2
:/ (1 commits ahead) :/ (1 commits ahead)
: :
: (stack head) : (stack head)
: @ eaffc draft 2 : @ eaff draft 2
: o 2b218 draft 1 : o 2b21 draft 1
:/ (stack base) :/ (stack base)
o b66bb base o b66b base
$ hg --config extensions.rebase= show stack $ hg --config extensions.rebase= show stack
o baa4b new 2 o baa4 new 2
/ (2 commits ahead; hg rebase --source 2b218 --dest baa4b) / (2 commits ahead; hg rebase --source 2b21 --dest baa4)
: o 9a848 new head 2 : o 9a84 new head 2
:/ (1 commits ahead; hg rebase --source 2b218 --dest 9a848) :/ (1 commits ahead; hg rebase --source 2b21 --dest 9a84)
: :
: (stack head) : (stack head)
: @ eaffc draft 2 : @ eaff draft 2
: o 2b218 draft 1 : o 2b21 draft 1
:/ (stack base) :/ (stack base)
o b66bb base o b66b base

tests/test-show-work.t

$ hg show work $ hg show work
Single draft changeset shown Single draft changeset shown
$ echo 0 > foo $ echo 0 > foo
$ hg -q commit -A -m 'commit 0' $ hg -q commit -A -m 'commit 0'
$ hg show work $ hg show work
@ 9f171 commit 0 @ 9f17 commit 0
Even when it isn't the wdir Even when it isn't the wdir
$ hg -q up null $ hg -q up null
$ hg show work $ hg show work
o 9f171 commit 0 o 9f17 commit 0
Single changeset is still there when public because it is a head Single changeset is still there when public because it is a head
$ hg phase --public -r 0 $ hg phase --public -r 0
$ hg show work $ hg show work
o 9f171 commit 0 o 9f17 commit 0
A draft child will show both it and public parent A draft child will show both it and public parent
$ hg -q up 0 $ hg -q up 0
$ echo 1 > foo $ echo 1 > foo
$ hg commit -m 'commit 1' $ hg commit -m 'commit 1'
$ hg show work $ hg show work
@ 181cc commit 1 @ 181c commit 1
o 9f171 commit 0 o 9f17 commit 0
Multiple draft children will be shown Multiple draft children will be shown
$ echo 2 > foo $ echo 2 > foo
$ hg commit -m 'commit 2' $ hg commit -m 'commit 2'
$ hg show work $ hg show work
@ 128c8 commit 2 @ 128c commit 2
o 181cc commit 1 o 181c commit 1
o 9f171 commit 0 o 9f17 commit 0
Bumping first draft changeset to public will hide its parent Bumping first draft changeset to public will hide its parent
$ hg phase --public -r 1 $ hg phase --public -r 1
$ hg show work $ hg show work
@ 128c8 commit 2 @ 128c commit 2
o 181cc commit 1 o 181c commit 1
| |
~ ~
Multiple DAG heads will be shown Multiple DAG heads will be shown
$ hg -q up -r 1 $ hg -q up -r 1
$ echo 3 > foo $ echo 3 > foo
$ hg commit -m 'commit 3' $ hg commit -m 'commit 3'
created new head created new head
$ hg show work $ hg show work
@ f0abc commit 3 @ f0ab commit 3
| o 128c8 commit 2 | o 128c commit 2
|/ |/
o 181cc commit 1 o 181c commit 1
| |
~ ~
Even when wdir is something else Even when wdir is something else
$ hg -q up null $ hg -q up null
$ hg show work $ hg show work
o f0abc commit 3 o f0ab commit 3
| o 128c8 commit 2 | o 128c commit 2
|/ |/
o 181cc commit 1 o 181c commit 1
| |
~ ~
Draft child shows public head (multiple heads) Draft child shows public head (multiple heads)
$ hg -q up 0 $ hg -q up 0
$ echo 4 > foo $ echo 4 > foo
$ hg commit -m 'commit 4' $ hg commit -m 'commit 4'
created new head created new head
$ hg show work $ hg show work
@ 668ca commit 4 @ 668c commit 4
| o f0abc commit 3 | o f0ab commit 3
| | o 128c8 commit 2 | | o 128c commit 2
| |/ | |/
| o 181cc commit 1 | o 181c commit 1
|/ |/
o 9f171 commit 0 o 9f17 commit 0
$ cd .. $ cd ..
Branch name appears in output Branch name appears in output
$ hg init branches $ hg init branches
$ cd branches $ cd branches
$ echo 0 > foo $ echo 0 > foo
$ hg -q commit -A -m 'commit 0' $ hg -q commit -A -m 'commit 0'
$ echo 1 > foo $ echo 1 > foo
$ hg commit -m 'commit 1' $ hg commit -m 'commit 1'
$ echo 2 > foo $ echo 2 > foo
$ hg commit -m 'commit 2' $ hg commit -m 'commit 2'
$ hg phase --public -r . $ hg phase --public -r .
$ hg -q up -r 1 $ hg -q up -r 1
$ hg branch mybranch $ hg branch mybranch
marked working directory as branch mybranch marked working directory as branch mybranch
(branches are permanent and global, did you want a bookmark?) (branches are permanent and global, did you want a bookmark?)
$ echo 3 > foo $ echo 3 > foo
$ hg commit -m 'commit 3' $ hg commit -m 'commit 3'
$ echo 4 > foo $ echo 4 > foo
$ hg commit -m 'commit 4' $ hg commit -m 'commit 4'
$ hg show work $ hg show work
@ f8dd3 (mybranch) commit 4 @ f8dd (mybranch) commit 4
o 90cfc (mybranch) commit 3 o 90cf (mybranch) commit 3
| o 128c8 commit 2 | o 128c commit 2
|/ |/
o 181cc commit 1 o 181c commit 1
| |
~ ~
$ cd .. $ cd ..
Bookmark name appears in output Bookmark name appears in output
$ hg init bookmarks $ hg init bookmarks
$ echo 3 > foo $ echo 3 > foo
$ hg commit -m 'commit 3' $ hg commit -m 'commit 3'
created new head created new head
$ echo 4 > foo $ echo 4 > foo
$ hg commit -m 'commit 4' $ hg commit -m 'commit 4'
$ hg bookmark mybook $ hg bookmark mybook
$ hg show work $ hg show work
@ cac82 (mybook) commit 4 @ cac8 (mybook) commit 4
o f0abc commit 3 o f0ab commit 3
| o 128c8 (@) commit 2 | o 128c (@) commit 2
|/ |/
o 181cc commit 1 o 181c commit 1
| |
~ ~
$ cd .. $ cd ..
Tags are rendered Tags are rendered
$ hg init tags $ hg init tags
$ cd tags $ cd tags
$ echo 0 > foo $ echo 0 > foo
$ hg -q commit -A -m 'commit 1' $ hg -q commit -A -m 'commit 1'
$ echo 1 > foo $ echo 1 > foo
$ hg commit -m 'commit 2' $ hg commit -m 'commit 2'
$ hg tag 0.1 $ hg tag 0.1
$ hg phase --public -r . $ hg phase --public -r .
$ echo 2 > foo $ echo 2 > foo
$ hg commit -m 'commit 3' $ hg commit -m 'commit 3'
$ hg tag 0.2 $ hg tag 0.2
$ hg show work $ hg show work
@ 37582 Added tag 0.2 for changeset 6379c25b76f1 @ 3758 Added tag 0.2 for changeset 6379c25b76f1
o 6379c (0.2) commit 3 o 6379 (0.2) commit 3
o a2ad9 Added tag 0.1 for changeset 6a75536ea0b1 o a2ad Added tag 0.1 for changeset 6a75536ea0b1
| |
~ ~
$ cd .. $ cd ..
Multiple names on same changeset render properly Multiple names on same changeset render properly
$ hg init multiplenames $ hg init multiplenames
$ cd multiplenames $ cd multiplenames
$ echo 0 > foo $ echo 0 > foo
$ hg -q commit -A -m 'commit 1' $ hg -q commit -A -m 'commit 1'
$ hg phase --public -r . $ hg phase --public -r .
$ hg branch mybranch $ hg branch mybranch
marked working directory as branch mybranch marked working directory as branch mybranch
(branches are permanent and global, did you want a bookmark?) (branches are permanent and global, did you want a bookmark?)
$ hg bookmark mybook $ hg bookmark mybook
$ echo 1 > foo $ echo 1 > foo
$ hg commit -m 'commit 2' $ hg commit -m 'commit 2'
$ hg show work $ hg show work
@ 34834 (mybook) (mybranch) commit 2 @ 3483 (mybook) (mybranch) commit 2
o 97fcc commit 1 o 97fc commit 1
Multiple bookmarks on same changeset render properly Multiple bookmarks on same changeset render properly
$ hg book mybook2 $ hg book mybook2
$ hg show work $ hg show work
@ 34834 (mybook mybook2) (mybranch) commit 2 @ 3483 (mybook mybook2) (mybranch) commit 2
o 97fcc commit 1 o 97fc commit 1
$ cd .. $ cd ..
Extra namespaces are rendered Extra namespaces are rendered
$ hg init extranamespaces $ hg init extranamespaces
$ cd extranamespaces $ cd extranamespaces
$ echo 0 > foo $ echo 0 > foo
$ hg -q commit -A -m 'commit 1' $ hg -q commit -A -m 'commit 1'
$ hg phase --public -r . $ hg phase --public -r .
$ echo 1 > foo $ echo 1 > foo
$ hg commit -m 'commit 2' $ hg commit -m 'commit 2'
$ echo 2 > foo $ echo 2 > foo
$ hg commit -m 'commit 3' $ hg commit -m 'commit 3'
$ hg --config extensions.revnames=$TESTDIR/revnamesext.py show work $ hg --config extensions.revnames=$TESTDIR/revnamesext.py show work
@ 32f3e (r2) commit 3 @ 32f3 (r2) commit 3
o 6a755 (r1) commit 2 o 6a75 (r1) commit 2
o 97fcc (r0) commit 1 o 97fc (r0) commit 1
$ cd ..
Prefix collision on hashes increases shortest node length
$ hg init hashcollision
$ cd hashcollision
$ echo 0 > a
$ hg -q commit -Am 0
$ for i in 17 1057 2857 4025; do
> hg -q up 0
> echo $i > a
> hg -q commit -m $i
> echo 0 > a
> hg commit -m "$i commit 2"
> done
$ hg show work
@ cfd04 4025 commit 2
o c562d 4025
| o 08048 2857 commit 2
| o c5623 2857
|/
| o 6a6b6 1057 commit 2
| o c5625 1057
|/
| o 96b4e 17 commit 2
| o 11424 17
|/
o b4e73 0
$ cd .. $ cd ..

tests/test-show.t

$ hg commit -m 'commit for book1' $ hg commit -m 'commit for book1'
$ echo book2 > f0 $ echo book2 > f0
$ hg commit -m 'commit for book2' $ hg commit -m 'commit for book2'
$ hg bookmark -r 1 book1 $ hg bookmark -r 1 book1
$ hg bookmark a-longer-bookmark $ hg bookmark a-longer-bookmark
$ hg show bookmarks $ hg show bookmarks
* a-longer-bookmark 7b570 * a-longer-bookmark 7b57
book1 b757f book1 b757
A custom bookmarks template works A custom bookmarks template works
$ hg show bookmarks -T '{node} {bookmark} {active}\n' $ hg show bookmarks -T '{node} {bookmark} {active}\n'
7b5709ab64cbc34da9b4367b64afff47f2c4ee83 a-longer-bookmark True 7b5709ab64cbc34da9b4367b64afff47f2c4ee83 a-longer-bookmark True
b757f780b8ffd71267c6ccb32e0882d9d32a8cc0 book1 False b757f780b8ffd71267c6ccb32e0882d9d32a8cc0 book1 False
bookmarks JSON works bookmarks JSON works
$ hg show bookmarks -T json $ hg show bookmarks -T json
[ [
{ {
"active": true, "active": true,
"bookmark": "a-longer-bookmark", "bookmark": "a-longer-bookmark",
"longestbookmarklen": 17, "longestbookmarklen": 17,
"node": "7b5709ab64cbc34da9b4367b64afff47f2c4ee83", "node": "7b5709ab64cbc34da9b4367b64afff47f2c4ee83",
"nodelen": 5 "nodelen": 4
}, },
{ {
"active": false, "active": false,
"bookmark": "book1", "bookmark": "book1",
"longestbookmarklen": 17, "longestbookmarklen": 17,
"node": "b757f780b8ffd71267c6ccb32e0882d9d32a8cc0", "node": "b757f780b8ffd71267c6ccb32e0882d9d32a8cc0",
"nodelen": 5 "nodelen": 4
} }
] ]
JSON works with no bookmarks JSON works with no bookmarks
$ hg book -d a-longer-bookmark $ hg book -d a-longer-bookmark
$ hg book -d book1 $ hg book -d book1
$ hg show bookmarks -T json $ hg show bookmarks -T json
[ [
] ]
commands.show.aliasprefix aliases values to `show <view>` commands.show.aliasprefix aliases values to `show <view>`
$ hg --config commands.show.aliasprefix=s sbookmarks $ hg --config commands.show.aliasprefix=s sbookmarks
(no bookmarks set) (no bookmarks set)
$ hg --config commands.show.aliasprefix=sh shwork $ hg --config commands.show.aliasprefix=sh shwork
@ 7b570 commit for book2 @ 7b57 commit for book2
o b757f commit for book1 o b757 commit for book1
o ba592 initial o ba59 initial
$ hg --config commands.show.aliasprefix='s sh' swork $ hg --config commands.show.aliasprefix='s sh' swork
@ 7b570 commit for book2 @ 7b57 commit for book2
o b757f commit for book1 o b757 commit for book1
o ba592 initial o ba59 initial
$ hg --config commands.show.aliasprefix='s sh' shwork $ hg --config commands.show.aliasprefix='s sh' shwork
@ 7b570 commit for book2 @ 7b57 commit for book2
o b757f commit for book1 o b757 commit for book1
o ba592 initial o ba59 initial
The aliases don't appear in `hg config` The aliases don't appear in `hg config`
$ hg --config commands.show.aliasprefix=s config alias $ hg --config commands.show.aliasprefix=s config alias
[1] [1]
Doesn't overwrite existing alias Doesn't overwrite existing alias