Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 24 Jun 2014 17:36:49 +0100] rev 22210
revert: drop `missingmodified` set
There cannot be any elements in this set since:
dsmodified &= modified
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 24 Jun 2014 17:28:20 +0100] rev 22209
revert: detect files added during a merge
In case of merge, file that are actually added can be reported as modified. This
is currently handled by special-case code. We detect it beforehand instead. This
will lets use remove the special-case code at some point in the future.
Pierre-Yves David <pierre-yves.david@fb.com> [Sat, 02 Aug 2014 11:32:24 -0700] rev 22208
revert: simplify handling of `added` files
There are multiple possible cases for added files. But it's all handled by magic
much lower in the stack. We document them, simplify the codes and move on.
Matt Mackall <mpm@selenic.com> [Fri, 15 Aug 2014 11:48:05 -0500] rev 22207
merge with stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 15 Aug 2014 23:05:53 +0900] rev 22206
rebase: use "rebase.collapse" as "editform" for "--collapse" always
Before this patch, if both "--message" and "--collapse" are specified
for "hg rebase", "rebaes.normal" is used as "editform" unexpectedly.
Unlike patches before and after in this series for improvement, this
is bug fix patch.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 15 Aug 2014 23:05:53 +0900] rev 22205
ui: invoke editor for committing with HGEDITFORM environment variable
At the external editor invocation for committing, the value specified
as "editform" for "cmdutil.getcommiteditor" is in "HGEDITFORM".
This enables external editor to do own customization according to
commit types.