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().