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

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)

contexts: improve filectx eq test

Merge with -stable

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

merge with crew-stable

Merge with crew-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.

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.

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

Use wsgi.url_scheme instead of ad-hoc CGI checks. Instead of each place in hgweb_mod that needs to check for SSL or get the protocol scheme (http vs. https) doing it ad-hoc, make them just look at the wsgi.url_scheme which because of previous patches is now always set correctly.

cosmetics

Make hg serve set the wsgi.url_scheme property correctly. This fixes the bug where hg serve with SSL will always detect the wrong urlbase for templates. This is also part of unifying the CGI interface and hg serve interface to both use standard wsgi.

Handle CGI SSL detection via HTTPS environment better. Some servers send on/off, 0/1, yes/no, and may be upper or lower case. This fix will handle all of those permutations. It was inspired by the detection done in in some other wsgi python web applications I looked at.

merge with crew-stable