convert/cvs: delay CVS log parsing after initialization (issue1581/2) Source and destination constructors should be fast so configurations issues are hit quickly, including authentication and filemap/authormap/splicemap issues. Delaying might be a problem if the remove side disconnects idle connections while the log is being read. It did not happen when converting openafs repository, where log retrieval took at least 10mn.

convert: better mapfile parsing errors (issue1581/1)

Merge with crew-stable

convert/bzr: fix file rename replaced by a dir case (issue1583) We were not checking entry types, and getting file content was working with directories instead of raising IOError.

purge: fix b777dd8f7836 (remove read-only files) - use try/except to avoid unnecessary work - edit only mode bits

purge: remove read-only files under Windows (issue583) Initial version by Benoit Boissinot <bboissin@gmail.com>

Merge with crew-stable

Fix manifest default rev doc when no rev is checked out (issue1603)

commands: more informative description of "!" files in status This makes the description more similar to the one used by Subversion. Suggestion by Dennis Brakhane.

commands: automatically word-wrap cmdline options Some of the descriptions of command line options were getting quite long, and when translated they are likely to grow even longer. This word-wraps them at 70 characters, just like the help texts. We could have opted to wrap them at the terminal width instead, but I think it looks better to have them be consistent with the help texts.

commands: removed bad linebreak in import help

Merge with crew-stable

test-convert-bzr: check renamed files are removed (issue1505)

convert: remove renamed source files (issue1505)

commands: lower-case --import-branch help text

commands: consistently write switches as -a/--abc

commands: use double quotes consistently in help texts

upper-case command line meta variables

i18n-da: synchronized

notify, commands: word-wrap help strings

expand "rev" to "revision" in help texts

expand "repo" to "repository" in help texts

expand "dir" to "directory" in help texts

patchbomb: Support initial in-reply-to header This allows follow-up/revised patches to appear properly threaded in mail readers and in the archives, reducing noise.

profiling: Adding support for kcachegrind output format, using lsprofcalltree

profiling: Adding a profiling.format config variable Allows defining other output formats for profiling. If an invalid format is given, output a warning and ignore it. For now, only the standard 'text' value is supported.

profiling: Adding profiling.output config variable If specified, outputs profiling data to the said file. Prints to stderr by default

profiling: dropping hotshot profiling. --profile as a unique profiling option hotshot was an experimental module, which is broken for Python < 2.5 And even for Python >= 2.5 users, hotshot usage is discouraged: cProfile (formerly lsprof) should be used instead.

log: fix broken multiple user search This fix also allows partial user matches so the full name and email does not have to be written out in verbatim.

i18n-da: updated, translated status help

commands: describe "!" files as "missing" in help for status

merge with -stable

raise RevlogError when parser can't parse the revlog index Initial patch and test thanks to Nicolas Dumazet.

templatefilters: strings are iterators, but shouldn't be joined anyway

templatefilters: split out jsonescape() function

cmdutil: prevent code repetition by abstraction in changeset_templater

tests: use unified diff in test-command-template for better error reports

util: don't overwrite os-specific functions with general ones

convert: align option types in help text

commands: fix typo on flag description

commands, i18n: avoid untranslated strings as message parameters

commands: enable 'hg help' translation of extensions

i18n-da: bring translations up-to-date This incorporates the word-wrap changes made to help strings, as well as new translations for the updated clone, push and pull help strings.

help: word-wrap help texts at 70 characters

commands: word-wrap help texts at 70 characters

zeroconf: word-wrap help texts at 70 characters

win32text: word-wrap help texts at 70 characters

win32mbcs: word-wrap help texts at 70 characters

transplant: word-wrap help texts at 70 characters

rebase: word-wrap help texts at 70 characters

purge: word-wrap help texts at 70 characters

patchbomb: word-wrap help texts at 70 characters

parentrevspec: word-wrap help texts at 70 characters

pager: word-wrap help texts at 70 characters

mq: word-wrap help texts at 70 characters

keyword: word-wrap help texts at 70 characters

hgk: word-wrap help texts at 70 characters

fetch: word-wrap help texts at 70 characters

extdiff: word-wrap help texts at 70 characters

convert: word-wrap help texts at 70 characters

color: word-wrap help texts at 70 characters

churn: word-wrap help texts at 70 characters

children: word-wrap help texts at 70 characters

bugzilla: word-wrap help texts at 70 characters

bookmarks: word-wrap help texts at 70 characters

Change double spaces to single spaces in help texts.

commands: explain when to use resolve -m

commands: clarify push help text

commands: make pull help point to the incoming command

commands, help: consistently write 'URL' in upper-case

help: expand command names in 'Url Paths' help text

commands: better merge help text

commands: removed redundant text in manifest help

commands: stress that commit is a local operation

commands: use single-quotes for 'hg help ...' hints

convert: attempt to check repo type before checking for tool

merge with crew-stable

Fix issue1495, corner case of adding empty files via patching

Merge with crew-stable

convert: simple fix for non-existent synthetic/mergepoint attributes

convert: handle comments starting with '#' in authormap files

cmdutil: refactor handling of templating in show_changeset()

templater: move stylemap function from hgweb to templater

i18n-de: translated record

i18n-de: translated archival.py, bundlerepo.py, changegroup.py and changelog.py

i18n-de: docu for resolve

convert: fix authormap handling of lines without '=' Unpacking the result from str.split raises ValueError, not IndexError, if the line does not contain a '='.

convert: Add testcase for convert authormap.

extensions loading: don't fail if path to extension ends with a '/'

tests: guess lexer by filename for recent pygments Recent pygments guess AntlrJavaLexer for the isolatin text, converted to ascii by util.tolocal, which yields class="err". Guess lexer by extension instead.

Fix how setup.py identifies the Mercurial version. There is a problem with setup.py where it will not identify the Mercurial version properly when not being ran in within a repository even if mercurial/__version__.py exists. To fix, use mercurial.__version__.version when available before defaulting to "unknown". (Using mercurial.util.version() is not an option due to a dependency issue where osutil can be referenced before it is built.)

right way to check if file was in renamed directory, fixes import monotone repos with renamed directories

convert: added cvsnt mergepoint support

rebase: keep original mq patch format (Issue1574) Rebase now doesn't make assumptions about which format has been used for a mq patch (git or normal). Before finalizing a patch it keeps track of the original format, by reading its header, and then restores the format when reimporting it. This way it also allows for having mixed styles. Note: this version corrects a failure in the test

rebase: don't lose rename/copy data (Issue1423)

Correct a bug on date formats with '>' or '<' accompanied by space characters.

rebase: store/restore arguments correctly Keep and keepbranches were lost after an interruption

rebase: correct help text Show the correct parameters in help text

issue1578: fix crash: do not use synthetic changesets as merge parents.

windows: get Abort from error

move encoding bits from util to encoding In addition to cleaning up util, this gets rid of some circular dependencies.

move util.Abort to error.py

setup: remove spurious posix import

pure/parsers: fix circular imports, import mercurial modules properly

pure/bdiff: fix circular import

posix: kill some trailing newlines

mention default branch in branch and clone help

i18n: update italian translation

i18n-de: Commands (push and pull) + typos

i18n-de: translated global options of commands

i18n-de: removed fuzzy translations after update of POT file

i18n-de: translated ui.py, url.py and util.py

i18n-de: translated 'help multirevs'

on clone failure, only remove directories we created If the user created the clone target directory before running the clone command, only cleanup the .hg/ repository when errors occur. Leave the empty target directory in place.

windows: break import cycle with util

windows: fix missing import of util.Abort

windows: fix import of win32.py (was util_win32.py)

issue1582: improve description of splicemap syntax in help.

merge with -stable

error: import LockError from correct module

hgweb: better English in IPv6 error message

allow clone into existing but empty directories

verify, i18n: fix unmarked strings

i18n: updated zh_CN instructions

i18n: rename zh.po to zh_CN.po This is the name used by at least Debian and RedHat for the Simplified Chinese translations. Furthermore, it is my understanding that a Simplified Chinese translation is a poor fallback for users in Taiwan, who need a Traditional Chinese translation instead.

httprepo: lowercase debug output

merge with -stable

hgweb: fix undefined name RepoError

merge with backout

Backed out changeset 490e40816cbd The difference came from a configuration difference (network unreachable vs. connection refused), not from an OS change.

Change wording in example hook

diffstat hook example

ability to load hooks from arbitrary python module

merge with crew

windows: add various missing import

windows: hoist expand_glob() back into util.py The windows version of expand_glob() requires patkind(). To avoid a circular dependency, move function back into util.py.

i18n-de: Several updates * translated 'hg help revisions' * updated translation from hg.pot * completed translation of rebase

record: fix indentation

record: Give user a hint about chunk selection progress It greatly improves usability when one roughly knows where the chunks of interest are.

coal/paper: Turn <img> into <img/> where missing

add missing +x flag to test-inotify-issue1542

merge with crew

Add missing imports for posix.py for OS X These don't seem to do harm on Linux.

convert: missing p4 tool is only slightly fatal checktool with default abort=True caused convert to fail too early.

Clarify the usage of HGRCPATH

tests: strip o/s-dependent error messages from some http tests

bisect: use integer division

i18n: spelling correction in German translation

i18n: completed German translation of the children extension

i18n: fixed textwidth in bookmarks extension

i18n: completed German translation of bookmarks extension

i18n: continuation of command.py translations/checking

i18n: more commands.py translations

i18n: more commands.py reworking + new translations

cmdutil: fix untranslatable string in copy

enhance Makefile for language translators To update a po-file just do 'make i18n/xx.po'. No other po-file will be touched.

Fixing issue1542, adding a relevant test inotify is smart enough to notify you about any changes in a directory, even if you only watch the directory, and none if its contents: the recursive add_watch I added was unnecessary. The only thing that matters here is the recursive status update on directory deletion. And scan() has to be called _before_ the deferred call is registered. (race condition: depending on the times, the previous patch could apparently fail on the provided test. It's not the case anymore.)

rebase: remove unused statement

util: split out posix, windows, and win32 modules

patchbomb: option to set the name of bundle attachment (issue1452) specifying --bundlename=NAME will create a "NAME.hg" attachment

Merge with -stable

Typo fix in help.

i18n: add German translation * Most basic commands are translated * hgext/alias.py * hgext/acl.py * hgext/fetch.py * help topics * urls * dates * patterns * diffs 433 translated messages, 1350 untranslated messages. Translators: * Tobias Bell * Fabian Kreutz (fabian DOT kreutz AT qvantel.com) * Lutz Horn (lutz DOT horn AT fastmail DOT fm) Please report issues to http://bitbucket.org/tobidope/i18n-german-translation/issues/ or to the mailing list.

i18n: updated Chinese translation

i18n: update italian translation

revlog: faster hash computation when one of the parent node is null Because we often compute sha1(nullid), it's interesting to copy a precomputed hash of nullid instead of computing everytime the same hash. Similarly, when one of the parents is null, we can avoid a < comparison (sort). Overall, this change adds a string equality comparison on each hash() call, but when p2 is null, we drop one string < comparison, and copy a hash instead of computing it. Since it is common to have revisions with only one parent, this change makes hash() 25% faster when cloning a big repository.

ancestor: caching the parent list to improve performance When computing the DAG depth, we walk through all ancestors: this commit adds memoization during that first step. Then, the memorized parents are fetched from a dict instead of calling parents() on each vertex. This tweak, according to Kcachegrind, improves ancestor() performance by 16% when cloning a big repository.

kill another trailing space

add debugcommands command: an easy to parse command + option index

templater: ability to display diffstat for log-like commands

templater: use contexts consistently throughout changeset_templater

cleanup: whitespace cleanup

cleanup: drop enumerate() when index is not used

cleanup: drop unused assignments

cleanup: drop variables for unused return values They are unnecessary. I did leave them in localrepo.py where there is something like: _junk = foo() _junk = None to free memory early. I don't know if just `foo()` will free the return value as early.

cleanup: drop unused imports

contrib: add perflog and perftemplating commands to perf extension

merge with crew-stable

Returns lines changed for paths specified as arguments correctly. This fixes issue 1569. hg churn <path> now returns only the number of lines changed in the path, if the path is specified by filtering files through a match filter at the changeset level. test-churn has been updated to take care of this issue.

cleanup: remove all trailing whitespace

keepalive: fix reference to IncompleteRead

merge tools: fix typo in Beyond Compare's 3 command line Fix a typo error preventing 'base' to be displayed properly.

Merge with -stable

Fix new CVS test output

Added signature for changeset 02981000012e

Added tag 1.2.1 for changeset 02981000012e

cvsps: recognize and eliminate CVS' synthetic "file added" revisions.

demandimport: blacklist pythoncom win32com.shell would segfault at import time if pythoncom was demand loaded.

diffstat: use width 80 by default and avoid division by zero

Fix for merge changes introduced in rev 9fe7e6acf525

merge with crew-stable

convert: honor 2.3 compatibility (rsplit)