repair: improves documentation of strip regarding locks This patch adds a comment making it clear that we should hold a lock before calling repair.strip. The wording is the same than what we have for obsolete.createmarkers

help: remove stray double spaces from config help

help: clarify that the config hook priority prefix includes a period

monoblue: correct feed links on /branches, /tags and /bookmarks

gitweb: describe feed type in links on /branches, /tags and /bookmarks

gitweb: link to the correct feeds from help pages

histedit: handle exceptions from node.bin in fromrule

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.