record: removed 'has_key' usage Py3k has removed the dictionary has_key method. This patch implements a one argument function that can be used as a callback by hg.revert in the record extension.

Merge with stable

test-log: Add test for "hg log -pf" (issue647) To test f786fc4b8764 we analyze this repo: 0 | 1 | 2 | 3 | 4 a ------------> b \ b -> dir/b -------> e d We follow dir/b and expects rev 0, 1 and 2. A log following b will surprisingly report rev 0 and 1. That's because the content and the parents are the same in rev 1 and rev 3, and the revlog entry from rev 1 is thus reused in rev 3 even though the revlink is incorrect. Note that if we follow e then we will get all revs, including rev 3, because b gets added to the set of interesting filenames we are following through all revisions. That might be surprising, but that's (currently) how it is. Original test case by Joel Rosdahl <joel@rosdahl.net> Original test reviewed by Nicolas Dumazet <nicdumz@gmail.com>

bookmarks: ensure current bookmark is updated when specified with -r . "hg bookmark -r . foo" should be equivalent to "hg bookmark foo".

subrepos: let caller specify a filename for SVN commands

subrepo: add abstract superclass for subrepo classes

archival: remove prefix argument from archivers When the archivers work on the full we can reuse the same archiver with different prefixes (for different subrepositories).

archival: move commands.archive.guess_type to archival.guesskind The list of suffixes for each kind of archive belongs in archival. Renamed function to fit with out code style.

merge stable to default

color/progress: subclass ui instead of using wrapfunction (issue2096) This resolves the issue of hg cmd --mq not being colorized. This was due to color wrapping only the instance of ui passed to dispatch._runcommand(), which isn't the same ui object that mq.mqcommand() receives. After dispatch calls extensions.loadall(), it makes sure any changes to ui.__class__ in uisetup are propagated. progress is updated to wrap ui in the same manner because wrapfunction doesn't play well when ui.__class__ has been replaced by another extension (orig will point to the old class method instead of color's).

merge with stable

merge crew and main

merge crew and main

commands: addremove does similarity 100 by default

merge with stable

inotify: Port of the C module to py3k. This patch accomplishes the port of the inotify C module to py3k by #including mercurial's util.h file, and by defining the necessary boilerplate code required by py3k through conditional compilation.

inotify: Better implementation of the event string representation. This patch reimplements the event_repr function. It got mostly rewritten to eliminate the need for conditional compilation of the module when building in py3k. The trick there (thanks to Antoine Pitrou) is to use the % operator to let the python interpreter format the string to be returned.

inotify: make proper use of Python API to get object size. In older python versions, it was ok to access an object's type by accessing its ob_type "member". With python 2.6+, the proper way of accessing it is via Py_TYPE(object). This patch implements the correct call for the inotify extension. When under python < 2.6, this macro is defined in mercurial's util.h.

mq: qrepo.add(mq.added) inside save_dirty inside of doing it manually This should make the MQ API more transparent: callers only have to call save_dirty, and no mq.added magic or knowledge is required.

inotify: check all components of filenames against hgignore (issue884) With inotify enabled, files that should be ignored could be detected as untracked by mercurial. This behavior was wrong because inotify's filestatus implementation only matched filenames against ignore patterns, instead of checking if other elements of their paths matched them. This patch fixes the behavior by checking the file paths against the ignore patterns. A new test has also been added to the main inotify test to prevent any regressions.

hg.clone: fix branch value when passing a repo object (issue2267) Since 3d6915f5a2bb the branch argument for addbranchrevs should be a tuple: (hashbranch, branches) The right empty value therefore is (None, []) instead of None.

test-bheads: use a case-insensitive set of filenames (issue2274) This prevents false negatives on case-insensitive systems.

mail: ensure that Python2.4 to 2.7 use the same header format Wrapping format for long headers changed in Python2.7 (see Python issue1974). Adopt the Python2.7 behaviour and backport it for 2.4-2.6

filelog: cmp: don't read data if hashes are identical (issue2273) filelog.renamed() is an expensive call as it reads the filelog if p1 == nullid. It's more efficient to first compute the hash, and to bail early if the computed hash is the same as the stored nodeid. 'samehashes' variable is not strictly necessary, but helps for comprehension.

filelog: test behaviour for data starting with "\1\n" Because "\1\n" is a separator for metadata, data starting with "\1\n" is handled specifically. It was not tested. size() call return incorrect data if original data had been "\1\n-escaped". There's no obvious way to fix it for now, just flag the error in the code and add an "expected failure" kind of test.

cmp: document the fact that we return True if content is different This is similar to the __builtin__.cmp behaviour, but still not straightforward, as the dailylife meaning of a comparison usually is "find out if they are different".

workingfilectx.cmp: invert boolean return value Apparently we mostly used filectx.cmp(workingfilectx.read()), so no error was ever triggered, but since all cmp() methods return True when content are different, that == should in fact be !=

rebase: small cosmetic cleanups

rebase: add a test for committed MQ patches (59bd20451ab6)

util.h: Defined macros for working "with" PyStrings in py3k. PyString* functions are defined as PyUnicode* to permit correct compilation in both python 2.x and 3.x.