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

merge: simplify some helpers

merge: more simplifications to checkcopies

merge: simplify checkcopies

merge: privatize some functions, unnest some others

merge: notice uncommited copies (issue1000) As mentioned in msg5349 in issue988, "hg update" doesn't take into account uncommitted copies. To reproduce: ---------------- hg init repo cd repo touch foo hg ci -Am 'add foo' echo >> foo hg ci -m 'change foo' hg up -C 0 hg mv foo bar HGMERGE=false thg --debug -y update -------------------------- A similar problem happens with hg merge --force. I'm attaching a possible patch.

Check for patches repo with os.path.isdir not os.path.exists

hook.py: fix redirections introduced by 323b9c55b328 The only non-obvious part is the use of sys.{__stderr__,__stdout__}, which is needed because sshserver overrides sys.stdout. This makes a test that I added back in revision 7939c71f3132 ineffective.

Issue937: error messages from hooks not sent over HTTP. Turns out that stderr - where ui.warn would send messages - was not being proxied over the HTTP connection. stdout was, and it seems you need both. (The streams are interleaved for readability.) Tested on Ubuntu 7.10 with lighttpd on hgweb.cgi with HTTP Basic auth, no SSL, using a changeset failing win32text.forbidcrlf.

revlog.py: remove extra close() atomictempfile.rename() already calls close().