comparison hgext/bookmarks.py @ 7489:9b64589b1112

Merge backout

7487:63446383dfb7

            tagscache.update(parse(repo))
            return tagscache

    repo.__class__ = bookmark_repo

def pushnonbookmarked(orig, ui, repo, *args, **opts):
    'Call push with only the heads that are not bookmarked'
    if opts.get('non_bookmarked'):
        if opts.get('rev'):
            heads = [repo.lookup(r) for r in opts.get('rev')]
        else:
            heads = repo.heads()

        markheads = parse(repo).values()
        opts['rev'] = [head for head in heads if not(head in markheads)]

    orig(ui, repo, *args, **opts)

def updatecurbookmark(orig, ui, repo, *args, **opts):
    '''Set the current bookmark

    If the user updates to a bookmark we update the .hg/bookmarks.current
    file.

    setcurrent(repo, rev)
    return res

def uisetup(ui):
    'Replace push with a decorator to provide --non-bookmarked option'
    entry = extensions.wrapcommand(commands.table, 'push', pushnonbookmarked)
    entry[1].append(('', 'non-bookmarked', None, _("push all heads that are not bookmarked")))
    if ui.configbool('bookmarks', 'track.current'):
        extensions.wrapcommand(commands.table, 'update', updatecurbookmark)

cmdtable = {
    "bookmarks":

7489:9b64589b1112

            tagscache.update(parse(repo))
            return tagscache

    repo.__class__ = bookmark_repo

def updatecurbookmark(orig, ui, repo, *args, **opts):
    '''Set the current bookmark

    If the user updates to a bookmark we update the .hg/bookmarks.current
    file.

    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":