D3660: graft: drop --user and --date values info from hint in case of conflicts

pulkit (Pulkit Goyal) phabricator at mercurial-scm.org
Fri May 25 16:53:11 EDT 2018


pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  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.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D3660

AFFECTED FILES
  mercurial/commands.py
  tests/test-graft.t

CHANGE DETAILS

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 @@
   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
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -2365,10 +2365,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



To: pulkit, #hg-reviewers
Cc: mercurial-devel


More information about the Mercurial-devel mailing list