osutil: cleanups - use tabs - eliminate old-style function pointer calls - eliminate weird scoping - eliminate assignment-in-iff - use !foo rather than foo == NULL

Execution bit detection fixes for VFAT on Linux On Linux VFAT execution mode can be modified, but changes don't persist a filesy stem remount. The current test can be trickled by this. We can help with the det ection of VFAT checking whether new files get created with the execution bits on (as usually these partitions are mounted with the exec option, for convenience) .

churn: simplify code to get terminal width

patch: fix git sendmail handling without proper mail headers

hgk: allow any extdiff command for visual diff

osutil.c: style fix - delete trailing end-of-line spaces

convert: do not output when trying to load svn bindings

convert: split converters into sink/source

Test darcs converter

convert: fix darcs_source.pull() under windows

convert: fix darcs_source._run() under windows

hghave: detect darcs client

hghave: reorder check functions and entries

Test workingctx exec/link bit for copies. Also, make the test runnable on platforms without symlinks.

Fix workingctx exec/link bit of copies on non-supporting systems

test-manifest: test symlink and exec bit display

Display symlink or executable bit with manifest -v New output looks like: 644 a 755 * b/a 644 @ l

convert: quote "^" to avoid windows using it as an escape char.

Always copy the necessary files before applying a git patch This patch removes the "copymod" attribute from the gitpatch class. AFAICS, that attribute was only used to delay the copying of renamed/copied files if there are no other changes to the target, but in this case, if there are changes to the source, we'll end up copying the wrong version. This should fix issue762.

mercurial_sink: regrab locks in setbranch

convert --filemap: reduce memory usage

convert: change SKIPREV to 'SKIP'

Fix bad lambda prototype in workingctx.fileflags()

osutil.c: use readdir instead of readdir64 Some systems (e.g. *BSD) don't have a readdir64 function - the regular readdir already uses 64-bit types. On other systems (Linux, Solaris, ...), if Python was compiled with large file support, Python.h will define _LARGEFILE_SOURCE and _FILE_OFFSET_BITS=64, so that any call to readdir will actually be a call to readdir64. If Python was not compiled with large file support, we probably don't want to define these macros to avoid ABI problems.

osutil.c: include Python.h before the other headers This is recommended by the Python documentation, since Python.h defines some constants.

Add osutil module, containing a listdir function. This is similar to os.listdir, only it returns a sorted list of tuples.

hgk: add basic usage and configuration documentation

hgk: add context menu visual diff action * * *

hgk: add debug-config command to pass configuration options

hgk: fix right-mouse button handling under macosx

Test *_ISLINK merge environment vars

merge: provide *_ISLINK environment vars to merge helper Sets HG_MY_ISLINK, HG_OTHER_ISLINK, HG_BASE_ISLINK in environment. Without these variables, it's impossible for the merge application to know whether the 'other' and 'base' files were symlinks in their original contexts. For the purposes of the merge they are always emitted as small text files.

context: add fileflags() to avoid rebuilding manifests

run-tests.py: allow a different temporary directory to be specified

Update test for new output produced since 17ed9b9a0d03

Fix accidentally broken test.

Merge with crew.

Allow tests to run in parallel.

run-tests.py: reorder options alphabetically.

convert_svn: add --filemap support

convert_cvs: add --filemap support

convert_git: add --filemap support

mercurial_source: add --filemap support

convert: add a mode where mercurial_sink skips empty revisions. The getchanges function of some converter_source classes can return some false positives. I.e. they sometimes claim that a file "foo" was changed in some revision, even though its contents are still the same. convert_svn is particularly bad, but I think this can also happen with convert_cvs and, at least in theory, with mercurial_source. For regular conversions this is not really a problem - as long as getfile returns the right contents, we'll get a converted revision with the right contents. But when we use --filemap, this could lead to superfluous revisions being converted. Instead of fixing every converter_source, I decided to change mercurial_sink to work around this problem. When --filemap is used, we're interested only in revisions that touch some specific files. If a revision doesn't change any of these files, then we're not interested in it (at least for revisions with a single parent; merges are special). For mercurial_sink, we abuse this property and rollback a commit if the manifest text hasn't changed. This avoids duplicating the logic from localrepo.filecommit to detect unchanged files.

convert: readd --filemap To handle merges correctly, this revision adds a filemap_source class that wraps a converter_source and does the work necessary to calculate the subgraph we're interested in. The wrapped converter_source must provide a new getchangedfiles method that, given a revision rev, and an index N, returns the list of files that are different in rev and its Nth parent. The implementation depends on the ability to skip some revisions and to change the parents field of the commit objects that we returned earlier. To make the conversion restartable, we assume the revisons in the revmapfile are topologically sorted.

convert: move filemapper class to a separate file

convert: disable current --filemap support The --filemap support in hg convert doesn't handle merges correctly. (And after 33015dac5df5 I managed to break it even for simple cases where we don't want the first revision.)

convert: allow the converter_source to say "skip this revision" If getchanges returns a string, it's assumed to be the id of an already converted revision. We map the current revision to the same revision this converted revision was mapped to. To allow skipping a root revision, getchanges can return the special string 'hg-convert-skipped-revision' (a.k.a. common.SKIPREV), which hopefully won't clash with any real id. The converter_source is responsible for rewriting the parents of the commit objects to make sure the revision graph makes sense.

convert: pass the order of the revmapfile to the converter_source The entries in this file are supposed to be topologically sorted and this may be useful for a converter_source.

Merge with crew

merge: add debug diagnostics for findcopies

Merge with crew-stable

test-convert-git: support older git client (1.4.4.4)

changegroup: avoid large copies - handle chunk headers separately rather than prepending them to (potentially large) chunks - break large chunks into 1M pieces for compression - don't prepend file metadata onto (potentially large) file data

revlog: generate trivial deltas against null revision To avoid extra memory usage and performance issues with large files, generate a trivial delta header for deltas against the null revision rather than calling the usual delta generator. We append the delta header to meta rather than prepending it to data to avoid a large allocate and copy.

Merge with crew

Merge with crew-stable

test-convert-cvs: handle older cvs client

Merge with crew

convert: fix a few residual bugs in darcs importer

Merge with crew

Merge with crew.

convert: support darcs as a source repo

convert: fail properly if we can't read a source hg repository