Bryan O'Sullivan <bos@serpentine.com> [Mon, 17 Mar 2008 08:04:09 -0700] rev 6292
Merge
Bryan O'Sullivan <bos@serpentine.com> [Mon, 17 Mar 2008 07:59:23 -0700] rev 6291
Backed out changeset 91ac1726730a
Bryan O'Sullivan <bos@serpentine.com> [Sun, 16 Mar 2008 22:59:31 -0700] rev 6290
Automated merge with http://hg.intevation.org/mercurial/crew
Bryan O'Sullivan <bos@serpentine.com> [Sun, 16 Mar 2008 22:59:04 -0700] rev 6289
issue 1003: send all data properly
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 16 Mar 2008 23:30:47 +0100] rev 6288
Remove unneeded "import os.path" again.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 16 Mar 2008 23:24:53 +0100] rev 6287
Spacing cleanup
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 16 Mar 2008 06:10:47 -0300] rev 6286
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
_repopath may be different from _path for workingfilectx when there
are renames involved.
Eric Hopper <hopper@omnifarious.org> [Sat, 15 Mar 2008 12:42:41 -0700] rev 6285
Change User-agent field in client to have a lot more info.
Eric Hopper <hopper@omnifarious.org> [Sat, 15 Mar 2008 12:42:34 -0700] rev 6284
Allow hgwebdir collections to follow symlinks.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 15 Mar 2008 22:03:18 -0300] rev 6283
Revert cfebb175704f, fixing the output of 2 tests
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 15 Mar 2008 22:03:18 -0300] rev 6282
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.
Patrick Mezard <pmezard@gmail.com> [Sun, 16 Mar 2008 00:35:14 +0100] rev 6281
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.
Patrick Mezard <pmezard@gmail.com> [Sun, 16 Mar 2008 00:35:12 +0100] rev 6280
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.
Matt Mackall <mpm@selenic.com> [Sat, 15 Mar 2008 16:51:53 -0500] rev 6279
update tests for copy detection changes
Matt Mackall <mpm@selenic.com> [Sat, 15 Mar 2008 16:49:27 -0500] rev 6278
copies: add tests for status -C/diff --git
This goes through 42 combinations of copy/rename branch/parent/working dir.
Matt Mackall <mpm@selenic.com> [Sat, 15 Mar 2008 16:25:27 -0500] rev 6277
copies: deal with symmetric difference for linear relationships
choose the minimum of symmetric difference and the two revs in question
Matt Mackall <mpm@selenic.com> [Sat, 15 Mar 2008 16:24:16 -0500] rev 6276
status: find copies and renames beyond the working directory
Matt Mackall <mpm@selenic.com> [Sat, 15 Mar 2008 10:02:31 -0500] rev 6275
diff: use copy smarts from copies.py
Matt Mackall <mpm@selenic.com> [Sat, 15 Mar 2008 10:02:31 -0500] rev 6274
copies: move findcopies code to its own module
- pass in contexts
- fold symmetricdifference check into copies.copies
Matt Mackall <mpm@selenic.com> [Sat, 15 Mar 2008 10:02:31 -0500] rev 6273
merge: move symmetricdifferences to ancestor.py
Matt Mackall <mpm@selenic.com> [Sat, 15 Mar 2008 10:02:31 -0500] rev 6272
merge: simplify some helpers
Matt Mackall <mpm@selenic.com> [Sat, 15 Mar 2008 10:02:31 -0500] rev 6271
merge: more simplifications to checkcopies
Matt Mackall <mpm@selenic.com> [Sat, 15 Mar 2008 10:02:31 -0500] rev 6270
merge: simplify checkcopies
Matt Mackall <mpm@selenic.com> [Sat, 15 Mar 2008 10:02:31 -0500] rev 6269
merge: privatize some functions, unnest some others
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 14 Mar 2008 11:01:31 -0500] rev 6268
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.
Eric Hopper <hopper@omnifarious.org> [Sun, 02 Mar 2008 08:51:02 -0800] rev 6267
Check for patches repo with os.path.isdir not os.path.exists
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 14 Mar 2008 21:57:46 -0300] rev 6266
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.
Jesse Glick <jesse.glick@sun.com> [Mon, 25 Feb 2008 09:55:57 -0500] rev 6265
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.