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)