indentation cleanup

test-debugcomplete: add --show merge option to output

merge: add -S/--show option to review revisions without merging

inotify: Abstract the layer format and sizes to a inotify.common dictionary Instead of having a single possible request format, introduce a dictionary of possible messages in inotify.common

inotify: Coding Style: name classes in lowercase.

inotify: dic.setdefault(k, d) ; v = dic[k] --> v = dic.setdefault(k, d) dict.setdefault sets a default value, but also returns the dict.get result. Getting the value on the next instruction was redundant.

inotify: make mask a class variable since it's instance-independant

inotify: RepoWatcher.updatestatus: document & use meaningful parameter names

inotify: server.walk(): use yield instead of for iterate on subdir when the directory is found, not once all the directories are found, since yield order doesn't matter

context: replace pseudo-set by real set

highlight: updated changed test output It was changed in 783c8c78db86, but I forgot to update it.

byterange: fix import error We must import the module as email.Utils on case-sensitive filesystems.

convert: adding branchmap functionality to convert extension

spartan: break long lines in map file

monoblue: break long lines in map file

gitweb: break long lines in map file

coal: break long lines in map file

paper: break long lines in map file

hgwebdir: refresh configuration periodically The old default behaviour of hgwebdir was to maintain a list of repositories permanently. This interacted badly with persistent application hosting software such as WSGI containers. If a new repository was published, it would potentially never appear in the top-level list of repositories. This change causes the hgwebdir configuration and list of repositories served to be refreshed periodically (at most every 20 seconds).

allow toggling when the cursor is on the correct line instead of just the filename text in hg-commit-toggle-file

coal/paper: Wrap diff in <pre/> In text-mode browsers the diff is otherwise rendered as just one long line per file. Other styles do the same.

cmdutil: replace pseudo-set by real set

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