crecord: re-enable reviewing a patch before comitting it The "r" option for this feature was copied into Mercurial from crecord, but the actual implementation never made it into hg until now. It's a moderately useful feature that allows the user to edit the patch in a text editor before comitting it for good. This requires a test, so we must also enable a corresponding testing 'R' option that skips the confirmation dialogue. In addition, we also need a help text for the editor when reviewing the final patch. As for why this is a useful feature if we can already edit hunks in an editor, I would like to offer the following points: * editing hunks does not show the entire patch all at once ** furthermore, the hunk "tree" in the TUI has no root that could be selected for edition * it is helpful to be able to see the entire final patch for confirmation ** within this view, the unselected hunks are hidden, which is visusally cleaner ** this works as a final review of the complete result, which is a bit more difficult to do conceptually via hunk editing * this feature was already in crecord, so it was an oversight to not bring it to core * it works and is consistent with editing hunks

crecord: break out the help message for editing hunks This help message can be useful for other situations, such as for the review extension. It's also easier to write it at the top-level indentation with triple-quoted strings instead of inserting comment characters and newlines programmatically.

crecord: refactor hunk edit action to use ui.edit The previous version of this code did a lot of dancing around a temporary edit file that ui.edit already handles.

edit: allow to configure the suffix of the temporary filename Sometimes, we can pick a more appropriate default suffix than ".txt", for example, diffs could have a ".diff" suffix.

merge: save merge part labels for later reuse We permit the caller of merge operations to supply labels for the merge parts ("local", "other", and optionally "base"). These labels are used in conflict markers to reduce confusion; however, the labels were not persistent, so 'hg resolve' would lose the labels. Store the labels in the mergestate.

ui: add prompt argument to write (issue5154) (API) When code like filemerge._iprompt calls ui.prompt, it expects the user to see the output in addition to getting the prompt. Other code such as histedit may call ui.pushbuffer, but its goal is not to interfere with prompts, so this commit adds an optional prompt flag to ui.write and has _readline include that argument. ui.promptchoice calls ui.prompt which calls ui._readline. This commit also updates hgext.color.write.

hg: perform update after pulling during clone with share (issue5103) This is a graft of 60adda1a0188 and a4692267bc2d from the default branch. Combined, they address a bug with pooled shared storage where an update may not update to the most recent revision when performing a `hg clone`. The patches should have been written against the stable branch in the beginning. I screwed up.

tests: fix failure of test-convert-mtn.t This is follow up for 3f9e25a42e69, which overlooked this test.

templater: relax unquotestring() to fall back to bare string This is convenient for our use case where quotes are optional except in a map file.

debugrevspec: show expanded/concatenated states before printing trees The debugrevspec command prints at most 4 parsed trees. It wasn't easy to tell which tree belongs to which state.