histedit: limit cleanup of histedit-last-edit.txt to success

histedit: use parse-error exception for parsing

test-histedit-edit: test histedit with dirty repo

histedit: limit mentioning histedit-last-edit.txt Before histedit-last-edit.txt would be mentioned for any failure. After, it should only be mentioned for failures relating to user input.

histedit: check fold of public change during verify

histedit: pass previous action to verify

annotate: mention that -n is suppressed in help

test-bundle2-format: force gc so a GeneratorExit will be thrown PyPy has looser semantics than CPython for when a generator's close method will be called. Forcing the gc causes it to be called at the right moment.

test-bad-extension: account for PyPy/CPython error difference

demandimport: update obsolete comment

demandimport: add support for PyPy PyPy's implementation of __import__ differs subtly from that of CPython. If invoked without a name or fromlist, it throws an ImportError, whereas CPython returns a reference to the level-appropriate importing package. Here, we achieve the same behaviour by hand.

test-demandimport: ensure that relative imports are deferred This adds a test not just at our local "top level" (the mercurial package), but also one level deeper (mercurial.hgweb).

histedit: don't bother with cPickle, demand-load pickle We're unlikely to ever need the pickle module, so there's no good reason to force loading of its faster cousin.

merge with stable

crecord: stop raising error.Abort if curses is not found (issue5008) On some servers, python curses support is disabled. This patch not only fixes that but provides a fallback on other machines (e.g. Windows) when curses is not found. The previous code was actually flawed logic and relied on wcurses throwing an ImportError which demandimport wouldn't throw. So, this patch also fixes that problem.

cmdutil: use crecordmod.checkcurses Instead of blindly trusting the user's experimental.crecord, we use checkcurses to abstract that logic so that we can handle the case where python was not built with curses.

crecord: ensure that curses is False if not imported This provides no functional change but makes the next two patches easier to review.

crecord: add helper function to determine if we should use curses To fix issue5008 properly, we need a helper function to determine if curses is imported and also if the user has enabled the experimental flag.

crecord: use try/except for import of curses Not only does this improve fragility with 'if os.name == ...' it will help future patches enable the behavior to fallback to use plain record when curses is unavailable (e.g. python compiled without curses support).

histedit: only use pickle if not using the modern save format This avoids a case where PyPy's cPickle module throws a more confusing error than CPython's.

perf: close transaction in perffncachewrite This fixes a bug, and brings CPython behaviour on this test into line with PyPy.

hbisect: use tryreadlines to load state This closes the file handle after reading, which stops PyPy from leaking open file handles and thus failing test-bisect3.t.

eol: make output stable This eliminates a divergence in behaviour between PyPy and Python.

exchange: use absolute_import

localrepo: use absolute_import

httpconnection: use absolute_import

import-checker: force 'logging' to stdlib module Not sure why this isn't getting picked up. Perhaps we're not handling stdlib paths that have sub-modules? Something to investigate for another day...

test-install: embed wix namespace for Python 2.6 compatibility According to doc, the syntax is "{uri}tag". https://docs.python.org/2.7/library/xml.etree.elementtree.html#parsing-xml-with-namespaces

fileset: add hint for list error to use or

revset: add hint for list error to use or

error: make ParseError inherit from HintException

error: refactor OutOfBandError to inherit from HintException

phases: mention how to make secret commits in help

mq: use fallback patch name if no alpha-numeric in summary line (issue5025) Before this patch, "hg qimport -r REV" fails, if the summary line of description of REV doesn't contain any alpha-numeric bytes. In this case, all bytes in the summary line 'title' are dropped from 'namebase' by the code path below. namebase = re.sub('[\s\W_]+', '_', title.lower()).strip('_') 'makepatchname()' immediately returns this empty string as valid patch name, because patch name conflicting against empty string never exists. Then, "hg qimport -r REV" is aborted at creation of patch file with empty filename. This situation isn't so rare. For example, ordinary texts in Japanese often consist of non alpha-numeric bytes in UTF-8. This patch makes 'makepatchname()' use fallback patch name if the summary line of imported revision doesn't contain any alpha-numeric bytes.

osutil: c_ssize_t is only available in Python >= 2.7

check-seclevel: pass a ui to the extension loader Without this, if an import error occurs (as with pypy), the attempt to report it fails since ui is None.

check-seclevel: add a --debug option This will make it possible to get semi-meaningful tracebacks if an import error occurs. Why care? Trying to run this script under pypy currently fails, but the true error is obscured.

test-run-tests: glob away a --debug run difference on Windows This internal test is piped through 'grep -v pwd' to eliminate the pwd alias set when running with MSYS. Unfortunately, the '.' from the successful run of the prior internal test precedes the pwd alias for the next test on the same line, so grep filters out '.' too, except for the final test. It also looks like there may be a bug with --debug: the output of the internal test that had this diff says 2 ran, 0 failed (one test being test-failure.t), but if --debug is omitted from the internal test, then it says 2 ran, 1 failed. With this longstanding issue fixed, the test suite finally runs cleanly on Windows (except subrepo merge documented in issue 4988), with 88 skips. \o/

import-checker: force 'ctype.util' to stdlib module Not having this caused warnings on Windows: mercurial/pure/osutil.py:12: stdlib import follows local import: os mercurial/pure/osutil.py:13: stdlib import follows local import: socket mercurial/pure/osutil.py:14: stdlib import follows local import: stat mercurial/pure/osutil.py:15: stdlib import follows local import: sys

keepalive: use absolute_import

context: use absolute_import

lsprofcalltree: use absolute_import

byterange: use absolute_import There were a lot of imports scattered around this file. They have been consolidated at the top of the file where they belong.

dirstate: use absolute_import

manifest: use absolute_import

pvec: use absolute_import

ui: remove unreachable code

mercurial.spec: remove execute bit

tests: add execute bit and fix shbang line

i18n: add execute bit to check-translation.py

doc: add execute bit and fix shbang line for gendoc.py

contrib: add execute bit for fixpax.py

contrib: add execute bit for check-py3-compat.py

perf: make start revision configurable for perfrevlog This will help isolate performance characteristics of delta chains.

perf: use standard arguments for perfrevlog We have a convention of using -c|-m|FILE elsewhere for reading from revlogs. Use it for `hg perfrevlog`. While I was here, I also added a docstring to document what this command does, as "perfrevlog" is ambiguous.

test-extension: do not depend on demandimport (issue5012) When demandimport is disabled, the test will fail because extroot/foo.py uses import outside PYTHONPATH. This is bad since we have a PyPy migration plan and it does not support demandimport. Fix by setting PYTHONPATH.