mirror of
https://github.com/facebook/sapling.git
synced 2024-10-08 15:57:43 +03:00
graft: fix printing of --continue command
Properly shell quote arguments, to avoid printing commands that won't work when run literally. For example, a date string with timestamp needs to be quoted: --date '1456953053 28800'
This commit is contained in:
parent
5296280949
commit
49958f0c37
@ -4231,9 +4231,9 @@ def _dograft(ui, repo, *revs, **opts):
|
||||
repo.vfs.write('graftstate', ''.join(nodelines))
|
||||
extra = ''
|
||||
if opts.get('user'):
|
||||
extra += ' --user %s' % opts['user']
|
||||
extra += ' --user %s' % util.shellquote(opts['user'])
|
||||
if opts.get('date'):
|
||||
extra += ' --date %s' % opts['date']
|
||||
extra += ' --date %s' % util.shellquote(opts['date'])
|
||||
if opts.get('log'):
|
||||
extra += ' --log'
|
||||
hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
|
||||
|
Loading…
Reference in New Issue
Block a user