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.

convert: avoid dirstate checks; add a test During a conversion, the dirstate contents are not consistent - there are files that may be missing from the dirstate and there may be files that shouldn't be in the dirstate. While this is not fixed, don't mark files as added - put them directly in state 'n'ormal.

merge with crew

merge with crew-stable

fix the dummy 00changelog.i not being copied on clone

convert/subversion: Use util.set() instead of set() for python2.3 compatibility

Fix \ inside ` problem in test-convert-svn (avoids code duplication, too)

merge with crew-stable

Make test-convert-git compatible with other git versions (tested with 1.4.4.3)

hgweb: Show date of last change for each file in manifest

remove unneeded statement

kill lonely docstring

Atom support: replaced xhtml namespace prefix with default namespace

Added support for the Atom syndication format

Include . in PYTHONPATH (makes testing unbundled extensions easier)

Make run-tests.py work when invoked outside of tests. This makes it usable for unbundled extensions.

Merge with crew-stable

When reverting a file which was renamed, also revert the old name

Avoid a working dir walk while trying to detect copies for diff --git

Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB

bundle: fix up lazy reads

Make bundlerepo lazier This allows the localbranch extension to override sopener in time.

Merge with crew

convert: new config variable hg.tagsbranch controls which branch tags are committed to

Push capability checking into protocol-level code.

Turn capabilities into a mutable set, instead of a fixed tuple.

Automated merge with http://hg.intevation.org/mercurial/crew

convert: document filemap.

Test svn repository conversion

hghave: detect subversion bindings availability

hghave: detect subversion client and admin tools availability

hghave: wrap command output matching

run-tests: append PYTHONPATH instead of overwriting it Optional dependencies like svn bindings not necessarily live in site-packages.

convert: svn: check for branch movement in any log entry, not just the first. This fixes, for example, r4151 D /branches A /project/branches (from /branches:4150) A /project/tags (from /tags:4150) A /project/trunk (from /trunk:4150) D /tags D /trunk

Merge with crew-stable.

correctly record file-level history when the local side renames a directory

Fix theoretical issue in filecommit. If the file was copied, we don't want to reuse the original entry. I think this is mostly a theoretical issue - when there are copies, fp1 == nullid, so it's very unlikely that the fl.cmp(fp1, t) would think the file was unmodified. In any case, if there was a copy, we should forcefully create a new entry.

Avoid adding to the changelog executable files added by the second parent. This was a regression introduced by b51a8138292a.

Merge with crew-stable

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".

Merge with crew-stable

convert: fix /dev/null redirections under Windows

Merge with crew-stable

Test git repository conversion

hghave: detect git availability

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

convert: gitcmd wrapper for os.popen

Improve extdiff configuration. In addition to the old cmd.foo, opts.foo hgrc entries, allow a more simple alias = command [opts]... form. For example: [extdiff] cdiff = colordiff -uprN

cgi: sys.path.insert should be before importing mercurial thanks to R. Burke

merge with crew

improve error message for 'hg merge' when repo already at branchtip

imerge: add automerge flag to attempt to batch merge all conflicts

Merge with crew

imerge: fix ancestor calculation If wctx already has two parents, ancestor calculation is wrong. Normally merge is called before wctx gets the second parent, so we simulate this in imerge by temporarily popping the second parent before calling filemerge. Highly dirty. This patch also handles the ParseError move from cmdutil to dispatch.

merge with crew-stable

fix test-permissions output

merge with crew-stable

testcase for issue705 (fixed by 316ce5e85b3e)

merge with crew-stable

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

mq: some improvements to header rewriting (closes #690) Tested with qrefresh -m against the mm series.

Merge with crew-stable

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

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.

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

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

Fix sshrepo.unbundle We weren't reading all the data sent by the server. Depending on the system, the remote hg (actually, the remote python) could send a "close failed: [Errno 32] Broken pipe", making some tests fail.

run-tests.py: pass --install-scripts to setup.py This avoids possible problems when the user has a ~/.pydistutils.cfg. Fixes issue638. Patch provided by Ralf Schmitt.

recognize user:password in URLs that include port numbers. when giving user/pwd in an URL, eg. hg pull http://user:pwd@host.com:666/hg/something, hg would still ask for user/pwd in interactive mode (or fail in non-interactive)

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).

Add parentrevspec extension

Move enabling of demandimport to dispatch.py This avoids loading many modules before enabling demandimport.

Move cmdtable and reposetup handling out of extensions.py A new function (extensions.extensions) allows the code that is interested in those attributes to handle them directly. This allows some cleanups of extensions.py. Notably, we can remove the extensions.commandtable hack. It also makes it easier to add standard extension attributes, like a "hgwebsetup" function or a "helptable" dict that augments the data in help.py, etc.

Adjust contrib/hg-ssh for moved dispatch() function.

Merge with crew

verify: report expected linkrev

dispatch: move command dispatching into its own module - move command dispatching functions from commands and cmdutil to dispatch - change findcmd to take a table argument - remove circular import of commands in cmdutil - privatize helper functions in dispatch

move parseurl from cmdutil to hg

fix-up references to repo.RepoError

remove unneeded imports of mdiff

Merge with stable

merge with -stable

clone: do not delete the target if only the update fails

Merge with crew-stable

Merge with hg-stable

test-grep: use lowercase hg command

Merge with crew-stable

mq: truncate patch just before rewriting header

convert: raise Abort instead of NoRepo when CVS pserver auth fails. At this point we know the source is CVS, so we should not go through the rest of the converters.

convert: hg: optionally create branches as clones If convert.hg.clonebranches is set, branches will be created as clones of their parent revisions. All clones will be subdirectories of the destination path.

Use smerge minor mode in emacs to resolve conflicts. The condition-case is used to suppress errors with emacs versions before 21.

Merge with crew-stable

test-grep: test issue 685

Fix issue 685: trackback in grep -r after rename

merge with crew-stable

The >| redirection does not exist in plain sh.

Merge with crew-stable

hghave: test hotshot dependencies (debian does not provide profile)

Merge with crew-stable

test-profile: fix grep, check hotshot availability

merge with -stable

Return 0 as 'hg bisect reset' is successful

fix bundlerepo broken by 4205f626dc05 since we now use struct in case of lazy parser, this have to be an integer instead of None see issue681

Merge with crew-stable

Test --time, --profile and --lsprof

demandimport: ignore resource module, not available under Windows.

demandimport: ignore pwd and grp. Both are unavailable under Windows and tarfile detects them via ImportError.

imerge: simplify 1d5ebb0d366f

imerge: fix status file lookups

demandimport: ignore pwd and grp. Both are unavailable under Windows and tarfile detects them via ImportError.

util: ignore invalid path errors in path_auditor.

merge with crew-stable

merge: fix a copy detection bug (issue672) When merging rev1 and rev2, we want to search for copies that happened in rev1 but not in rev2 and vice-versa. We were starting the search at rev1/rev2 and then going back, stopping as soon as we reached the revno of the ancestor, but that can miss some cases (see the new test-issue672). Now we calculate the revisions that are ancestors of rev1 or rev2 (but not both) and make sure the search doesn't stop too early. Simplified test provided by mpm, based on a test case provided by Edward Lee.

merge with crew-stable

Added test for commands.dispatch (especially 88803a69b24)

test-context.py: Don't create second repo instance (fixed since 7b5723c95a82)

fancyopts: Copy list arguments in command table before modifying. Before this, executing commands.dispatch(['log', '-r', '0']) commands.dispatch(['log', '-r', 'tip']) would look like: hg log -r 0 hg log -r 0 -r tip Reported by TK Soh, patch by Alexis S. L. Carvalho

Print less scary message if the system supports symlinks: "Skipping test-no-symlinks: system supports symbolic links" instead of "Skipping test-no-symlinks: unexpected feature: symbolic links"

Hide absolute path from test-no-symlinks output. And add missing eol and remove trailing space which where introduced by the patches adding this test.

Make a few portability improvements to path auditing code.

Make audit_path more stringent. The following properties of a path are now checked for: - under top-level .hg - starts at the root of a windows drive - contains ".." - traverses a symlink (e.g. a/symlink_here/b) - inside a nested repository If any of these is true, the path is rejected. The check for traversing a symlink is arguably stricter than necessary; perhaps we should be checking for symlinks that point outside the repository.

mq: teach qpop about symlinks

debugstate: print symlinks as 'lnk', not '777'

manifest: accept -r for rev specification

record: improve docs, improve prompts

Merge with crew-stable

hghave: prefix temporary files with "hg-hghave-"

test-no-symlinks: rename .bundle into .hg for consistency.

Merge with crew-stable

fix up previous commit for stable

Merge with crew-stable

Cache extension load failures. hg commands call extensions.loadall twice, once during dispatch and once when the repository is instantiated. Without this change, load caches successful loads, but not unsuccessful, causing errors to be displayed twice.

merge with -stable

unobfuscate part of f94dbc6c7eaf

Merge with crew-stable

Test symlink handling on platform not supporting them

hghave: feature absence can be checked by prefixing with 'no-'

merge with -stable

Fix hgwebdir after 9858477ed74cce9dc8f4069f9453a1bda0e13ba1 broke it.

refactor options from cmdtable - add extracommitopts for user and date - factor stuff

merge with crew-stable

CVS import: Support new-style .cvspass-file format. Based on an email from Ralf.Leibold at nuance dot com

raise util.Abort again if specified revision is not an integer. This was changed to NoRepo in 462cc56d898f, because specifying non-integer revisions for e.g. the Mercurial backend caused Abort to be raised in the subversion importer. Now util.Abort is raised again, but the check is done after verifying if it really is a subversion repository.

debugsvnlog call had too many quotes (found by Edouard Gomez)

Remove trailing spaces, fix indentation

merge with crew-stable

Remove trailing spaces

Removed debug print from convert/subversion.py

Replace _ with inst for catching exceptions to not shadow gettext. And removed one _(...) because mercurial.i18n is not yet imported in convert/subversion.py.

Move debugsvnlog to subversion module.

convert: Use debugsvnlog instead of git-like debug-svn-log.

extdiff: do single file diffs from the wc with no copy Extdiff was always making a temporary directory and copying files even when not required. This change makes extdiff avoid the copy when diffing a single file that lives in the wc. This lets external diff tools edit the working copy file directly. It also lets other extensions resuse the functions in extdiff and get in-place diffs.

extdiff: made it less chatty in non-verbose mode Made the status info only display in verbose mode since most hg commands aren't so chatty. This also makes it cleaner for other extensions to call extdiff.

extdiff: un-nested two functions The functions in extdiff that create temporary repo copies for are useful in other extensions, so the change moves them at the module level.

convert: remove accidental debug print

convert: use '.' as destination name if renaming subdir into root

Automated merge with http://hg.intevation.org/mercurial/crew

convert: only get history for requested revs when converting hg repo

convert: raise correct type of exception if svn converter can't handle rev

record: raise an exception correctly if we can't create a backup directory

record: work properly if invoked in a subdirectory

convert: replace fork with subprocess call.

convert: support windows SVN simple auth provider

merge with crew-stable

Update on pull -u when heads were closed (fixes issue666). Patch written by Benoit Boissinot. This should probably be improved in the future to handle long-living branches, as joining two "other" heads will switch to that new head. But this is not a new problem, as adding to the "other" head would have switched to that new head, too.

gitweb: add notfound template

Add message to test output if a test is aborted due to a timeout. Without this an aborted test could produce an empty .err file so the diff looks like as if all lines of the .out files are just missing for some unknown reason.

Merge with crew-stable

Fix issue 653: symlinks checkout failure on non-supporting platforms

test-oldcgi: replace shebangs with explicit python calls to help pysh.

test-issue352: skip tests if platform does not support EOL in paths.

hghave: detect support for EOL in paths.

test-git-import: fake executable permissions.

hghave: detect executable permission availability.

test-clone-failure: fake output upon fifo unavailabity

hghave: detect FIFO availability

Skip test-archive-symlinks if symlinks are not available

posixfile_nt: '+' should allow read access. This fixes unexpected I/O error on committing many files due to cset:8a53b39cd402 (r4902 in crew).

posixfile_nt: '+' was understood as read mode instead of update.

merge with crew-stable

httprepo: quote the path part of the URL This should fix a 'hg clone "http://hg.example.org/path with spaces/"' The code tries to do the right thing when the user passes a path that's already escaped in part (e.g. "http://hg.example.org/path%20with spaces/"). If we're redirected, urllib2 will happily follow the URL it's given without escaping anything. I'm not sure what we would have to hook to work around that.

dirstate: fix rebuild; add a test If rebuild calls invalidate, it will just queue a (re)read of the dirstate file, while what we really want is to empty the current state.

hgweb: don't use os.path.join to build URL parts

hgwebdir: change os.sep in the name of repos to "/"

convert: svn: remove debugging message

convert: look up copies in getchanges instead of getcommit svn: defer path expansion until getchanges to reduce latency, as well as memory usage when converting incrementally.

convert: svn: pull up path to file expansion code into separate function. This is part of the process for deferring path expansion until getchanges. Copy detection also needs to be moved out of the commit object.

convert: svn: hoist up branch creation check

convert: svn: remove dead code

convert: svn: add helper function for optrevs

patch: add git symlink support

Merge with crew

convert: svn: ensure leading / is removed from paths in _find_children (broken in 2bd996d0aaf8)

merge with crew-stable

Simplify/correct finding the hg executable (fixes issue644) Simply use find_exe('hg') as the default value for $HG and require to manually set it if you have special requirements. While the default will not always be 100% correct (i.e. the identical hg version) for many users it is and for the others the hg executable found in the PATH should do most things correctly. Developers or other users with multiple installs can set $HG or run something like util.set_hgexecutable in their shell or python scripts. Additionally util.hgexecutable() is now available so extensions can access the value with a public interface, too.

convert: drop duplicated assignments.

imerge: gussy up dispatcher to support subcommand opts. Add -n, --resolved, --unresolved to status.

Merge with crew

imerge: handle renames

merge with crew-stable

archive: abort on empty repository. Fixes #624.

Merge with -stable

merge: avoid double deletion mentioned in issue636

merge with hg-stable

The >| redirection does not exist in plain sh.

imerge: sorted() is only available in python2.4 and above

imerge: tarfile.extractall is only available in python2.5

Update imerge for new filemerge interface

del transaction before lock before wlock This way rollbacks happen while the repo is still locked. Deleting lock before wlock is not strictly necessary, but is more consistent with the locking order.

convert: fix locking order

update tests output

convert: (svn) simplify _find_children

Merge with stable

Update asciidoc instructions to suggest html4 for newer versions

Merge with mpm

Merge with stable

merge: do early copy to deal with issue636 Without copies/renames, merges source names are 1:1 with their targets. Copies and renames introduce the possibility that there will be two merges with the same input but different output. By doing the copy to the destination name before the merge, the actual merge becomes 1:1 again, and no source is the input to two different merges. - add a preliminary scan to applyupdates to do copies - for the merge action, pass the old name (for finding ancestors) and the new name (for input to the merge) to filemerge - eliminate the old post-merge copy - lookup file contents from new name in filemerge - pass new name to external merge helper - report merge failure at new name - add a test

Automated merge with http://hg.intevation.org/mercurial/crew

dirstate: improve error message on file/directory clash

imerge extension and test

localrepository: allow rawcommit to commit with an empty message

Update style of record's cmdtable to match mercurial/commands.py

os.isatty isn't available on Windows, so use sys.stdin.isatty()

convert: add config option to turn off use of branch names

Add record extension, giving darcs-like interactive hunk picking

ui: get readline and prompt to behave better depending on interactivity

patch: make internal code a bit friendlier to use

commands: move commit to cmdutil as wrapper for commit-like functions

patch: remove unused parameter from b85diff

Update expected test output It's no longer a "problem" to have the same name listed with no prefix and a "hgext." prefix.

extensions: don't get confused by aliasing between "foo" and "hgext.foo"

merge with crew-stable

Fix re: and glob: patterns in .hgignore (reported by Brad Schick) relglob: and relre: were already detected for a long time, so I kept this undocumented functionality, especially as it was already tested in test-hgignore.

test-convert: Hide warning about missing subversion bindings.

Fix bashism and remove useless use of cat.

Test qnew --git

mq: add qnew --git option

convert: empty log messages are OK as of 7f5c3fb0a37d

localrepo.commit: only munge comment text if committing via dirstate

convert: make test-convert executable

Merge with bos

convert svn: canonicalize path before calling url_from_path. Otherwise libsvn has a tendency to abort().

Ignore mergebackup files generated by mpatch

convert: get rid of ugly use of hasattr

convert: get rid of "hg." prefix where not needed

convert: add filename filtering and renaming support

convert: add test

convert: acquire/release locks periodically

convert: Support Mercurial as a source, as well as a sink

convert: make commit constructor clearer and less magical

convert: rename mapfile to revmapfile, so we can map more than just revs

convert svn: try to extract URL from source if it is a working directory

Merge with mpm

revlog: localize some fastpath functions

revlog: minor chunk speed-up

revlog: minor revdiff reorganization

revlog: move flag checking out of the offset fastpath

dirstate: localize a bunch of methods in status fastpath

dirstate: speed up sorting in findfiles

revlog: pass mode to _supported directly

dirstate: localize a bunch of methods for findfiles

Merge with -stable

merge: don't forget to update the dirstate for exec bit changes

convert: urlify svn repos if necessary. We should also try to extract the URL from an svn working directory.

posixfile_nt: '+' should allow read access. This fixes unexpected I/O error on committing many files due to cset:8a53b39cd402 (r4902 in crew).

revlog: avoid some unnecessary seek/tell syscalls

manifest: speed up creation of the manifestdict - fold iteration and rawset into parse - avoid creating extra new strings with [:] where possible - speed up node.bin

lazyparser.findnode: fix typo and s/rfind/find/ There's no reason to use reverse string search and it's slightly slower

lazyindex: speed up __getitem__ This function is fairly performance sensitive, so we make a couple ugly tweaks: - keep all entries packed so we needn't test entry types - fold index lookup/load into unpack call to eliminate local variable setting

lazyparser: up the blocksize from 512 bytes to 64k

revlog: implement a fast path for heads

revlogio: speed up parsing - precalcuate ending offset - pull some variables into local scope - separate inline and out of line code paths

revlog: eliminate diff and patches functions call mdiff variants directly

revlog: speed up chunkcache - use a reasonable cache size - avoid an extra copy when we pull in big revs

revlog: some basic code reordering

revlog: abstract out index entry packing This lets us remove most of the remaining v0/v1 logic from revlog

revlog: simplify revlog.__init__ - move stat into io helper - get rid of self.defversion and self.indexstat - fold _load into __init__

revlog: mark cache private

revlog: pull chunkcache back into revlog

revlog: change _inline from a function to a variable

revlog: simplify addrevision - remove unused defaults for p1, p2, and text - reduce some if/else - use better variable names - remove some extra variables - remove some obsolete corner tests - simply first entry handling for revlogng - simply inline vs outofline writeout

revlog: some codingstyle cleanups

revlog: add a magic null revision to our index We expand our index by one entry so that index[nullrev] points to a unique entry, the null revision. This naturally eliminates numerous extra tests in the performance-sensitive index access functions, most of which are now trivial again. Adding new entries is now done with insert(-1, e) rather than append(e).

revlog: change accesses to index entry elements to use positive offsets

revlog: parse revlogv0 indexes into v1 internally This lets us eliminate lots of special case code in our performance-sensitive index accessors.

revlog: only allow lazy parsing with revlogng files This will allow us to store indices in memory in a single entry format

revlog: simplify the v1 immediate parser - read all the data at once (large files are handled by the lazy parser) - cache the entire file for inline revlogs - simplify looping

revlog: set the threshold for lazy parsing higher A typical machine can parse a 1MB index in well under a second

revlog: simplify the v0 parser

revlog: add revlogio interface This lets us separate the logic for different on-disk revlog formats from the main revlog logic.

revlog: regroup parsing code

transactions: avoid late tear-down (issue641) We use weak references (ugh) to avoid having to manually delete transaction references out of each call frame when an exception occurs.

hgk: enable mouse wheel under Windows. For some reason, MouseWheel events are not routed under windows even in latest ActiveTcl 8.4.15 while they are under linux and macosx. These events are activated using code supplied with Tcl Tip 171: <http://www.tcl.tk/cgi-bin/tct/tip/171.html>. Strangely, the Tip code almost work but generates some unexpected infinite loop which is fixed using a simple boolean to check reentrancy.

hgk: enable mouse wheel on MouseWheel events. At this point, mouse wheel still does not work under Windows.

merge with crew-stable

addremove: print meaningful error message if --similar not numeric

Merge with crew

revlog: privatize some methods

revlog: delete unused function makenode

revlog: raise offset/type helpers to global scope

Make repo locks recursive, eliminate all passing of lock/wlock

Use a weakref for recursive transactions

Use try/finally pattern to cleanup locks and transactions

repo locks: use True/False

rename and simplify do_lock

simplify dirstate fixups in repo.status()

dirstate: add doesn't need to call stat

use context for part of localrepo status

context: add __contains__, __getitem__, and __iter__

dirstate: get rid of default args for status

dirstate: make filterfiles private

dirstate: add __contains__ and make __getitem__ more useful dirstate.state(f) == '?' -> f not in dirstate dirstate.state(f) -> dirstate[f]

dirstate: make wjoin function private

dirstate: break update into separate functions

dirstate: use True and false for _dirty

test-alias: Removed fallback to parentui, no longer needed since 10afa3fab6b4

merge with crew-stable

Make [defaults] in .hg/hgrc work.

fix bogus close spotted by pychecker (no close() in global scope)

Remove unused pprint import and the commented line which used it before.

Use format string for lockname again (was changed by 3e25a6eb5c9a)

Backout ad09ce1d393c and replace ''' with """ to make some highlighting happy. I have tried Debian's default emacs and the current CVS version. Default emacs doesn't have highlighting enabled (and being emacs-illiterate I don't know how to enable it) and the CVS emacs' Python highlighting has no problems with ' characters here.

removed trailing whitespace

fix unused variables reported by pychecker

churn: get current terminal width if possible

merge with crew-stable

dirstate.invalidate: avoid rebuilding _map Since hasattr will call __getattr__, the call to hasattr(self, '_dirs') will end up reparsing the dirstate file.

add dirstate._dirtypl variable Theoretically, it's possible to forget modified dirstate parents by doing: dirstate.invalidate() dirstate.setparents(p1, p2) dirstate._map The final access to _map should call _read(), which will unconditionally overwrite dirstate._pl. This doesn't actually happen right now because invalidate accidentally ends up rebuilding dirstate._map.

archive: delay extraction of file revisions This allows us to look only at the filelogs we're interested in, providing a nice speedup if we're archiving only part of a repository.

help: avoid traceback if an extension has only debug commands

convert/subversion: rehandle the no-tags case

Print meaningful error message if os.symlink fails

lock.py: cache hostname, but not pid, in case we fork

convert/subversion: work around memory leak in svn's python bindings The svn.ra.get_log wrapper attaches the hash of changed paths for every log entry to a global memory pool, so memory consumption increases rapidly, with no way to free it. Our workaround is to call this function in a child process, and feed its results back over a pipe. The memory consumption of the child still grows huge (hundreds of megabytes), but at least it goes away once the reading-the-log phase is done.

Automated merge with http://hg.intevation.org/mercurial/crew

convert/subversion: Simplify callback.

merge with crew-stable

Simplify update.

Better fix for issue 622 than we had in c4dd58af0fc8.

convert/subversion: reduce memory usage by filtering early This makes up to a 50% difference in memory consumption.

Automated merge with http://hg.intevation.org/mercurial/crew

convert/subversion: get converter working against plain HTTP.

Simplify update.

Better fix for issue 622 than we had in c4dd58af0fc8.

merge with main

doc: typo, -x bit

merge with crew-stable

fix test-tag on Solaris

tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) This also fixes an asymmetry bug in which we called the pretag hook if we were going to create a local tag, but didn't call the tag hook afterwards.

issue 622: pull/unbundle -u updates to default branch if repo was empty

mq: autodetect an existing git patch during qrefresh (issue 491)

replace .hgtags instead of appending to it when doing a raw commit

handle nonexistent .hgtags in raw _tag

convert/subversion.py: str.rsplit is not available in Python 2.3

Automated merge with http://hg.intevation.org/mercurial/crew

convert/subversion.py: fix bad assumptions about SVN path naming The SVN converter assumed that the trunk and branches paths were fixed, and immediately under the base of the SVN URL. Fix the second assumption, and allow the trunk and branches paths to be reconfigured.

convert/subversion.py: escape quotes to make code readable in Emacs

patch: patches should be read and written in binary mode when possible.

patch: fix normalized paths separators.

posixfile_nt: '+' was understood as read mode instead of update.

Update test output to reflect small changes in patch chattiness.

patch.py: re-add the ability to use an external patch program This is now invoked by default only if ui.patch is set. Otherwise, we use our built-in patch. If that fails because it can't find any valid hunks, we'll fall back to trying the external patch command.

patch.py: don't mark files as changed unless they have actually been changed

patch.py: fix some incorrect uses of _() for i18n

Add Chris Mason's mpatch library. The original repo is http://oss.oracle.com/mercurial/mason/mpatch

merge with crew-stable

convert: manually set encoding to UTF-8 Right now the backends assume we're working in UTF-8 and there's no good way to ignore the encoding when adding revisions.

hg parents: don't pass an OS-specific path to repo.filectx The only reason to use the matcher code instead of calling util.canonpath directly is to be able to use "path:canonical/path/to/file" patterns.

merge with main

contexts: improve filectx eq test

Merge with -stable

merge: fix unnecessary rename merges on linear update (issue631) If one side's revision is identical to the ancestor, we skip the rest of the copy detection logic.

tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) This also fixes an asymmetry bug in which we called the pretag hook if we were going to create a local tag, but didn't call the tag hook afterwards.

issue 622: pull/unbundle -u updates to default branch if repo was empty

mq: autodetect an existing git patch during qrefresh (issue 491)

patchbomb: add --desc, to specify a file containing a series description

merge with crew-stable

convert: Use clone's behaviour for the default destionation name. Adjusted the documentation for this and for the fact that the destionation is created even if a name is specified.

Merge with crew-stable.

test-symlink-basic: require symlinks availability

Add hghave utility and run-tests.py support. hghave detects system features like symlinks availability at run-time. Tests can be skipped by starting them with: "$TESTDIR/hghave" symlink || exit 80 The 80 exit status triggers hghave output handling by run-tests.py. Also, tests output can be locally patched on the fly to match reference output.

run-tests: extract correct status when script terminates with exit

Merge with -stable

diff: correctly handle combinations of whitespace options

hg grep: handle re.compile errors & update tests/test-grep

typo fix

Re: mercurial.el and hg-version-other-window hg-version-other window is unimplemented in mercurial.el. The version below works for me, YMMV.

Use isinstance instead of type == type

convert: record the source revision in the changelog

Use wsgi.url_scheme instead of ad-hoc CGI checks. Instead of each place in hgweb_mod that needs to check for SSL or get the protocol scheme (http vs. https) doing it ad-hoc, make them just look at the wsgi.url_scheme which because of previous patches is now always set correctly.

cosmetics

Make hg serve set the wsgi.url_scheme property correctly. This fixes the bug where hg serve with SSL will always detect the wrong urlbase for templates. This is also part of unifying the CGI interface and hg serve interface to both use standard wsgi.

Handle CGI SSL detection via HTTPS environment better. Some servers send on/off, 0/1, yes/no, and may be upper or lower case. This fix will handle all of those permutations. It was inspired by the detection done in in some other wsgi python web applications I looked at.

merge with crew-stable

archive: make the %r escape work.

serve: respect settings from .hg/hgrc create_server was looking only at the root ui object, ignoring any settings from .hg/hgrc. To keep respecting command-line arguments, commands.serve must also call repo.ui.setconfig.

Fix inconsistency for the stream_out capability in hgweb During some experiments of mine, the uncompressed cloning could not be enabled for hgweb.cgi nor hgwebdir.cgi though the server claimed to be stream_out capable. The only solution was to enable it using the user's .hgrc file. This solution is not acceptable when publishing the repos through an HTTP server because the CGI runs as a www dedicated user whose's home hgrc file may not be accessible to users publishing their repos through their userdir. For such cases we could end up with this typical debug output: hg --debug clone --uncompressed http://server/hg/project destination directory: project sending capabilities command capabilities: lookup changegroupsubset stream=1 unbundle=HG10GZ,HG10BZ,HG10UN sending stream_out command abort: operation forbidden by server The error lies in the fact the hgweb object defines new accessors to the repo configuration that trust things by default (untrusted=True) but the streamclone:stream_out function uses the usual accessors to the repo.ui object, which do not trust by default (untrusted=False) Fix this inconsistency, adding a new parameter to the stream_out function. hgweb then forces a "trust by default" behavior.

improve warning for hg add foo; hg mv foo bar

util._hgexecutable: default to 'hg' This should make hooks work even if util.set_hgexecutable is not called (e.g. hgweb.cgi). Fixes issue625.

archive: add symlink support

archive: use util.opener when archiving files. This simplifies the code a bit and makes it easier to support symlinks.

localrepo.wwrite: use opener.symlink This makes us fall back to regular files if symlinks are not supported.

Add symlink method to util.opener. Differences from os.symlink: - the symlink name is relative to the opener base directory - if a file with that name already exists, it's removed - if necessary, parent directories are created - if the system (OS or filesystem) doesn't support symlinks, a regular file is created. Its contents are the symlink target.

turn util.opener into a class

Make {urlbase} work in templates when https is used.

replace .hgtags instead of appending to it when doing a raw commit

handle nonexistent .hgtags in raw _tag

Export extra in _tag so convert can set the branch of a tag

archive: abort on empty repository. Fixes #624.

mq: improve qclone error handling when patch directory is not a repository.

Fix test-debugcomplete for new --certificate option

Add SSL support to hg serve, activated via --certificate option

Correct inadvertent line ending change.

Fix for win32text corrupting files that have CRLF line endings. (issue302) Also generate a warning when encountering this condition. From Shun-ichi Goto in attachment win32text-patch3.txt for issue 302.

Add --line-number option to hg annotate (issue506) Line numbers are separated from the last annotation element with a colon, like with many other commands, e.g. (hg) grep or compiler errors. Idea and tests by FUJIWARA Katsunori.

Allow filectx.annotate to return the line number of first appearance.

Check for conflict markers in hgmerge (issue471)

merge with crew-stable

Fixed double slash for doc install path introduced by using $DESTDIR (issue620) $MANDIR already is an absolute path so the extra / isn't needed.

hg log: Move filtering implicit parents to own method and use it in templater. Extended test repo in test-command-template to contain changeset to test this.

Strip whitespace from changeset description in changeset_templater. changeset_printer already does this, too.

Removed deprecated hg:// and old-http:// protocols (issue406)

hgwebdir: check for repo foo before browsing subdirectories of foo/

Merge with crew

hgweb: browse subdirectories before checking whether parent directory is also a repository

Use a prefix for debuginstall tempfiles. This way you know where the files came from if they don't get removed.

python 2.3 does not have sorted

Sort changelog extra dict to avoid possible nondeterminism

Last change broke new-style URLs

hgwebdir: do not walk up the given path looking for a repository. It is there or it isn't.

merge with crew-stable

merge with crew-stable

Add html docs and use for help shortcut

hgwebdir: show only trailing part of path when browsing subdirectories

gitweb: add notfound template

hgweb: let hgwebdir browse subdirectories

convert: svn code movement (no actual changes)

convert: svn: avoid parsing already-seen logentries due to branch following

Merge with main

Merge with stable

Merge with crew-stable

merge: fix adding untracked files on directory rename (issue612) Fix from Brendan Added test case

extensions: untangle some recursive dependencies

interhg extension allows you to change changelog text like InterWiki.

setup.py not executable: change instructions at beginning of file

Merge with stable

merge: make test for fast-forward merge stricter (issue619) don't allow merging with an ancestor fix != on contexts add a test

convert: svn: some improvements in memory usage

convert: svn: remove svn_paths wrappers

convert: svn: use revmap to parse only new revisions in incremental conversions