wire protocol: avoid infinite loop (issue1483)

fix up tests for paths and urls help

use PURE option in Makefile

notify: remove subfunctions that are called only once

move mercurial.osutil to mercurial.pure.osutil

pure Python implementation of bdiff.c

pure Python implementation of diffhelpers.c

Pure python base85 fallback Encoding takes about 100x longer than native on a large binary.

pure Python implementation of parsers.c

pure Python implementation of mpatch.c

i18n: sort Danish translation by file

i18n: strip string locations from Danish translation

simplify colwidth a bit

Also find correct column width of wide characters. Use unicodedata.east_asian_width() to determine wide/full width characters if available. Otherwise, return character count as before.

added information to patchbomb help pointing users to hgrc(5) to configure the [smtp] section in order to send patchbombs

consolidated url help into urls help topic and added information about path aliases

i18n: updated Danish translation This fixes a crash due to a bad string interpolation, fixes a bunch of typos and adds more translated strings.

Clarified 'hg paths' command help

Merge with crew-stable

Fix a corner case when committing a rename after a merge (issue1476)

i18n: Starting Chinese Translation of Mercurial

i18n: sort by file when generating hg.pot This will make the order more stable and give smaller patches when translations merge in new and deleted strings from the hg.pot file.

Do not install executable man pages Default mode of install might be 755, therefore specify 644.

patchbomb: respect diff settings

status: make options optional (issue1481)

Retrieve Beyond Compare's path from registry Switch from a hardcoded path to registry key to find Beyond Compare's executable. Calling BCompare.exe works fine with version 3.0.14.

templater: fix age filter to state the obvious on future timestamps

tests: fix issue in test-audit-path with HGTMP on OS X

tests: eliminate use of sed -i (which fails on NetBSD)

tests: fix up tests to cope with 6a0bc2dc9da6

help: some improvements for the templating topic

help: add a topic about some of the templating features

Merge with stable

verify: don't trip over binary files starting with 01 0a

Merge with stable

notify: fix neglect of custom headers set via template e981725da3fe introduced a bug that discarded all custom headers. Add custom header to test template.

Give a useful message about PYTHONPATH if startup fails

hgweb: simplify parents/children generation code

kill some trailing whitespace

merge with crew-stable

coal/paper: add missing spaces in changeset child formatting

cmdutil.logmessage: options should be optional

bookmarks: work around missing posixfile_nt.readline()

Update win32 merge tools configuration Add WinMerge and Beyond Compare 3 to default merge tools configuration. Fix TortoiseMerge configuration.

diffstat: don't fail on merges First version by Alexander Solovyov <piranha@piranha.org.ua>

Package hgk Tcl/Tk script in win32 installer hgk script will be copied to Contrib/hgk.tcl

Update mercurial.ini file packaged in win32 installer Update contrib/win32/mercurial.ini file with contrib/sample.hgrc content and append contrib/mergetools.hgrc content during installation

Merge with crew-stable

Document how HTML documentation is built under Windows

Add Lee Cantey's installer icon to win32 installer Add Lee Cantey's installer icon to contrib/win32 and update mercurial.iss accordingly

notify: fix neglect of custom headers set via template e981725da3fe introduced a bug that discarded all custom headers. Add custom header to test template.

branch closing: add test for branch closing (and reopening)

branch closing: referencing open and closed branches/heads Treat fully closed branches similarly to "inactive" in the output of 'hg branches'. They will be suffixed with "(closed)" where inactive branches are marked with "(inactive)". If the -a/--active option is given both inactive and closed branches will not be shown. Partially closed branches (multiple heads, at least one not closed) will display the next (tipmost) open head. Add -a/--active option to "hg heads" which will hide closed heads iff the option is specified. In other hg commands, when multiple branch heads exist the branch name will refer to the tipmost open head, and if none exist, then the tipmost closed head.

branch closing: mark closed branches with a 'close' extra Adds a --close-branch option to commit. When --close-branch is present the commit will mark the changeset with close=1 in the changeset extras field. If a regular changeset is added on top of a closed head the branch is no longer considered closed, and thus re-opened.

store all heads of a branch in the branch cache All heads of branches will be stored in a new cache file 'branchheads.cache' within the .hg directory. The old 'branch.cache' file from older versions will be ignored. The new cache contents are formatted line-by-line as '{node} {branchtag}\n'. This is the same as the previous format. Now, every head is recorded in an oldest -> tipmost order. The localrepo.branchheads function is reworked to use the data from the cache.

i18n: make local now builds .mo files

i18n: beginnings of a Danish translation

i18n: encode output in user's local encoding This makes the translated output obey the HGENCODING environment variable or the preferred encoding as set by the LANG or LC_ALL environment variables. Python 2.4 has a lgettext method which is similar, except that it doesn't know about HGENCODING or the settings in .hgrc.

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