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: reuse the --log value passed initially in `hg graft --continue` (BC)
authorPulkit Goyal <7895pulkit@gmail.com>
Sat, 26 May 2018 03:01:14 +0530
changeset 38238 2b8c8b8d1a06
parent 38237 66fc2ef8dbff
child 38239 ead71b15efd5
graft: reuse the --log value passed initially in `hg graft --continue` (BC) We now stores the value of --log flag passed initially in the graftstate and reuse that value when doing `hg graft --continue` which is a nice behavior. The test updates demonstrate the fix. Since we now preserve the value by default, drop the mention of `--log` flag from the hint which we see after conflicts. Differential Revision: https://phab.mercurial-scm.org/D3662
mercurial/commands.py file | annotate | diff | comparison | revisions
tests/test-graft.t file | annotate | diff | comparison | revisions 
--- a/mercurial/commands.py	Sat May 26 02:57:36 2018 +0530
+++ b/mercurial/commands.py	Sat May 26 03:01:14 2018 +0530
@@ -2230,6 +2230,8 @@
                 opts['date'] = statedata['date']
             if statedata.get('user'):
                 opts['user'] = statedata['user']
+            if statedata.get('log'):
+                opts['log'] = True
             nodes = statedata['nodes']
             revs = [repo[node].rev() for node in nodes]
         else:
@@ -2344,6 +2346,7 @@
         message = ctx.description()
         if opts.get('log'):
             message += '\n(grafted from %s)' % ctx.hex()
+            statedata['log'] = True
 
         # we don't merge the first commit when continuing
         if not cont:
@@ -2363,10 +2366,7 @@
                 statedata['nodes'] = nodes
                 stateversion = 1
                 graftstate.save(stateversion, statedata)
-                extra = ''
-                if opts.get('log'):
-                    extra += ' --log'
-                hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
+                hint = _("use 'hg resolve' and 'hg graft --continue'")
                 raise error.Abort(
                     _("unresolved conflicts, can't continue"),
                     hint=hint)
--- a/tests/test-graft.t	Sat May 26 02:57:36 2018 +0530
+++ b/tests/test-graft.t	Sat May 26 03:01:14 2018 +0530
@@ -213,7 +213,7 @@
   my e@1905859650ec+ other e@9c233e8e184d ancestor e@4c60f11aa304
   warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
   abort: unresolved conflicts, can't continue
-  (use 'hg resolve' and 'hg graft --continue --log')
+  (use 'hg resolve' and 'hg graft --continue')
   [255]
 
 Summary should mention graft:
@@ -1545,7 +1545,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 --log')
+  (use 'hg resolve' and 'hg graft --continue')
   [255]
 
   $ echo foobar > b
@@ -1558,10 +1558,10 @@
   grafting 2:8be98ac1a569 "added c"
 
   $ hg log -GT "{rev}:{node|short} {desc}" -r '.^^::.'
-  @  11:7ee8d3496b19 added c
-  |
-  o  10:802f1eae3af3 added b
-  |
+  @  11:30c1050a58b2 added c
+  |  (grafted from 8be98ac1a56990c2d9ca6861041b8390af7bd6f3)
+  o  10:ec7eda2313e2 added b
+  |  (grafted from 80e6d2c47cfe5b3185519568327a17a061c7efb6)
   o  3:9e887f7a939c bar to b
   |
   ~
mercurial