run-tests: skip threading for a single test Threading is incompatible with most Python debuggers, which makes debugging run-tests.py a real pain. If there is only one test to run, skip using a thread for it. Note that --debug is not compatible with debugging tests, since it bypasses the output handling, which is where much of the excitement is.

sslutil: fix reversed logic (issue5034)

installer: add windows application version number to inno installer script This addition to the inno installer script means that the windows uninstaller registry key “DisplayVersion" is set to the application version number and will show in Add/Remove Programs.

run-tests: add 'diff' entry in json report This patch adds to the json report the "diff" between expected and observed result. This diff can be useful for automatically filing bug report on failing tests.

bookmarks: make _readactive safe when readlines raises ENOENT When reading over static http, the file isn't actually opened until the readlines() call, so we have to check for ENOENT IOErrors here too. This is necessary so that we can use the bmstore everywhere for managing the active bookmark, which will be true in the next change.

wix: add help for current internal topics This makes the changes in a79cba6cb206 and 84784f834b3a available on Windows. I'm not setup to make the installer, so someone with experience in this area should probably give it a look. In looking around to try to figure out how to build the installer, it looks like the Makefile may need an update to $DOCFILES.

help: fix quoting for bundle1 options

merge with stable

extdiff: use @command decorator to set up diff commands It can set "inferrepo" attribute appropriately.

extdiff: factor out list of common options

dispatch: copy inferrepo attribute to alias commands The other attributes are copied. Let's do the same for the inferrepo.

transplant: specify the right file and path for unfinishedstates

transplant: only use checkunfinished if not continue

transplant: correct language to use working directory

histedit: replace @addhisteditaction with @action @action supports verbs, messages, priority, and internal messages should be translated. internal means the action should not be listed. geteditcomment will construct the verbs list based on @actions (prefering priority over non priority, otherwise favoring verbs with short forms over verbs without).

histedit: prefer edit commit, edit message, use commit Selecting editing commits, rewording commit messages, and selecting commits are key actions, we will prefer them more generally in a future commit, this pulls them ahead before that to make the diffs easier to read. The remaining commands are left alphabetically sorted

histedit: replace editcomment with a function

debugignore: find out why a file is being ignored (issue4856) This patch adds a capability to hg debugignore: to explain why a given file is being ignores by mercurial. We display the filename, line and linenumber of the rule that lead us to ignore the file.

debugignore: find out if a file is being ignored Before this patch debugignore was just displaying the list of ignore patterns. This patch makes it support a list of filename as argument and tells the user if those given files are ignored or not.

dirstate: add a way to get the ignore file/line matching an ignored file This information will be used to improve debugignore (issue4856).

clone: move bookmarks and checkouts before pull help The bookmark/checkout help actually split the pull help. The subsequent verbose container is talking about pull too. This change puts the pull help back together again.

status: revert + flag-change == modified After just changing the flag on a file, plain 'hg status' will report the file as modified. However, after reverting a file to a previous revision's state and changing the flag, it will be reported as clean. Fix by comparing the flags that were previously ignored in context._buildstatus().

util: remove outdated comment about construction overhead An old implementation of this class (possibly only in my local repo) allocated nodes in the cache during construction time, making __init__ slow for large cache capacities. The current implementation lazily grow the cache size, making this comment wrong.

test-transplant.t: improve test coverage * ?, x, q * not a parent * --source * outstanding local changes * outstanding uncommitted merges * no revision checked out * checkopts all+branch+rev * checkopts all-branch * checkopts no-args * checkopts continue+all * revset:transplanted(...) * filter corrupted changeset

help: use backticks for progress.format keywords, correct letter case

log: help provide sort by date example

log: mention ordering a user complained that hg help log did not hint how to sort the output by date

transaction: remove 'if True:' This seems to be left over from 96dd93de548c (transaction: reorder unlinking .hg/journal and .hg/journal.backupfiles, 2015-10-16).

lazymanifest: check more return values in filtercopy Spotted by Bryan O'Sullivan (and vexingly not the static analyzer I've been using.)

mercurial: pass ui to extensions.load (issue5007) extensions.load does need ui argument to print error if an extension fails to load.

test-patchbomb.t: drop a number of now-redundant uses of "-n"

test-patchbomb.t: test use of sendmail program