# HG changeset patch # User Adam Simpkins # Date 1461810271 25200 # Node ID 224dd889ecd01034f0cce8afcaa917eb4b2915b6 # Parent 67fd250b7c21b859c85d89603fb292de3aaeef26 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' diff -r 67fd250b7c21 -r 224dd889ecd0 mercurial/commands.py --- a/mercurial/commands.py Fri Apr 29 14:14:00 2016 -0500 +++ b/mercurial/commands.py Wed Apr 27 19:24:31 2016 -0700 @@ -4231,9 +4231,9 @@ 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