Merge with main

convert: svn: some improvements in memory usage

archive: make the %r escape work.

serve: respect settings from .hg/hgrc create_server was looking only at the root ui object, ignoring any settings from .hg/hgrc. To keep respecting command-line arguments, commands.serve must also call repo.ui.setconfig.

Fix inconsistency for the stream_out capability in hgweb During some experiments of mine, the uncompressed cloning could not be enabled for hgweb.cgi nor hgwebdir.cgi though the server claimed to be stream_out capable. The only solution was to enable it using the user's .hgrc file. This solution is not acceptable when publishing the repos through an HTTP server because the CGI runs as a www dedicated user whose's home hgrc file may not be accessible to users publishing their repos through their userdir. For such cases we could end up with this typical debug output: hg --debug clone --uncompressed http://server/hg/project destination directory: project sending capabilities command capabilities: lookup changegroupsubset stream=1 unbundle=HG10GZ,HG10BZ,HG10UN sending stream_out command abort: operation forbidden by server The error lies in the fact the hgweb object defines new accessors to the repo configuration that trust things by default (untrusted=True) but the streamclone:stream_out function uses the usual accessors to the repo.ui object, which do not trust by default (untrusted=False) Fix this inconsistency, adding a new parameter to the stream_out function. hgweb then forces a "trust by default" behavior.

improve warning for hg add foo; hg mv foo bar

util._hgexecutable: default to 'hg' This should make hooks work even if util.set_hgexecutable is not called (e.g. hgweb.cgi). Fixes issue625.

archive: add symlink support

archive: use util.opener when archiving files. This simplifies the code a bit and makes it easier to support symlinks.

localrepo.wwrite: use opener.symlink This makes us fall back to regular files if symlinks are not supported.

Add symlink method to util.opener. Differences from os.symlink: - the symlink name is relative to the opener base directory - if a file with that name already exists, it's removed - if necessary, parent directories are created - if the system (OS or filesystem) doesn't support symlinks, a regular file is created. Its contents are the symlink target.

turn util.opener into a class

Fixed double slash for doc install path introduced by using $DESTDIR (issue620) $MANDIR already is an absolute path so the extra / isn't needed.

hg log: Move filtering implicit parents to own method and use it in templater. Extended test repo in test-command-template to contain changeset to test this.

Strip whitespace from changeset description in changeset_templater. changeset_printer already does this, too.

merge with crew-stable

Add html docs and use for help shortcut

Merge with stable

Merge with crew-stable

merge: fix adding untracked files on directory rename (issue612) Fix from Brendan Added test case

extensions: untangle some recursive dependencies

interhg extension allows you to change changelog text like InterWiki.

setup.py not executable: change instructions at beginning of file

Merge with stable

convert: svn: remove svn_paths wrappers

convert: svn: use revmap to parse only new revisions in incremental conversions

convert: export revmap to source. Sources may be able to use it to optimise their own log fetching

convert: svn: defer get_log parsing until after get_log completes. According to the documentation, it is not safe to perform any other operation on the ra object until get_log completes.

convert: move some code into common init function

Merge with crew

alias: remove dead code

convert: call superclass init from engine init functions

Merge with crew-stable

test-archive: stop checking md5 absolute values Different tar/zlib versions can generate different binaries.

Fix issue589 wording problem

Fix serve on Windows without win32* modules.

test-demandimport: match upper-case hexadecimal

Add alias extension

merge with crew-stable

convert svn: minor improvement to tag detection. The better way is probably to list the latest tags directory and look up the last log message for each entry. This is surprisingly annoying to do.

convert: svn merges produce hard-to-trace file entries. Ignore them for now.

convert: svn: autodetect /branches, /tags, /trunk. Various other branch handling improvement attempts too.

convert: svn: pull out broken batching code, add alpha tags support

convert: svn: get parent for branch creation events

convert: add optional module argument to svn._fetch_revisions

convert: svn: parse log entries as they arrive instead of deferring it

convert: svn: move some debug output to verbose

convert: another typo in svn.latest

convert: typo in svn.latest

convert: svn: add function to get the latest revision touching a path Make it work for HTTP URLs

convert: svn: add an early return to move most changeset parsing out an indent level

convert: svn: use a separate mempool for each ls in the 1.4 fallback path

Remove specific version requirement and point to latest versions of Mac Python downloads.

children extension: Don't abort when looking at the null revision. Since 62c56d8f368b revlog.children only returns real children, so this is no longer a problem.

merge with crew-stable

Add extension to provide the 'hg children' command (with tests)

merge with crew-stable

Merge with tah

convert: make convertsource option handling transparent

Added import test for [PATCH] subject and message body with subject

patch.extract: fix test-import breakage introduced in the previous changeset

patch.extract: do not prepend subject if the description already starts with it

convert: svn: skip revisions without file entries

convert: svn: disable batched fetch - get the whole log immediately

convert: svn: add revnum() to convert rev to revnum

convert: svn: abort if module stat fails

convert: fetch svn changes on demand (in batches)

convert: svn: convert branch trunk to default

convert: svn: fix fallback directory listing code when importing a submodule

convert: remove svn debugger trap

convert: import all branches from git repositories

convert: gitcmd wrapper for os.popen

convert: activate subversion engine Fail gracefully if the subversion python bindings are not installed. Support --rev option to convert as well as URL@rev.

convert extension: Add SVN converter

convert extension: stripped-down svn transport module

convert: split converter into convertsource and convertsink

convert: move *** empty log message *** into commit class

convert: initialize source after destination, cleaning up if source is unusable

convert: add -r argument specifying latest revision to convert

convert: ove recode method into converter_source

Merge with crew-stable

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

merge: make test for fast-forward merge stricter (issue619) don't allow merging with an ancestor fix != on contexts add a test

Fixed calling the merge script and reporting errors in debuginstall (issue617)

Fix revlog.children so the real children of the null revision can be calculated.

hgweb: use lrwxrwxrwx as the permissions of a symlink

Make hg add foo; hg mv foo bar work. - foo will be removed (the user has a copy of its contents in bar) - bar will not be marked as a copy (there was no committed version of foo). We print a warning telling that to the user. Fixes issue269.

test-copy2: use status -C instead of debugstate | grep copy

test-rename: use hg status -C; don't use hg debugstate | grep copy

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.

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.