help: avoid traceback if an extension has only debug commands

convert/subversion: rehandle the no-tags case

Print meaningful error message if os.symlink fails

lock.py: cache hostname, but not pid, in case we fork

convert/subversion: work around memory leak in svn's python bindings The svn.ra.get_log wrapper attaches the hash of changed paths for every log entry to a global memory pool, so memory consumption increases rapidly, with no way to free it. Our workaround is to call this function in a child process, and feed its results back over a pipe. The memory consumption of the child still grows huge (hundreds of megabytes), but at least it goes away once the reading-the-log phase is done.

Automated merge with http://hg.intevation.org/mercurial/crew

convert/subversion: Simplify callback.

merge with crew-stable

Simplify update.

Better fix for issue 622 than we had in c4dd58af0fc8.

convert/subversion: reduce memory usage by filtering early This makes up to a 50% difference in memory consumption.

Automated merge with http://hg.intevation.org/mercurial/crew

convert/subversion: get converter working against plain HTTP.

Simplify update.

Better fix for issue 622 than we had in c4dd58af0fc8.

merge with main

doc: typo, -x bit

merge with crew-stable

fix test-tag on Solaris

tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) This also fixes an asymmetry bug in which we called the pretag hook if we were going to create a local tag, but didn't call the tag hook afterwards.

issue 622: pull/unbundle -u updates to default branch if repo was empty

mq: autodetect an existing git patch during qrefresh (issue 491)

replace .hgtags instead of appending to it when doing a raw commit

handle nonexistent .hgtags in raw _tag

convert/subversion.py: str.rsplit is not available in Python 2.3

Automated merge with http://hg.intevation.org/mercurial/crew

convert/subversion.py: fix bad assumptions about SVN path naming The SVN converter assumed that the trunk and branches paths were fixed, and immediately under the base of the SVN URL. Fix the second assumption, and allow the trunk and branches paths to be reconfigured.

convert/subversion.py: escape quotes to make code readable in Emacs

patch: patches should be read and written in binary mode when possible.

patch: fix normalized paths separators.

posixfile_nt: '+' was understood as read mode instead of update.

Update test output to reflect small changes in patch chattiness.

patch.py: re-add the ability to use an external patch program This is now invoked by default only if ui.patch is set. Otherwise, we use our built-in patch. If that fails because it can't find any valid hunks, we'll fall back to trying the external patch command.

patch.py: don't mark files as changed unless they have actually been changed

patch.py: fix some incorrect uses of _() for i18n

Add Chris Mason's mpatch library. The original repo is http://oss.oracle.com/mercurial/mason/mpatch

merge with crew-stable

convert: manually set encoding to UTF-8 Right now the backends assume we're working in UTF-8 and there's no good way to ignore the encoding when adding revisions.

hg parents: don't pass an OS-specific path to repo.filectx The only reason to use the matcher code instead of calling util.canonpath directly is to be able to use "path:canonical/path/to/file" patterns.

merge with main

contexts: improve filectx eq test

Merge with -stable

merge: fix unnecessary rename merges on linear update (issue631) If one side's revision is identical to the ancestor, we skip the rest of the copy detection logic.

tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) This also fixes an asymmetry bug in which we called the pretag hook if we were going to create a local tag, but didn't call the tag hook afterwards.

issue 622: pull/unbundle -u updates to default branch if repo was empty

mq: autodetect an existing git patch during qrefresh (issue 491)

patchbomb: add --desc, to specify a file containing a series description

merge with crew-stable

convert: Use clone's behaviour for the default destionation name. Adjusted the documentation for this and for the fact that the destionation is created even if a name is specified.

Merge with crew-stable.

test-symlink-basic: require symlinks availability

Add hghave utility and run-tests.py support. hghave detects system features like symlinks availability at run-time. Tests can be skipped by starting them with: "$TESTDIR/hghave" symlink || exit 80 The 80 exit status triggers hghave output handling by run-tests.py. Also, tests output can be locally patched on the fly to match reference output.

run-tests: extract correct status when script terminates with exit

Merge with -stable

diff: correctly handle combinations of whitespace options

hg grep: handle re.compile errors & update tests/test-grep

typo fix

Re: mercurial.el and hg-version-other-window hg-version-other window is unimplemented in mercurial.el. The version below works for me, YMMV.

Use isinstance instead of type == type

convert: record the source revision in the changelog