merge from crew-stable

mq: lose the trailing whitespace

improve help text for push (explanation of -r)

merge from crew-stable

merge from crew-stable

Merge with crew-stable

hgk: difftree must match all files when supplied list is empty

status: fix "added" attributes renamed in bf2bf986ff87

doc/hgrc.5.txt: add anchors for sections Enables links into hgrc.5.html of the form: hgrc.5.html#section

merge from crew-stable

gendoc: add anchors for commands Enables links into hg.1.html of the form: hg.1.html#command

mq: add correct documentation for qpop

Backed out changeset ff5ef3c0fe10 (fixes wrong documentation)

Slight improvement to qpop arguments help

test-mq: update qdiff summary output

mq: make qselect fail properly on an empty guard

mq: expand help text for qdiff Thanks to Waldo for thinking about this and formulating some text.

status: refactor status command - directly calculate a list of states to show - simplify repo.status call - use zip to build file list - only add relevant copies to copy dict

match: cleanup match classes a bit

match: remove files arg from repo.status and friends

match: remove files argument from patch.diff

match: use match.files() for patch.diff

match: stop passing files through commitfunc

status: use match helpers for various users

churn: simplify hg status call

match: use helpers for cmdutil

match: add always, never, and exact methods

remove default arg from patkind

resolve: use cmdutil.match

dirstate: remove default from status list_unknown

purge: remove unused 'missing' logic

dirstate: minor status cleanups

status: rename type_ to state

walk: use match.bad in statwalk

walk: use match.dir in statwalk

walk: make dirstate.walk return a single value too

walk: return a single value

walk: remove cmdutil.walk

walk: remove rel and exact returns

walk: remove more old badmatch logic

walk: remove remaining users of cmdutils.matchpats

cmdutil: switch commit to match

walkchangerev: use new match objects

walk: pass match object to cmdutil.walk - introduce cmdutil.match - change args to cmdutil.walk - create match objects for walk calls

walk: begin refactoring badmatch handling

walk: remove files arg from repo.walk and dirstate.walk

walk: introduce match objects

walk: kill util.cmdmatcher and _matcher

purge: use cmdutil.matchpats

purge: eliminate dopurge

walk: eliminate some default variables

coal: fix CSS errors as reported by Firefox

add compression type type parameter to bundle command

add support for HG10GZ bundles to bundlerepo.bundlerevlog()

tests: fix test-highlight output, changed in ccc2481e3954

merge from crew-stable

rename --after: do not unlink source file (issue910) "rename --after a.txt A.txt" on case mangling systems (e.g. Windows) erroneously deleted A.txt (even if modified).

Make mercurial easy installable again

webcommands: pass full author to annotate, fix templates (issue 1054)

sshserver: Don't try to close fp if mkstemp failed

merge from crew-stable

mq: fix qdiff -U (it apparently never really worked)

mergetools.hgrc patch

mergetools.hgrc patch

merge from crew-stable

merge from crew-stable

coal: put link fragment at the end of the url (after session vars)

merge from crew-stable

mq: don't commit local changes on pushing empty patch (issue1087)

remove trailing spaces

mq: add a little documentation on qpush -f

ignore *.pyd files *.c modules on Windows are compiled to *.pyd

Merge with crew-stable, fix test output

Merge with crew-stable

replace usage of os.popen() with util.popen() To make this possible, I added a mode parameter to both implementations of util.popen(), defaulting to 'r' (as it does in the Python stdlib).

test-merge-internal-tools-pattern: make executable

convert: fix svn file copy detection code

convert: fix svn branch source detection corner case It was confused by composite-looking revisions made by copy + remove.

convert: cleanup svn file copy handling

convert: handle past or foreign partial svn copies Subversion allows revisions to be composed of subparts coming from revisions before the parent or from other part of the repository. There is no simple representation for these now, keep the changes but do not track their origins.

convert: more cleanup in svn directory copy handling

convert: svn directory copy handling cleanup

convert: improve subversion branch filtering

convert: rename get_entry_from_path() into an svn_source method

convert: fix subpaths detection in svn source

test-convert-svn-branches: short identifiers are more legible

cmdutil: handle and warn about missing copy revisions

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.