parsers: use absolute_import

osutil: use absolute_import

mpatch: use absolute_import While I was here, I removed the try..except around importing cStringIO because cStringIO should always be importable on modern Python versions. We already do an unconditional import in other files.

diffhelpers: use absolute_import

bdiff: use absolute_import

base85: use absolute_import

destutil: use absolute_import

obsolete: use absolute_import

contrib: ignore empty files in check-py3-compat.py

doc: make gendoc.py module import policy aware Without this, running gendoc.py during an install without C modules available (via `make local`) will result in an import failure because the default module load policy insists on C modules. We also remove the sys.path adjustment because it is no longer needed since our magic importer handles things.

merge with stable

check-commit: add a test for the patch checking script in contrib This introduces a test for the change introduced in 8f5735b4aca5.

match: use re2 in readpatternfile if possible This has a small, but measurable, effect on performance if a pattern file is very large. In an artificial test with 200,000 lines of pattern data, using re2 reduced read time by 200 milliseconds.

test-hgignore.t: add tests for comments Although support for comments in hgignore files has existed for a while, it was previously untested.

help: fix help -c/help -e/help -k Before, hg help -c was the same as hg help, now it only shows commands. Before, hg help -e was the same as hg help, now it only shows extensions. Before, hg help -k crashed, now it shows all topics.

help: call filtercmd from topicmatch update test coverage to explicitly define when help -c should list debug/deprecated items.

help: refactor filtercmd

transplant: use Oxford comma

crecord: add dictionary to default return value of filterpatch When committing interactively without changes, the user would get a ValueError exception. This patch adds a dictionary to the return value of filterpatch when there are no files to change.

paths: include #fragment again Since 5f2a4fc3c4fa, #fragment was missing in "hg paths" output because path.loc was changed to a parsed URL. "hg paths" should use path.rawloc to show complete URLs.

discovery: properly filter changeset in 'peer.known' (issue4982) The 'peer.known' call (handled at the repository level) was applying its own manual filtering (looking at phases) instead of relying on the repoview mechanism. This led to the discovery finding more "common" node that 'getbundle' was willing to recognised. From there, bad things happen, issue4982 is a symptom of it. While situations like described in issue4982 can still happen because of race conditions, fixing 'peer.known' is important for consistency in all cases. We update the code to use 'repoview' filtering. This lead to small changes in the tests for exchanging obsolescence marker because the discovery yields different results. The test affected in 'test-obsolete-changeset-exchange.t' is a test for issue4982 getting back to its expected state.

test: add an extra base changeset in test-obsolete.t A fix to issue4982 (not fixed in this patch) will reinforce the filtering during discovery. This will makes two of our test repositories appear unrelated (because all common content is properly hidden). To avoid this, we introduce an extra base changeset that will not get obsoleted. This affects various test output so we put this addition in its own changeset.

parents: provide equivalent revsets in help

merge: refuse update/merge if there are unresolved conflicts (BC) We currently allow updating and merging (with --force) when there are unresolved merge conflicts, as long as there is only one parent of the working copy. Even worse, when updating to another revision (linearly), if one of the unresolved files (including any conflict markers in the working copy) can now be merged cleanly with the target revision, the file becomes marked as resolved. While we could potentially allow updates that affect only files that are not in the set of unresolved files, that's considerably more work, and we don't have a use case for it anyway. Instead, let's keep it simple and refuse any merge or update (without -C) when there are unresolved conflicts. Note that test-merge-local.t explicitly checks for conflict markers that get carried over on update. It's unclear if that was intentional or not, but it seems bad enough that we should forbid it. The simplest way of fixing the test case is to leave the conflict markers in place and just mark the files resolved, so let's just do that for now.

tests: drop require slow in test-contrib-perf * skip presleep * use a stub mode which does not output and generally loops only once * only use one node for perfparents

convert/svn: quiet check-config

check-config: handle multiline config

check-config: escape period in regexp for inline comments

check-config: allow numbers in configs p4...

check-config: recognize convert style documentation