Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
graft: fix printing of --continue command stable
authorAdam Simpkins <simpkins@fb.com>
Wed, 27 Apr 2016 19:24:31 -0700
branchstable
changeset 29029 224dd889ecd0
parent 29028 67fd250b7c21
child 29030 18c1b107898e
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'
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- 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
mercurial