Yuya Nishihara <yuya@tcha.org> [Wed, 21 Mar 2018 01:39:44 +0900] rev 38242
templater: move getdictitem() to hybrid class
Since a raw dict will never be returned by evalwrapped(), we don't need
to support d.get(key).
Yuya Nishihara <yuya@tcha.org> [Sat, 21 Apr 2018 17:43:16 +0900] rev 38241
templater: add try-except stub to runmember()
New wrapped interface will raise ParseError if the underlying object doesn't
support dict-like lookup operation.
Yuya Nishihara <yuya@tcha.org> [Wed, 21 Mar 2018 01:18:29 +0900] rev 38240
templater: do dict lookup over a wrapped object
Dict/list lookup operations will be moved to a wrapped interface so that
a returned element can inherit hybrid-ness automatically. wraphybridvalue()
will be inlined.
Augie Fackler <augie@google.com> [Wed, 06 Jun 2018 13:31:24 -0400] rev 38239
merge with stable
Pulkit Goyal <7895pulkit@gmail.com> [Sat, 26 May 2018 03:01:14 +0530] rev 38238
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
Pulkit Goyal <7895pulkit@gmail.com> [Sat, 26 May 2018 02:57:36 +0530] rev 38237
graft: add test showing --continue not preserving --log passed earlier
This patch shows that when we do `hg graft --continue`, the value of --log flag
passed when initial graft was run was not used.
Next patch will fix this and tests will help us in realising that.
Differential Revision: https://phab.mercurial-scm.org/D3661