comparison hgext/bookmarks.py @ 11443:9e1bc1aafdb1 stable

bookmarks: fix bogus cut and paste for outgoing

11442:ee1ed6afac21

        ui.status(_('comparing with %s\n') % url.hidepassword(source))
        diffbookmarks(ui, repo, other)
    else:
        oldincoming(ui, repo, source, **opts)

def outgoing(oldoutgoing, ui, repo, source="default", **opts):
    if opts.get('bookmarks'):
        source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
        other = hg.repository(hg.remoteui(repo, opts), source)
        ui.status(_('comparing with %s\n') % url.hidepassword(source))
        diffbookmarks(ui, other, repo)
    else:
        oldoutgoing(ui, repo, source, **opts)

def uisetup(ui):
    extensions.wrapfunction(repair, "strip", strip)
    if ui.configbool('bookmarks', 'track.current'):
        extensions.wrapcommand(commands.table, 'update', updatecurbookmark)

11443:9e1bc1aafdb1

        ui.status(_('comparing with %s\n') % url.hidepassword(source))
        diffbookmarks(ui, repo, other)
    else:
        oldincoming(ui, repo, source, **opts)

def outgoing(oldoutgoing, ui, repo, dest=None, **opts):
    if opts.get('bookmarks'):
        dest = ui.expandpath(dest or 'default-push', dest or 'default')
        dest, branches = hg.parseurl(dest, opts.get('branch'))
        other = hg.repository(hg.remoteui(repo, opts), dest)
        ui.status(_('comparing with %s\n') % url.hidepassword(dest))
        diffbookmarks(ui, other, repo)
    else:
        oldoutgoing(ui, repo, dest, **opts)

def uisetup(ui):
    extensions.wrapfunction(repair, "strip", strip)
    if ui.configbool('bookmarks', 'track.current'):
        extensions.wrapcommand(commands.table, 'update', updatecurbookmark)