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.

forgot to add import statement for _.

add _ to several strings

turn patchbomb script into an extension module. command name is now 'hg email'.

[hgweb] Added rename information to gitweb templates & misc cleanups Fixed up file log template's title Removed double entry for filelogentry in gitweb map file

verify: notice extra data in indices

Added tag 0.8 for changeset 3a56574f329a368d645853e0f9e09472aee62349

Merge with crew

Safer version of FileMerge merge

return a non-zero exit code when a merge failed

Added missing quote in warning text to tests, too.

Added missing quote in warning text.

Fix revlog signature check for empty revlogs

Add revlog version signature check

doc: clone and outgoing point to pull for valid path docs

deprecate the rawcommit command

convert-repo: use commit rather than rawcommit

convert-repo: automatically create empty map file

deprecate the use of 'hg tag NAME [REV]' add some tests and some doc

hgweb: show copy/rename links in file history

unbreak templates/summary-gitweb.tmpl

Fix comment syntax

changed template escape filter, added urlescape filter; audited all templates for insertion bugs; added note to manifest.py about newlines in filenames

hgweb: fix breakage on manifest subdirs from path cleaning

Process working files through encode filters in dodiff()

Use of opendiff as merge program on MacOS X Hello, If one has the developer tools installed on MacOS X there's another alternative for the merge program. Invocation could be done somehow like in the attached patch for hgmerge.

Clean up paths passed to hgweb (spotted by Peter van Dijk)

add removed files to the changelog file list - this should allow better detection of removed file when walking in the history (like hg log) it doesn't help for the fast path of hg log where we only look at the filelog - users of the changelog file list shouldn't assume anymore that the file still exist (anyway it won't be found in the manifest like in 5ecf05541e11) - fix the tests (some hashes changed)

Remove duplicate bunidiff code from hgdiff, importing from mdiff.py instead

bash_completion: ignore hg help error messages They are usually not useful when you're completing stuff and end up cluttering the screen.

bash_completion: always use single quotes with compgen -W This avoids a bug in bash 2.05a

bash_completion: be more careful about whitespaces - use awk to parse the output of hg help. - print one completion candidate per line - print the debug commands after regular commands (this eases the shell side of the parsing) - don't print aliases that are simple abbreviations (e.g. up/update, id/identify)

Added hint to hg-ssh that you can use shell pattern matching.

_hg_status improvements in bash_completion: - Use "hg status -n" option instead of cut command. - Sort status flags accoring to "hg status --help" - Show deleted files instead of "hg remove"d for "hg remove"

bash_completion: small updates and fixes - $result in _hg_commands is not an array - use "hg status ." - update "hg cat" completion - let bash itself generate the default completion

Add new bdiff based unidiff generation.

contrib: add Chris Mason's stand-alone diff tool This uses Mercurial's diff algorithm to generate unidiffs like the traditional diff tool.

Fix rcpath for hgwebdir case (sys.argv is empty)