protocol: use generators instead of req.write() for hgweb stream responses

protocol: wrap non-string protocol responses in classes

protocol: convert StreamException to generated error code This makes it much easier to handle these errors at the transport level.

protocol: extract compression from streaming mechanics

protocol: rename send methods to get grouping by prefix

protocol: shuffle server methods to group send methods

protocol: do not translate error messages on the remote side

protocol: use return shortcut instead of respond function

protocol: command must be checked before passing in

tests: rename some tests to help grouping

keyword: add extra datefilters in a single update call

Merge with stable

Merge with main

cmdutil: fix accidental name clash with revrange function The revrange function was used further up, and when a local variable is defined with the same name, the earlier call to revrange becomes a 'local variable used before assignment' error. The clash was introduced in 890ad9d6a169.

commands: fix update's help to be more accurate Branches can have multiple heads, so it doesn't make sense to speak of "the head of the current branch". What update really does is try to update to the *tip* of the current branch.

i18n: use encoding.colwidth() for correct column width Some encoding and language combinations (e.g.: UTF-8 and Japanese) cause encoding characters into sequence of bytes more than column width of them. So, encoding.colwidth() should be applied instread of len() on i18n strings. In addition to it, formatting by '%*s'/'%-*s' also uses "number of bytes" to calculate space padding size, and should be fixed, too.

merge with stable

log: slowpath: do not read the full changelog When in the slowpath, we are examining _all_ changesets in revs. We need to order reads so they happen increasingly for I/O performance. Increasing windows were used to read changelog backwards in a windowed manner, reading the changelog forward inside each window. But since no revision range was specified, it was equivalent to reading the full changelog, even if a single revision was passed to the commandline. When --removed is used, we _need_ to scan all changesets, but if we're only looking for file patterns, this is not necessary and we can stick to the revspec that was given to us.

log: remove increasing windows usage in fastpath The purpose of increasing windows is to allow backwards iteration on the filelog at a reasonable cost. But is it needed? - if follow is False, we have no reason to iterate backwards. We basically just want to walk the complete filelog and yield all revisions within the revision range. We can do this forward or backwards, as it only reads the index. - when follow is True, we need to examine the contents of the filelog, and to do this efficiently we need to read the filelog forward. And on the other hand, to track ancestors and copies, we need to process revisions backwards. But is it necessary to use increasing windows for this? We can iterate over the complete filelog forward, stack the revisions, and read the reversed(pile), it does the same thing with a more readable code.

log: refactor: test for ranges inside filerevgen

log: refactor: compute the value of last outside of filerevgen

context: use os.lstat instead of os.stat to fetch file size When file is a link, we want the size of the link itself, not the size of the file it points to.

check-code: add --blame switch

changegroupsubset: remove unneeded cast to list

check-code: catch dict.has_key

Merge with stable

mark ui.warn strings for translation

check-code: warn about untranslated ui.warn calls

localrepo: remove push_{unbundle,addchangegroup}(), factor it inside push()

wireproto: refactor list of nodeid encoding / decoding

ssh: drop some old imports

protocol: move hgweb protocol support back into protocol.py - introduce iscmd - simplify error handling - remove unneeded imports

protocol: unify server-side capabilities functions

protocol: unify unbundle on the server side

protocol: unify client unbundle support - introduce _callpush helper - factor out differences in result handling into helpers - unify

protocol: unify client changegroup methods

protocol: convert some ssh abort calls

protocol: clean up call-like functions in http and ssh clients

protocol: unify stream_out client code

protocol: unify basic http client requests

protocol: move basic ssh client commands to wirerepository

protocol: unify stream_out command

protocol: unify changegroup commands - add sendchangegroup protocol helpers - handle commands with None results - move changegroup commands into wireproto.py

protocol: add proto to method prototypes

protocol: use new wireproto infrastructure in ssh - add protocol helper - insert wireproto into dispatcher - drop duplicate functions from hgweb implementation

protocol: introduce wireproto.py - add a protocol-independent dispatcher - move most of the basic commands from sshserver to wireproto - dispatch through wireproto first

protocol: move most ssh responses to returns

protocol: add ssh getargs - introduce getargs - make getarg a helper function - update users

discovery: remove duplication for new remote head discovery

discovery: better coding style

discovery: simplify findoutgoing(), the updated_head stuff wasn't used

mq: evaluate --user before invoking editor with -e (issue2289)

Abort: add a hint argument, printed in the next line inside parenthesis discovery was using a custom made message for this purpose push now returns -1 after aborting, instead of 1 previously

discovery: clarify comment

Merge with stable

subrepo: docstrings

gendoc: remove call to callable for py3k compatibility

check-code: added check for reduce usage

check-code: check for tuple parameter unpacking (missing in py3k)

removed exception args indexing (not supported by py3k) Py3k removed __getitem__ for exception classes. The correct way of getting the exception arguments is by using the args method.

util: use fakebuffer as buffer in py3k There's no buffer type in py3k, util.py has a function, called fakebuffer, that implements a similar API. This patch implements fakebuffer as a memoryview wrapper in py3k.

util: improved the check for the existence of the 'buffer' builtin 2to3 is unable to translate '__builtin__' calls to 'builtins' when hasattr is used (as in hasattr(__builtin__, buffer)). Translating the check to the format try: whatever except NameError # define whatever __builtin__.whatever = whatever is a correct way of checking for the name and has the benefit of being translated by 2to3. This patch implements the same idea for the aforementioned example.

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.

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

test-log: also test "log -p -R" case

log: fix missing diff output for hg log -p in sub directory prep(ctx, fns) receives paths relative to repository root, not cwd.

commands: document return values of add and paths commands