Mercurial > hg
changeset 7638:f83a2b1d1a71
bookmarks; clean up imports and function wrapping
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 12 Jan 2009 10:53:41 -0600 |
parents | 1d54e2f6c0b7 |
children | ae7a614a6a57 |
files | hgext/bookmarks.py |
diffstat | 1 files changed, 10 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/bookmarks.py Mon Jan 12 10:42:31 2009 -0600 +++ b/hgext/bookmarks.py Mon Jan 12 10:53:41 2009 -0600 @@ -25,12 +25,10 @@ just updates it. This is similar to git's approach of branching. ''' -from mercurial.commands import templateopts, hex, short -from mercurial import extensions from mercurial.i18n import _ -from mercurial import cmdutil, util, commands, changelog -from mercurial.node import nullid, nullrev -import mercurial, mercurial.localrepo, mercurial.repair, os +from mercurial.node import nullid, nullrev, hex, short +from mercurial import util, commands, localrepo, repair, extensions +import os def parse(repo): '''Parse .hg/bookmarks file and return a dictionary @@ -198,7 +196,7 @@ saveheads.append(p) return [r for r in tostrip if r not in saveheads] -def strip(ui, repo, node, backup="all"): +def strip(oldstrip, ui, repo, node, backup="all"): """Strip bookmarks if revisions are stripped using the mercurial.strip method. This usually happens during qpush and qpop""" @@ -214,11 +212,8 @@ marks[m] = repo.changectx('.').node() write(repo, marks) -oldstrip = mercurial.repair.strip -mercurial.repair.strip = strip - def reposetup(ui, repo): - if not isinstance(repo, mercurial.localrepo.localrepository): + if not isinstance(repo, localrepo.localrepository): return # init a bookmark cache as otherwise we would get a infinite reading @@ -293,6 +288,11 @@ repo.__class__ = bookmark_repo +def uisetup(ui): + extensions.wrapfunction(repair, "strip", strip) + if ui.configbool('bookmarks', 'track.current'): + extensions.wrapcommand(commands.table, 'update', updatecurbookmark) + def updatecurbookmark(orig, ui, repo, *args, **opts): '''Set the current bookmark @@ -306,11 +306,6 @@ setcurrent(repo, rev) return res -def uisetup(ui): - 'Replace push with a decorator to provide --non-bookmarked option' - if ui.configbool('bookmarks', 'track.current'): - extensions.wrapcommand(commands.table, 'update', updatecurbookmark) - cmdtable = { "bookmarks": (bookmark,