Merge with crew

Fix failing darcs test

Merge with mpm

Merge backout of 26fa0e31011d

Backed out changeset 26fa0e31011d. On OS X, it broke test-issue322, test-issue660, test-permissions, test-symlink-addremove, and test-walk.

mercurial.ini: provide more useful info * Add warning about not editing the site-wide file on Vista * More detail about where to create user Mercurial.ini * Provide examples for ssh tools * List extensions, all disabled * add [patch] section, for fixing patch behavior when using win32text * example [extdiff] section, all disabled * example [diff] section, all disabled

churn: correct output when run in subdirectories

i18n: move unrelated line out of try-except block

i18n: updated outdated comment

merge backout of 5724cd7b3688

Backed out changeset 5724cd7b3688 (depends on other changes, no tests)

merge with crew-stable

dispatch: also pass level argument to __import__ for ignored modules I wanted to check if mercurial.demandimport could speed up the loading of PyObjC, and ran into this: the level argument for __import__, available in Python 2.5 and later, is silently dropped when doing an 'import *'. I have no idea what these arguments mean, but this minor change made it work. (Oh, and because of that 'from ... import *', PyObjC still took about 2s...)

lsprof: make profile not die when imported modules changes (issue1774)

notify: do not mime encode multipart templates Mulitpart templates should take care of this themselves. See http://www.selenic.com/pipermail/mercurial/2009-July/027017.html Also catch potential parsing errors gracefully.

kill trailing whitespace

color: simplify & improve colorization of qseries Use 'repo.mq.series' to obtain patch names, instead of deriving them from the qseries output. This is both simpler and more robust, and fixes colorization of patches without a message with -s/--summary.

gendoc: documentation section describing available extensions

localrepo: document the locking scheme a little better - localrepo: document lock(), wlock() methods - lock: add class docstring

keyword: use util.datestr for utcdate filter, expose through variable

keyword: reference templating help, add utcdate filter example

keyword: remove "help keyword" from test Testing help output does not make sense as we have no way to check for errors in content which would be the only reasonable test here.

keyword: update copyright

hgwebdir: add links to the main repository page in notfound.tmpl

Merge with crew-stable

help: improve "hg help revisions" Add info about branch names, and other clarifications.

rebase: link to RebaseExtension This new page has the usual user-oriented information about the extension.

patchbomb: use a list instead of indented paragraphs

help: un-indent list in "hg help diffs"

help: add "templates" as an alias for "templating" help topic

gendoc: make anchors for help topic names

gendoc: rename underlined/bold to section/subsection

help: use field lists for lists of extensions

help: format templating help topic with a field list

minirst: parse field lists

minirst: simplify bullet list indentation computation

minirst: indent literal blocks with two spaces The vast majority* of them are formatted like this in the source, so this basically reverts the output to how it looked before we got the minirst parser. *: the help on templating use four spaces for some examples and will now shown with an indentation of just two spaces.

help: mark literal blocks

patchbomb: reST syntax for literal blocks in help text

Merge with crew-stable

mq: Parse commit message after we find start of changeset patch patch.extract extracts just the message below HG changeset patch. So to not parse comments above the patch, we reset the message if we find a changeset patch as we know the commit message comes after the changeset patch data. This is similar to the behavior of patch.extract. The drawback of this approach, after a qref -e the comment above HG changeset patch is gone. Without this patch the message would become part of the commit message in the HG changset patch part.

doc: fix quotes mismatches affecting rst

Merge with crew-stable

test-repair-strip: Don't rely on cat error message

test-gpg: suppress secure memory warning Some platforms (Solaris for one) does not support secure memory and would give a warning.

Merge with main

keyword: refactor kwdemo and make output translatable Better reflect the actual behaviour of the extension: - Make map arguments and -f/--rcfile not mutually exclusive but extend the current configuration - Map arguments and -f/--rcfile both override the defaults even when -d/--default is specified - -d/--default only overrides the current configuration Inform the user about extending/overriding behaviour, but only at the beginning; the following messages become terser, making the output translatable without too much code clutter. Rephrase help (use "short/long" option notation etc.).

commands: Check if helptext contains a newline before we split

Merge with crew-stable

Makefile: remove non-default wrapping of hg.pot strings

help: wrap help strings at 70 characters

zeroconf: wrap docstrings at 70 characters

win32mbcs: wrap docstrings at 70 characters

transplant: wrap docstrings at 70 characters

share: wrap docstrings at 70 characters

record: wrap docstrings at 70 characters

rebase: wrap docstrings at 70 characters

purge: wrap docstrings at 70 characters

patchbomb: wrap docstrings at 70 characters

parentrevspec: wrap docstrings at 70 characters

pager: wrap docstrings at 70 characters

notify: wrap docstrings at 70 characters

mq: wrap docstrings at 70 characters

keyword: wrap docstrings at 70 characters

interhg: wrap docstrings at 70 characters

highlight: wrap docstrings at 70 characters

hgk: wrap docstrings at 70 characters

hgcia: wrap docstrings at 70 characters

graphlog: wrap docstrings at 70 characters

fetch: wrap docstrings at 70 characters

extdiff: wrap docstrings at 70 characters

convert: wrap docstrings at 70 characters

color: wrap docstrings at 70 characters

churn: wrap docstrings at 70 characters

children: wrap docstrings at 70 characters

bugzilla: wrap docstrings at 70 characters

bookmarks: wrap docstrings at 70 characters

acl: wrap docstrings at 70 characters

commands: wrap docstrings at 70 characters It is no longer necessary to wrap the docstrings at 70 characters in the source -- with the reST parser, they are re-formatted to fit the terminal when shown. However, wrapping the docstrings at 78 characters makes life harder for translators because it marks a lot of strings as fuzzy for no good reason. When un-marking them, the translators would have to examine each string again and determine if it is merely re-wrapped or if the content was also changed. The long lines also introduce very ugly linebreaks in the .po files if they are processed using the standard Gettext tools without using something like '--width 85' all the time.

Merge with crew

Merge with stable

email: Catch exceptions during send. Catch SMTPlib exceptions to avoid mercurial showing a backtrace during an e.g. authentication error.

update: make a naked except more specific (issue1766)

tests/hghave: bzr114 checks for bzr >= 1.14 Everything but the implementation indicated that bzr114 also should be true for "or higher".

fix issue 1763: strip chars from end of line when parsing gitpatch lines

issue1251: bail if darcs version is too old

Merge with crew-stable

gendoc: don't translate topic strings twice (issue1760)

dirstate: fold paths using the just added util.realpath() function. Using the one true canonical path of a directory entry allows equivalent paths to be treated gracefully. Equivalent means, in this case, differing directory entries resulting in the same, unique file system link to a file.

util: add realpath() for getting the 'true' path. The function is implemented for Mac OS X using the F_GETPATH fcntl, and a basic implementation for Windows is provided as well. On other POSIX systems, vanilla os.path.realpath() is used.

bookmarks: optimize update routine in case track.current is set

bookmarks: Teach addchangset to respect track.current addchangeset didn't respect track.current, resulting in hg pull to forward all bookmarks although track.current is set to True. Reported by Christos Trochalakis.

bookmarks: Wrap commictx instead of commit (issue 1515)

Merge with stable

Merge with i18n

i18n-de: fix indention

i18n-da: switch back to "rettelse" for "patch"

i18n-da: updates in gpg, highlight, inotify, and mq

i18n-da: synchronized with 78e54b9f3a62

i18n-fr: synchronized with 78e54b9f3a62

i18n-fr: translations for dispatch.py

i18n-fr: translation of various core messages

i18n-fr: translation for the archive command

i18n-fr: translation of bisect

i18n-pt_BR: synchronized with 78e54b9f3a62

merge with stable

i18n-pt_BR: synchronized with 196d40e7c885 (1.3)

transaction: document close(), abort() methods

merge with crew-stable

zeroconf: use reST syntax for literal blocks

win32text: use reST syntax for literal blocks

win32mbcs: fix formatting of lists with proper reST markup

purge: fix formatting of lists with proper reST markup

patchbomb: use reST syntax for literal blocks

parentrevspec: change list to a literal block

pager: use reST syntax for literal blocks

interhg: use reST syntax for literal block

highlight: use reST syntax for literal block

hgk: use reST syntax for literal blocks

hgcia: use reST syntax for literal block

extdiff: use reST syntax for literal block

color: use reST syntax for literal block

churn: use reST syntax for literal blocks

bugzilla: wrap example template line

bugzilla: reformat list of configuration options

bookmarks: use reST syntax for literal block

acl: use reST syntax for literal blocks

transplant: better reST formatting

Merge with crew-stable

coding style: use a space after comma I left a cases like 'lambda x,y:' alone -- the lack of a space does not bother me as much when the variables are single letters.

commands: remove ineffective parenthesis

merge with crew-stable

keyword: reformat kwfiles help for minirst parser

hgignore.5: mark file names and cmdline options as literal text

merge with crew-stable

Added signature for changeset 3ef6c14a1e8e

Added tag 1.3.1 for changeset 3ef6c14a1e8e

keyword: argument to "kwdemo --rcfile" must be string (bugfix)

heads: more clarity for --closed

Merge with crew-stable

update: allow -c to jump branches if clean

subrepo: use '/' for joining non-local paths

fetch: drop force arg for commit (issue1752) This appears to be unneeded and forces fetch commits to examine clean files.

Fix issue1679: path reconstruction in hgwebdir was mangling things badly

do not translate commit messages It is not very helpful to have 'Added tag %s for changeset %s' and similar messages translated into different languages when people work together using different locales. We now use English strings without support for translations. If needed, the user can still supply a custom string for most commands.

hgignore.5: expanded description - explain that .hgignore must be created manually - hint that it is typically put under revision control

Merge with stable

merge with -stable

Update win32 build instructions for rst2html

Merge with crew-stable

Merge with crew-stable

graphlog: fix incoming with local repo (issue1731)

Mention GnuWin32 gettext in win32 build instructions

Fix test-demandimport and test-trusted under Windows The Windows-only wrapper around stdout is causing both of these tests to fail. test-demandimport fails because it tries to print repr(sys.stdout). Use stderr instead since that is not wrapped. test-trusted fails because the wrapper doesn't handle softspace and an unexpected extra space gets printed.

Merge with crew-stable

doc: update README with links to Docutils

hg: better wrapping of string literal

Merge with crew

Merge with crew-stable

convert/svn: fix backtrace in tags discovery (issue1742)

Merge with hg

changelog: move delayopener outside of class to eliminate reference cycle

changelog: swap opener to switch delay modes

changelog: factor out _delayname

changelog: _delaycount -> _divert

doc: link man pages to one another

doc: fixup font markup in man pages This exposed a bug in rst2man where it neglects to escape a literal backslash. A patch has been applied upstream, but not yet packaged in, say, Debian unstable. A forward-compatible work-around has therefore been put in place.

help: fix bad indentation in template filters list The indentation showed up in the hg.1.html file.

doc: add newline after literal blocks in man pages The rst2man writer leaves no space between a literal block and the following paragraph. This patch corrects this. It has also been applied upstream. This does not conflict with this change since any number of newlines can be added without effecting the rendered man page.

doc: use reStructuredText for man and HTML pages The Makefile now requires the rst2html and rst2man programs. Both can be found in Debian testing or downloaded from the Docutils homepage: http://docutils.sf.net/ http://docutils.sf.net/sandbox/manpage-writer/ The new HTML and man pages no longer contain huge amounts of un-wrapping literal blocks, thanks to how snippets of reStructuredText can easily be included inside other reStructuredText documents. The HTML pages now have anchors for all sections, including the help topics in hgrc.1 which were missing from the old HTML pages.

commands: use minirst parser when displaying help

minimal reStructuredText parser

util: wrap at termwidth-2 by default

Merge with stable

Add ui.progress API

tags: support 'instant' tag retrieval (issue548) - modify _readtagcache() and _writetagcache() to read/write tag->node mapping for global tags - if (and only if) tip unchanged, use that cached mapping to avoid reading any revisions of .hgtags - change so tag names are UTF-8 in memory in tags.py, and converted to local encoding as late as possible (in localrepository._findtags())

tags: implement persistent tag caching (issue548). - rename findglobaltags() to findglobaltags1() (so the "no cache" implementation is still there if we need it) - add findglobaltags2() and make findglobaltags() an alias for it (disabling tag caching is a one-line patch) - factor out tagcache class with methods readcache() and writecache(); the expensive part of tag finding (iterate over heads and find .hgtags filenode) is now in tagcache.readcache()

localrepo: add destroyed() method for strip/rollback to use (issue548).

Factor tags module out of localrepo (issue548). Currently only handles reading tags, and will soon grow support for tag caching. Could eventually deal with updating tags too.

localrepo: factor updatetags() out of readtags() (issue548).

localrepo: improve readability of _findtags(), readtags() (issue548). - rename many local variables - add some comments - refactor call to line.split() (catch ValueError rather than checking length of return value: one less local variable)

localrepo: rename in-memory tag cache instance attributes (issue548). - self.tagscache to self._tags - self._tagstypecache to self._tagtypes - this is for consistency, readability, privacy, and to subtly hint that "caching" is something else

localrepo: factor _findtags() out of tags() (issue548). This makes in-memory caching the sole responsibility of localrepo, eliminating some localrepo code that was duplicated in mq and bookmarks.

test-tags: enhance the test to probe tag caching better (issue548). - give detailed dumps of .hgtags and localtags content - repeat some query operations to expose cache bugs - ensure that rollback/strip undo tagging operations

test-tags: clarify test output; simplify test script a bit (issue548). - use simpler way ('hg id') to get current changeset id - add 'echo' statements to guide the eye when reading output - add some more output to clarify the state of .hgtags - drop '-d' option from every commit/tag, since run-tests.py does this (although with a different timestamp, so changeset ids differ)

merge with crew-stable

Merge with crew-stable

Merge with crew-stable

Merge with crew-stable

merge with mpm

merge with crew-stable

for calls expecting bool args, pass bool instead of int str.splitlines and email.message.as_string both expect a bool argument defaulting at False: replace f(1) by f(True) and f(0) by f()

merge with -stable

merge with crew-stable

store: eliminate reference cycle in fncachestore no reference to self in fncacheopener Inspired by Adrian Buehlmann

win32mbcs: add special wrapper for osutil.listdir(). osutil.listdir() may misinterpret 0x5c of MBCS 2nd. byte as path separator. New wrapper prevents this by adding it beforehand.

win32mbcs: wrapper supports keyword arguments and dict result. The keyword arguments are also decoded before calling original. And dict of return value is also encoded back.

gendoc: fall back to pure modules if C extensions are not available (issue1711)

Don't copy hidden files/directories during `setup.py install` This is useful if a copy of Mercurial is stored in a Subversion repository so that the .svn directories don't get copied.

commands: hide deprecated commands. A command is considered deprecated if the word "DEPRECATED" is found in the doc string. Such commands are hidden from non-verbose help.

hgignore.5.txt: improved description of matching Improved the description of the matching behavior used with .hgignore. Made some minor language improvements.

Merge with bos

Fix issue1738 for strip too. I see no reason to open every touched file at once.

setup.py: don't pollute the current directory with temporary files

Make patch.diff filelog cache LRU of 20 files. Fixes issue1738. 20 files is as fast as 200 for hg diff -r 28015:30103 of mozilla-central. Ideally we'd use util.lrucachefunc, but the interface doesn't quite work.

url: fix use of non-int port in https connections via proxy Complements eef406165507 (issue1725).

test-fetch: fix non-portable sed regex. (s/...\+/.../ appears to be a GNU-ism: this test broke on OS X and NetBSD. Changing \+ to * fixes it, although that is a slightly less strict regex.)

branch heads: optimise computation of branch head cache (issue1734) The previous branch heads cache implementation iterated all ancestors for each new revision in the repository, causing a massive slowdown on cloning larger repositories.

Merge with stable

cmdutil: fall back to filename if glob expand has errors On Windows, Mercurial tries to glob expand provided filenames as a convenience to the user. Unfortunately, there are valid filenames which are not valid glob patterns. In those cases, we should fallback to the original provided filename.

inotify: server: explicitely ignore events in subdirs of .hg/ (issue1735)

inotify: fix issue1375, add a test. The biggest problem was the data structure, which did not allow changing a file into a directory or vice versa. This problem is fixed by b55d44719b47. The walk() method also had an issue in this case: - we know 'path' as a directory. inotify server sleeps. - 'path' is deleted - 'path' is recreated as a file - the server catches up here, and see the deletion. it instantiates a scan(), which in its turn calls for walk(repo, path). - walk() then assumes that 'path' is a directory and calls os.listdir on it, which raises an OSError(errno.ENOTDIR) Catch the error, and yield the file instead of the directory contents.

inotify: server: new data structure to keep track of changes. == Rationale for the new structure == Current structure was a dictionary tree. One directory was tracked as a dictionary: - keys: file/subdir name - values: - for a file, the status (a/r/m/...) - for a subdir, the directory representing the subdir It allowed efficient lookups, no matter of the type of the terminal leaf: for part in path.split('/'): tree = tree[part] However, there is no way to represent a directory and a file with the same name because keys are conflicting in the dictionary. Concrete example: Initial state: root dir |- foo (file) |- bar (file) # data state is: {'foo': 'n', 'bar': 'n'} Remove foo: root dir |- bar (file) # Data becomes {'foo': 'r'} until next commit. Add foo, as a directory, and foo/barbar file: root dir |- bar (file) |-> foo (dir) |- barbar (file) # New state should be represented as: {'foo': {'barbar': 'a'}, 'bar': 'n'} however, the key "foo" is already used and represents the old file. The dirstate: D foo A foo/barbar cannot be represented, hence the need for a new structure. == The new structure == 'directory' class. Represents one directory level. * Notable attributes: Two dictionaries: - 'files' Maps filename -> status for the current dir. - 'dirs' Maps subdir's name -> directory object representing the subdir * methods - walk(), formerly server.walk - lookup(), old server.lookup - dir(), old server.dir This new class allows embedding all the tree walks/lookups in its own class, instead of having everything mixed together in server. Incidently, since files and directories are not stored in the same dictionaries, we are solving the previous key conflict problem. The small drawback is that lookup operation is a bit more complex: for a path a/b/c/d/e we have to check twice the leaf, if e is a directory or a file.

merge with crew-stable

gitweb, monoblue: fix double-spacing in file view (issue1733) The error was introduced in 338412820a57.

util: use propertycache in opener instead of __getattr__

mq: use ui.status when pushing and popping patches

mq: qpop now tells which patches are popped When navigating through a patch series by qpushing and qpopping it was easy to get lost because qpop was silent. I found myself often running qnext after qpop to see which patch I just dropped - especially if I was about to qrm it. This patch makes qpop more symmetric to qpush by showing which patches are applied/"unapplied". I think it is a good change even though it changes output by adding a new line of output.

merge with crew-stable

url: fix use of non-int port in https connections (issue1725) Versions of Python before 2.6 cannot automatically convert a given port number to an integer, so we add a conversion to coerce the given input to an int.

doc/Makefile: let hg1.gendoc.txt depend on gendoc.py

keyword: use all caps for 'note:' in help string The diff, export, log, and status commands write it as 'NOTE:'.

notify: fix indentation in module docstring

notify: cleanup module docstring

convert: fix inconsistent indentation in help text The sort modes flags and convert.cvsps options were indented while the convert.hg, convert.svn, and convert.p4 options were not. I've now un-indented all of them.

Merge with stable

filectx: add a hex method

win32mbcs: also wrap windows.pconvert()

Use os.path.split() for MBCS with win32mbcs extension.

win32mbcs: look up modules using sys.modules (issue1729) globals()[module] doesn't work for modules inside of packages, such as os.path.

fix memory usage of revlog caches by limiting cache size [issue1639]

keyword: eliminate potential reference cycles from kwrepo - delete kwrepo.commitctx after using the tweaked version - prefer self.hook over repo.hook to avoid nesting Also pass arguments to commit as arbitrary list. Thanks to Simon Heimberg and Matt Mackall for guidance.

convert/cvs: improve error message on unexpected server output.

transaction: fix uncaught ENOENT (issue1724) The opener raises an IOError on errors where transaction expects an OSError.

branch heads: fix regression introduced in e67e5b60e55f (issue1726) For merge nodes it is not adequate to only check a single possible branch head for whether it is an ancestor of the latest head, but it needs to be done for each possible branch head.

subrepo: use hg.repository instead of creating localrepo directly this way, extensions' reposetup will be called, which allows for git subrepos to be handled by hg-git (and I believe the same goes for svn and hgsubversion)

ignore: separate pattern extraction from match compilation hgignore files have slightly different syntax from match objects, e.g. syntax: foo headers, regexp: forms, and re being relre. Put conversion from hgignore syntax into match syntax into a standalone function so that it is easier to validate hgignore hunks externally.

merge with crew-stable

util: remove unused bufsize argument Removed it correctly this time: the subprocess default is 0, not -1 and so we must pass -1 explicitly. Added a comment to that effect.

convert/cvs: improve error message on unexpected server output.