largefiles: test lfconvert with rename, remove, and merge

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

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.

largefiles: test lfconvert error handling; remove redundant code

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.

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

largefiles: test interaction between largefiles and vanilla clients and servers This reintroduces tests for the case described by issue3066, among others: - vanilla clients and servers should still be able to talk to largefiles clients and servers about vanilla repos - vanilla clients should not attempt to clone largefiles repos over http and should report a useful error message (issue3066; this appears to work correctly) - vanilla clients should not attempt to clone largefiles repos over ssh, again with a useful error message - largefiles clients should not attempt to push largefile changes to vanilla servers

tests: darcs > 2.5 got "smart" about encoding, disable encoding tests We can no longer convert a repo with mixed encodings, nor can I even figure out how to get Darcs to display such messages.

check-code: catch BaseException and os.path.relpath

largefiles: py2.4 doesn't have BaseException ..and it's the wrong base class anyway.

largefiles: rename lfconvert --tonormal option to --to-normal

largefiles: test lfconvert --tonormal

largefiles: use smaller files in test script

largefiles: test that minimum size can be a float This allows us to drop the existing test of --lfsize, since it's redundant with the new test.

largefiles: polish comments in test script

import: abort usefully if no patch name given

revset: disambiguous the node variable The module could be confused with the function.

revset: deal with empty lists in formatspec

keyword: correct grammar in iskwfile docstring

largefiles: remove all uses of os.path.relpath for 2.4 compatibility

mq: avoid data loss upon qfold + qmv (issue3058) When renaming a patch A as B where B was previously qfolded into A and therefore marked as removed, a versioned MQ would first restore B before marking it as a copy of A, thus losing A changes. The undelete() call is probably a left-over, wctx.copy() explicitely handles the case where the destination is removed. Also note that status command represents "hg rm b; hg mv a b" as: A b a R a which explains the first hunk in test-mq-qrename.t.

subrepos: abort commit by default if a subrepo is dirty (BC) This changeset flips the default value of ui.commitsubrepos setting from True to False and adds a --subrepos flag to commit. The commit, status, and diff commands behave like this with regard to recusion and the ui.commitsubrepos setting: | recurses | recurses | by default | with --subrepos --------+---------------+---------------- commit: | commitsubrepo | True status: | False | True diff: | False | True By changing the default from True to False, the table becomes consistent in the two columns: * without --subrepos on the command line, commit will abort if a subrepo is dirty and status/diff wont show changes inside subrepos. * with --subrepos, all three commands will recurse. A --subrepos flag on the command line overrides the config settin.g

largefiles: use XDG and OS X-specific cache locations by default (issue3067)

largefiles: remove redundant any_ function

largefiles: testcase to simulate inter-user clone on local machine

largefiles: make the store primary, and the user cache secondary This uses the now-properly-named functions and methods from the previous patch to actually deliver the desired behavior

largefiles: rename functions and methods to match desired behavior The original intent was that the largefiles would primarily be in the repository, with the global cache being only that--a cache. The naming conventions and actual intent have both strayed. In this first patch, the naming conventions are switched to match the actual intent, as are the configuration options.

largefiles: fix documentation to match desired behavior