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.

util.h: Add a PyInt_AsLong definition for usage in the inotify module.

setup.py: Add 'mercurial' as include dir for the inotify compiler. This patch adds access to util.h for the inotify C module by adding the "mercurial" directory as an include dir, enabling access to the macros defined in util.h.

setup.py: Adjustments to make setup.py run in py3k. In py3k, subprocess.Popen.communicate's output are bytes objects. String literals are Unicode objects. Thus, when a bytes object startswith method is called, with string literals, it fails. What this patch does is: * Convert the string (unicode in py3k) literals to bytes objects; * As "bytes" is not a builtin in python < 2.6, it defines a "b" helper function that merely returns its argument, as suggested by Antoine Pitrou.

rebase: re-add patches to mq repo after rebase Since 1b82a26635d7, we are adding patches after the qimport call, and not inside it anymore. Correct updatemq to match the new behaviour.

mq: reset self.added after the mq transaction instead of inside qimport It seems wiser to reset mq.added at the end of the mq transaction instead of at the beginning of a qimport call: this way, calling several times qimport() without saving mq state in-between does not overwrite the previous value of mq.added (this happens, for example in rebase, where we import several patches in a batch before calling .save_dirty() )

Merge with stable

i18n-pt_BR: synchronized with dec57aa0f8ca

merge with stable

i18n-pt_BR: synchronized with 9d905b9769af

Merge with stable

dispatch: add shell aliases This patch adds git-style "shell aliases" to Mercurial. Any alias with a definition beginning with a '!' will be treated as a shell alias. For example: [alias] echo = !echo qempty = !hg qrefresh -X "`hg root`" ; echo Emptied patch "`hg qtop`" $ hg echo foo foo $ hg qempty Emptied patch foo $

convert: cleanup of filemap help text Clarify that: - Specified paths are matched by comparing name of file or directory. - Line order (thus) doesn't matter. - Rename doesn't imply include.

check-code: add test for callable

extensions: add a few assertions to wrapfunction() and wrapcommand(). Specifically, assert that the given wrapper is callable in both functions, and assert that the original was also callable in wrapfunction().

extensions: improve language for wrapfunction() docstring.

extensions: add docstring for wrapcommand().

commands: mention "hg status -C" in addremove help

Merge with stable

test-merge-closedheads: test cc982ff2dcf8

commands: only warn when reopening the workdir's branch When commiting, a check is made to see if one of the parents is a closed head. However this did not check that the branch of the commit is the same as the closed head, so one could get a warning message on the sequence hg commit --close-branch hg branch new-branch hg commit or when merging in a closed head.

Merge with stable

mq: fixed ENOENT when qrename to new/directory.patch MQ patch name can contain slashes, e.g. 'foo/bar.patch'. Currently "qnew foo/bar.patch" works, but "qrename foo/bar.patch new/dir.patch" fails with "No such file or directory". Also added test case for "qnew foo/bar.patch"

mercurial.spec: rename docutils to python-docutils in BuildRequires Even though the name of the project is Docutils, most packagers use the package name python-docutils to fit into the naming scheme of other packages written in Python. The name is used by Fedora, EPEL, DAG, Mandriva, and a few other distributions.

glossary: fixed typo in "Directory, working" description The term "Directory, working" referenced a non-existant term named "Parents, working directory". This patch fixes the typo.

Merge with stable