Merge with crew-stable

Make hgk handle filenames with spaces (issue49)

Use "--config ui.report_untrusted=false" for hg calls in hgk, fixes issue523. tcl's exec yields an error if output to stderr happens and isn't redirected to a file, so the warnings about untrusted .hg/hgrc caused problems in hgk. The warning is still printed when executing 'hg view', so the user can see it when using it from the shell.

Merge with Adam Spiers

mercurial.spec: convert extension now installs files into hgext/convert/

buildrpm: fix rpm release number calculation It was broken when patch queues were in use.

buildrpm: auto-generate %changelog in .spec file Top entry is tip; subsequent entries are the version tags from .hgtags.

mercurial.spec: include CONTRIBUTORS, COPYING and man pages in rpm

mercurial.spec: include various utility files from contrib/ in rpm Files included: hgk convert-repo hg-ssh hg-viz git-rev-tree bash_completion zsh_completion mercurial.el

mercurial.spec: add BuildRequires Add build dependencies from README as block quote.

mercurial.spec: fix when default python prefix != rpm %{_prefix} e.g. on SUSE Linux Enterprise 10

Convert default mercurial.ini file to Windows line endings

Added full URL to debug output if something doesn't look like an http hg repo. This way it is easier to debug problems with failing subcommands, like changegroupsubset due to permission problems, when generally accessing the repository works fine.

Handle extensions with defined but empty cmdtable

mq: more qdelete help text tweaks

mq: require patch argument or revision for qdelete

Make hg glog abort if unused arguments are given.

Abort if earlygetopt fails to detect an option. Otherwise it could happen that a command is used on the wrong repository, because abbreviations of --cwd or --repository were ignored.

Simplified earlygetopt and made it remove parsed options and values. The order of aliases is no longer important, too.

Disallow short earlygetop option combined with other short options While "hg commit -qRfoo" can be read as "--quiet --repository foo", "hg commit -mRfoo" should be "--message Rfoo".

Fix tgz archival on Windows. Making tgz's on Windows has been broken by 06de65673ec2 due to not being careful enough about binary mode opens.

Updated command tables in commands.py and hgext extensions. - Marked for translation where extensions already had _() - Corrected indentation - fixed a few synopsises

Catch illegal boolean values in hgrc nicely. With hg 0.9.3 the section and parameter name wasn't printed, with hg 0.9.4 there was a traceback for ValueError.

Added test for earlygetopt fixes (36d23de02da1 and 79cc512a34ed)

Fix earlygetop for short options with unnecessary spaces removed Examples: hg log -qR foo hg log -Rfoo hg log -qRfoo

Fix and test 'hg backout' without or with too many revisions.

Added signature for changeset fb4b6d5fe100b0886f8bc3d6731ec0e5ed5c4694

Added tag 0.9.4 for changeset fb4b6d5fe100

Update binary installer files.

mq: regularize patch header creation. Do not prefix qnew patches with [mq]: when a message has been given. Always use [mq]: as the prefix for generated commit messages.

convert: "unknown" is a string

OpenVMS patches

fix 'convert' with single commit repositories The attached patch passes the three 'convert' testcases, and also is able to successfully convert the git.git repository.

backout: report short hash in commit message

New config option: ui.report_untrusted (defaults to True)

Make earlygetopt return a list of all option values, use the last value. This fixes: "hg -R" showing a useful error instead of traceback "hg -R foo --repository bar" using bar instead of foo And provides a way for other users of earlygetopt to accept more than one value.

Fixed sorting inside nearly sorted sections in hgrc.5

Make changeset_printer respect ui diffopts

mq: support qnew -I/-X and file name lists

Merge with mpm

mq: document that qinit -c may be run later

gitweb: do not mix shortlog and changelog in summary page.

Add option "hidden" to hgwebdir. TODO: should this option be renamed to 'hide_from_index' or maybe to 'index_ignore' (like Apache's mod_autoindex) ?

Add support for RFC2822 to util.parsedate().

Makefile: remove *.pyd files on "make clean".

Makefile: change "make local" to build a fully working local version.

gitweb: hide email addresses in shortlog with |person

Make shortlog the default page in hgweb

hgweb: improve shortlog formatting shorten author with |person don't shrink font (default font is presumed to be preferred reading size) set widths based on font ems rather than page percents.

strip: move strip code to a new repair module

strip: simplify bundle helper

strip: pull core strip logic into its own function

unbundle: accept multiple file arguments update test-bundle for multiple unbundle support

convert: handle new cvsps with Tags: and multiple tags.

cat: return an error on failure

tests: add merge test for changeset 9fe267f77f56 When all the files in a directory are moved somewhere else, and new files are added in changesets of the local branch, a subsequent pull and merge shouldn't rename the locally added files too.

purge: add the clean alias inspired by git-clean and svn-clean

mercurial.el: ignore errors on hg-after-save-hook() Don't signal an error even if running hg command fails. Otherwise, succeeding hooks won't be called.

mercurial.el: change default log range to tip:0 If the tip revision is smaller than hg-rev-completion-limit (defaults to 100), "hg log -r tip:-100" fails. Since performance does not differ between "hg log -l 50 -r tip:0" and "hg log -l 50 -r tip:-100" even on large repository, default range can be changed from "tip:-100" to "tip:0" without any drawbacks.

Command in doc comment is now on a single line, fixed after previous formatting broke it.