Add --line-number option to hg annotate (issue506) Line numbers are separated from the last annotation element with a colon, like with many other commands, e.g. (hg) grep or compiler errors. Idea and tests by FUJIWARA Katsunori.

Allow filectx.annotate to return the line number of first appearance.

Check for conflict markers in hgmerge (issue471)

merge with crew-stable

Removed deprecated hg:// and old-http:// protocols (issue406)

hgwebdir: check for repo foo before browsing subdirectories of foo/

Merge with crew

hgweb: browse subdirectories before checking whether parent directory is also a repository

Use a prefix for debuginstall tempfiles. This way you know where the files came from if they don't get removed.

python 2.3 does not have sorted

Sort changelog extra dict to avoid possible nondeterminism

Last change broke new-style URLs

hgwebdir: do not walk up the given path looking for a repository. It is there or it isn't.

merge with crew-stable

hgwebdir: show only trailing part of path when browsing subdirectories

gitweb: add notfound template

hgweb: let hgwebdir browse subdirectories

convert: svn code movement (no actual changes)

convert: svn: avoid parsing already-seen logentries due to branch following

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.