This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2808

remotenames: show remote bookmarks in `hg bookmarks`
ClosedPublic

Authored by pulkit on Mar 12 2018, 9:45 AM.

Details

Reviewers
durin42
indygreg
Group Reviewers
hg-reviewers
Commits
rHGa61fff493d98: remotenames: show remote bookmarks in `hg bookmarks`
Summary

This patch adds functionality to show list of remote bookmarks in hg bookmarks
command.

There is some indenting problem in the test output as the current bookmark
printing code in core can handle bookmark names of size 25 only gracefully.

The idea is taken from hgremotenames extension which has --remote and --all
flags to show remote bookmarks. However, this patch by defaults support showing
list of remote bookmarks if remotenames extension is enabled and remotebookmarks
are turned on.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Mar 12 2018, 9:45 AM
durin42 accepted this revision as: durin42.Mar 12 2018, 5:40 PM
durin42 added a subscriber: durin42.

Sounds nice.

pulkit updated this revision to Diff 7102.Mar 19 2018, 4:35 AM
pulkit updated this revision to Diff 7248.Mar 22 2018, 3:35 AM
indygreg accepted this revision.Mar 23 2018, 2:41 PM
This revision is now accepted and ready to land.Mar 23 2018, 2:41 PM
Closed by commit rHGa61fff493d98: remotenames: show remote bookmarks in `hg bookmarks` (authored by pulkit). · Explain WhyMar 23 2018, 2:45 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/remotenames.py (20 lines)
Mtests/test-logexchange.t (6 lines)

Diff 7248

hgext/remotenames.py

from __future__ import absolute_import from __future__ import absolute_import
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial.node import ( from mercurial.node import (
bin, bin,
) )
from mercurial import ( from mercurial import (
bookmarks,
extensions,
logexchange, logexchange,
namespaces, namespaces,
pycompat, pycompat,
registrar, registrar,
revsetlang, revsetlang,
smartset, smartset,
templateutil, templateutil,
) )
self._nodetohoists = {} self._nodetohoists = {}
hoist += '/' hoist += '/'
for name, node in marktonodes.iteritems(): for name, node in marktonodes.iteritems():
if name.startswith(hoist): if name.startswith(hoist):
name = name[len(hoist):] name = name[len(hoist):]
self._nodetohoists.setdefault(node[0], []).append(name) self._nodetohoists.setdefault(node[0], []).append(name)
return self._nodetohoists return self._nodetohoists
def wrapprintbookmarks(orig, ui, repo, bmarks, **opts):
if 'remotebookmarks' not in repo.names:
return
ns = repo.names['remotebookmarks']
for name in ns.listnames(repo):
nodes = ns.nodes(repo, name)
if not nodes:
continue
node = nodes[0]
bmarks[name] = (node, ' ', '')
return orig(ui, repo, bmarks, **opts)
def extsetup(ui):
extensions.wrapfunction(bookmarks, '_printbookmarks', wrapprintbookmarks)
def reposetup(ui, repo): def reposetup(ui, repo):
if not repo.local(): if not repo.local():
return return
repo._remotenames = remotenames(repo) repo._remotenames = remotenames(repo)
ns = namespaces.namespace ns = namespaces.namespace
if ui.configbool('remotenames', 'bookmarks'): if ui.configbool('remotenames', 'bookmarks'):

tests/test-logexchange.t

tag: tip tag: tip
remote branch: $TESTTMP/server2/wat remote branch: $TESTTMP/server2/wat
remote branch: default/wat remote branch: default/wat
parent: 4:aa98ab95a928 parent: 4:aa98ab95a928
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: added bar summary: added bar
$ hg bookmarks
$TESTTMP/server2/bar 6:87d6d6676308
$TESTTMP/server2/foo 3:62615734edd5
default/bar 6:87d6d6676308
default/foo 3:62615734edd5
* foo 8:3e1487808078