i18n-da: fixed unfortunate translation The Danish word "fjern" means both "remote" and "remove".

some modernization cleanups, forward compatibility

Makefile: fix grammar in comment

windows: avoid deleting non-empty reparse points If a hg repository including working directory is a reparse point (directory symlinked or a junction point), then using os.removedirs will remove the reparse point erroneously. This is fixed by only removing directories if they are empty.

transaction: add atomic groups to transaction logic When performing a strip operation on a repository, it is vital that all the truncations are performed, or that none of them are. This is done by adding support for writing a number of entries in a single operation. Co-contributor: Sune Foldager <cryo@cyanite.org>

mq: add -P/--push option to qimport

templater: make the templating engine pluggable to some extent

templater: provide the standard template filters by default

hgweb: trust config file passed into hgwebdir Before this patch, hgwebdir suddenly showed up empty for a webdir-conf file that was for some reason not trusted. This was previously not a problem because the trust mechanism wasn't required for the very separate webdir-conf.

tests: add test for branches webcommand

spartan: add branches page

gitweb: add branches page

monoblue: add branches page

hgweb: use context api in branches webcommand

paper/coal: add branches page

webcommands: add 'branches' command, similar to 'tags'

test-patchbomb: fix style Specifying revisions without -r is deprecated, break long lines.

tests: avoid export FOO=bar bashism

i18n-da: fix typo and translate rollback messages

record: better formatting for qrecord help

util.termwidth: a file-like object may legitimately lack a fileno() method Spotted in the wild when running a hook while pushing over HTTPS.

hgweb: get rid of inaccurate hgwebdir.repos_sorted, localize machinery

hgwebdir: read --webdir-conf as actual configuration to ui (issue1586) This cleans up code and allows specification of values more globally. For example, it's now possible to specify web.contact in webdir-conf for all repositories without a specified contact set.

url: fix bug in passwordmgr related to auth configuration Usernames given as part of the URL would be ignored. This bug was introduced in 89c80c3dc5842d609e9ba13f08fd2cf7f127c25a

mail: updated comment

add verbose output to compact template style

hgrc.5: fix label delimiter

util: remove unused bufsize argument in popen[23]

util: remove ignored mode argument in popen[23]

i18n-da: synchronized and improved slightly

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