sapling/remotenames.py

1233 lines
40 KiB
Python
Raw Normal View History

2015-03-25 06:42:21 +03:00
"""
remotenames: a mercurial extension for improving client/server workflows
The remotenames extension provides additional information to clients that is
particularly useful when pushing and pulling to peer repositories.
Before diving in to using remotebookmarks, we suggest you read the included
README file, which explains the changes to expect, the configuration knobs
available (note: almost everything is configurable), and gives examples of
how to set up the configuration options in useful ways.
This extension is the work of Sean Farley forked from Augie Fackler's seminal
remotebranches extension. Ryan McElroy of Facebook also contributed.
"""
2010-01-04 07:37:45 +03:00
import os
import errno
import shutil
2010-01-04 07:37:45 +03:00
2015-02-10 22:43:07 +03:00
from mercurial import bookmarks
from mercurial import commands
from mercurial import encoding
2015-01-06 22:18:07 +03:00
from mercurial import error
from mercurial import exchange
from mercurial import extensions
2010-01-04 07:37:45 +03:00
from mercurial import hg
2015-02-10 20:18:13 +03:00
from mercurial import localrepo
2015-01-06 22:18:07 +03:00
from mercurial import namespaces
from mercurial import obsolete
from mercurial import repoview
2014-03-18 22:46:10 +04:00
from mercurial import revset
from mercurial import scmutil
2014-03-18 22:46:10 +04:00
from mercurial import templatekw
2015-01-06 22:18:07 +03:00
from mercurial import url
from mercurial import util
from mercurial.i18n import _
from mercurial.node import hex, short
2010-01-11 02:24:02 +03:00
from hgext import schemes
2010-01-04 07:37:45 +03:00
_remotenames = {
"bookmarks": {},
"branches": {},
}
def expush(orig, repo, remote, *args, **kwargs):
res = orig(repo, remote, *args, **kwargs)
2015-03-12 00:48:08 +03:00
pullremotenames(repo, remote)
return res
def expull(orig, repo, remote, *args, **kwargs):
res = orig(repo, remote, *args, **kwargs)
pullremotenames(repo, remote)
return res
def pullremotenames(repo, remote):
path = activepath(repo.ui, remote)
if path:
# on a push, we don't want to keep obsolete heads since
# they won't show up as heads on the next pull, so we
# remove them here otherwise we would require the user
# to issue a pull to refresh .hg/remotenames
bmap = {}
repo = repo.unfiltered()
for branch, nodes in remote.branchmap().iteritems():
bmap[branch] = []
for node in nodes:
if node in repo and not repo[node].obsolete():
bmap[branch].append(node)
saveremotenames(repo, path, bmap, remote.listkeys('bookmarks'))
precachedistance(repo)
def blockerhook(orig, repo, *args, **kwargs):
blockers = orig(repo)
unblock = util.safehasattr(repo, '_unblockhiddenremotenames')
if not unblock:
return blockers
# add remotenames to blockers by looping over all names in our own cache
cl = repo.changelog
for remotename in _remotenames.keys():
rname = 'remote' + remotename
try:
ns = repo.names[rname]
except KeyError:
continue
for name in ns.listnames(repo):
blockers.update(cl.rev(node) for node in ns.nodes(repo, name))
return blockers
def exupdatefromremote(orig, ui, repo, remotemarks, path, trfunc, explicit=()):
if ui.configbool('remotenames', 'syncbookmarks', False):
return orig(ui, repo, remotemarks, path, trfunc, explicit)
2015-02-12 09:31:14 +03:00
ui.debug('remotenames: skipped syncing local bookmarks\n')
2015-01-29 04:45:48 +03:00
def exclone(orig, ui, *args, **opts):
"""
We may not want local bookmarks on clone... but we always want remotenames!
"""
srcpeer, dstpeer = orig(ui, *args, **opts)
pullremotenames(dstpeer.local(), srcpeer)
if not ui.configbool('remotenames', 'syncbookmarks', False):
2015-02-12 09:31:14 +03:00
ui.debug('remotenames: removing cloned bookmarks\n')
repo = dstpeer.local()
wlock = repo.wlock()
try:
try:
repo.vfs.unlink('bookmarks')
except OSError, inst:
if inst.errno != errno.ENOENT:
raise
finally:
wlock.release()
2015-01-29 04:45:48 +03:00
return (srcpeer, dstpeer)
2015-02-10 20:18:13 +03:00
def excommit(orig, repo, *args, **opts):
res = orig(repo, *args, **opts)
precachedistance(repo)
2015-02-10 20:18:13 +03:00
return res
2015-02-10 07:16:15 +03:00
def exupdate(orig, repo, *args, **opts):
res = orig(repo, *args, **opts)
precachedistance(repo)
2015-02-10 07:16:15 +03:00
return res
2015-02-10 07:38:30 +03:00
def exsetcurrent(orig, repo, mark):
res = orig(repo, mark)
precachedistance(repo)
2015-02-10 07:38:30 +03:00
return res
2010-01-04 07:37:45 +03:00
def reposetup(ui, repo):
if not repo.local():
return
2010-01-04 07:37:45 +03:00
loadremotenames(repo)
ns = namespaces.namespace
if ui.configbool('remotenames', 'bookmarks', True):
mark2nodes = _remotenames.get('bookmarks')
node2marks = {}
for name, node in mark2nodes.iteritems():
node2marks.setdefault(node[0], []).append(name)
remotebookmarkns = ns(
2015-04-22 21:31:36 +03:00
'remotebookmarks',
templatename='remotebookmarks',
logname='bookmark',
colorname='remotebookmark',
listnames=lambda repo: mark2nodes.keys(),
namemap=lambda repo, name: mark2nodes.get(name),
nodemap=lambda repo, node: node2marks.get(node, []))
repo.names.addnamespace(remotebookmarkns)
# hoisting only works if there are remote bookmarks
2015-03-20 07:31:43 +03:00
hoist = ui.config('remotenames', 'hoist', 'default')
if hoist:
hoist += '/'
if hoist:
hoist2nodes = {}
node2hoists = {}
for name, node in mark2nodes.iteritems():
if name.startswith(hoist):
name = name[len(hoist):]
hoist2nodes[name] = node
node2hoists.setdefault(node[0], []).append(name)
hoistednamens = ns(
2015-04-22 21:31:36 +03:00
'hoistednames',
templatename='hoistednames',
logname='hoistedname',
colorname='hoistedname',
listnames=lambda repo: hoist2nodes.keys(),
namemap=lambda repo, name: hoist2nodes.get(name),
nodemap=lambda repo, node: node2hoists.get(node, []))
repo.names.addnamespace(hoistednamens)
if ui.configbool('remotenames', 'branches', True):
branch2nodes = _remotenames.get('branches')
node2branch = {}
for name, nodes in branch2nodes.iteritems():
for node in nodes:
node2branch[node] = [name]
remotebranchns = ns(
2015-04-22 21:31:36 +03:00
'remotebranches',
templatename='remotebranches',
logname='branch',
colorname='remotebranch',
listnames=lambda repo: branch2nodes.keys(),
namemap=lambda repo, name: branch2nodes.get(name),
nodemap=lambda repo, node: node2branch.get(node, []))
repo.names.addnamespace(remotebranchns)
2015-03-12 00:57:32 +03:00
def _tracking(ui):
2015-03-12 22:53:08 +03:00
# omg default true
return ui.configbool('remotenames', 'tracking', True)
2015-03-12 00:57:32 +03:00
2015-03-12 01:38:19 +03:00
def exrebasecmd(orig, ui, repo, **opts):
2015-03-12 01:38:19 +03:00
dest = opts['dest']
source = opts['source']
revs = opts['rev']
base = opts['base']
2015-03-19 10:06:51 +03:00
current = bookmarks.readcurrent(repo)
2015-03-19 10:06:51 +03:00
if not (dest or source or revs or base) and current:
2015-03-12 01:38:19 +03:00
tracking = _readtracking(repo)
2015-03-19 10:06:51 +03:00
if current in tracking:
opts['dest'] = tracking[current]
2015-03-12 01:38:19 +03:00
ret = orig(ui, repo, **opts)
precachedistance(repo)
return ret
2015-03-12 01:38:19 +03:00
2015-03-13 01:55:16 +03:00
def exstrip(orig, ui, repo, *args, **opts):
ret = orig(ui, repo, *args, **opts)
precachedistance(repo)
2015-03-13 01:55:16 +03:00
return ret
2015-03-13 02:50:27 +03:00
def exhistedit(orig, ui, repo, *args, **opts):
ret = orig(ui, repo, *args, **opts)
precachedistance(repo)
2015-03-13 02:50:27 +03:00
return ret
2015-03-14 01:57:43 +03:00
def expaths(orig, ui, repo, *args, **opts):
"""allow adding and removing remote paths
This is very hacky and only exists as an experimentation.
"""
delete = opts.get('delete')
2015-03-14 02:39:30 +03:00
add = opts.get('add')
2015-03-14 01:57:43 +03:00
if delete:
# find the first section and remote path that matches, and delete that
foundpaths = False
oldhgrc = repo.vfs.read('hgrc').splitlines(True)
f = repo.vfs('hgrc', 'w')
for line in oldhgrc:
if '[paths]' in line:
foundpaths = True
if not (foundpaths and line.strip().startswith(delete)):
f.write(line)
f.close()
saveremotenames(repo, delete)
precachedistance(repo)
2015-03-14 01:57:43 +03:00
return
2015-03-14 02:39:30 +03:00
if add:
# find the first section that matches, then look for previous value; if
# not found add a new entry
foundpaths = False
oldhgrc = repo.vfs.read('hgrc').splitlines(True)
f = repo.vfs('hgrc', 'w')
done = False
for line in oldhgrc:
if '[paths]' in line:
foundpaths = True
if foundpaths and line.strip().startswith(add):
done = True
line = '%s = %s\n' % (add, args[0])
f.write(line)
# did we not find an existing path?
if not done:
done = True
f.write("%s = %s\n" % (add, args[0]))
f.close()
return
2015-03-14 01:57:43 +03:00
return orig(ui, repo, *args)
def extsetup(ui):
extensions.wrapfunction(exchange, 'push', expush)
extensions.wrapfunction(exchange, 'pull', expull)
extensions.wrapfunction(repoview, '_getdynamicblockers', blockerhook)
extensions.wrapfunction(bookmarks, 'updatefromremote', exupdatefromremote)
extensions.wrapfunction(bookmarks, 'setcurrent', exsetcurrent)
extensions.wrapfunction(hg, 'clone', exclone)
extensions.wrapfunction(hg, 'updaterepo', exupdate)
extensions.wrapfunction(localrepo.localrepository, 'commit', excommit)
entry = extensions.wrapcommand(commands.table, 'bookmarks', exbookmarks)
entry[1].append(('a', 'all', None, 'show both remote and local bookmarks'))
entry[1].append(('', 'remote', None, 'show only remote bookmarks'))
2015-03-12 00:57:32 +03:00
if _tracking(ui):
2015-04-22 21:31:36 +03:00
entry[1].append(('t', 'track', '',
'track this bookmark or remote name',
'BOOKMARK'))
2015-03-14 06:38:55 +03:00
entry[1].append(('u', 'untrack', None,
'remove tracking for this bookmark',
'BOOKMARK'))
2015-03-14 08:12:55 +03:00
try:
rebase = extensions.find('rebase')
2015-04-22 21:31:36 +03:00
def afterload(loaded):
extensions.wrapcommand(rebase.cmdtable, 'rebase', exrebasecmd)
2015-04-22 21:31:36 +03:00
2015-03-14 08:12:55 +03:00
if rebase:
extensions.afterloaded('tweakdefaults', afterload)
2015-03-14 08:12:55 +03:00
except KeyError:
# rebase isn't on, that's fine
2015-03-14 08:12:55 +03:00
pass
2015-03-12 00:57:32 +03:00
entry = extensions.wrapcommand(commands.table, 'branches', exbranches)
entry[1].append(('a', 'all', None, 'show both remote and local branches'))
entry[1].append(('', 'remote', None, 'show only remote branches'))
entry = extensions.wrapcommand(commands.table, 'log', exlog)
entry[1].append(('', 'remote', None, 'show remote names even if hidden'))
entry = extensions.wrapcommand(commands.table, 'push', expushcmd)
entry[1].append(('t', 'to', '', 'push revs to this bookmark', 'BOOKMARK'))
2015-03-10 03:36:25 +03:00
entry[1].append(('d', 'delete', '', 'delete remote bookmark', 'BOOKMARK'))
2015-03-14 01:57:43 +03:00
entry = extensions.wrapcommand(commands.table, 'paths', expaths)
entry[1].append(('d', 'delete', '', 'delete remote path', 'NAME'))
2015-03-14 02:39:30 +03:00
entry[1].append(('a', 'add', '', 'add remote path', 'NAME PATH'))
2015-03-14 01:57:43 +03:00
extensions.wrapcommand(commands.table, 'pull', expullcmd)
2015-03-14 04:02:21 +03:00
entry = extensions.wrapcommand(commands.table, 'clone', exclonecmd)
entry[1].append(('', 'mirror', None, 'sync all bookmarks'))
exchange.pushdiscoverymapping['bookmarks'] = expushdiscoverybookmarks
templatekw.keywords['remotenames'] = remotenameskw
2015-03-13 01:55:16 +03:00
try:
strip = extensions.find('strip')
if strip:
extensions.wrapcommand(strip.cmdtable, 'strip', exstrip)
except KeyError:
# strip isn't on
pass
2015-03-13 02:50:27 +03:00
try:
histedit = extensions.find('histedit')
if histedit:
extensions.wrapcommand(histedit.cmdtable, 'histedit', exhistedit)
except KeyError:
# histedit isn't on
pass
2015-03-13 01:55:16 +03:00
def exlog(orig, ui, repo, *args, **opts):
# hack for logging that turns on the dynamic blockerhook
if opts.get('remote'):
repo.__setattr__('_unblockhiddenremotenames', True)
res = orig(ui, repo, *args, **opts)
if opts.get('remote'):
repo.__setattr__('_unblockhiddenremotenames', False)
return res
_pushto = False
2015-03-10 03:36:25 +03:00
_delete = None
def expushdiscoverybookmarks(pushop):
2015-02-12 06:56:36 +03:00
repo = pushop.repo.unfiltered()
remotemarks = pushop.remote.listkeys('bookmarks')
force = pushop.force
2015-03-10 03:36:25 +03:00
if _delete:
if _delete not in remotemarks:
raise util.Abort(_('remote bookmark %s does not exist'))
pushop.outbookmarks.append([_delete, remotemarks[_delete], ''])
return exchange._pushdiscoverybookmarks(pushop)
if not _pushto:
ret = exchange._pushdiscoverybookmarks(pushop)
2015-04-22 21:31:36 +03:00
if not (repo.ui.configbool('remotenames', 'pushanonheads') or
force):
# check to make sure we don't push an anonymous head
if pushop.revs:
revs = set(pushop.revs)
else:
revs = set(repo.lookup(r) for r in repo.revs('head()'))
2015-03-10 10:06:51 +03:00
revs -= set(pushop.remoteheads)
# find heads that don't have a bookmark going with them
for bookmark in pushop.bookmarks:
rev = repo.lookup(bookmark)
if rev in revs:
revs.remove(rev)
# remove heads that advance bookmarks (old mercurial behavior)
for bookmark, old, new in pushop.outbookmarks:
rev = repo.lookup(new)
if rev in revs:
revs.remove(rev)
# we use known() instead of lookup() due to lookup throwing an
# aborting error causing the connection to close
anonheads = []
knownlist = pushop.remote.known(revs)
for node, known in zip(revs, knownlist):
obs = repo[node].obsolete()
closes = repo[node].closesbranch()
if known or obs or closes:
continue
anonheads.append(short(node))
if anonheads:
msg = _("push would create new anonymous heads (%s)")
hint = _("use --force to override this warning")
raise util.Abort(msg % ', '.join(sorted(anonheads)), hint=hint)
return ret
bookmark = pushop.bookmarks[0]
rev = pushop.revs[0]
# allow new bookmark only if force is True
old = ''
if bookmark in remotemarks:
old = remotemarks[bookmark]
elif not force:
msg = _('not creating new bookmark')
hint = _('use --force to create a new bookmark')
raise util.Abort(msg, hint=hint)
# allow non-ff only if force is True
if not force and old != '':
if old not in repo:
msg = _('remote bookmark revision is not in local repo')
hint = _('pull and merge or rebase or use --force')
raise util.Abort(msg, hint=hint)
foreground = obsolete.foreground(repo, [repo.lookup(old)])
if repo[rev].node() not in foreground:
msg = _('pushed rev is not in the foreground of remote bookmark')
hint = _('use --force flag to complete non-fast-forward update')
raise util.Abort(msg, hint=hint)
2015-02-12 10:41:42 +03:00
if repo[old] == repo[rev]:
repo.ui.warn(_('remote bookmark already points at pushed rev\n'))
return
pushop.outbookmarks.append((bookmark, old, hex(rev)))
def _pushrevs(repo, ui, rev):
"""Given configuration and default rev, return the revs to be pushed"""
pushrev = ui.config('remotenames', 'pushrev')
if pushrev == '!':
return []
elif pushrev:
return [repo[pushrev].rev()]
if rev:
return [repo[rev].rev()]
return []
2015-03-10 10:06:51 +03:00
def expullcmd(orig, ui, repo, source="default", **opts):
revrenames = dict((v, k) for k, v in _getrenames(ui).iteritems())
source = revrenames.get(source, source)
return orig(ui, repo, source, **opts)
def expushcmd(orig, ui, repo, dest=None, **opts):
2015-03-10 03:36:25 +03:00
# needed for discovery method
global _pushto, _delete
_delete = opts.get('delete')
2015-03-10 09:37:13 +03:00
if _delete:
flag = None
for f in ('to', 'bookmark', 'branch', 'rev'):
if opts.get(f):
flag = f
break
if flag:
msg = _('do not specify --delete and '
2015-03-12 00:33:56 +03:00
'--%s at the same time') % flag
2015-03-10 09:37:13 +03:00
raise util.Abort(msg)
# we want to skip pushing any changesets while deleting a remote
# bookmark, so we send the null revision
opts['rev'] = ['null']
return orig(ui, repo, dest, **opts)
2015-03-10 10:06:51 +03:00
revs = opts.get('rev')
to = opts.get('to')
2015-03-12 03:24:01 +03:00
2015-03-19 19:48:27 +03:00
paths = dict((path, url) for path, url in ui.configitems('paths'))
revrenames = dict((v, k) for k, v in _getrenames(ui).iteritems())
origdest = dest
2015-03-12 03:24:01 +03:00
if not dest and not to and not revs and _tracking(ui):
current = bookmarks.readcurrent(repo)
tracking = _readtracking(repo)
# print "tracking on %s %s" % (current, tracking)
if current and current in tracking:
track = tracking[current]
path, book = splitremotename(track)
# un-rename a path, if needed
path = revrenames.get(path, path)
2015-03-12 03:24:01 +03:00
if book and path in paths:
dest = path
to = book
# un-rename passed path
dest = revrenames.get(dest, dest)
# if dest was renamed to default but we aren't specifically requesting
# to push to default, change dest to default-push, if available
if not origdest and dest == 'default' and 'default-push' in paths:
dest = 'default-push'
try:
# hgsubversion does funcky things on push. Just call it directly
path = paths[dest]
if path.startswith('svn+'):
orig(ui, repo, dest, **opts)
except KeyError:
pass
2015-03-19 19:48:27 +03:00
if not to:
if ui.configbool('remotenames', 'forceto', False):
msg = _('must specify --to when pushing')
hint = _('see configuration option %s') % 'remotenames.forceto'
raise util.Abort(msg, hint=hint)
2015-03-10 03:36:25 +03:00
2015-03-10 10:06:51 +03:00
if not revs:
opts['rev'] = _pushrevs(repo, ui, None)
2015-03-10 10:06:51 +03:00
return orig(ui, repo, dest, **opts)
if opts.get('bookmark'):
msg = _('do not specify --to/-t and --bookmark/-B at the same time')
raise util.Abort(msg)
if opts.get('branch'):
msg = _('do not specify --to/-t and --branch/-b at the same time')
raise util.Abort(msg)
if revs:
revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
else:
revs = _pushrevs(repo, ui, '.')
if len(revs) != 1:
msg = _('--to requires exactly one rev to push')
hint = _('use --rev BOOKMARK or omit --rev for current commit (.)')
raise util.Abort(msg, hint=hint)
rev = revs[0]
_pushto = True
# big can o' copypasta from exchange.push
dest = ui.expandpath(dest or 'default-push', dest or 'default')
dest, branches = hg.parseurl(dest, opts.get('branch'))
try:
other = hg.peer(repo, opts, dest)
except error.RepoError:
if dest == "default-push":
hint = _('see the "path" section in "hg help config"')
raise util.Abort(_("default repository not configured!"),
hint=hint)
else:
raise
# all checks pass, go for it!
node = repo.lookup(rev)
2015-02-12 09:31:27 +03:00
ui.status(_('pushing rev %s to destination %s bookmark %s\n') % (
short(node), dest, to))
# TODO: subrepo stuff
force = opts.get('force')
# NB: despite the name, 'revs' doesn't work if it's a numeric rev
pushop = exchange.push(repo, other, force, revs=[node], bookmarks=(to,))
result = not pushop.cgresult
if pushop.bkresult is not None:
if pushop.bkresult == 2:
result = 2
elif not result and pushop.bkresult:
result = 2
_pushto = False
return result
2015-03-14 04:02:21 +03:00
def exclonecmd(orig, ui, *args, **opts):
if opts['mirror']:
ui.setconfig('remotenames', 'syncbookmarks', True, 'mirror-clone')
orig(ui, *args, **opts)
def exbranches(orig, ui, repo, *args, **opts):
if not opts.get('remote'):
orig(ui, repo, *args, **opts)
if opts.get('all') or opts.get('remote'):
# exit early if namespace doesn't even exist
namespace = 'remotebranches'
if namespace not in repo.names:
return
ns = repo.names[namespace]
label = 'log.' + ns.colorname
fm = ui.formatter('branches', opts)
# it seems overkill to hide displaying hidden remote branches
repo = repo.unfiltered()
# create a sorted by descending rev list
revs = set()
for name in ns.listnames(repo):
for n in ns.nodes(repo, name):
revs.add(repo.changelog.rev(n))
for r in sorted(revs, reverse=True):
ctx = repo[r]
for name in ns.names(repo, ctx.node()):
fm.startitem()
padsize = max(31 - len(str(r)) - encoding.colwidth(name), 0)
tmplabel = label
if ctx.obsolete():
tmplabel = tmplabel + ' changeset.obsolete'
fm.write(ns.colorname, '%s', name, label=label)
fmt = ' ' * padsize + ' %d:%s'
fm.condwrite(not ui.quiet, 'rev node', fmt, r,
fm.hexfunc(ctx.node()), label=tmplabel)
fm.plain('\n')
fm.end()
def _readtracking(repo):
tracking = {}
try:
2015-03-12 01:38:19 +03:00
for line in repo.vfs.read('bookmarks.tracking').strip().split('\n'):
try:
book, track = line.strip().split(' ')
tracking[book] = track
except ValueError:
# corrupt file, ignore entry
pass
except IOError:
pass
return tracking
def _writetracking(repo, tracking):
data = ''
for book, track in tracking.iteritems():
data += '%s %s\n' % (book, track)
2015-03-12 22:53:08 +03:00
repo.vfs.write('bookmarks.tracking', data)
def _removetracking(repo, bookmarks):
tracking = _readtracking(repo)
needwrite = False
for bmark in bookmarks:
try:
del tracking[bmark]
needwrite = True
except KeyError:
pass
if needwrite:
_writetracking(repo, tracking)
def exbookmarks(orig, ui, repo, *args, **opts):
"""Bookmark output is sorted by bookmark name.
This has the side benefit of grouping all remote bookmarks by remote name.
"""
delete = opts.get('delete')
rename = opts.get('rename')
inactive = opts.get('inactive')
remote = opts.get('remote')
track = opts.get('track')
2015-03-14 06:38:55 +03:00
untrack = opts.get('untrack')
rev = opts.get('rev')
disallowed = set(ui.configlist('remotenames', 'disallowedbookmarks'))
if not delete:
for name in args:
if name in disallowed:
2015-04-22 21:31:36 +03:00
msg = _("bookmark '%s' not allowed by configuration")
raise util.Abort(msg % name)
2015-03-14 06:38:55 +03:00
if untrack:
if track:
msg = _('do not specify --untrack and --track at the same time')
raise util.Abort(msg)
_removetracking(repo, args)
return
if rev and not track and not untrack:
track = opts['track'] = rev
if delete or rename or args or inactive:
ret = orig(ui, repo, *args, **opts)
if track:
tracking = _readtracking(repo)
for arg in args:
tracking[arg] = track
_writetracking(repo, tracking)
# update the cache
precachedistance(repo)
# also remove tracking for a deleted bookmark, if it exists
if delete:
_removetracking(repo, args)
return ret
if not remote:
displaylocalbookmarks(ui, repo, opts)
if remote or opts.get('all'):
displayremotebookmarks(ui, repo, opts)
def displaylocalbookmarks(ui, repo, opts):
# copy pasta from commands.py; need to patch core
fm = ui.formatter('bookmarks', opts)
hexfn = fm.hexfunc
marks = repo._bookmarks
if len(marks) == 0 and not fm:
ui.status(_("no bookmarks set\n"))
tracking = _readtracking(repo)
distances = readdistancecache(repo)
nq = not ui.quiet
for bmark, n in sorted(marks.iteritems()):
current = repo._bookmarkcurrent
if bmark == current:
prefix, label = '*', 'bookmarks.current'
else:
prefix, label = ' ', ''
fm.startitem()
if nq:
fm.plain(' %s ' % prefix, label=label)
fm.write('bookmark', '%s', bmark, label=label)
pad = " " * (25 - encoding.colwidth(bmark))
rev = repo.changelog.rev(n)
h = hexfn(n)
fm.condwrite(nq, 'rev node', pad + ' %d:%s', rev, h, label=label)
if ui.verbose and bmark in tracking:
tracked = tracking[bmark]
if bmark in distances:
distance = distances[bmark]
else:
distance = calculatenamedistance(repo, bmark, tracked)
if tracked:
ab = ''
if distance != (0, 0) and distance != (None, None):
ab = ': %s ahead, %s behind' % distance
pad = " " * (25 - encoding.colwidth(str(rev)) -
encoding.colwidth(str(h)))
fm.write('bookmark', pad + '[%s%s]', tracked, ab, label=label)
if distance != (None, None):
distances[bmark] = distance
fm.data(active=(bmark == current))
fm.plain('\n')
fm.end()
# write distance cache
writedistancecache(repo, distances)
def displayremotebookmarks(ui, repo, opts):
n = 'remotebookmarks'
if n not in repo.names:
return
ns = repo.names[n]
color = ns.colorname
label = 'log.' + color
fm = ui.formatter('bookmarks', opts)
# it seems overkill to hide displaying hidden remote bookmarks
repo = repo.unfiltered()
for name in sorted(ns.listnames(repo)):
node = ns.nodes(repo, name)[0]
ctx = repo[node]
fm.startitem()
if not ui.quiet:
fm.plain(' ')
padsize = max(25 - encoding.colwidth(name), 0)
fmt = ' ' * padsize + ' %d:%s'
tmplabel = label
if ctx.obsolete():
tmplabel = tmplabel + ' changeset.obsolete'
fm.write(color, '%s', name, label=label)
fm.condwrite(not ui.quiet, 'rev node', fmt, ctx.rev(),
fm.hexfunc(node), label=tmplabel)
fm.plain('\n')
fm.end()
def activepath(ui, remote):
local = None
try:
local = remote.local()
except AttributeError:
pass
# determine the remote path from the repo, if possible; else just
# use the string given to us
rpath = remote
if local:
rpath = getattr(remote, 'root', None)
if rpath is None:
# Maybe a localpeer? (hg@1ac628cd7113, 2.3)
rpath = getattr(getattr(remote, '_repo', None),
'root', None)
elif not isinstance(remote, str):
try:
rpath = remote._url
except AttributeError:
rpath = remote.url
candidates = []
for path, uri in ui.configitems('paths'):
uri = ui.expandpath(expandscheme(ui, uri))
if local:
uri = os.path.realpath(uri)
else:
if uri.startswith('http'):
try:
uri = url.url(uri).authinfo()[0]
except AttributeError:
try:
uri = util.url(uri).authinfo()[0]
except AttributeError:
uri = url.getauthinfo(uri)[0]
uri = uri.rstrip('/')
# guard against hgsubversion nonsense
if not isinstance(rpath, basestring):
continue
rpath = rpath.rstrip('/')
if uri == rpath:
candidates.append(path)
if not candidates:
return ''
# be stable under different orderings of paths in config files
# prefer any name other than 'default' and 'default-push' if available
# prefer shortest name of remaining names, and break ties by alphabetizing
cset = set(candidates)
cset.discard('default')
cset.discard('default-push')
if cset:
candidates = list(cset)
2015-04-22 21:31:36 +03:00
candidates.sort() # alphabetical
candidates.sort(key=len) # sort is stable so first will be the correct one
bestpath = candidates[0]
2015-03-03 10:22:51 +03:00
renames = _getrenames(ui)
realpath = renames.get(bestpath, bestpath)
return realpath
2015-03-03 10:22:51 +03:00
# memoization
_renames = None
def _getrenames(ui):
2015-03-03 10:22:51 +03:00
global _renames
if _renames is None:
_renames = {}
for k, v in ui.configitems('remotenames'):
if k.startswith('rename.'):
_renames[k[7:]] = v
return _renames
def expandscheme(ui, uri):
'''For a given uri, expand the scheme for it'''
urischemes = [s for s in schemes.schemes.iterkeys()
if uri.startswith('%s://' % s)]
for s in urischemes:
# TODO: refactor schemes so we don't
# duplicate this logic
2015-03-09 23:12:23 +03:00
ui.note(_('performing schemes expansion with '
'scheme %s\n') % s)
scheme = hg.schemes[s]
parts = uri.split('://', 1)[1].split('/', scheme.parts)
if len(parts) > scheme.parts:
tail = parts[-1]
parts = parts[:-1]
else:
tail = ''
2014-12-16 10:45:59 +03:00
ctx = dict((str(i + 1), v) for i, v in enumerate(parts))
uri = ''.join(scheme.templater.process(scheme.url, ctx)) + tail
return uri
def splitremotename(remote):
name = ''
if '/' in remote:
remote, name = remote.split('/', 1)
return remote, name
def joinremotename(remote, ref):
if ref:
remote += '/' + ref
return remote
def readremotenames(repo):
rfile = repo.join('remotenames')
# exit early if there is nothing to do
if not os.path.exists(rfile):
return
# needed to heuristically determine if a file is in the old format
branches = repo.names['branches'].listnames(repo)
bookmarks = repo.names['bookmarks'].listnames(repo)
f = open(rfile)
for line in f:
nametype = None
line = line.strip()
if not line:
continue
nametype = None
remote, rname = None, None
node, name = line.split(' ', 1)
# check for nametype being written into the file format
if ' ' in name:
nametype, name = name.split(' ', 1)
remote, rname = splitremotename(name)
# skip old data that didn't write the name (only wrote the alias)
if not rname:
continue
# old format didn't save the nametype, so check for the name in
# branches and bookmarks
if nametype is None:
if rname in branches:
nametype = 'branches'
elif rname in bookmarks:
nametype = 'bookmarks'
yield node, nametype, remote, rname
f.close()
def loadremotenames(repo):
alias_default = repo.ui.configbool('remotenames', 'alias.default')
for node, nametype, remote, rname in readremotenames(repo):
# handle alias_default here
if remote != "default" and rname == "default" and alias_default:
name = remote
else:
name = joinremotename(remote, rname)
# if the node doesn't exist, skip it
try:
ctx = repo[node]
except error.RepoLookupError:
continue
# only mark as remote if the head changeset isn't marked closed
if not ctx.extra().get('close'):
nodes = _remotenames[nametype].get(name, [])
nodes.append(ctx.node())
_remotenames[nametype][name] = nodes
def transition(repo, ui):
"""
Help with transitioning to using a remotenames workflow.
Allows deleting matching local bookmarks defined in a config file:
[remotenames]
transitionbookmarks = master
stable
"""
transmarks = ui.configlist('remotenames', 'transitionbookmarks')
localmarks = repo._bookmarks
for mark in transmarks:
if mark in localmarks:
del localmarks[mark]
localmarks.write()
message = ui.config('remotenames', 'transitionmessage')
if message:
ui.warn(message + '\n')
def saveremotenames(repo, remote, branches={}, bookmarks={}):
wlock = repo.wlock()
try:
# delete old files
try:
repo.vfs.unlink('remotedistance')
except OSError, inst:
if inst.errno != errno.ENOENT:
raise
if not repo.vfs.exists('remotenames'):
transition(repo, repo.ui)
# while we're removing old paths, also update _remotenames
for btype, rmap in _remotenames.iteritems():
for rname in rmap.copy():
if remote == splitremotename(rname)[0]:
del _remotenames[btype][rname]
# read in all data first before opening file to write
olddata = set(readremotenames(repo))
f = repo.vfs('remotenames', 'w')
# only update the given 'remote'; iterate over old data and re-save it
for node, nametype, oldremote, rname in olddata:
if oldremote != remote:
n = joinremotename(oldremote, rname)
f.write('%s %s %s\n' % (node, nametype, n))
for branch, nodes in branches.iteritems():
for n in nodes:
rname = joinremotename(remote, branch)
f.write('%s branches %s\n' % (hex(n), rname))
for bookmark, n in bookmarks.iteritems():
f.write('%s bookmarks %s\n' % (n, joinremotename(remote, bookmark)))
f.close()
finally:
wlock.release()
def calculatedistance(repo, fromrev, torev):
"""
Return the (ahead, behind) distance between `fromrev` and `torev`.
The returned tuple will contain ints if calculated, Nones otherwise.
"""
if not repo.ui.configbool('remotenames', 'calculatedistance', True):
return (None, None)
ahead = len(repo.revs('only(%d, %d)' % (fromrev, torev)))
behind = len(repo.revs('only(%d, %d)' % (torev, fromrev)))
return (ahead, behind)
def calculatenamedistance(repo, fromname, toname):
"""
Similar to calculatedistance, but accepts names such as local and remote
bookmarks, and will return (None, None) if any of the names do not resolve
in the given repository.
"""
distance = (None, None)
if fromname and fromname in repo and toname in repo:
rev1 = repo[fromname].rev()
rev2 = repo[toname].rev()
distance = calculatedistance(repo, rev1, rev2)
return distance
def writedistancecache(repo, distance):
try:
f = repo.vfs('cache/distance', 'w')
for k, v in distance.iteritems():
f.write('%s %d %d\n' % (k, v[0], v[1]))
except (IOError, OSError):
pass
def readdistancecache(repo):
distances = {}
try:
for line in repo.vfs.read('cache/distance').splitlines():
line = line.rsplit(' ', 2)
try:
d = (int(line[1]), int(line[2]))
distances[line[0]] = d
except ValueError:
# corrupt entry, ignore line
pass
except (IOError, OSError):
pass
return distances
def invalidatedistancecache(repo):
"""Try to invalidate any existing distance caches"""
error = False
try:
if repo.vfs.isdir('cache/distance'):
shutil.rmtree(repo.vfs.join('cache/distance'))
else:
repo.vfs.unlink('cache/distance')
2015-04-28 01:25:01 +03:00
except (OSError, IOError), inst:
if inst.errno != errno.ENOENT:
error = True
try:
repo.vfs.unlink('cache/distance.current')
except (OSError, IOError), inst:
if inst.errno != errno.ENOENT:
error = True
2015-04-28 01:25:01 +03:00
if error:
repo.ui.warn(_('Unable to invalidate tracking cache; ' +
'distance displayed may be incorrect\n'))
def precachedistance(repo):
"""
Caclulate and cache the distance between bookmarks and what they
track, plus the distance from the tipmost head on current topological
branch. This can be an expensive operation especially in repositories
with a high commit rate, so it can be turned off in your hgrc:
[remotenames]
precachedistance = False
precachecurrent = False
"""
# to avoid stale namespaces, let's reload
loadremotenames(repo)
2015-04-28 01:25:45 +03:00
wlock = repo.wlock()
try:
invalidatedistancecache(repo)
distances = {}
if repo.ui.configbool('remotenames', 'precachedistance', True):
distances = {}
for bmark, tracked in _readtracking(repo).iteritems():
distance = calculatenamedistance(repo, bmark, tracked)
if distance != (None, None):
distances[bmark] = distance
writedistancecache(repo, distances)
if repo.ui.configbool('remotenames', 'precachecurrent', True):
# are we on a 'branch' but not at the head?
# i.e. is there a bookmark that we are heading towards?
revs = list(repo.revs('limit(.:: and bookmark() - ., 1)'))
if revs:
# if we are here then we have one or more bookmarks
# and we'll pick the first one for now
bmark = repo[revs[0]].bookmarks()[0]
distance = len(repo.revs('only(%d, .)' % revs[0]))
repo.vfs.write('cache/distance.current',
'%s %d' % (bmark, distance))
finally:
wlock.release()
#########
# revsets
#########
def upstream_revs(filt, repo, subset, x):
upstream_tips = set()
for remotename in _remotenames.keys():
rname = 'remote' + remotename
try:
ns = repo.names[rname]
except KeyError:
continue
for name in ns.listnames(repo):
if filt(splitremotename(name)[0]):
upstream_tips.update(ns.nodes(repo, name))
if not upstream_tips:
return revset.baseset([])
tipancestors = repo.revs('::%ln', upstream_tips)
2014-12-16 10:45:59 +03:00
return revset.filteredset(subset, lambda n: n in tipancestors)
def upstream(repo, subset, x):
'''``upstream()``
Select changesets in an upstream repository according to remotenames.
'''
repo = repo.unfiltered()
upstream_names = repo.ui.configlist('remotenames', 'upstream')
# override default args from hgrc with args passed in on the command line
if x:
upstream_names = [revset.getstring(symbol,
"remote path must be a string")
for symbol in revset.getlist(x)]
2015-04-22 21:31:36 +03:00
default_path = dict(repo.ui.configitems('paths')).get('default')
if not upstream_names and default_path:
default_path = expandscheme(repo.ui, default_path)
upstream_names = [activepath(repo.ui, default_path)]
2015-04-22 21:31:36 +03:00
def filt(name):
if upstream_names:
return name in upstream_names
return True
return upstream_revs(filt, repo, subset, x)
def pushed(repo, subset, x):
'''``pushed()``
Select changesets in any remote repository according to remotenames.
'''
2014-12-16 10:45:59 +03:00
revset.getargs(x, 0, 0, "pushed takes no arguments")
return upstream_revs(lambda x: True, repo, subset, x)
def remotenamesrevset(repo, subset, x):
"""``remotenames()``
All remote branches heads.
"""
2014-12-16 10:45:59 +03:00
revset.getargs(x, 0, 0, "remotenames takes no arguments")
remoterevs = set()
cl = repo.changelog
for remotename in _remotenames.keys():
rname = 'remote' + remotename
try:
ns = repo.names[rname]
except KeyError:
continue
for name in ns.listnames(repo):
remoterevs.update(ns.nodes(repo, name))
return revset.baseset(sorted(cl.rev(n) for n in remoterevs))
2014-03-18 22:46:10 +04:00
revset.symbols.update({'upstream': upstream,
'pushed': pushed,
'remotenames': remotenamesrevset})
###########
# templates
###########
def remotenameskw(**args):
""":remotenames: List of strings. List of remote names associated with the
changeset. If remotenames.suppressbranches is True then branch names will
be hidden if there is a bookmark at the same changeset.
"""
repo, ctx = args['repo'], args['ctx']
remotenames = []
if 'remotebookmarks' in repo.names:
remotenames = repo.names['remotebookmarks'].names(repo, ctx.node())
suppress = repo.ui.configbool('remotenames', 'suppressbranches', False)
if (not remotenames or not suppress) and 'remotebranches' in repo.names:
remotenames += repo.names['remotebranches'].names(repo, ctx.node())
return templatekw.showlist('remotename', remotenames,
plural='remotenames', **args)