avoid double slash problem mentioned in issue695

clone: remove "file://" before making the path absolute This avoids writing bogus paths to .hgrc. Fixes issue695.

pull -u: if "url#rev" was given, update to rev

clone: if "url#rev" was given, update to rev

parseurl: also return the revision after the "#"; add a test

pull -r: pass the revisions as the heads argument of findincoming This can make a hg pull -r faster if the remote repo has many heads, and fixes an "abort: received changelog group is empty".

convert: fix /dev/null redirections under Windows

Test git repository conversion

hghave: detect git availability

convert: fix issue702 about GIT_DIR= construct unsupported under Windows.

convert: gitcmd wrapper for os.popen

fix test-permissions output

testcase for issue705 (fixed by 316ce5e85b3e)

merge with -stable

check exec: return fallback in case of error during the check If there is any error while checking if exec is supported, we can return fallback. fix issue705

Do not lose previous tags when adding a tag in raw mode

merge: forcefully mark files that we get from the second parent as dirty After a hg merge, we want to include in the commit all the files that we got from the second parent, so that we have the correct file-level history. To make them visible to hg commit, we try to mark them as dirty. Unfortunately, right now we can't really mark them as dirty[1] - the best we can do is to mark them as needing a full comparison of their contents, but they will still be considered clean if they happen to be identical to the version in the first parent. This changeset extends the dirstate format in a compatible way, so that we can mark a file as dirty: Right now we use a negative file size to indicate we don't have valid stat data for this entry. In practice, this size is always -1. This patch uses -2 to indicate that the entry is dirty. Older versions of hg won't choke on this dirstate, but they may happily mark the file as clean after a full comparison, destroying all of our hard work. The patch adds a dirstate.normallookup method with the semantics of the current normaldirty, and changes normaldirty to forcefully mark the entry as dirty. This should fix issue522. [1] - well, we could put them in state 'm', but that state has a different meaning.

gendoc: use demandimport

Merge with -crew

make hg add of a removed file unremove the file if a file was removed, hg add shouldn't mark the file as added, but as normal see issue683

abort when adding a file in merged state

add import from url capability

convert: load parent commits on-demand

convert: wrap cached commits author remapping

Merge with -stable

match: handle large regexes Some Python versions don't handle large regexes, so when we hit an overflow, split our regex in two.

path_auditor: cache names of audited directories We use a separate cache to avoid problems with audit = path_auditor(repo.root) audit("subrepo") audit("subrepo/file") whitelisting "subrepo" (which is fine) and then using the same whitelist with "subrepo/file" (which is not fine). Since we create a separate path_auditor for every path on the command line, a "hg add dir/a dir/b dir/c" will still lstat dir 3 times just to audit the paths.

Quote ^ and ~ chars in test-parentrevspec. At least ^ causes problems on some sh implementations.

Remove demandimport.enable from dispatch.py

Enable demandimport only in scripts, not in importable modules (issue605) This way other applications can choose if and when they want this feature, because it might be problematic if those applications rely on ImportError.

Merge with crew-stable

convert: fix mercurial_sink.putcommit Changeset 4ebc8693ce72 added some code to putcommit to avoid creating a revision that touches no files, but this can break regular conversions from some repositories: - conceptually, since we're converting a repo, we should try to make the new hg repo as similar as possible to the original repo - we should create a new changeset, even if the original revision didn't touch any files (maybe the commit message had some important bit); - even if a "regular" revision that doesn't touch any file may seem weird (and maybe even broken), it's completely legitimate for a merge revision to not touch any file, and, if we just skip it, the converted repo will end up with wrong history and possibly an extra head. As an example, say the crew and main hg repos are sync'ed. Somebody sends an important patch to the mailing list. Matt quickly applies and pushes it. But at the same time somebody also applies it to crew and pushes it. Suppose the commit message ended up being a bit different (say, there was a typo and somebody didn't fix it) or that the date ended up being different (because of different patch-applying scripts): the changeset hashes will be different, but the manifests will be the same. Since both changesets were pushed to public repos, it's hard to recall them. If both are merged, the manifest from the resulting merge revision will have the exact same contents as its parents - i.e. the merge revision really doesn't touch any file at all. To keep the file filtering stuff "working", the generic code was changed to skip empty revisions if we're filtering the repo, fixing a bug in the process (we want parents[0] instead of tip).