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

util: add default argument to strdate

convert: add before/after hooks for converter sources

merge with -stable

Merge with crew-stable

Merge with crew-stable

Merge with crew-stable.

Merge with crew.

darcs2hg: Added support for darcs tags.

darcs2hg: Now detects and recovers from simple darcs conflicts.

darcs2hg: Now understands files that were explicitly renamed in darcs.

set_exec: do not chmod a symlink

Test debugindexdot

Test mercurial convert sink removes empty directories.

convert: fix missing import

convert: delete empty directories if deleting a file (bug 754)

bdiff: switch to lyhash lyhash is a very simple and fast hash function that had the fewest hash collisions on a 3.9M line text corpus and 190k line binary corpus and should have significantly fewer collisions than the current hash function.

bdiff: use INT_MAX to avoid some inner loop comparisons

bdiff: simple splitlines optimization

I have spotted the biggest bottleneck in "bdiff.c". Actually it was pretty easy to find after I recompiled the python interpreter and mercurial for profiling. In "bdiff.c" function "equatelines" allocates the minimum hash table size, which can lead to tons of collisions. I introduced an "overcommit" factor of 16, this is, I allocate 16 times more memory than the minimum value. Overcommiting 128 times does not improve the performance over the 16-times case.

revlog: fix revlogio.packentry corner case We want to store version information about the revlog in the first entry of its index. The code in packentry was using some heuristics to detect whether this was the first entry, but these heuristics could fail in some cases (e.g. rev 0 was empty; rev 1 descends directly from the nullid and is stored as a delta). We now give the revision number to packentry to avoid heuristics.

Don't try to determine interactivity if ui() called with interactive=False. WSGI applications are not supposed to refer to sys.stdin. In ed6df6b1c29a, hgweb and hgwebdir were fixed to pass interactive=False to their ui()'s, but sys.stdin.isatty() was still called by the ui objects. This change makes sure only the ui.fixconfig() method will call ui.isatty() (by making the ui._readline() method, which is currently only called from ui.prompt(), private). ui.fixconfig() is changed to let config files override the initial interactivity setting, but not check isatty() if interactive=False was specified in the creation of the ui.

Merge with crew-stable

convert_git: avoid returning two entries for the same file in getchanges This could happen in merge changesets if the merged file was different from both parents.

mq: fix qrefresh -e with no patches applied

Push over HTTP: really tell the user the size of the bundle

hgwebdir: ignore hgrc parse errors while building the index page An error in the .hg/hgrc file from a repository would prevent the following repos from being shown in the index page. The IOError handling was unnecessary - it's already handled in readconfig. This should fix issue731. The error in the .hg/hgrc file will still prevent the repo from being exported with hgweb.

hgweb: don't raise an exception when displying empty repos The nullid node claims it's in the default branch, but the branch dict is empty. This fixes the main symptom from issue696, but we may want to set branchtags()['default'] = nullid somewhere for empty repos.

make identify an optionalrepo command Fixes issue726.

copy: if destination ends with "/", make sure it's a directory Fixes issue724.

manifest: minor performance tweak

dirstate: speed up read and write read: - single call to len(st) - fewer assignments for position tracking - don't split apart tuple from unpack - use a literal for the unpack spec write: - localize variables and functions - avoid copied function call - use % for string concatenation

dirstate: make dir collision logic faster - shortcircuit decpath if we haven't built the _dirs map - increment only for leafnodes of directory tree (this should make construction more like O(nlog n) than O(n^2))

Merge with crew

revlog: fix inlined revision transaction extra data (issue 749)

Merge with crew-stable

bisect: remove useless try/except

Merge with crew-stable

bisect: don't write data on failure

bisect: do silent init if necessary

Test renaming files brought by merge second parent (issue 746)

localrepo: fix undelete() on merge working directory (issue 746)

Test static-http calls on '/' URI (issue 747)

statichttprepo: fix calls on '/' URI (issue 747)

convert-cvs: update test to pass on Linux

verify: report first bad changeset - add linkrev and file arguments to err - track lowest reported linkrev in err - find linkrev in a couple cases - sort linkrevs when reporting a bunch of errors against a file - tidy up lots of messages - make more robust against damaged indexes - report first bad changeset if an error is encountered

revlog: more robust for damaged indexes - fix flag reporting - make broken length reporting smarter

debugindex: more robust for damaged indexes

debuginstall: stop looking for patch utility, just test it

Updated zsh completion from issue722.

Merge with crew-stable

convert: test cvs repository conversion

convert: workaround for cvsps.cache under Windows In non-cygwin environment, cvsps fails to create its cache directory and redirect its output to stderr. Just ignore the error and capture stderr as well.

convert: fix remote cvs file paths separator

convert: avoid interpreting Windows path as CVS connection strings. CVS connection strings regexp detect colons to separate protocols from path and login. Unfortunately, Windows paths contains colons and were interpreted as rsh connection strings.

convert: call popen2 in binary mode, with a command string.

hghave: detect cvs and cvsps availability "cvsps -h" was returning 1 in cygwin, probably because CVSROOT was unset, which does not prevent it to work correctly.

hghave: wrap command output matching

Merge with crew-stable

Test parents behaviour with files.

parents: make it match the doc when called on a file parents used to return the parent revision of the last revision updating selected file, instead of the updating revision itself.

Merge with crew-stable

Document pseudo-tags "null" and ".".

Merge with crew

mq: fix regression in 6fd953d5faea It caused qrefresh; qrefresh -X addedfile to leave the file as normal in dirstate. It should be marked added on the second pass.

Merge with crew-stable

sshrepo: fix Windows command quoting

extdiff: avoid repr() doubling paths backslashes under Windows

merge with crew-stable

Prevent WSGI apps from touching sys.stdin by setting ui.interactive to False.

interhg: allow more flexible pattern specification (fixes 2/3 of issue699) - something else than "pat" followed by a number can be used as key - something else than "/" can be used as delimiter - "ilmsux" flags (e.g. "i" for case insensitive) can be used

Don't decode unicode strings. This does not work with python2.3 and is probably not useful anyway with 2.4.

Update test-record for 3ef190234b55

record: change wording of initial per-file prompt

hgk: add repo root to window title

Forgot to quote "6^" in test-parentrevspec (see 94e77a174f55)

test-convert-hg-source: enforce conversion order with --date

convert: rename a class and a function

convert: mercurial_source: also search for copies in modified files There are some corner cases where we may have a copy in a file that isn't in the added list: - the result of a hg copy --after --force - after a merge across a (local) rename

convert: clear the dirstate before a conversion, invalidate it afterwards Clearing it before the conversion protects us from whatever data were there (file copies in particular). Invalidating it after the conversion avoids writing a possibly inconsistent dirstate to disk.