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)

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

merge with crew.

make server tests use --daemon.

Merge with upstream

Added help string for --daemon-pipefds

stop read end of pipe from staying open forever in child process.

add --daemon option to serve command. for issue 45. code looks odd because it is portable to windows. windows does not have os.fork, so have to spawn and use pipe to tell parent ready instead.

AmbiguousCommand is raised too soon. Right now, hg raises AmbiguousCommand as soon as it finds two commands/aliases that start with the substring it's searching for, even though it may still find a full match later on. This is a bit hard to hit on purpose, because hg checks the list of commands in whatever order is returned by table.keys(), which will change when you add an alias to a command. You should be able to hit it by adding an alias "u" to the "identify" command - not that that makes a lot of sense...

Don't hard-code /tmp in test-ro-message This makes the test succeed when $TMPDIR is set.

Merge with crew

add preoutgoing and outgoing hooks. preoutgoing lets prevent pull over http or ssh. outgoing lets notify after pull.

i forgot to change the test output for test-hook.

tests for new hooks. fix things i found when writing tests.

fix test-help diff options.

merge with crew.

add -p option to tip. for issue 64.

add prechangegroup and pretxnchangegroup hooks. prechangegroup lets you stop push, pull or unbundle before it begins. pretxnchangegroup lets you inspect changegroup before transaction is committed, and roll back if you not like it.

merge with crew.

add -w and -p options to diff. this is for issue 126.

fix names of parent changeset ids in hooks. fix hook part of man page.

prefix hook env var names with HG_. old names are still provided, but doc says they deprecated.

merge with crew

add a -b/--branch option to 'hg parents'

Fix diff against an empty file (issue124) and add a test for this.

catch errors and throw exception with invalid binary patch data

add pretxncommit hook. hook allows check of changeset after create, but before transaction is committed. hook failure rolls transaction back. makes place for local policies like commit message must contain bug id or reviewer signoff. change also adds parent changeset ids to commit hook environment, because is cheap and useful.

add pretag and tag hooks. pretag hook lets hook decide how tags can be named. tag hook is notifier.

hook parameters must be strings.

make hook code nicer. pre hooks can raise exception if fail. tidy up better if exception raised (like KeyboardInterrupt) when running hook program.

hooks run after transactions finish must not affect method results.

Refactor excessive merge detection, add test

Revert convert-repo changes

fix hgrc doc hook descriptions.

hooks: distinguish between locally committed and incoming changes. "commit" hook is now for locally committed changes only. "incoming" is for changes pulled, pushed, or unbundled into local repo.

Allow callers to pass in the dirstate lock in most localrepo.py funcs. This makes it possible to take the lock once and commit a large number of patches, without having to read and write the dirstate for each patch.

revlog.strip should clear the chunkcache The chunkcache isn't valid after a strip, it needs to be cleared out.

Show "(No help text available)" for commands without doc string. Currently this only occurs with "hg help qcommit" from mq extension.

Create default commit message in a more pythonic way.

Removed "HG: manifest hash" line from commit message.

Put the empty line in commit text above the branch merge line.

Run commit message editor in the repo root (like hooks). This makes the hgeditor script work with hg commit -R path/to/repo

add changenav at bottom of page if one reads through the changelog and wants to go to the previous or next page one needs the navigation links at the bottom, not at the top of the page

display revision numbers revision numbers are useful for orientation when browsing through the changelog

fix changenav for maxchanges != 10 for maxchanges = 25 the changelog navigation had a minimum stepsize of 30; try to calculate more useful navigation steps

add --mbox output to patchbomb add option to save generated mails in an mbox file for later processing with formail, instead of sending them directly

hgmerge: various cleanups Details: - put temporary file names into variables - make all temporary file names end with random part - cleanup FileMerge handling - do not use hardlinks in FileMerge change test (breaks on FAT) - try harder to keep file mtime unchanged in case of failed merge

hgmerge: add cleanup functions This patch adds functions cleanup, success and failure. The last two of these should be used instead of exit. Current code was changed to use them. It also moves $HGTMP to the top of the file (it's used in the cleanup function), changes the comment and removes now unneeded trap in the diff+patch merge.

hgmerge: add and use more tool variables This patch adds even more customisable variables with tool paths. Also moves $FILEMERGE where it belongs.

Update copyright notice

Merge with crew

Merge with Peter van Dijk

remove escaping from decriptions on repo index page

Added raw view for file annotate in hgweb.

hgweb/templates: remove unused vars from map-raw annotateline contains html and it is unused filenodelink is unused but should be defined

hgweb/templates: no need to escape the '<' '>' and '&' in raw templates

Removed executable bit from patchbomb extension.

Update version strings and add release notes to Windows specific files

Fall back to asciidoc6 html backend if html4 doesn't work. This reenables building documentation on Debian sarge, which broke after 9346a7fb3fe2.

Reverted name change (mercurial -> Mercurial) from dd5085897010.

merge with crew.

make stuff for macos x binary package. it is now easy to make prebuilt binary for macos x. i have no hosting space. i hope someone else can make binaries.

extension gpg.py: really raise the exception in case of invalid data

Cleanup of spacing in bash_completion

Use user specified path to hg in bash_completion e.g. for multiple installs with different versions or extensions.

fix an exception in gpg.py with multiples sigs for the same cset - silly error, do not overwrite the variable we use for iterating - correct 'hg help sign'

fixes for gpg.py extension - add copyright and license - add i18n - add 'sigs' command behaving like 'hg tags' - change 'role' to 'comment' and output it only if there is one - refactoring

Merge with crew

Merge with upstream

reverting 11d12bd6e1dcd9610fa26e97d25e7ad553e8ffa5 passing local everywhere violate the layering

cleanup of revlog.group when repository is local revlog.group cached every chunk from the revlog, the behaviour was needed to minimize the roundtrip with old-http. The patch export the information that the repository is local or not from the repository object down to the revlog. Then it uses the workaround for old-http only if the repository is non-local. The memory used server side when pulling goes down to less than 30Mo maximum whereas without the patch more than 160Mo was used when cloning the linux kernel repository. The time used by cloning is roughly the same (although some caching could be implemented if needed): before 110.25user 20.90system 2:52.00elapsed 76%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+708707minor)pagefaults 0swaps after 112.85user 22.98system 2:50.66elapsed 79%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+862862minor)pagefaults 0swaps

Added missing space in output of gpg.py

merge with crew

abort when using 'update -m' and this is not a merge add more testcases for updating with local changes

merge with self.

add documentation for email command.