merge with crew.

Fix manifest view on Windows

Removed script header from mq.py

Moved bisect extension to hgext folder.

Added copyright information to hbisect.py

Merged tah and crew

Moved --cwd handling in front of -R handling again. Shorter code for initial -R.

Make hg paths and hg debugconfig work with -R/--repository option. Commands that can use a repo, but don't need one, should be added to the "optionalrepo" string, similar to the "norepo" string.

Always try to open the repository if -R/--repository is specified. This makes 'hg -R something_unknown command' consistently fail for all commands, not only for those who need a repository.

Make bisect extension work with python2.3

Fixed spacing/indentation, removed #! script header, added short description.

Fixed contrib/hbisect.py to work with the new opener behaviour.

Fix some problems when working on broken repositories: Fix tracebacks in hg verify for certain repo errors. Print compression type byte encoded safely.

Fix mq's usage of opener, which don't allow absolute paths now.

merge with crew

Hide debug commands in ambiguous command list, unless no normal command matches. This will execute diff if 'hg d' is typed and hide rawcommit on 'hg r'. Based on a patch by TK Soh.

Show ambiguous aliases, if they are not simple abbreviations. Sort output.

show choices on ambiguous commands

fix annotate for removed files walk in the manifest files instead of the working dir files when running annotate

only put numbers on patches if > 1 patch.

Patchbomb only sends introductory message [0 of N] if there are multiple patches.

Remove patchbomb from list of contrib files to install since it's now an extension. Innosetup script was referencing old contrib location. Also cosmetic change to group related files.

Removed PKG-INFO from repository, because it already gets auto-generated. Canonical place for changing the contained info is setup.py.

merge with crew.

Fix py2exe packagescan problem with new demandload

Merge with crew

Create local ui object per repository, so .hg/hgrc don't get mixed. This is needed for hooks, but may be important for other settings, too. Fixes issue113, also integrated push-hook-lock.sh as a test case for this.

Call hooks in alphabetical (=defined) order, of course still grouped by type. Output of test-hook adjusted.

make ui flush output. this makes error happen if printing to /dev/full. before this change, error happened with some pythons, but not others. now always happens. fixes issue 155.

make lock module use demandload.

Validate paths before reading or writing files in repository or working dir. Fixes security relevant issue134.

Fixes running 'hg serve' with Windows executable and no explicit template path configured. PY2EXE executables don't support __file__ but do place the directory of the shared code library into sys.prefix. Fixes bug 152.

i made a mistake in last change.

generate profile even when exception raised. otherwise, is not possible to profile hg serve.

merge with crew.

merge with crew.

hgwebdir: export collections of repos now you can use [collections] section in hgweb.config to export entire tree of repos.

merge with crew.

get patchbomb extension to use demandload. speeds up hg startup by 50%.

rewrite demandload module to be more flexible. performance not affected. old demandload module could only import top-level modules like os and sys. with rewrite, all of following syntax is emulated perfectly: import foo, bar foo bar import foo.bar.quux foo.bar.quux from foo.bar import quux, blurfl foo.bar:quux,blurfl only thing missing is "import foo as bar". also, namespace clashes between placeholder object and demand loaded module are no longer possible.

Make hgweb.staticfile() more secure and portable. Without this, files in directories next to the static directory starting with 'static' could be retrieved, e.g. with '../static.private/foo'. Additionally staticfile now generates platform specific pathnames from the /-separated paths given in the URL. Illegal file names (e.g. containing %00) now yield a sane error message.

merge with crew.

merge with crew.

copy/rename to a removed destination file When the destination of a copy or rename operation has been marked for removal, we need to restore it before we overwrite it with the new content. This also handles the case of idempotent renames, i.e. hg rename "a" "b" hg rename "b" "a"

Catch urllib errors for old-http in a nicer way.

Really fix bash_completion on Solaris. Maybe. Hopefully. Use substr instead of sub.

Regenerate hg.1.gendoc.txt if commands.py changed.

Make the deprecated rawcommit an alias of debugrawcommit. This way it doesn't show up in the non-debug help.

Ignore generated documentation

Updated help synopsises and reordered some options. Dropped [-n] from revert.

merge with crew

generate hg manpage from commands.py docstring gendoc.py is a script generating a part of the manpage (the commands help and options) from the docstring in commands.py. It avoids duplicating the doc between the doc/ directory and the docstrings. To generate the manpage, 'make doc' will create all the necessary intermediate files.

Merged automatic doc generation from tonfa.

fix the synopsis of some commands, mark rawcommit as deprecated in short help

resync commands.py docstrings with hg.1.txt

Whitespace, tab and formatting cleanups, mainly in mq.py

Updated test-commit to match changed output caused by nested transactions.

Add mq extension

Allow repo lock to be passed in to localrepo.commit for performance

Automatic nesting into running transactions in the same repository. This associates a transaction handle with a given repository object, and any additional calls to start new transactions reuse that transaction. For the 2700 patch import run, this brings the system time down from 1m20s to 50s, mostly by skipping backups of the dirstate file. (note, this patch does not change hg import to use the nested transaction, mq is the only user right now)

Fix bash_completion on Solaris TK Soh noticed that the awk that ships with Solaris doesn't allow you to define new functions. According to http://www.shelldorado.com/articles/awkcompat.html it looks like it also doesn't have some other stuff that we were using, like deletion of an array element and gsub. Rewrite the parsing of hg --debug help to work around that. This version doesn't filter aliases that are simple abbreviations for debug commands (not a big problem, since there are none right now).

refactor the dodiff optimization

speed up hg log --patch Changing dodiff to read the manifest/changelog for node1 before calling repo.update allows us to take advantage of the revlog revision cache. Before this patch and my previous "speed up hg log --debug" patch, when using hg log -p to display three revisions (A, B and C), dodiff and repo.changes would end up reading the manifests in this order: B A B A C B C B With both patches, this order becomes: A A B B B B C C (This considers only dodiff and repo.changes. I'm not sure how other parts of hg log enter the picture.) The speed up will depend on the revisions being displayed. (All "before" times already have my previous "speed up hg log --debug" patch applied.) hg repo (tip = 414e81ae971f). hg log -p before after real 0m50.981s 0m45.279s user 0m47.930s 0m42.560s sys 0m2.526s 0m2.523s output size: 6917897 bytes kernel repo (tip = 9d4e135960ed). hg log -p -l64 before after real 2m14.995s 1m45.025s user 2m9.509s 1m33.900s sys 0m3.663s 0m2.942s output size: 31497621 bytes same kernel repo. hg log -p -l64 -r c84c2069592f:0 before after real 1m48.045s 1m0.076s user 1m44.094s 0m58.492s sys 0m2.603s 0m1.103s output size: 197983 bytes c84c2069592f was the tip of a 10 day old kernel repo that I had lying around and was where I first tested this patch. For some weird coincidence it's also a place where the patch makes a huge difference.

speed up hg log --debug hg repo: before: real 0m6.998s user 0m6.952s sys 0m0.046s after: real 0m3.884s user 0m3.839s sys 0m0.042s

on revert, only undele files that are removed in the dirstate

Removed now obsolete min/max check in walkchangerevs().

Replaced fixed window size for walkchangerevs with an increasing one. Window sizes starts at 8 (for good interactiveness) and doubles with each window until it is 512, which seems to be the maximum efficient value.

hgmerge: do not use file with markers in tools merging themselves This time I forgot about a crucial part of the logic change. The patch makes kdiff3 and tkdiff useful again.

Fix hgmerge: mkdir "'/tmp'/hgmerge..." and ask_if_merged() didn't work.

Fixed wrong (copy&paste) usage of tmpl instead of self.t in hgweb.

Fix 'hg serve' not using CSS. hgweb.py (templatepath): Return normalized path [fixes later checks in staticfile()]

only write the dirstate when something changed

Allow serving static files from hgwebdir to fix CSS and favicon.

Cleanup of tabs and coding when sending content type.

Merge with jeffpc's hg-static

[hgweb] Added favicon to standard/gitweb templates

Merge with mercurial/tonfa

change the default timeout to 600 seconds

add a timeout when a lock is held (default 1024 sec) - change the wait keyword from lock.lock to timeout, a negative timeout of means "wait forever" - refactor the two lock functions from localrepo.py - make them use the timeout (default 1024, can be changed with ui.timeout in the config file - update the doc

Don't use mktemp in tests, we're already in a secure temp dir.

Added test cases for repo corruption fixed in 2e0a288ca93e (issue132) (submitted by Alexis S. L. Carvalho <alexis@cecm.usp.br>)

revalidate revlog data after locking the repo (issue132)

merge with matt

merge with crew

add an optional argument to push only the specified revisions (push -r)

Merge with jeffpc

Merge with mpm

[hgweb] Move CSS from headers into static files

[hgweb] Static content serving

Merge

Merge with crew

hgmerge: add meld support

hgmerge: improve "apps not found" message

hgmerge: logic changes Details: - keep automatic merge conflicts in $LOCAL - do not assume that $EDITOR returns proper error code - fix a slight mistake in diff+patch merge success detection (it could succeed if the $EDITOR failed to run)

hgmerge: add and use ask_if_merged function This patch, unlike the earlier ones, doesn't use unportable select builtin.

hgmerge: fix diff+patch detection; cleanups Details: - actually show help message when no tools are found - whitespace cleanup (stupid emacs) - quote more variables - simplify merge/diff3 error handling

Merged RSS feed for tags from Peter van Dijk

add rss link to tags page

implement entriesnotip for tags in hgweb.py ; change entries to entriesnotip in templates/tags-rss.tmpl

tags-rss support; still shows tip

hg log --limit shouldn't count unprinted revisions (found by TK Soh)

Cleanup: Put initialization of br in front of --branches option handling.

Make option --branch vs. --branches more consistent. As you can abbreviate --branches to --branch, old scripts using the long name will still work.

Add option -b/--branch to hg tip (as done for hg parents).

merge with crew

fix typo in debugrebuildstate

Sunpro compiler patch The compiling runs through without warning, but runnig the newly builded hg emmits a message: | ImportError: ld.so.1: python: fatal: relocation error: | file /opt/local/lib/python2.3/site-packages/mercurial/bdiff.so: | symbol cmp: referenced symbol not found Removing the inline infront of cmp corrects this error message.

add options to log man page.

merge with crew.

add -l,--limit to log command.

add 'debugrebuildstate' to rebuild the dirstate from a given revision - added and removed files will be lost while recreating the dirstate - modifications are not lost

use repo.lock when cloning via copy, use lock.LockException when necessary

Raise a different exception when the lock is not available When the filesystem is read-only or if we have some other error, there is no need to wait. Raise a lock.LockUnavailable exception.

merge with crew

localrepo: refactor the locking functions

make test-pull-permission cleanup correctly in case of errors

fix warnings from pychecker (unused variables and shadowing)

bisect: fix for recent changes disallowing "false" merges

transitive copy/rename Add support for transitive copy or rename operations, e.g. hg rename a b ... (possibly edit b) hg rename b c hg commit ... by actually renaming "b" as "c" while recording a copy of "a" to "c" and a removal of "a".

Fixed misleading indentation in mpatch.c