merge with stable

merge with i18n

merge with i18n

i18n-pt_BR: fix typo in commit help text spotted by Fred Maranhão

i18n: merge with stable

i18n-pt_BR: synchronized with 2da0cf99b642

i18n-pt_BR: fix typo

i18n-da: synchronized with 7fa36341e7a0

log: fix the bug 'hg log --stat -p == hg log --stat' Before: hg log --stat -p -r tip # only show stat After: hg log --stat -p -r tip # show stat _and_ diff

hgfixes: added a fixer to convert changes in the email package This patch adds a fixer that accounts for changes in python packages, as the framework provided by lib2to3 is only able to track changes in module names. This fixer (hopefully) can fix any change in one-level hierarchies. To exemplify, this fixer can successfully change an import from "email.MIMEMultipart" to "email.mime.multipart".

contrib/setup3k.py: added script to build hg with py3k This patch implements a script that inherits most of its functionality from hg's setup.py and adds support to calling 2to3 during invocation with python3. The motivation of having this script around is twofold: 1) It enables py3k crazies to test mercurial in py3k and, hopefully, patch it more easily, so it can improve the py3k support to eventually run there. 2) Being separated from the main setup.py eliminates the need to make hg's setup.py even more cluttered, and enables "independent" development until the port is done. Some considerations about the structure of this patch: Mercurial already overrides the behavior of build_py, this patch tweaks it a bit more to add support to call 2to3 with a custom fixer* location for Mercurial. There is also a need of having the core C modules built *before* the translation process starts, otherwise 2to3 will think those are global modules. * A fixer is a python module that transforms python 2.x code in python 3.x code.

mq: save qrefresh message for easy recovery in case it fails (issue2062) Currently, if you start editing a commit message from qrefresh -e and, for any reason: forget you were editing it, leave the editor open and start qpopping and qpushing, when you decide to save your commit message, it is going to fail. This patch copies the commit behavior of saving the message contents in $HGROOT/.hg/last-message.txt before continuing.

util: avoid using hashlib on Python < 2.5 (issue2278) The following patch allows the use of python2.4 with a standalone hashlib rather than assuming that python2.5 is in use when hashlib is imported successfully.

ui: differentiate empty configlist from None

revset: predicate to avoid lookup errors A query like head() and (descendants("bad") and not descendants("fix")) (testing if repo heads are affected by a bug) will abort with a RepoLookupError if either badrev or fixrev aren't found inside the repository, which is not very informative. The new predicate returns an empty set for lookup errors, so head() and (descendants(present("bad")) and not descendants(present("fix"))) will behave as wanted even if those revisions are not found.

inotify: show the exact command used to start the server

demandimport: store level argument on _demandmod instances The 'level' argument to __import__ was added in Python 2.6, and is specified for either relative or absolute imports. The fix introduced in e160f2312815 allowed such imports to proceed without failure, but effectively disabled demandimport for them. This is particularly unfortunate in Python 3.x, where *all* imports are either relative or absolute. The solution introduced here is to store the level argument on the demandimport instance, and propagate it to _origimport() when its value isn't None. Please note that this patch hasn't been tested in Python 3.x, and thus may not be complete. I'm worried about how sub-imports are handled; I don't know what they are, or whether the level argument should be modified for them. I've added 'TODO' notes to these cases; hopefully, someone more knowledgable of these issues will deal with them.

revert: use opts.get If you want to programatically perform a revert right now you need to include a date=False parameter due to the use of opt["date"] instead of opt.get("date").

tests: unify test-copy2

mq/qqueue: enable renaming of active queue

mq/qqueue: split _setactive Prepare _setactive to be called without checking for applied patches.

merge with stable

templates: add filenolink to raw style (issue2332)

revlog: optimize deltachain

manifest: correct readdelta() according to parentdeltas

contrib: simple extension to practically convert a repo from tip delta to parentdelta

localrepo: add parentdelta to requires only if enabled in config file

revlog: append delta against p1

revlog: teach revlog to construct a revision from parentdeltas

revlog: deltachain() returns chain of revs need to construct a revision

revlog: parentdelta flags for revlog index

glossary: fixed typo

Merge with stable

tests: unify test-clone-r

tests: unify test-debugcomplete

tests: unify tests-debugindexdot

tests: unify test-debugbuilddag

tests: unify test-diffdir

tests: unify test-children

tests: unify test-revlog-packentry

tests: unify test-revlog-group-emptyiter

tests: unify test-install

tests: unify test-subrepo-svn

tests: unify test-subrepo-relative-path

tests: unify test-subrepo-paths

tests: unify test-subrepo-deep-nested-change

tests: unify test-subrepo

glossary: add entry for "Branch, inactive"

tests: unify test-patchbomb

Merge with mpm

tests: unify test-mq-symlinks

tests: use regular expressions instead of helpers

tests: unify test-mq-strip

tests: drop big sed from test-keyword.t

tests: unify test-keyword

test-walk: enable absolute path tests

tests: unify test-grep

cmdutil: code simplification

tests: unify test-log

log: do not --follow file that is deleted and recreated later (issue732) == What == issue732 is only one example of a buggy behaviour, but there are in fact many intricated cases. For example: ( "o" contains an alive version of the tracked file, "x" does not) tip - o - o - x - o - o - x ... \ o - o - o - o - x ... \ / o - o This repository contains at least two instances of the tracked file, but when calling "hg log -f file" only the latest one (the one alive in tip) matters to us. == How == We must extract from the filelog the history of the file instance we're interested in and discard changes related to other instances of that file. We see that we're only interested in ancestors(node), and that all other nodes in the filelog should not be considered.

tests: unify test-mq-safety

tests: unify test-mq-caches

tests: unify test-mq-guards

tests: unify test-mq-eol

tests: unify test-mq

Merge with stable

encoding: improve handling of buggy getpreferredencoding() on Mac OS X Prior to version 2.7, calling locale.getpreferredencoding() would always return 'mac-roman' on Mac OS X. Previously, this was handled by a call to locale.setlocale(). Unfortunately, Python 2.6.5 and older have a bug where isspace() would incorrectly report True for 0x85 and 0xa0 after such a call. In order to fix this, we replace the previous _encodingfixup mapping to an _encodingfixers mapping. Rather than mapping encodings to their replacement, it maps them to a function returning the replacement. This allows us to provide an simplified implementation of getpreferredencoding() which extracts the expected encoding and restores the locale. This fix is based on a patch originally submitted by Martijn Pieters as well as feedback from Brodie Rao.

templatefilters: unnest uescape()

templatefilters: use \uxxxx style escape for JSON string It's embeddable in plain javascript, and also conforms to JSON standard.

test-notify: make it pass on Mac OS X (again) Changeset 25e74cd3f023 (from 2008) introduced a hack to handle the very long values of $TMPDIR typically seen on Mac OS X. This hack expected continuation lines to begin with a tab. However, as a result of a change in Python 2.7, changeset 594b98846ce1 made it so continuation lines began with a tab. Since then, `test-notify' has been broken on Mac OS X. Merely replacing the tab in the regular expression with a space will not work: not only do tab continuations still occur in the message, but other lines -- in the body of the message -- also start with a space. Luckily, all broken up lines appear to end with either a colon or an n, so we can match those, and reinsert them in the replacement.

tests: combine test-dirstate-future.t into test-dirstate.t

tests: unify test-dirstatedirs

Merge with stable

dagparser: transplant part of 4e804302d30c

check-code: catch "echo -n" in tests

test-init: replace 'echo -n' with 'printf' The '-n' argument to echo is a non-standard extension that isn't supported on Mac OS X 10.6.

revset: fix outgoing argument handling

debugbuilddag: escape backslash properly in help string

url.py: removed 'file' inheritance in the httpsendfile class Since py3k doesn't have a "file" builtin and, consequently, doesn't support inheriting from it, this patch refactors the httpsendfile class to wrap the objects returned by the builtin "open" function while adding the necessary methods (__len__ for constructing the Content-Length header and read, write, close and seek for the file-like interface).

fix undefined variables, spotted by pylint

py3kcompat: added fake ord implementation for py3k In py3k, a bytes object __getitem__ will return an int instead of a one-character bytes object. This has negative consequences when we want to ord(), like in the following example: >>> b'foo'[0] 102 >>> ord(b'foo'[0]) Traceback (most recent call last): File "<stdin>", line 1, in <module> TypeError: ord() expected string of length 1, but int found This patch overrides the default ord() implementation to just return an int that's what is passed as an argument for ord(). Making the above call succeed: >>> ord(b'foo'[0]) 102

commit: explicitly document the existence of "last-message.txt"

Merge with stable

tests: unify test-changelog-exec

tests: unify test-cat

tests: unify test-bundle-vs-outgoing

tests: unify test-bundle-type

tests: unify test-bundle-r

tests: unify test-bundle

tests: unify test-branch-option

tests: unify test-branches

tests: unify test-dumprevlog

tests: unify test-dirstate-future

tests: unify test-fncache

tests: unify test-bookmarks-strip

tests: unify test-bookmarks-rebase

tests: unify test-bookmarks-current

tests: unify test-bookmarks

tests: unify test-bisect2

tests: unify test-bad-pull

tests: unify test-bad-extension

tests: unify test-backwards-remove

tests: unify test-backout

tests: unify test-audit-path

tests: unify test-archive-symlinks

tests: unify test-archive

tests: unify test-annotate

tests: unify test-addremove-similar

tests: unify test-addremove

tests: unify test-acl

tests: unify test-abort-checkin

tests: unify test-1102

tests: unify test-586

mercurial.spec: gettext is a build requirement for getting proper localization

http basic auth: reset redirect counter on new requests (issue2255) On Python 2.6.6 (and patched 2.6.5 on certain Linux distros), the change that caused issue2255 was also applied to non-digest authentication; this change extends the 2ec346160783 fix accordingly.

rebase: recompute the set of skipped rev when using --continue (issue2330)

Remove variable output affected by length of TMPDIR. If the temporary directory is longer than /tmp then it's possible that the Subject line will get wrapped by the headencode function.

Merge with stable

tests: update to match "hg help resolve" output from 53fdc0989047

test-clone: f1c2de22b8a8 lost changes from b1ae33b813cb

url: limit expansion to safe auth keys (Issue2328) Mads Kiilerich pointed out that 7c9beccb0533 was too eager since the prefix and password keys may contain $-signs. So this only add the username to the list of keys that are expanded. This also updates the documentation to match.

Merge with stable

resolve: updated help documentation for improved clarity

convert: Test svn sink for a repo with tags. This test case backs the fix in changeset 7e5f5e5858f9. The subversion sink used to crash, if the source repo used tags.

hgrc.5: fix "hg hg status" -> "hg status"

url: expand vars in all [auth] settings (issue2328)

merge with stable

merge with i18n

merge with i18n

i18n: merge Romanian translation

i18n: merge with stable

i18n-it: update many broken fuzzy messages I started updating many fuzzy messages which no longer expressed the intended meaning - new translations are inserted only to keep coherence. Not all fuzzy messages have been fixed, yet.

i18n-it: readd missing non-ASCII characters Some accented vowels had disappeared.

i18n-it: avoid using two spaces after a '.' See http://en.wikipedia.org/wiki/Sentence_spacing to verify that single spacing is indeed correct.

i18n-ro: initial version

Merge with stable

test-check-code: fix test after e1359ad582f6

cmdutil: remove unnecessary parenthesis

patch: fix typo in comment

qguard: label patch names by status when listing guards

hg.clone: do not ignore branch argument when source is a repo object This is a revert of 4a70178f9bde. The "bug" mentioned in this changeset is unclear: hopefully using a test to cover this usage should prevent any bugs.

merge: fix typo in docstring

check-code: add exit status so that we can use it in a shell command combination and/or in hg hooks.

test-patch.t: typos

tests: unify test-alias

tests: unify test-parents

tests: merge all 4 test-symlink* into test-symlinks

tests: unify test-symlink-root

tests: unify test-symlink-basic

tests: unify test-symlink-addremove

tests: unify test-qimport-eol

tests: unify test-import

tests: unify test-clone

tests: unify test-copy

tests: unify test-commit-unresolved

unify test-commit-copy

tests: unify test-commit

tests: unify test-committer

tests: unify test-transplant

tests: unify test-walk

tests: unify test-symlinks

tests: unify test-conflict

tests: unify test-identify

tests: unify test-add

tests: remove useless sed in test-hook

tests: unify test-hook

tests: unify test-flags

repair: do not compress partial bundle if we do not keep it on disk A partial bundle is created to temporarily save revisions > rev but not descending from the node to strip, to be able to restore the changesets after stripping the changelog. Since this bundle is not kept after the strip operation, and is not user-visible, it is not necessary and should be faster to avoid compression.

store: skip decodir check if path does not contain '.hg/' The three replace calls are slower than this simple __contains__, and anyway we should not have this many paths ending with .i, .d, or .hg compared to the normal, un-encoded other paths.

strip: support multiple revisions

tests: unify test-tag

tests: unify test-verify

tests: unify test-init

tests: unify test-paths

tests: unify test-patch

tests: unify test-status-color

tests: unify test-status

tests: catch re.error if test line is not a valid regular expression

Merge with stable

convert: less shouting in SVN sink warning

convert: Using --dest-type svn crashed, if the source repo used tags. The convert extension requires puttags(self, tags) to return a sequence for a multi-variable assignment. If puttags implicitly returns None, the code will break when trying to un-pack None for assignment.

commands: use round parenthesis in 'hg head --active' help This is the style used in the rest of the help strings.

graphlog: mark --branch as incompatible with --graph The --only-branch option was deprecated in 0d5f139b23c1 and --branch was added instead. But the graphlog extension was not updated to match the change.

subrepos: support remapping of .hgsub source paths Given a .hgsub file containing lib/libfoo = http://server/libfoo the 'lib/libfoo' subrepo will be cloned from 'http://server/libfoo'. This changeset introduces a remapping mechanism whereby the source paths (the right-hand sides) in the .hgsub file can be remapped. This subpaths section [subpaths] http://server = /local will result in the 'lib/libfoo' subrepo being cloned from '/local/libfoo' instead of from 'http://server/libfoo'. The patterns (left-hand sides) are really regular expressions and the replacement strings (right-hand sides) can refer to matched groups using normal backreferences. This can be used for more complicated replacements such as [subpaths] http://server/(.*)-hg/ = http://hg.server/\1/ which replaces 'http://server/foo-hg/' with 'http://hg.server/foo/'. All patterns are applied in the order by which they are listed in the config files.

bookmarks: replace var used as a Boolean with a Boolean

merge with stable

test-dispatch: Make test of removed working directory work on AIX (issue2315) AIX sh won't delete its own working directory. Removing it from another process works. Also hide the actual OS error message - operating systems returns different errors when getcwd fails.

tests: only run check-code on tracked files

Merge with stable

dirstate: ignore symlinks when fs cannot handle them (issue1888) When the filesystem cannot handle the executable bit, we currently ignore it completely when looking for modified files. Similarly, it is impossible to set or clear the bit when the filesystem ignores it. This patch makes Mercurial treat symbolic links the same way. Symlinks are a little different since they manifest themselves as small files containing a filename (the symlink target). On Windows, these files show up as regular files, and on Linux and Mac they show up as real symlinks. Issue1888 presents a case where the symlink files are better ignored from the Windows side. A Linux client creates symlinks in a working copy which is shared over a network between Linux and Windows clients. The Samba server is helpful and defererences the symlink when the Windows client looks at it. This means that Mercurial on the Windows side sees file content instead of a file name in the symlink, and hence flags the link as modified. Ignoring the change would be much more helpful, similarly to how Mercurial does not report any changes when executable bits are ignored in a checkout on Windows. An initial checkout of a symbolic link on a file system that cannot handle symbolic links will still result in a regular file containing the target file name as its content. Sharing such a checkout with a Linux client will not turn the file into a symlink automatically, but 'hg revert' can fix that. After the revert, the Windows client will see the correct file content (provided by the Samba server when it follows the link on the Linux side) and otherwise ignore the change. Running 'hg perfstatus' 10 times gives these results: Before: After: min: 0.544703 min: 0.546549 med: 0.547592 med: 0.548881 avg: 0.549146 avg: 0.548549 max: 0.564112 max: 0.551504 The median time is increased about 0.24%.

mq/qqueue: enable bash completion Return the list of available queues when completion is attempted on qqueue.

mq/qqueue: --list does not print (active) with --quiet For scripting purposes, it can be convenient to get a simple listing of available queues, without indication of the active one. --quiet documentation change removed by Patrick Mézard.

Merge with stable

templatefilters: make json filter handle multibyte characters correctly It aims to fix javascript error of hgweb's graph view in Japanese 'cp932' encoding. 'cp932' contains multibyte characters ending with '\x5c' (backslash), e.g. '\x94\x5c' for Japanese Kanji 'Noh'. Due to json filter escapes '\' to '\\', multibyte string ending with '\x5c' is translated to "xxx\", resulting javascript parse error on a web browser. This patch changes json() to pass unicode to jsonescape(). Unicode decoding error handler changed to 'replace' by Patrick Mézard.

check-code: added a check for calls to the builtin cmp function

manifest: removed usage of the global cmp function Py3k doesn't have a global cmp() function, making this call problematic in the py3k port. Also, calling cmp() here is not necessary, since we only want to know if the two values are equal. A check for equality perfect in this case and this patch does that.

tests: run check-code.py on working directory files If we insist on Mercurial sources to pass check-code.py, let automate the process and make it part of the tests. Objections?

minor style fix: hgext/rebase.py:157 -- line too long found by a run of check-code

zsh completions: add qpush --move option

Merge with stable

chunkbuffer: use += rather than cStringIO to reduce memory footprint This significantly refactors the read() loop to use a queue of chunks. The queue is alternately filled to at least 256k and then emptied by concatenating onto the output buffer. For very large read sizes, += uses less memory because it can resize the target string in place.

httprepo: decompress stream incrementally to reduce memory usage

verify: initialize rp variable in case we hit out of memory

merge: drop reference to file contents after write This reduces memory usage on large consecutive gets.

revlog: drop cache after use to save memory footprint If we reconstruct back to back large versions, we need to drop the cache first to avoid doubling memory usage.

verify: reduce memory footprint when unpacking files By never holding a reference to the unpacked string, we avoid holding two consecutive large files in memory.

verify: report exceptions that don't have a str() method

color: fix test-diff-color breakage

hgcia/color: remove star imports This plays nicer with demandimport and allows pyflakes to detect undefined names.

hgfixes: added a fixer that makes bytes to be formatted correctly This patch implement a fixer that replaces all calls to the '%' when bytes arguments are used to a call to bytesformatter(), a function that knows how to format byte strings. As one can't be sure if a formatting call is done when only variables are used in a '%' call, these calls are also translated. The bytesformatter, in runtime, makes sure to return the "raw" % operation if that's what was intended.

py3kcompat: added a "compatibility layer" for py3k This patch adds some ugly constructs. The first of them is bytesformatter, a function that formats strings like when '%' is called. The main motivation for this function is py3k's strange behavior: >>> 'foo %s' % b'bar' "foo b'bar'" >>> b'foo %s' % b'bar' Traceback (most recent call last): File "<stdin>", line 1, in <module> TypeError: unsupported operand type(s) for %: 'bytes' and 'bytes' >>> b'foo %s' % 'bar' Traceback (most recent call last): File "<stdin>", line 1, in <module> TypeError: unsupported operand type(s) for %: 'bytes' and 'str' In other words, if we can't format bytes with bytes, and recall that all mercurial strings will be converted by a fixer, then things will break badly if we don't take a similar approach. The other addition with this patch is that the os.environ dictionary is monkeypatched to have bytes items. Hopefully this won't be needed in the future, as python 3.2 might get a os.environb dictionary that holds bytes items.

hgfixes: add a fixer to convert plain strings to bytestrings This patch implements a 2to3 fixer that converts all plain strings in a python source file to byte strings syntax. Example: foo = 'Normal string' would become foo = b'Normal string' The motivation behind this fixer can be found in http://selenic.com/pipermail/mercurial-devel/2010-June/022363.html or, in other words: the current hg source assumes that _most_ strings are "meant" to be byte sequences, so it makes sense to make the convertion implemented by this patch. As mentioned above, not all mercurial modules want to use strings as bytes, examples include i18n (which uses unicode), and demandimport (in py3k, module names are normal strings, thus unicode, and there's no need for a convertion). Therefore, these modules are blacklisted in the fixer. There are also a few functions that can take only unicode arguments, thus the convertion shouldn't be done for those.

revlog: add shallow header flag REVLOGSHALLOW header flag to mark revlog as shallow. The _shallow attribute of the revlog is used to check if the header flag is set.

revlog: add punched revision flag index flag to identify a revision as punched, i.e. it contains no data. REVIDX_PUNCHED_FLAG = 2, is used to mark a revision as punched. REVIDX_KNOWN_FLAGS is the accumulation of all index flags.

tests: unify test-tags

tests: unify test-empty

tests: unify test-basic

tests: basic support for unified tests

tests: move script execution in runner helpers

Merge with stable

Added signature for changeset c00f03a4982e

Added tag 1.6.2 for changeset c00f03a4982e

i18n-pt_BR: synchronized with 87dcf758309d

merge with i18n stable

i18n-sv: synchronized with 56b41b2cc690

Merge with stable

color: call correct superclass method in write_err Without this fix, any calls to write_err would go to stdout instead of stderr, and calls during pushbuffer would cause unpack ValueErrors on popbuffer.

convert/progress: use plural and avoid retrieving

qfinish: fix range logic for --applied qbase:qtip can include non-mq csets, use qbase::qtip instead

rebase/progress: Adding progress for rebasing

record: count lines changed as the number of lines added or removed per "record" hunk Record deals in hunks which are tighter than traditional patch hunks, really only a single run of additions/removals. Another addition, even a line after a fixed line is treated as a new hunk by record.

color: pass write/write_err to win32print correctly (issue2312)

Merge with stable

Added signature for changeset bf1774d95bde

Added tag 1.6.1 for changeset bf1774d95bde

Merge with stable

i18n-pt_BR: synchronized with db426935fa94

Merge with stable

i18n-pt_BR: synchronized with 0e789549271d

i18n-sv: synchronized with c47cb3193c53

help: fix bytes/digit confusion for hashes spotted by FUJIWARA Katsunori <fujiwara@ascade.co.jp>

Merge with stable

progress: use gerund (updating) for merge progress

qpush --move: move the right patch even with comment lines 88fc876a4833 caused that we find the index of the moving patch in self.series but look it up in self.full_series. The difference between these is that full_series also contains comment lines, and we thus moved the wrong patch. Use back self.full_series to find the moving patch, but take care of striping the patch guard markers before comparing the patch name. Test cases have been added for comments and empty lines in self.full_series, and for the case of guarded patches. Original patch contributed by Mads Kiilerich <mads@kiilerich.com>

merge with stable

perf: break down long line

dispatch: trailing whitespace

merge crew and main

merge crew and main

mq: clarify the fact that qimport is trying to read a file "hg qimport tip" would throw "abort: unable to read tip" before this.

revset: add min function

runrst: try to be more helpful if docutils is not installed

mq: correct qimport documentation

merge with stable

bookmarks: don't allow name to contain whitespaces only

context: reuse filecontext.cmp in workingfilecontext.cmp Same code path should mean less mistakes, and hopefully, better caching.

filectx: use cmp(self, fctx) instead of cmp(self, text) This allows more flexibility in implementation, and in particular, lets the context decide if revision text has to be loaded or not.

mq: fix qimport --name --existing --force on win32 os.rename() does not overwrite existing targets on Windows.

mq: document possible combination of -e and -n for qimport

mq: support "qimport --existing --name renametothis thatexistingpatch" Before this change, the command would abort with a not too clear "patch renametothis does not exist" error. This change makes: qimport --existing --name renametothis thatexistingpatch equivalent to: qimport --existing thatexistingpatch; qrename thatexistingpatch renametothis

localrepo: refactor filter computation Separate loading part from access part to be able to tell with: repo._loadfilter(name) bool(name in repo.filterpats) if there is a 'name' filter available.

Merge with stable

Merge with crew

alias: improved diagnostic when arguments include --cwd, etc. The logic pre-emptively checks for -R, --repo, --repository and --cwd in order to give the user a more helpful error message. In addition, each option is handled invididually, which avoids listing them all in the error. Before: % hg --config alias.broken='push --cwd /dev/null' broken abort: Option --cwd may not be abbreviated! After: % hg --config alias.broken='push --cwd /dev/null' broken error in definition for alias 'broken': --cwd may only be given on the command line

perf: add perfrevlog function to check performance of revlog

revlog: add a flags method that returns revision flags

tag: do not allow tag names to consist solely of whitespace (issue2307) (simplification and test by mpm)

Merge with stable

convert: warn on superfluous / in paths shlex is really a bad parser for this line-based format ...

inotify: remove unused variable

convert: handle closed branch heads in hg-hg conversion (issue2185)

check-code: add warning on lines over 80 characters

debugbuilddag: build repository content in binary mode

cleanup: typos

revsets.txt: minor improvements

dispatch: write Abort hint to stderr too

bookmarks: sort diffbookmarks() output

Merge with stable

convert: warn on superfluous / in paths shlex is really a bad parser for this line-based format ...

inotify: remove unused variable

keyword: move collecting of [keyword] patterns to reposetup (issue2303) When cloning, prevent [keyword] filename patterns configured locally in the source directory to persist during the update in the destination. a) move [keyword] retrieval (back) to reposetup b) remove the corresponding global kwtools attributes Add test cases.

hgwebdir: allow pure relative globs in paths This allows the (to me, in some setups) obvious configuration: [paths] / = * or / = ** Relative paths used to work with [collections] even though it isn't documented. Perhaps it should be documented?

alias: ensure checksignature() is applied directly to the command (issue2286) Aliased commands that received bad arguments would raise TypeError instead of SignatureError. This only affected commands that weren't wrapped by extensions. Using util.checksignature() in cmdalias.__call__() ensures SignatureError is raised correctly.

dispatch: give better error message when cwd doesn't exist (issue2293) Previous behavior wasn't very helpful: $ hg st foo abort: No such file or directory Now we tell more about what failed: abort: error getting current working directory: No such file or directory

i18n: safety writing into non-ASCII named files on any shell implementation some shell implementation (e.g.: dash) can not handle redirection into non-ASCII UTF-8 named file correctly.

convert: handle closed branch heads in hg-hg conversion (issue2185)

check-code: add warning on lines over 80 characters

Remove variable output affected by length of TMPDIR. If the temporary directory is longer than /tmp then it's possible that the Subject line will get wrapped by the headencode function.

chunkbuffer: split big strings directly in chunkbuffer

localrepo.status: move fixup concatenation inside if block for clarity clean += fixup only makes sense if fixup is not empty; it should be inside the "if fixup" test.

chunkbuffer: targetsize isn't used outside of read()

chunkbuffer: use list instead of cStringIO

chunkbuffer: use for/else to detect end of iteration

changegroup*(): use enumerate when possible

changegroupsubset(): with the fix, prune() is actually useful in the testsuite

test-permissions: echo commands to make output readable

changegroupsubset: simplify knownheads/has_cl_set computation

changegroupsubset(): ancestors() is not inclusive, we need to remove the "heads"

changegroupsubset(): move comment at the right place

changegroupsubset(): refactor the prune() functions

Merge with stable

help: make helptable a list instead of a tuple The table should always have been a list so that extensions can append their own help topics -- hgsubversion would like to do this now.

test-command-template: test 'children' template keyword

templates: 'children' keyword The template keyword 'parents' is already present and this just provides the complimentary template keyword.

changegroupsubset(): change variable names, simplify lookup logic

changegroup(): used "linkrev" instead of "revlink"

fix comment

Merge with stable

revset: fix ancestor subset handling (issue2298)

hgwebdir: use template paths configured in the hgrc (issue2281)

changegroup*(): use set instead of dict

Merge with stable

bash/zsh completion: use HGPLAIN when invoking hg (issue2297)

patch: fix extract() docstring, it returns branch as well

merge with stable

doc: remove has_key usage in hgmanpage

gendoc: remove callable usage (check-code)

bookmarks: rewrite _bookmarks method documentation

init: create target directory recursively Subrepos with relative paths must often be cloned to locations deep in the directory structure. This allows clone over ssh (init+push) work.

doc: make sure we use our own code for generating man pages docutils would in some situations pick up its own manpage.py instead of doc/manpage.py. Renaming to hgmanpage.py makes it less ambiguous.

transplant: crash if repo.commit() finds nothing to commit (makes issue2135, issue2264 more obvious, but does nothing to fix either one) This seems to happen in two distinct cases: * patch.patch() claims success but changes nothing (e.g. the transplanted changeset adds an empty file that already exists) * patch.patch() makes changes, but repo.status() fails to report them Both of these seem like bugs in other parts of Mercurial, so arguably it's not transplant's job to detect the failure to commit. However: * detecting the problem as soon as possible is desirable * it prevents a more obscure crash later, in transplants.write() * there might be other lurking (or future) bugs that cause repo.commit() to do nothing Also, in the case of issue2264 (source changesets silently dropped by transplant), the only way to spot the problem currently is the crash in transplants.write(). Failure to transplant a patch should abort immediately, whether it's user error (patch does not apply) or a Mercurial bug (e.g. repo.status() failing to report changes).

mq: cleanup status if applied mq is stripped (issue1881) stripping of applied mq patches leads to wrong state recorded in status file. find all mq patches that will be affected and clean up status file before strip.

bundle: lookup revisions after addbranchrevs When addbranchrevs extends revs, it adds changeset hashes, and not node ids. Which means that we have to lookup for revisions _after_ the addbranchrevs call, instead of before.

log: do not redefine cachefunc in walkchangerevs The same variable is defined a few blocks earlier. The first phases in walkchangerevs should in fact fill that cache, and allow faster lookups in the last phase. Redefining and overriding this cached function, (knowing that it will be called with the same arguments) defeats the caching purpose.

cmdutils: fix code style

contrib: add debugshell extension

log: document the different phases in walkchangerevs

log: slowpath: only walk specified revision range during preparation Even with --removed, it does not make sense to examine changesets outside of the revision range that was specified by the user: the last phase only yields a subset of (revs), preparation phase hence only has to examine (revs) to fill correctly fncache.

Merge with stable

revert: rename original to .orig instead of copying (issue2282) By renaming before reverting the content of the file we ensure that we handle and break hardlinks properly. Handling of other hardlinks to .orig is somebody elses problem.

inotify: make inotifydirstate.status() returns a tuple of lists. This makes it consistent with dirstate.status(), which is important if there are other extensions messing with the output of status(). Those extensions can safely assume that dirstate.status() returns a tuple of lists, because its docstring says it does. But inotifystatus.dirstate() returns a list of lists, which can break those other extensions.

protocol: move the streamclone implementation into wireproto

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

mergetools.hgrc: add vimdiff Imported from deb_specific__mergetools patch in Debians patch queue: http://svn.debian.org/viewsvn/python-apps/packages/mercurial/trunk/debian/patches/

Merge with stable

zeroconf: small fixes in docstring Use reST role for consistency, import small part of Debian's proposed_upstream__correct-zeroconf-doc patch from http://svn.debian.org/viewsvn/python-apps/packages/mercurial/trunk/debian/patches/

hgweb: add link to wiki

hgweb.wsgi: add a URL to the corresponding wiki documentation Imported for_upstream__add_doc_url_in_example_files.patch from Debian's patch queue: http://svn.debian.org/viewsvn/python-apps/packages/mercurial/trunk/debian/patches/

churn: remove tuple parameter unpacking (deprecated in py3k)

record: removed 'reduce' calls (unsupported by py3k) Quoting python's documentation, "Note that sum(range(n), m) is equivalent to reduce(operator.add, range(n), m)". The "sum" function is a builtin from 2.3 on and there's no reason for not to use it.

record: tuple parameter unpacking is deprecated in py3k

convert: tuple parameter unpacking is deprecated in py3k

revlog: Marked classic int divisions as such.

Merge with stable (again)

debugger: give a little intro before entering pdb

debugger: show traceback before entering pdb post-mortem

Merge with stable

wix: generate a new GUID for the help folder A GUID change is recommended after changes like 159233cc9c14

wix: pick up new help topics added between 1.5 and 1.6 These files are not included the 1.6.0 installer, but will be picked up by nightly builds as soon as this makes it to the stable branch.

Added signature for changeset f786fc4b8764

Added tag 1.6 for changeset f786fc4b8764

log: follow filenames through renames (issue647) In commands.log a displayer was initialized from cmdutil.show_changeset() with the initial matchfn (which designates the specified files which only is correct in the highest revision in the range). prep() is handed the correct list of files, but displayer.show() didn't use that list but keept using the original matchfn. The matchfn argument to cmdutil.show_changeset() wasn't specified in other places and is only used in .show(), so now we give the matchfn as an optional parameter to .show(). We do however still have to detect --patch and --stat from opts in show_changeset() and let it imply a matchall, but that can now be overruled with the new .show() matchfn parameter.

i18n-pt_BR: synchronized with d3c3e2fdeb0c

commit: add missing _()

subrepo: refuse to commit subrepos if .hgsub is excluded (issue2232)

Merge with i18n

i18n-da: translated eol extension and various small strings

i18n-ja: synchronized with 13d02d6677f2

i18n-pt_BR: synchronized with 59af1d65029c

merge with stable

i18n-sv: synchronized with 13d02d6677f2

i18n-pt_BR: synchronized with 9fa255c32406

Merge with stable

i18n-pt_BR: glossary.txt translation

i18n-sv: output from 'hg' is once again fully Swedish

i18n-sv: synchronized with 469a48dff18b

i18n-pt_BR: synchronized with 2186124f08e4

Merge with stable

i18n-sv: synchronized with 4d03c3680400

subrepo: correctly handle update -C with modified subrepos (issue2022) (based on a patch by Saint Germain)

http: deliver hook output to client

setup: ignore failures to build optional inotify extension

revset: make negate work for sort specs

update: synchronize permissions in the dirstate (issue1473) fix by Benoit, updated by mpm to not affect all clean files

heads: fix templating of headers again (issue2130) (tweaks and test by mpm)

minirst: use unicode string as intermediate form for replacement Some character encodings use ASCII characters other than control/alphabet/digit as a part of multi-bytes characters, so direct replacing with such characters on strings in local encoding causes invalid byte sequences.

subrepo: fix recording of + in .hgsubstate (issue2217)

mq: qimport cleanup on fail (issue2214) save state of successfully added patches and ensure cleanup on the way out.

test-acl: don't use $PWD solaris ....

test-alias: don't use the environment variable PWD solaris ...

revert: Make it clearer when not to use revert

progress: check stderr.isatty() before each print This prevents writing progress information to a non-tty stderr if one is swapped in after startup, which happens in `hg serve`.

http digest auth: reset redirect counter on new requests (issue2255) This fixes a regression introduced in a1e575b48563 when Mercurial reuses the auth handler for several requests and the redirect counter never is reset.

revset: deal with empty sets in range endpoints (spotted by Julian Cowley <julian@lava.net>)

subrepo: fix silent push failure for SVN (issue2241)

merge: pass constant cset ancestor to fctx.ancestor

context: allow passing the common cset ancestor to fctx.ancestor This is used by the next patch to speed up merge.applyupdates.

merge: document how to 'undo' a merge

resolve: do not crash on empty mergestate I managed to get an empty .hg/merge/state file by interrupting a merge by pressing Control-C. This lead to this error: TypeError: a2b_hex() argument 1 must be string or read-only buffer, not None since localnode is assigned None before the iteration over lines in the mergestate begins.

revset: fix spelling typo

parser: fix URL to effbot

glog: fix crash on empty revision range

mercurial.spec: don't include convert-repo - use "hg convert" instead