##// END OF EJS Templates
bookmarks: resolve divergent bookmark when moving across a branch...
bookmarks: resolve divergent bookmark when moving across a branch This patch resolves a single divergent bookmark if a divergent bookmark exists in the target revision and it current bookmark is not an ancestor of the target revision, else it would already be handled by the previous patch in this series. Test coverage is added.

File last commit:

r6365:1d3eb332 default
r19111:6439d78e stable
Show More
convert-repo
27 lines | 643 B | text/plain | TextLexer
Edouard Gomez
Add a wrapper script for convert extension
r4514 #!/usr/bin/env python
#
# Wrapper script around the convert.py hgext extension
# for foreign SCM conversion to mercurial format.
#
import sys
from mercurial import ui, fancyopts
from hgext import convert
# Options extracted from the cmdtable
func, options, help = convert.cmdtable['convert']
# An ui instance
u = ui.ui()
opts = {}
args = []
try:
Patrick Mezard
convertrepo: make it work with refactored convert extension
r6365 args = list(fancyopts.fancyopts(sys.argv[1:], options, opts))
args += [None]*(3 - len(args))
src, dest, revmapfile = args
except (fancyopts.getopt.GetoptError, ValueError), inst:
u.warn('Usage:\n%s\n' % help)
Edouard Gomez
Add a wrapper script for convert extension
r4514 sys.exit(-1)
Patrick Mezard
convertrepo: make it work with refactored convert extension
r6365 convert.convert(u, src, dest, revmapfile, **opts)