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.

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)

copy & rename can ignore removed source files As mercurial now distinguishes deleted files from removed files, we can skip removed source files while copying or renaming.

copy/rename '.' or '..' correctly

Merge with Eric

Merge with crew

This fixes a bug that Chris Mason found. As for a test case, I can't think of one. It's a very weird case. Basically, if there is a file listed as changed in the changelog entry, but not showing up in any of the associated manifest entries, hg would abort when trying to create a changeset. Now it just decides the file must not have any versions relevant to the changeset.

Copy manifest map before modifying it (see issue86)

[hgweb] Prevent search engine bots from indexing the entire repository

fix for hgweb.filterfiles some variable weren't converted, fix a possible out of range error

make the order of the arguments for filterfiles consistent fix a bug where the order was reversed

correct the relative path when walking from a subdir - yield the correct relative path when walking from a subdir (regardless the walk is repo-wide or not) - have a consistent output from all commands: filename are absolute when no patterns are specified and relative otherwise.

Added test for relative paths and all status flags for 'hg status'

Added test for the currently broken addremove with the expected output.

fix locate broken since 63799b01985c - fix the keyword arguments for walk in commands.locate - implement 'hg locate -r <rev>' - add a test for 'hg locate'

Restored old behaviour for 'hg co' and 'hg co -C' for removed files.

Adjusted all but one test output for the new behaviour of localrepo.changes()

Distinguish removed and deleted files. Tests are not fixed yet. hg status will now show "R filename" for "hg rm"ed files and "! filename" for files which were deleted manually. Manually deleted files are considered unmodified.

Renamed c, a, d, u to modified, added, removed, unknown for users of changes()

Make localrepo.changes() internally distinguish between removed and deleted.

Cleaned up localrepo.changes()

Cleanup of indentation, spacing, newlines, strings and line length

hgk.py is not a script (no '#!' line needed)

Added archives links to gitweb template

Adjusted test output to match new hgignore error messages.

make invalid pattern message not confusing.

if hgignore contains errors, print message that is not confusing.

eliminate backtrace when piping output on windows. this fixes issue 54.

document revert command more accurately. this fixes issue 87.

add '_' to several strings

- duplicate the parent link logic to show child links - don't show trivial parent or children links

merge with mainline

add --plain option to patchbomb. this omits the hg patch headers. it makes a patchbomb email look like a regular email with a patch.

make patchbomb work with recent changes to export

strictly adher to 80 chars per line

Error handling for unbundle, fix option line wrapping

add --update support to 'hg unbundle'

remove the gpg stuff from hgeditor (superseded by the signing extension) remove the gpg stuff from hgeditor, update the comments to make it clear it can be used to show a diff while commiting

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. We now cache the revlog data ~4MB at a time. The memory used server side when pulling goes down to 35Mo maximum whereas without the patch more than 160Mo was used when cloning the linux kernel repository. The time used by cloning is higher mainly because of the check in revlog.revision. before 110.25user 20.90system 2:52.00elapsed 76%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+708707minor)pagefaults 0swaps after 117.56user 18.86system 2:50.43elapsed 80%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+748366minor)pagefaults 0swaps

remove a duplicate check in commit / fix a bug when merging files followed by revert

fix 'hg tag <tagname> <revision> - fix a collision with the option keyword rev and the option name - update the tests

Re-enable the renamed check fastpath

Merge with crew

if a filename contains spaces, patch adds quote around it

gpg signing extension for hg the principle is almost the same as how tags work: .hgsigs stores signatures, localsigs stores local signatures the format of the signatures is: nodeid sigversion base64_detached_sig sigversion 0 signs simply the nodeid (maybe we would like to sign other things in the future). you can associate fingerprints with roles in hgrc like: [gpg] fingerprint_of_a_key_without_spaces = release fingerprint_of_a_key_without_spaces = contributor, testing the key used for signing can be specified on the command line or via hgrc (key =) thanks to Eric Hopper for testing and bugfixing

do not copy atime and mtime in util.copyfiles it is unsupported on some fs (vfat) and we don't need to copy it one clone anyway

reloads manifest and changelog after recovering

fix a bug in hg export --switch-parent

Better error message (without /.hg appended) when repository is not found. This makes the error for missing default or default-push more readable.

Less annoying directory completion (see http://bugs.debian.org/343458) The current bash completion script is quite painful in conjuntion with deep directory trees because it adds a space after each successful directory completion. Eg. "hg clone /ho<tab>" is completed to "hg clone /home " when what you really want is "hg clone /home/" (assuming the complete path to the repository looks like /home/foo/hg...). That's because the 'complete' command does not know about the type of completion it receives from the _hg shell function. When only a single completion is returned, it assumes completion is complete and tells readline to add a trailing space. This behaviour is usually wanted, but not in the case of directory completion. I've attached a patch that circumvents this problem by only returning successful completions for directories that contain a .hg subdirectory. If no repositories are found, no completions are returned either, and bash falls back to ordinary (filename) completion. I find this behaviour a lot less annoying than the current one. Alternative: Use option nospace for the 'complete' command and let _hg itself take care of adding a trailing space where appropriate. That's a far more intrusive change, though.

Merge with upstream.

delete unintended print statement

merge with crew

make mercurial look in more places for config files. now it searches <install dir>/etc/mercurial, /etc/mercurial, and user hgrc. this allows site-wide configuration to be shared over automounted nfs partition, instead of chenging on every system. option of having local configuration on every system remains. old code for searching /etc/mercurial/hgrc.d never worked, this code is tested and works.

fix the cat command - improve localrepo.walk when passed a node - make the differents walk commands in commands.py accept a node - change commands.cat to walk over a revision - add a test

abort when merging two heads and repository has local changes

Merge http://sh0n.net/jeffpc/repos/hg-gitweb/

Remove tabs, and trailing whitespace from hgweb.py

[hgweb] Remove reference to a non-existing file

[hgweb] Fixed up bad link

File log and some FIXMEs

[hgweb] gitweb style: File annotate converted, file revision made more like the deafault style Namespace polution prevention (manifest vs. tagmanifest - shouldn't be a problem yet) File annotate updated File revision now has commit info

[hgweb] More gitweb style related fixes Fixed manifest link on tags page Fixed changeset link on manifest page

File revision style fixed

[hgweb] Initial import of the "gitweb" style