Martin Geisler <mg@aragost.com> [Mon, 24 Oct 2011 10:08:58 +0200] rev 15352
largefiles: improve markup in module help text
Martin Geisler <mg@aragost.com> [Mon, 24 Oct 2011 09:54:02 +0200] rev 15351
largefiles: remove redundant documentation
The extension help text already covered what was in usage.txt and
design.txt is now moved to the wiki:
http://mercurial.selenic.com/wiki/LargefilesExtension
Greg Ward <greg@gerg.ca> [Sun, 23 Oct 2011 14:25:48 -0400] rev 15350
largefiles: use ui.configpath() where appropriate
Greg Ward <greg@gerg.ca> [Sun, 23 Oct 2011 10:23:31 -0400] rev 15349
largefiles: drop more unnecessary compatibility checks
Matt Mackall <mpm@selenic.com> [Sun, 23 Oct 2011 16:32:27 -0500] rev 15348
windows: sanity-check symlink placeholders
On Windows, we store symlinks as plain files with the link contents.
Via user error or NFS/Samba assistance, these files often end up with
'normal' file contents. Committing these changes thus gives an
invalid symlink that can't be checked out on Unix.
Here we filter out any modified symlink placeholders that look
suspicious when computing status:
- more than 1K (looks more like a normal file)
- contain NULs (not allowed on Unix, probably a binary)
- contains \n (filenames can't contain \n, very unusual for symlinks,
very common for files)
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 23 Oct 2011 21:59:15 +0200] rev 15347
largefiles: use util.sha1() instead of hashlib.sha1() everywhere
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 23 Oct 2011 21:22:55 +0200] rev 15346
tests: check for svn >= 1.3 and >= 1.5 in tests that require those versions
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 22 Oct 2011 23:42:48 +0200] rev 15345
convert: add missing import of util, needed for svn < 1.6
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 22 Oct 2011 23:21:38 +0200] rev 15344
run-tests: make sure no_proxy/NO_PROXY are empty to fix test-http-proxy.t
If no_proxy (or NO_PROXY) includes localhost, the test for detecting an
unreachable proxy fails, because the proxy setting is ignored.
Greg Ward <greg@gerg.ca> [Sat, 22 Oct 2011 15:39:51 -0400] rev 15343
largefiles: test "lfconvert --to-normal" with rename/remove/merge
This gets us very close to full test coverage of lfconvert. The only
features not tested are:
- .hgtags conversion
- abort when largefile becomes symlink
Greg Ward <greg@gerg.ca> [Sat, 22 Oct 2011 15:16:52 -0400] rev 15342
largefiles: test lfconvert with rename, remove, and merge
Greg Ward <greg@gerg.ca> [Sat, 22 Oct 2011 14:52:05 -0400] rev 15341
largefiles: beef up test-lfconvert.t so it's more thorough
- instead of converting a single changeset with a single file, convert
two changesets which each add a mix of normal and large files
- make one of the large files not-so-large, but identified as large
by filename
- use shorter, simpler filenames
- put some files in a subdirectory
- test that file contents are correctly converted
- drop unnecessary cleanup step
Greg Ward <greg@gerg.ca> [Sat, 22 Oct 2011 14:20:17 -0400] rev 15340
largefiles: rearrange how lfconvert detects non-local repos
Mainly this is so we can test that code; it has the side benefit of not
requiring network I/O to reject non-local repo URLs.
Greg Ward <greg@gerg.ca> [Sat, 22 Oct 2011 14:17:19 -0400] rev 15339
largefiles: test lfconvert error handling; remove redundant code
Greg Ward <greg@gerg.ca> [Sat, 22 Oct 2011 13:48:56 -0400] rev 15338
largefiles: extract test-lfconvert.t from test-largefiles.t
test-largefiles.t is getting pretty big, and there's lots more to test
in lfconvert. And lfconvert is a fairly orthogonal feature to the
rest of largefiles.
Matt Mackall <mpm@selenic.com> [Sat, 22 Oct 2011 16:12:33 -0500] rev 15337
windows: recompute flags when committing a merge (
issue1802)
Before this patch, Windows always did the wrong thing with exec bits
when committing a merge: consult the flags in first parent.
Now we manually recompute the result of merging flags at commit time,
which almost always does the right thing (except when there are
conflicts between symlink and exec flags).
To do this, we:
- pull flag synthesis out into its own function
- delay building this function unless it's needed
- add a merge case that compares flags in local and other against the ancestor
This has been tested in multiple ways on Linux:
- running the whole test suite with both old and new code in place,
checking for differences in each flags() result
- running the whole test suite while comparing real on-disk flags
against synthetic ones for merges
- test-
issue1802 (from Martin Geisler) which disables exec bit
checking on Unix