diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -64,7 +64,6 @@ from . import ( ) from .utils import ( dateutil, - procutil, stringutil, ) @@ -2365,10 +2364,6 @@ def _dograft(ui, repo, *revs, **opts): stateversion = 1 graftstate.save(stateversion, statedata) extra = '' - if opts.get('user'): - extra += ' --user %s' % procutil.shellquote(opts['user']) - if opts.get('date'): - extra += ' --date %s' % procutil.shellquote(opts['date']) if opts.get('log'): extra += ' --log' hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra diff --git a/tests/test-graft.t b/tests/test-graft.t --- a/tests/test-graft.t +++ b/tests/test-graft.t @@ -1456,7 +1456,7 @@ running `hg graft --continue` merging b warning: conflicts while merging b! (edit, then use 'hg resolve --mark') abort: unresolved conflicts, can't continue - (use 'hg resolve' and 'hg graft --continue --user batman') + (use 'hg resolve' and 'hg graft --continue') [255] $ echo wat > b @@ -1506,7 +1506,7 @@ Test that --date is preserved and reused merging b warning: conflicts while merging b! (edit, then use 'hg resolve --mark') abort: unresolved conflicts, can't continue - (use 'hg resolve' and 'hg graft --continue --date '1234560000 120'') + (use 'hg resolve' and 'hg graft --continue') [255] $ echo foobar > b