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)

Merge with stable

regression test for issue1552 Ensures that fetch correctly infers what to merge when pulling a repository with inactive branches.

fetch: do not count inactive branches when inferring a merge The fetch extension would erroneously consider inactive branches when inferring which branches to merge. It now considers only active branches.

bundlerepo: reintroduce dirstate

exporting patch: Fixed behavior of revsplit for branch names including the @-symbol.

imported patch issue1546-hg-bisect-command-doesn-t-work-with-shell-scripts.patch

bisect: fix --command for me.

atom: fix URLs used in entry GUIDs

resolve: move reset to localrepo.commit This way rebase doesn't leave a stale resolve state

resolve: keep .orig files

test-merge-tools: test ui.merge functionality and selection of internal tools

zeroconf: advertise repositories with hostname

Merge with crew

i18n: better Danish word for "working directory"

i18n: add Danish translation for "commit"

i18n: translated help for all basic commands into Danish

i18n: updated fuzzy Danish translations

i18n: merged new strings into Danish translation

i18n: update Japanese translation to follow bd8f44638847

merge with -stable

Merge with main

Optimization of pure.base85.b85encode This makes pure python base85 encoding 3x faster than before. Now it is only 40x slower than the C version.

Merge with crew-stable

verify: find correct first corrupted cset for missing/corrupted revlogs

verify: do not abort on fully corrupted revlog

hgweb: fix allow_read permissions when a user is specified Thanks to Juan Pablo Aroztegi for reporting and debugging it.

test-identify: require no-outer-repo The test expects "There is no Mercurial repository here (.hg not found)"

update copyright date in version information

Typo fix

update copyright in ReadMe.html

setup.py: fix version detection for tarball - don't do version detection if there's no .hg directory - shrink try: clause - don't write __version__.py if version is unknown (we might overwrite the real version)

Added signature for changeset 11efa41037e2

Added tag 1.2 for changeset 11efa41037e2

convert: Perforce source for conversion to Mercurial

remove tests for long-gone imerge extension

merge: better error messages to lead users to hg update --clean to abandon merges. Fixes issue1533.

audit: be even pickier (issue1450)

dispatch: extract command execution block into method This pulls the pre-command hook/command/post-command hook workflow out of the method it is in and puts it into its own method so that it potentially could be exposed for extensions to wrap.

bookmarks: change NAME to REV

bookmarks: fixes bug where a deleted bookmark may still be treated as current when track.current option is set

bookmarks: Set current bookmark if we create a new one on the tip If track.current is enabled we set the newly created bookmark as the current tracked bookmark. We do not do this if a revision is specified.

convert: change hg.saverev default to False This needlessly breaks changeset identifiers for the common case (cleaning history), which is sad.