small solaris portability fixes from John Levon <levon@movementarian.org>

add md5sum.py required by fix in previous changeset

fix testsuite for freebsd and one timingissue

ui: output the number of file updated/merged/removed/... on update add a note for people to remember commiting after a merge.

Don't expand empty [paths] so later interpolation can do the right thing. Example: [paths] default = default-push = %(default)s

merge with crew.

add changeset_quiet to templates.

fix template tests.

add quiet and debug template keys.

fix test failures that depend on when tests run.

add tests for command line template. fix default template problem found in test.

make --style=compact look for map-cmdline.compact. change name of key in map file from changelog to changeset. rename command map files to start with map-cmdline. rename ui.logmap to ui.style in hgrc. now --style=foo does this: tries to open foo as file. tries as map-cmdline.foo in template path. tries as foo in template path.

fix some things people wanted to be cleaner. rename --map-file to --style. no more -t alias for --template. update docs. rename template entry in map files to changelog. if --verbose, use changelog_verbose if there, else changelog.

hide some functions behind lambdas, so demandload is useful.

add extra newline to verbose log template. asak found this.

changeset_templater: only compute manifest when --debug.

add doc comments to template code.

print tags in compact template.

let commands that show changesets use templates. mechanism is same as hgweb templates. old show_changeset code is still used for now if no template given, because it is faster than template code when verbose or debug. simple template can be given on command line using -t, --template. example: hg log -t '{author|person}\n' complex template can be put in template map file, given on command line using --map-file. we give two example map files: map-log.compact prints 3 lines of output for every change. map-log.verbose prints exact same output as default "hg log -v". map files are searched where user says, then in template path as backup. example: hg log --map-file map-log.compact defaults can be set in hgrc with ui.logtemplate and ui.logmap.

add iso date template filter.

improve template errors when something is wrong.

improve templating. allow {foo} as well as #foo#. add new functions for changeset authors.

move shortuser into util module.

make parsestring work with strings that do not have quotes.

use safer string parser for template engine.

move repeated work out of inner loops.

many small changes to templater. get string code to parse escapes. uses eval now, should parse strings itself soon. let caller check if fragment is defined using "in". make templatepath take optional file name.

missed hunk when moving code to templater module

move hgweb.templatepath into templater

move hgweb template code out to templater

findincoming should return an iterable

Allow symbolic path names in global -R/--repository parameter.

Read paths specified in .hg/hgrc relative to repo root, otherwise to home dir.

Directory names take precedence over symbolic names consistently. Previously this was only done for clone.

New version/release in mercurial.spec, patchbomb is now in hgext.

fix contrib/mercurial.spec for hgext

Try to import extensions from the hgext module first.

Make bash_completion more robust for e.g. broken hgrc or old hg installations.

new command debugcomplete add a new command debugcomplete, it lists all the possible completion for the specified command. make the bash_completion script uses it instead of the awk code

remove bashisms from tests

run merge program in repo root. before, merge program was run in user current directory. Well defined location is better for scripts. no more need to pass HG_ROOT to merge program now.

merge with self.

give more info to hgmerge script.

merge util.esystem and util.system.

undo edit that was accident.

fix broken environment save/restore when a hook runs. move "run commend with different env/cwd" code out to function in util. new function is called esystem.

make clean now removes generated documentation.

Make #!/usr/bin/env python in test-bdiff run the specified python version.

change lock format to let us detect and break stale locks. old style: symlink to pid new style: symlink to hostname:pid if lock code finds new-style lock, it breaks lock if locking pid is on same machine and pid is not alive. otherwise, lock is left alone. this makes locking code safe with old-style locks and with locks on other machines. new code makes server part of mercurial more robust in case machine crashes, power fails, or crazy user does kill -9.

Catch hgrc interpolation errors nicely.

Catch other exceptions (e.g. util.Abort) in parse(), too. This has the benefit of removing duplicate catching of AmbiguousCommand and UnknownCommand, and keeping all exception handling together.

Inherit config from real parentui and don't use ConfigParser internals. Added comments for the meaning of parentui.

Added check for minimal python version to setup.py

merge with crew.

patchbomb: ignore exception if pager quits.

make push over http print good error message.

Reordered options for remove, fixed synopsis for rename.

merge with self.

add -f/--force to remove command. else to remove modified file, must use "hg revert; hg rm" or "rm; hg rm --after".

inherit hgrc so "%" interpolation works.

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)