i18n: lookup .mo files in private locale/ directory This default is to look for /usr/share/locale/xx/LC_MESSAGES/hg.mo for language xx, but this code will instead do the lookup from locale/ or mercurial/locale/ relative to the root of the Mercurial source tree.

i18n: new build_mo command for setup.py This command will generate .mo files under locale/ for the .po files found under i18n/.

i18n: let Makefile generate i18n/hg.pot The target update-pot extracts strings using pygettext and updates the i18n/hg.pot file. The translators can then use msgmerge to merge the new strings in hg.pot with their xx.po file when they want to. The setup.py file now includes files under both templates/ and i18n/ as data files.

recover when no version information is available

error: move SignatureError

dispatch: sort exception handlers

error: move SignalInterrupt now derived from KeyboardInterrupt to simplify catches

error: move UnknownCommand and AmbiguousCommand

sshrepo: change raise_ to abort

error: move UnexpectedOutput (now ResponseError)

error: move lock errors rename LockException to LockError

mq: remove import of revlog

bookmarks; clean up imports and function wrapping

error: move repo errors rename NoCapability to CapabilityError

error: move ParseError

kill imerge.py It's been broken for a while.

revlog: kill from-style imports They're slow.

errors: move revlog errors - create error.py for exception classes to reduce demandloading - move revlog exceptions to it - change users to import error and drop revlog import if possible

refactor version code - simplify version detection code - move detection code into setup.py - move version reading function into util.py - drop version.py code This makes hg more closely follow its own recommendation of how to deal with versioning your builds: use hg id in your build script.

Merge with crew-stable

merge: fix execute bit update issue introduced by 89207edf3973

transplant: move docstrings before imports (see issue1466)

diff: add --change option to display single changeset diff (issue1420)

mq: lowercase output This extension produces quite a lot of informational messages during its normal operation and it is hard to say which strings can be changed and which cannot.

churn: lowercase output This changes the continuously updated progress bar -- not something a script would rely on.

bdiff: add comment about normalization

Improved hgweb test. The hgweb fix in 069b29656401 aimed at restoring the "back" link in hgweb's filelog that has been lost in 62e0bb41e682. However, the previous version of this test ran the filelog command on a file with only a single filelog entry. In this case, the previous hgweb version did not exhibit the bug. The error condition is now correctly tested with a filelog of 2 entries.

tests: use killdaemons.py in test-highlight

use dict.iteritems() rather than dict.items() This should be faster and more future-proof. Calls where the result is to be sorted using util.sort() have been left unchanged. Calls to .items() on configparser objects have been left as-is, too.

mq: allow qpop if popped revisions are not working dir parents

mq: refactor the pop code to be more readable and allow more changes

merge with crew-stable

Bugzilla 2.18 and on use contrib/sendbugmail.pl, not processmail. During 2.17, Bugzilla ditched the old 'processmail' script. With 2.18 contrib/sendbugmail.pl arrived in its place. For notification emails to work properly, sendbugmail.pl requires as its second parameter the Bugzilla user who made the commit. Otherwise the user will not be recognised as the committer, and will receive notification emails about the commit regardless of their preference about being notified on their own commits. This parameter should be given to processmail also, but wasn't for historical reasons. Add new config with the local Bugzilla install directory, and provide defaults for the notify string which should work for most setups. Still permit notify string to be specified, and for backwards compatibility with any extant notify strings try first interpolating notify string with old-style single bug ID argument. Add new 2.18 support version to introduce sendbugmail.pl. In other words, this update should be backwards-compatible with existing installations, but offers simplified setup in most cases. And as a bonus Bugzilla notification emails will be dispatched correctly; notifiers will not receive an email unless configured to do so.

merge with -stable

use enumerate instead of zip

patch: export shouldn't close files received as a parameter We rely on __del__ to close the fd instead. Patchbomb was relying on this behaviour, fix it. Thanks to Manuel Barkhau for reporting it.

mq: make qnew patch format consistent with qrefresh (issue1457)

monoblue: fix child revision display in file diff page

web: use the correct filectx in filelog

convert: display child command output if --debug (fix 878466138b57)

convert: print darcs error messages iff --debug

convert: check for darcs-2-compatible path

merge with -stable

merge with crew-stable

zeroconf: add extension documentation

1 file changed, 7 insertions(+), 9 deletions(-) hgext/purge.py | 16 +++++++--------- purge: clarify behavior with regard to ignored files The purge documentation previously said that purge would delete ignored files. This is only true if purge is passed the --all option, which is now stated explicitly. A few trivial grammar errors were also fixed.

tests: shrink wait interval for test-convert-bzr-merges

Merge with crew-stable

tests: try to prevent different ordering in test-convert-bzr-merges

merge with crew

lowercase prompts The prompts are interactive and not meant for scripts.

lowercase ui.debug and assert output This does not effect the log or status commands and should be okay according to the compatibility rules.

lowercase help output Changes docstrings to begin with a lowercase word. Only docstrings used in help output is changed. Scripts are not expected to grep the output of 'hg help' so this change should pose no problem with regard to the compatibility rules.

mq, i18n: mark strings for translation

commands: remove redundant paragraph from tags help

Merge with crew-stable

test: added testcase for cvsps log message lookahead

cvsps: cvs log loop uses lookahead to avoid misleading text Changes cvsps.py's cvs log reader to use a one-line lookahead, so that possibly misleading log messages can be disambiguated. In particular I have past committers who used cvs log's 28-character row of hyphens within commit messages; this throws cvsps and disrupts conversion. The only alternative in this case is to edit the cvs ,v file by hand, which bloodies mercurial's "don't change history" principle.

convert/gnuarch: recode cat-log parts to utf-8 to be hg.description friendly

convert/gnuarch: add cat-log payload to commit description

bisect: improve hg bisect -c (relative paths, error handling) hg bisect -c failed with a relative path or when the executable wasn't found. Use util.find_exe()+os.spawnl() instead of os.spawnlp() and improve the handling of errors (killed process, exe not found). Thanks to Georg Brandl for reporting it.

merge with crew-stable

convert/gnuarch: correct indentation

merge with crew