mergestate: explicitly forget 'dc' conflicts where the deleted side is picked Once we move change/delete conflicts into the resolve phase, a 'dc' file might first be resolved by picking the other side, then later be resolved by picking the local side. For this transition we want to make sure that the file goes back to not being in the dirstate. This has no impact on conflicts during the initial merge.

merge.applyupdates: add all actions returned from merge state At the moment this is a no-op (the only actions defined are 'r', 'a' and 'g'), but soon we're going to add other sorts of actions to the dictionary returned from mergestate.actions().

identify: refer to log to be able to view full hashes

log: add 'hg log' example for full hashes

backout: add examples to clarify basic usage

gpg: rename sigcheck function I see no reason for the function not to be sigcheck ...

extensions: properly mark progress as part of core This should have been done as part of or as an immediate follow-up to f5c906878a47, but presumably this feature of extensions.py was forgotten at that time.

test-help: don't use progress extension for the test of argument parsing The next patch will remove the progress extension completely, so we have to pick another extension. The schemes is picked arbitrary. This test was introduced at 69da16b366ad.

hghave.py: fix matchoutput documentation

dispatch: use versiontuple() We have a new generic function for this. Use it.

util: add versiontuple() for returning parsed version information We have similar code in dispatch.py. Another consumer is about to be created, so establish a generic function in an accessible location.

extensions: rename _ignore to _builtin, add descriptive comment It was previously not at all obvious what this was for. We also change it to a set to avoid iterating over an admittedly small list repeatedly at startup time.

ui: avoid needless casting to a str In many cases, we don't need to cast to a str because the object will be cast when it is eventually written. As part of testing this, I added some code to raise exceptions when a non-str was passed in and wasn't able to trigger it. i.e. we're already passing str into this function everywhere, so the casting isn't necessary.

ui: remove labeled argument from popbuffer It was moved to pushbuffer and currently does nothing.

color: evaluate labels at write time Previously, we stored 2-tuples of text and label in a list and then evaluated the labels when the buffer was popped. After this patch, we evaluate the labels at write time and do a simple join when the buffer is popped. This patch appears to have no impact on performance, despite creating fewer 2-tuples and having fewer strings hanging around in memory.

cmdutil: pass labeled=True to pushbuffer() This doesn't yet change behavior because labeling is still performed at popbuffer time. Surprisingly, this is the only in-tree consumer that passes labeled=True.