dirstate: fix in memory dirstate entries for 1-second race Only the on-disk file was modified, we need to modify the in-memory dirstate as well.

commands: leftover from d7b601f1e02c

commands: small refactoring in summary

commands: retrieve tags from context object

summary: make use of output labeling The individual pieces of information use the same labels as the commands they summarize for better cohesion of commands.

color: concatenate effects correctly and avoid printing empty effects

commands: fix typo

cmdutil: do not translate trivial string

wix: refactor and new guids.wxi

color: don't split colors across lines (which confuses less -R) Currently, less -R doesn't support colors spanning multiple lines; only the first line will be colorized. Instead of allowing colors to span multiple lines, the color extension now applies colors to each line it receives, even when ui.write() is given multiple lines in one call.

color: colorize based on output labels instead of parsing output By overriding ui.write(), ui.write_err(), ui.popbuffer(), and ui.label(), the color extension can avoid parsing command output and simply colorize output based on labels. As before, the color extension provides a list of default colors for core commands/labels. Other extensions can provide their own defaults by specifying a colortable dict (similar to cmdtable). In this process, --color is promoted to a global option and the deprecated --no-color option is removed.

record: make use of output labeling

qseries: make use of output labeling

qdiff: make use of output labeling

qguard: make use of output labeling

churn: make use of output labeling