convert: allow missing tools not to stop source type detection

fix test-serve breakage for other hostnames

util: test fileno() availability in win32 set_binary() Fix suggested by Alexander Belchenko <bialix@ukr.net>

tests: fix repeatability for test-filebranch with dirstate granularity

tests: remove some unnecessary sleeps

dirstate: refactor granularity code, add a test - rename option dirstate.granularity - move option reading into .write() - add a simple test

dirstate: ignore stat data for files that were updated too recently This should fix the race where hg commit foo <change foo without changing its size> happens in the same second and status is fooled into thinking foo is clean. A configuration item is used to determine the timeout, since different filesystems may have different requirements (I think VFAT needs 3s, while most Unix filesystems are fine with 1s).

pager: remove pager code from core

pager: further simplify code, clean up comments

Use the pager given by the environment to display long output Unix systems usually have a PAGER environment variable set. If it is set, mercurial will use the pager application to display output. Two configuration variables are available to influence the behaviour of the pager: pager.application sets the application to be used pager.quiet silences Broken Pipe errors that might occur when the user quits the pager before mercurial finished to write the output

hgk: don't exit if mercurial commands only print warnings

tag: allow multiple tags to be added or removed - Example: "hg tag -r 42 build-25 beta-1" will add tags build-25 and beta-1 for rev 42. - The deprecated and undocumented usage "hg tag arg1 arg2" used to emit a warning, then add tag arg1 for rev arg2 (equivalent to "hg tag -r arg2 arg1"). It will now add tags arg1 and arg2 for the current revision. - If one tag triggers an error, no tags are added/removed (all or nothing).

tests: update test-command-template for the new {isodatesec} filter

Add an {isodatesec} template, to show seconds too.

convert: Add convert.cvsps option to set up an alternate cvsps command line.

hgwebdir: Tiny fix for webdir on non-symlink capable platforms.

Add tests for cloning from a all-history bundle

clone: use cancopy

Add ability to directly clone from all-history bundles bundlerepos can be used as clone src, even if CWD is not a repo

remoterepo: no longer needed All users already use repo.local() to test for local, which is false in the repository base class. statichttprepository never derived from this class anyway.

repo classes: remove unused dev() method

Add default local() and cancopy() methods to repository base class

make hgrc man page tell about ~/.hgrc on Windows

ui: make chuild ui feed output to parentui's active buffer

convert: fix test complaint for mtn bits

cleanup monotone conversion and use commandline class

initial version of monotone source for convert extension

notify: print diffstat even if maxline == 0

Make clear that for a changegroup '-r' pulls "up to" a revision If some better wording is found, it can be changed later.

two fixes for the pager stuff - open pipe in binary mode - don't start a pager if stdout is not a tty (this prevents test-ssh from hanging if you set ui.usepager=True in run-tests.py)

Use the pager given by the environment to display long output Unix systems usually have a PAGER environment variable set. If it is set, mercurial will use the pager application to display output. Two configuration variables are available to influence the behaviour of the pager. ui.pager sets the pager application. The pager is only used if ui.usepager is true. By default ui.usepager is disabled.

Fix thinko in test-inherit-mode If we don't change any rwx bit in the last test, hg will skip the calls to chmod since it'll assume they're not needed. This might fix things on BSD systems.

test-serve: replace copy/paste with shell function

revert: update state of files in the "checkout" list This can make a difference when there are filters involved and decode(encode(working-dir-data)) != working-dir-data even though encode(decode(repo-data)) == repo-data An example is a working dir file that uses only \n when you're using the win32text extension.

normallookup: during merges, restore the state saved by remove

dirstate.remove: during merges, remember the previous file state We encode the previous state as a negative file size (AFAICS, previous versions of hg always have size == 0 when state == 'r'). We save the state of 'm'erged and dirty files, because they're the two states that indicate that a file has to be committed on a merge to correctly record per-file history.

debugstate: add --nodates This can be useful for tests.

patch: fix corner case with update + copy patch handling (issue 937) The self patching of files when diffed with a backup is a bit peculiar to me. It makes sense in mpatch, that's less clear in mercurial patching code. Let's document and preserve it for now.

Merge

Backed out changeset 4b81eecc8aa2

Merge

Backed out changeset 91ac1726730a

Automated merge with http://hg.intevation.org/mercurial/crew

issue 1003: send all data properly

Remove unneeded "import os.path" again.

Spacing cleanup

filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) _repopath may be different from _path for workingfilectx when there are renames involved.

Change User-agent field in client to have a lot more info.

Allow hgwebdir collections to follow symlinks.

Revert cfebb175704f, fixing the output of 2 tests

test-mv-cp-st-diff: avoid linkrev collisions The copy detection code relies heavily on the linkrevs, so it's better to avoid collisions in this test.

convert: avoid querying log of foreign svn branches Server configuration may prevent access to other branches, so don't even try to get them, instead of ignoring them afterwards.

patch: check filename is /dev/null for creation or deletion (issue 1033) Otherwise, file creation or deletion is ambiguous with file being filled or emptied.

update tests for copy detection changes

copies: add tests for status -C/diff --git This goes through 42 combinations of copy/rename branch/parent/working dir.

copies: deal with symmetric difference for linear relationships choose the minimum of symmetric difference and the two revs in question

status: find copies and renames beyond the working directory

diff: use copy smarts from copies.py

copies: move findcopies code to its own module - pass in contexts - fold symmetricdifference check into copies.copies

merge: move symmetricdifferences to ancestor.py