localrepo: forbid nullid copyrev

verify: check copy source revlog and nodeid

Merge with -stable

removing unused local ccache in patch.diff

merge with -stable

merge: replace readline() call, missing from posixfile_nt

Merge with crew-stable

remove trailing whitespace introduced in cfeeac24fc1e

templates/coal: spell class correctly in {fileentry}

repo: add rjoin method

parseurl: make revs optional

Hoist localpath to the top level

test-imerge: disable due to massive brokenness

use internal merge tool when specified for a merge-pattern in hgrc It is possible to specify in the hgrc file that one of the internal merge tools (internal:fail, internal:local or internal:other) be used for performing merges on files matching a given pattern. However, this setting is not being acted upon (the merge tool is not found). This patch fixes that.

test that internal merge tools are used when set for a merge-pattern in hgrc It is possible to specify that one of the internal merge tools (internal:fail, internal:local or internal:other) should be used for performing merges on files matching a given pattern. This test makes sure that such a setting actually works.

fix import with -p0

context: handle untracked files in filectx.fileflags()

resolve: new command - add basic resolve command functionality - point failed update and merge at resolve

python-2.6: use sha wrapper from util for new merge code

fixed missing sorting in test-dumprevlog The test failed at random because the order of files was non-deterministic, which produced diffs in test output.

test-dumprevlog: fix extra path separator under MacOSX The "find .hg/store/ -name '*.i'" command returned paths with extra separators like '.hg/store//00changelog.i'.

Merge from main.

Add a batch file driver for Windows

merge: introduce mergestate

Merge with crew-stable.

win32text: actually import util so util.binary() can be used

issue 1053: heavily qualify the "cp -al" advice for cloning

Get rid of reimplementations of util.binary

Let util.binary check entire data for \0 (issue1066, issue1079)

keyword: check for '\0' in entire data before acting util.binary might not be safe enough, as it fails eg. on certain pdf files (issue1066).

keyword: make overwrite() arguments mandatory

keyword: compact setting of optional arguments

keyword: privatize remaining monkeypatches by moving them into reposetup Make it more transparent if and when monkeypatches are needed.

keyword: collect filename patterns, wrap dispatch._parse in uisetup Store [keyword] config in kwtools. hgcmd defaults to empty string.

Merge

Tidy code, fix typo

Added hgexecutable support for py2exe/frozen scripts

Remove trailing space

merge with crew-stable

python-2.6: md5 import in test-archive helper

python-2.6: deprecation of GzipFile.filename

highlight: backward compatibility with pygments 0.5.1

Fix spacing error introduced in 5efd447a9b8d

Merge with crew-stable

convert: check svn branches are directories

Merge from crew-stable.

tests/test-diff-copy-depth: using sh instead of bash test failed on plain FreeBSD 6.2 due to nonexistent bash

gendoc: fix indentation