Mercurial > hg
view contrib/convert-repo @ 21537:1ab30e9ba0fc
update: specify custom conflict markers for update (BC)
Add custom conflict markers 'working copy' and 'destination' for doing hg update
when there are conflicts between your working copy and the destination.
author | Durham Goode <durham@fb.com> |
---|---|
date | Fri, 09 May 2014 18:09:11 -0700 |
parents | 1d3eb332f3cb |
children |
line wrap: on
line source
#!/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: 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) sys.exit(-1) convert.convert(u, src, dest, revmapfile, **opts)