merge with crew

merge with crew

Merging with crew.

clarify license on md5sum.py

add http_proxy= lines to test-bad-pull and test-pull

changes by John Levon to standardize some erroroutput

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.