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.

typos: "it's" -> "its"

convert: fixed typo in docstring

Merge OS X performance regression fix

Merge backed out change

Backed out changeset fce065538bcf: it caused a 5x performance regression on OS X

help: wrapped help strings at 78 characters

keyword: collect kwmaps using a generator expression Allowed for Python 2.4.

commands: avoid bad linebreak in addremove docstring

Makefile: wrap hg.pot strings at 82 chars By default, xgettext will wrap strings at 79 characters. This width includes the two double-quotes and the '\n' added. Our strings are now wrapped at 78 characters and a line can therefore be up to 82 characters wide in the .po file. Setting the width to 82 characters ensures that xgettext does no silly wrapping on our already-wrapped strings while still wrapping long one-liners at 82 characters.

zeroconf: wrapped docstrings at 78 characters

win32mbcs: wrapped docstrings at 78 characters