localrepo/branchcache: remove lbranchmap(), convert users to use utf-8 names We don't need a "local-charset" aware branchmap() function, we can convert the names when needed during the output.

localrepo/branchcache: kill unused localrepo.branchcache The UTF-8 version of the branchcache is the master, always up-to-date, we can rename it to localrepo._branchcache.

localrepo/branchcache: rebuild the "charset-aware" branchcache when needed It's simpler and the two cache weren't always in sync otherwise: localrepo.branchcache would not be updated after calling branchmap()

churn: fix --progress (broken by f3d60543924f)

transfer branchmap branch names over the wire in utf-8

churn: fix changeset count (broken by 9b127e888640)

churn: ability to display added/removed lines separately

cmdutil: fix bug in finddate() implementation

merge changes from mpm

cmdutil: update finddate() walkchangerevs() now returns contexts, does not take a cache func.

walkchangerevs: drop ui arg

walkchangerevs: reset cache between windows

log: tidy up some filter tests

walkchangerevs: move 'add' to callback Now walkchangerevs is a simple iterator over contexts

hgweb: added test case for extension loading phases (issue1824) this checks the order of module loading phases of hgweb. `4) reposetup' lines are duplicated because hgweb calls hg.repository() twice, one by __init__, another by refresh.

extensions: changed to call extsetup() from extensions.loadall() previously uisetup() was invoked by extensions.loadall(), but extsetup() was by _dispatch(). there's no need to split them because we have nothing to do between uisetup() and extsetup(). this fixes issue1824 indirectly.

hgrc.5.txt: mention hgrc categories with higher precedence first Reordering the FILES section accordingly. The previous ordering of categories might have been nice from the viewpoint of a site admin doing an initial install, but presenting a higher-precedence-first ordering is more relevant and natural for the average end user, since he will most likely resort to editing rc files in the order of their precedence, overriding whatever "sane" defaults are coming from more general files. Note that this patch does not change the texts, it just moves them. So, whatever bugs, grammar errors, or typos may have been in the texts before this patch: they are still there. On purpose. Because this patch here does not want to reword texts while moving them.

hook: only redirect stdout if it and stderr are valid files When using hgwebdir with WSGI via the IIS ISAPI-WSGI extension, both stdout and stderr filenos are set to -2, which makes the os.dup call in hook.py fail.

verify: filter the candidate list for broken linkrevs

Merge with crew

walkchangerevs: internalize ctx caching

walkchangerevs: yield contexts

walkchangerevs: kill window step of iterator

walkchangerevs: pull out matchfn * * * imported patch mercurial/commands.py

diffstat: made test case work with POSIX sh and printf * arithmetic expression ((...)), without $, is bashism. * printf '\xXX' seems non-standard. '\0' is okay. http://www.opengroup.org/onlinepubs/009695399/utilities/printf.html tested with bash 4.0 and dash 0.5.5.1

bundlerepo: fix small bug in exception raising

minor documentation improvements

patchbomb: accept default if it is empty string This fixes Cc: prompt.

patchbomb: fix double-spaces in prompts

commands: adding --no-status to resolve to match status