merge: move merge step to the end Resolving other conflicts before merge ones is better because the state before the merge is as consistent as possible. It will also help with future work involving automatic resolution of merge conflicts with an external merge driver. There are no ordering issues here because it is easy to verify that the same file is never in both the dg/dm and the m sets.

lock: factor out lock testing into a separate function This is going to be needed for upcoming work with lock inheritance.

lock: factor code to read lock into a separate function This is going to be needed for upcoming work with lock inheritance.

tests: add unit tests for locking code We're going to make significant changes to lock behavior soon.

gitweb: port code selection without line numbers from paper This is adapted from f2e4fdb3dd27 and e92d4b8530cb. It also fixes issue4790 in gitweb; tab characters now have meaningful width on the modified pages (file view, file diff, changeset).

obsolete: remove unused _knownrevs function The call site was removed at cd62532c62a1.

bookmark: do not crash when active bookmark is forward and --date is used The logic that decides where to update according to the active bookmark location (when not on ".") was setting the rev to update to before we process --date. This lead to --date processing aborting because of duplicated specification. We reorder the two pieces of code and add a test for this.

bookmark: actually test update behavior in both cases The test claimed to test pull --update behaved the same way as pull + update, but the behavior of pull + update was never tested. We now test both.

coal: reuse style-paper.css and use a separate css file for visual tweaks To remove another big chunk of duplication from coal hgweb style, we can move all visual tweaks to style-extra-coal.css and include it together with style-paper.css.

coal: reuse all templates from paper/map by %including the file Before, coal/map simply had all the templates copied and pasted from paper/map file. It was easy to make a change to paper that would get into coal only partially and just sit there until something like 399e970e35c8 happened. Let's remove this duplication from coal/map by using %include to reuse templates from paper/map directly.

help/config: reword committemplate external editor text

help/config: reword committemplate multibyte character text

help/config: use :hg:`help config....` notation

help/config: omit True or False

help/config: capitalize items

tests: add more doctests for check-translation deprecated

tests: cleanup check-translation deprecated

gitweb: add author to filelogentry The line is copied from shortlogentry template.

monoblue: add author to filelogentry The line is copied from shortlogentry template.

monoblue: split a long line in filelogentry template The whole td has a nowrap class, which disallows breaking the line, so it's not required to use non-breakable spaces.

readbundle: fix typo of None compression The test simulates pre-d1b16a746db6 hgweb that sends "unbundle" capability with no argument.

readbundle: map 'HG10UN' to None compression In line with the other previous changes

getsubset: use None to request uncompressed changegroup

bundle: use None when unpacking uncompressed changegroup Let's be more modern!

writebundle: use 'None' instead of 'UN' for the bundle2 case Let's be modern!

compression: use 'None' for no-compression This seems more idiomatic and clearer. We still support both None and 'UN' for now because no user are migrated.

changegroup: move all compressions utilities in util We'll reuse the compression for other things (next target bundle2), so let's make it more accessible and organised.

obsolete: clarify that 'successorssets' returns the latest successors We do not return the first successors we found, we returns the latest (non obsolete (mostly)) one following the obsolete link transitively. We update the documentation to make this clean.

obsolete: drop an empty line at the end of a docstring This empty line is useless, let's drop it.

traceback: allow providing a local support contact point The extensions blaming code is fine for casual users but pretty terrible for corporate environments that can deploy a large amount of extensions to unsuspecting users. Reports will likely blame a random "innocent" extension (in our case crecord) and the hint in the message will triggers endless debug attempts from the user. We introduce a "ui.supportcontact" option that allow such big company to redirect their users to their own support desk. This disables all extensions blaming and just point people to the local support in all cases.