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