Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 37120:a8a902d7176e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
procutil: bulk-replace function calls to point to new module
author Yuya Nishihara <yuya@tcha.org>
date Sat, 24 Mar 2018 15:10:51 +0900
parents 704932ef8913
children 6f570c501e3e
comparison
equal deleted inserted replaced
37119:d4a2e0d5d042 37120:a8a902d7176e
61 util, 61 util,
62 wireprotoserver, 62 wireprotoserver,
63 ) 63 )
64 from .utils import ( 64 from .utils import (
65 dateutil, 65 dateutil,
66 procutil,
66 stringutil, 67 stringutil,
67 ) 68 )
68 69
69 release = lockmod.release 70 release = lockmod.release
70 71
2314 # write out state for --continue 2315 # write out state for --continue
2315 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]] 2316 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
2316 repo.vfs.write('graftstate', ''.join(nodelines)) 2317 repo.vfs.write('graftstate', ''.join(nodelines))
2317 extra = '' 2318 extra = ''
2318 if opts.get('user'): 2319 if opts.get('user'):
2319 extra += ' --user %s' % util.shellquote(opts['user']) 2320 extra += ' --user %s' % procutil.shellquote(opts['user'])
2320 if opts.get('date'): 2321 if opts.get('date'):
2321 extra += ' --date %s' % util.shellquote(opts['date']) 2322 extra += ' --date %s' % procutil.shellquote(opts['date'])
2322 if opts.get('log'): 2323 if opts.get('log'):
2323 extra += ' --log' 2324 extra += ' --log'
2324 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra 2325 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
2325 raise error.Abort( 2326 raise error.Abort(
2326 _("unresolved conflicts, can't continue"), 2327 _("unresolved conflicts, can't continue"),