copies: don't translate untranslatable string

inotify: remove the useless 'if st' checks in RepoWatcher.filestatus Only call is in RepoWatcher.updatestatus: if st: self.filestatus(wfn, st) st can never be None

inotify: Clarify the use of "watcher" name. Currently, Watcher is a class in inotify.linux.watcher, but it's also a class in inotify.server . To complicate things further more, the latter has a 'watcher' attribute, an instance of the former class. When it comes to the 'watcher' attribute of the Server class in inotify.server, one can get quite confused: is it a Watcher object from inotify.server, or from inotify.linux.watcher? Changes: * in inotify.linux.watcher : nothing * in inotify.server : ** Watcher class is renamed to RepoWatcher ** server.watcher is renamed to server.repowatcher

inotify: inotify.server.walk() filetype is never used, do not yield it

allow http authentication information to be specified in the configuration

patchbomb: quoted-printable encode overly long lines RfC2822 mandates a line length limit of 998 byte + CRLF. Python mail tools break lines at 990 byte. To prevent that, we quoted-printable encode overly long lines.

patchbomb: fix quotes in help string

Windows: improve performance via buffered I/O The posixfile_nt code hits the win32 file API directly, which essentially amounts to performing a system call for every read and write. This is slow. We add a C extension that lets us use a Python file object instead, but preserve our desired POSIX-like semantics (the ability to rename or delete a file that is being accessed). If the C extension is not available (e.g. in a VPS environment without a compiler), we fall back to the posixfile_nt code.

win32: clarify comment regarding use of fdopen

win32: allow catching of both pywintypes.error and WindowsError

atomictempfile: delegate to posixfile instead of inheriting from it

merge with mpm

inotify: inotify.server.walk() simplify control flow

inotify: inotify.server.walk*() remove unnecessary var Remove hginside var and the test it relates to: not( top or not hginside ) == (not top) and hginside, so the only case when nothing will be yielded is when hginside is True and top is False. Because of the returns placed upstream, this case will not happen anymore. We can then safely remove hginside and the (if)s

inotify: inotify.server.walk*() cleanup When not in root repo, if we meet a .hg, bail out. break was used, but return can be safely used instead: if we go through break then (top or not hginside) == False -> nothing is done after the for loop

inotify: inotify.server.walkrepodirs() simplify walking Do not 'yield tuple, boolean' to filter later on the boolean. Test the boolean first, and yield tuple only if needed.

inotify: inotify.server.walkrepodirs() simplify compute string concatenation only once

inotify: inotify.server.walk() simplify algorithm Do not yield (bool, tuple) in a subfunction and check later: 'if not bool: yield tuple'. Instead simplify so the tuple doesnt get yielded on the first time, to avoid systematic checks.

inotify: inotify.server.walk cleanups * Removing useless path computation * moving 'reporoot' computation down to the first call to avoid confusion with the parameter used in walkit()

revlog: add cache priming for reconstructing delta chains

revlog: use chunk cache to avoid rereading when splitting inline files

revlog: clean up the chunk caching code

revlog: use index to find index size

revlog: preread revlog .i file Smaller revlogs can be read with a single read, do it on open.

commit: be more verbose in the -u help text Make the requirement of an argument for -u a little more explicit.

separate import lines from mercurial and general python modules

manpage build: fail early when xmlto is not available When we try to build manpages with xmlto and sed, but xmlto is missing fail at the xmlto stage. Otherwise, one may run `cd doc; make' and miss the warnings like: xmlto: not found sed: hg.1: No such file or directory and end up with empty files installed as manpages.

dirstate: translate forgotten string

util: overwrite sha1 and _fastsha1

test-convert-bzr: tweak sed hack to preserve timezone in 'bzr log' output

zeroconf: remove unwarranted execute bit

test-convert-bzr: use sed instead of awk The run-tests.py script has a list of required tools and awk is not one of them -- luckily it could be replaced by sed in this case.

convert/bzr: handle Bazaar timestamps correctly (issue1652).

dispatch: remember loaded extensions in a real set

gpg: use reverse kwarg to sort sigs in reversed order

util: simplify pipefilter and avoid subprocess race The subprocess module is not thread safe. Spawning a thread to read the output leads to exceptions like this when Mercurial exits: Exception exceptions.TypeError: TypeError("'NoneType' object is not callable",) in <bound method Popen.__del__ of <subprocess.Popen object at 0x9ed0dcc>> ignored The bug is already reported in the Python bug tracker: http://bugs.python.org/issue1731717

Removed unnecessary call to dict.keys.

gpg: fix traceback in revs{} display code

util: kill unused Popen3

config: make remap actually work

util: stop overwriting sha1, overwrite _fastsha1 instead Some modules (like revlog) would import util.sha1 as _sha1. This defeats the purpose of having util.sha1 overwrite itself with a faster version -- revlog would end up always calling the slow version. By always delegating to util._fastsha1 we avoid this at the cost of an extra (but unconditional) indirection.

util: remove md5 This hash function is broken and should not be used by new code. It is currently only used by keepalive.

util: remove warnings when importing md5 and sha

transaction: refactor transaction.abort and rollback to use the same code This adds a change to the way that abort is processed, as it will not continue truncating files beyond the first failure, otherwise the respective functionality is maintained, i.e. abort will not unlink files, but rollback will. Co-contributor: Sune Foldager <cryo@cyanite.org>

test: change repair strip test to illustrate manifest errors

verify: reference the correct linkrev when a filelog is missing when a filelog is missing, the first bad revision is the first revision where the filelog is referenced, not 0.

verify: avoid exception on missing file revlog Previously, accessing the filelinkrevs of a specific file that happens to have already been unlinked from the filesystem, e.g. due to a partial rollback having occurred, will trigger a KeyError being raised. Co-contributor: Sune Foldager <cryo@cyanite.org>

transaction: reset transaction on abort Prevent the use of the transaction after it has been aborted. Co-contributor: Sune Foldager <cryo@cyanite.org>

transaction: ensure finished transactions are not reused All transactional methods on the transaction class have had a decorator added that ensures the transaction is running. Co-contributor: Sune Foldager <cryo@cyanite.org>

mq: simpler check of first character of guard name

commands: fix capitalization in revert help text

setup: require Python 2.4

Merge with crew-stable

bisect: use subprocess to get command return code

setup: cleanup old left-over code

localrepo: mark commit message template for translation

util: initialize md5 and sha1 without using extra global variables This lets the functions skip the "if _sha1 is None" test on each call.

util: always use subprocess

commands: describe --debug in showconfig help

color: look for mq with extensions.find

write options in "-r/--rev" style in help texts

i18n-da: translated various short messages

i18n-da: removed fuzzy translations

i18n-da: synchronized with hg.pot

Makefile: fixed comment

Makefile: add more meta data to hg.pot

Add committer tag only when needed in git conversion Convert from a git repo added a committer: tag in the log message even if the committer and the author were the same person.

Merge with crew-stable

simplemerge: use ui.warn() for warnings

test-glog: Remove sed hack - '...$HGTMP...' isn't expanded anyway

test-convert-baz: hide GNU tar deprecation warning

rebase: fix bug where --keepbranches could leave wrong branch in dirstate Report and original fix by Augie Fackler <durin42@gmail.com>

config: add parse interface

zeroconf: guess ip for Zeroconf Zeroconf() is actually pretty dumb in guessing IPs and in case of socket.gaierror will not guess right IP.

config: allow spaces in key portion of items

localrepo: use set for requirements

dirstate: use propertycache

localrepo: use propertycache

ui: replace regexp pattern with sequence of choices Use ampersands (&) to delineate the response char in each choice. ui.prompt() responses are now explicitly case insensitive. GUIs that subclass ui can generate dialogs from the full choice names.

run-tests.py: ensure that hgpkg is always visible

Fix missing import from e68e149f4d44 merge

Merge with crew-stable

util.rename: use temporary file name for rename-targets on windows Use a temporary file name as target for a forced rename on Windows. The target file name is not opened at any time; just renamed into and then unlinked. Using a temporary instead of a static name is necessary since otherwise a hg crash can leave the file lying around, blocking future attempts at renaming.

churn: use .hgchurn in repo root as default map file

win32text: add copyright header

patchbomb: add copyright and license header

highlight: add copyright and license header

convert: add copyright and license headers to back-ends

Reproduce crash where synthetic revs break merge detection (issue1578). (The fix for this was committed as 9bbcfa898cd3.) Slightly edited by Patrick Mezard <pmezard@gmail.com>

convert/svn: ignore composite tags Tools like cvs2svn generate tags made of files coming from different revisions from different branches. This is not supported by Mercurial, and it slows down the conversion a lot. Ignore them. See bacula@4082 for a sample.

Merge with crew-stable

convert/svn: keep latest and not oldest tag value

Don't use sed -r; instead use old-style regexp Rev d895158fe8af introduced some sed -r tests, but -r is only available on GNU sed, while BSD sed uses -E. Better to use old-style regular expressions, that way the tests work on all sed variants.

localrepo: Refactor var names in filecommit to improve readability.

merge with crew-stable I pushed the dd1b47e17d7e to crew before realizing that it would also be suitable for crew-stable, hence the double changeset.

Fix typeerror when specifying both --rebase and --pull

Fix typeerror when specifying both --rebase and --pull

coal, paper: omit unneeded #l1 anchor in links

localrepo: corrected outdated comment

localrepo: fixed typos in comments

help: document nonempty template filter.

webcommands: move nonempty logic from JavaScript to Python This avoids hard-coding the '(none)' string in the JavaScript for each style and avoids the {nonexisting|nonempty} hack which only works since the template system don't complain about undefined variables.

hgweb: use "nonempty" filter in templates for the changelog message At least subversion allows empty commit logs which, after conversion, show up as empty fields in hgweb and don't allow selecting the changeset. Using "nonempty" as filter, "(none)" is used to get clickable links for empty commit messages.

templatefilters: add "nonempty" template filter It ensures that at least "(none)" is returned in case the argument passed is None or ''. This is primarily useful to render empty changelog messages for hgweb but may be useful for others, too.

keepalive: fix 4f13ed6ee544, reintroduce unredirected_hdrs The previous fix dropped unredirected_hdrs which contain authentication headers. Removing them break POST request requiring authentication (like unbundle calls to bitbucket.org).

pure/osutil: add copyright and license header

match: add copyright and license header

fancyopts: add copyright and license header

config: add copyright and license header

add blank line after copyright notices and after header

turn some comments back into module docstrings

put license and copyright info into comment blocks

updated license to be explicit about GPL version 2

hgweb: pre-init mimetypes module (fixes ugly bug in python-2.6.2 mimetypes) The ugly initialization hack in mimetypes' initialization procedure can make hg serve hit the maximum recursion depth when in threaded mode.

templater: fix little problem from stylemap() changes

more whitespace cleanup and some other style nits

convert: hide svn deprecation warnings

ui: ui.copy() now takes the ui class into account Helps subclassing by other API users.

whitespace cleanup

templater: separate template management and actual string processing