graft: drop --user and --date values info from hint in case of conflicts
After previous patch, we have started preserving user and date values in
graftstate and reusing them during `hg graft --continue`. Now passing --user and
--date again with --continue makes no sense. Let's drop them from the hint.
Differential Revision: https://phab.mercurial-scm.org/D3660
--- a/mercurial/commands.py Fri May 25 17:21:01 2018 +0530
+++ b/mercurial/commands.py Sat May 26 02:11:09 2018 +0530
@@ -64,7 +64,6 @@
)
from .utils import (
dateutil,
- procutil,
stringutil,
)
@@ -2365,10 +2364,6 @@
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
--- a/tests/test-graft.t Fri May 25 17:21:01 2018 +0530
+++ b/tests/test-graft.t Sat May 26 02:11:09 2018 +0530
@@ -1456,7 +1456,7 @@
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 @@
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