HGcommand.vim : the status was read for the wrong file as we changed the current directory before

Do not try to get revision and branch information for file which are not tracked

Correction of commit with a log message in a file

Test if file is below an HG root before doing anything

[mq]: merge marker

fix logfile option for HGFinishCommit

codingstyle: use spaces instead of tabs

Merge with tonfa

context.py: various fixes - use a normal changeset instead of a context - define _filenode instead of _node to match the else clause

context.py: filectxs was using a keyword arg, add it to filectx

context.py: self.repo is not defined, change to self._repo

walkchangerevs: fix race in fast path do not yield revs if the corresponding cl entry does not exists, it avoids a race in the fastpath (where we walk in the filelog) with an ongoing transaction.

mention the bts for bug reporting in traceback message

expand the path if destination is not a directory

fix problem with uncompressed clone and python 2.3.

rename stream hgrc option to compressed.

clone: disable stream support on server side by default. enable in hgrc like this: [server] stream=True

clone: change name of --stream to --uncompressed. mpm asked for this.

update test-backout.out

merge with crew

fix bug introduced in b13a98bd078e

merge.

contrib: add sample.hgrc

backout: allow backout of merge changeset with --parent option. --parent allows to choose which parent of merge to revert to.

clone: do not make streaming default. add --stream option instead.

add support for streaming clone. existing clone code uses pull to get changes from remote repo. is very slow, uses lots of memory and cpu. new clone code has server write file data straight to client, client writes file data straight to disk. memory and cpu used are very low, clone is much faster over lan. new client can still clone with pull, can still clone from older servers. new server can still serve older clients.

Add merge to list of required tools.

Fix sed expression for OS X and Solaris 2.6. Matches previous fixes in other tests.

util.parsedate should understand dates from hg export

merge with mathieu clabaut.

HGcommand.vim : HGCommandEnableBufferSetup on by default

HGcommand.vim : HGGetStatusLine accept to display an empty 'branch' value

HGcommand.vim : suppress CVS relief

HGcommand.vim : doc review.

HGcommand.vim : doc integration

contrib/hgsh: make to work with remote clone over ssh.

move most of tag code to localrepository class.

clean up trailing white space.

Added tests for local and remote init. This tests the changes done in edb66cb05ded and b898afee9d0d.

Add ui method to set --ssh/--remotecmd, use it in init/clone/pull/push/in/out. The only user visible change is that 'hg init' now accepts this options, too.

clone: move code into hg module. make doc better. api in commands module is still same, but version in hg is best for calling within python now.

merge with crew.

parse url schemes more strictly. previous code mistook repo named "hg" for scheme named "hg".

add missed tests for diff -b/-B

merge with crew.

Vim script: Adaptation from CVS to Mercurial

Addition of CVScommand vim script as a base for HGcommand

Additional information about URLs in pull/push/clone/init: - clone to ssh:// - init via ssh:// - example for pull from an absolute directory via ssh:// - push to http:// and https://

disambiguate help about url syntax

merge with crew.

darcs2hg: pause and resume support, date extraction from commit hash, does not break on empty commits

darcs2hg: improved logging

darcs2hg.py: use darcs patch hash as patch identifier The use of the patch name is dangerous when duplicate names exist. In case of a duplicate name the second patch and all its dependancies are merged into a single mercurial patch. The patch identifier (hash) is always unique.

merge with crew

adding local_hostname option to smtp configuration

Respect "Connection: close" headers sent by HTTP clients. A HTTP client can indicate that it doesn't support (or doesn't want) persistent connections by sending this header. This not only makes the server more compliant with the RFC, but also reduces the run time of test-http-proxy when run with python 2.3 from ~125s to ~5s (it doesn't affect it with python 2.4, which was already ~5s).

allow use of extensions in python hooks extensions are loaded with hgext_ prefix, try to use them if the module is not found in the normal path

diff: add -b/-B options

use __contains__, index or split instead of str.find str.find return -1 when the substring is not found, -1 evaluate to True and is a valid index, which can lead to bugs. Using alternatives when possible makes the code clearer and less prone to bugs. (and __contains__ is faster in microbenchmarks)

coding style: use spaces instead of tabs