Add qtip and qbase to mq qlookup.

Mq: modify repo.lookup to resolve applied patches too.

merge with crew.

status: add -c (clean) and -A (all files) options also add new localrepo.status what is more uniform than localrepo.changes. localrepo.changes is deprecated and will go away soon.

Added signature for changeset 2be3001847cb18a23c403439d9e7d0ace30804e9

Added tag 0.9.1 for changeset 2be3001847cb18a23c403439d9e7d0ace30804e9

Merge with crew

make convert-repo deal with git symbolic refs. Problem noticed by Sébastien Pierre

Merge with crew

util.getuser: better comments

util.getuser: raise exception if win32api not available.

merge with crew.

fix windows username problem.

Merge with crew

Make hgweb threads into daemon threads. This fixes the problem that an interrupted hg serve will not terminate until the next request has been received.

Preserve multibyte UTF-8 characters when obfuscating. This version uses the unicode 'replace' option, so non-UTF-8 encodings will still be mangled. Luckily, there aren't any of those.

spelling fix

change 'hg tag' to tag the parent rev instead of tip

merge with tonfa-experimental

fix 'hg cat' broken by 156fb1feab62

allow specifying a file to hg parents, change the syntax to use -r/--rev

fix filectxt to really work - use a context instead of changelog.read - changectx._id is not necessary

correct the handling of linkrev with nullid

lookup should allow -1 to represent nullid (if passed an int as arg)

fix tests.

Add an option '-C|--copies' to hg status to show the source of copied files. Copied files are displayed in the form: A newname oldname

merge

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