localrepo: add revs helper method

merge with stable, reopen default branch

Added signature for changeset 41453d55b481

Added tag 2.0 for changeset 41453d55b481

dirstate: don't fail when dropping a not-tracked file (issue3080) Complex merges with divergent renames can cause a file to be 'moved' twice, causing dirstate.drop() to be called twice. Rather than try to ensure there are no unexpected corner cases where this can happen, we simply ignore drops of files that aren't tracked.

tests: fix readline escape characters in heredoctest.py/test-url.py This fix mirrors the changes made to test-doctest.py in b856071435f7 and 967adcf5910d. Without this change, tests running heredoctest.py can fail on certain versions of OS X when TERM is set to xterm-256color: $ /opt/local/Library/Frameworks/Python.framework/Versions/2.7/Resources/Python.app/Contents/MacOS/Python -m heredoctest <<EOF > >>> open('b', 'w').write('this' * 1000) > EOF + \x1b[?1034h (no-eol) (esc) A similar problem occurs with test-url.py: $ ./run-tests.py test-url.py --- .../tests/test-url.py.out +++ .../tests/test-url.py.err @@ -0,0 +1 @@ + ERROR: .../test-url.py output changed ! Failed test-url.py: output changed # Ran 1 tests, 0 skipped, 1 failed.

merge with i18n

i18n-pt_BR: synchronized with a53888685a6c

merge with i18n

i18n-ja: synchronized with b357a972d6cd

minirst: use unicode string as intermediate form for replacement # this change redones part of 521c8e0c93bf, backed out by 0ad0ebe67815 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. [mpm: test changed to simple doctest]

util: add a doctest for empty sha() calls

largefiles: replace tempfile.NamedTemporaryFile with tempfile.mkstemp This is consistent with the rest of Mercurial's code, mirroring the try-finally-unlink structure elsewhere. Furthermore, it fixes the case where largefiles throws an IOError on Windows when the temporary file is opened a second time by copytocacheabsolute. This patch creates the temporary file in the repo's largefiles store rather than /tmp, which might be a different filesystem.

util: allow sha1() with no args Normally this works because we replace util.sha1 with hashlib.sha1 after first use, but if the first user doesn't provide an arg, it breaks.

tests: use md5sum.py instead of sha1sum, add check

setup: set whole env for running hg even if .hg doesn't exist (issue3073) The issue was partially fixed by b357a972d6cd, but there were missing variables to run build_hgextindex.

keyword: backout realpath change (issue3071)

strip: backout 73307643a09f (issue3077)

largefiles: avoid checking requirements on every command When largefiles is enabled, commands on large repositories which don't require largefiles could be slowed down substantially. Disable checking this for every command.

largefiles: shorten test suite by using log --template

largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on

largefiles: test that a largefile cannot accidentally be re-added as a regular file

backout dbdb777502dc (issue3077) (issue3071) Using util.realpath turns out to create complex issues on both Mac and Windows. Back this change out for the release.

largefiles: fix uppercase in abort message

Makefile: adjust example, test-merge1 is now test-merge1.t

tests: use $DAEMON_PIDS and killdaemons in largefiles test $DAEMON_PIDS is used by tests to make sure there will be no leftover processes, the cycling through ports is needed because they are not available for a new bind that quickly on some systems. There are not enough $HGPORT variables available for each hg serve, so use the killdaemons script before reusing ports.

tests: make largefiles test use $HGPORT instead of 8001

merge in another fix on the wrong branch

hgweb: fix dynamic date calculation not working under Safari While Chrome, Firefox, and IE 6+ support the current date format being passed to Date(), Safari doesn't: > new Date('Mon Oct 24 13:58:01 2011 +0200') Invalid Date However, the rfc822date format--officially supported by ECMAScript[1]--does work: > new Date('Mon, 24 Oct 2011 13:58:01 +0200') Mon Oct 24 2011 04:58:01 GMT-0700 (PDT) This change replaces all instances of {date|date} in HTML with {date|rfc822date}. For elements that only have the "age" class, there's no outward change for users with JavaScript enabled. For elements with both the "age" and "date" classes, the full date displayed uses the new format. Tested in IE 6, Safari 5.1.1, Google Chrome 15, and Firefox 7.0.1. [1]: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Date/parse

tests: fix spurious largefiles test failure on Cygwin

revert: fix missing removes when parent was changed in dirstate When dirstate parent is changed with dirstate.setparent before a revert so it no longer points to where the dirstate refered to, revert does not remove all files it should: Revert to a different revision needs also to remove files that are not found through disptables and not in the context or parent manifest.

check-code: fix issues with finding patterns in unified tests, fix tests - old-style patterns without ^ were getting improperly anchored - finditer was matching against beginning of line poorly - \s was matching newlines - [^x] was matching newlines so we: - remove earlier hacks for multiline matching - fix unified test anchoring by adding .* - replace \s with [ \t] - replace [^x] with [^\nx] - force all matches into multiline mode so ^ anchors work This uncovers a number of test issues that are then repaired.

largefiles: remove lfutil.createdir, replace calls with util.makedirs

largefiles: fix typo

largefiles: bugfix for symlink handling with testcase The code was using the size of a symlink's target, thus wrongly making symlinks to large files into largefiles themselves. This can be demonstrated by deleting the symlink and then doing an 'hg up' or 'hg up -C' to restore the symlink.

i18n-it: fixed wrong message

setup: set env global earlier (3073)

largefiles: test reverting largefiles (coverage creeping ever upwards) This reveals a small bug: revert reports "reverting .hglf/largefile" when it really should report "reverting largefile". I don't see an easy fix, though (short of using ui.pushbuffer() to interfere with revert's output).

largefiles: test "update --check" It works fine; I'm just getting the test coverage up.

tests: fix check-code detection of anchored expressions, fix echo -n usage

diffstat: be more picky when marking file as 'binary' (issue2816) The 'Bin' marker was added to every changed file for which we could not find any diff changes. This included binary files but also copy/renames and mode changes. Since Mercurial regular diff format emits a 'Binary file XXX has changed' line when fed with binary files, we use that and the usual git marker to tell them from other cases. In particular, new empty files are no longer reported as binary. Still, this fix is not complete since copy/renames/mode changes are now reported as '0' lines changes, instead of 'Bin'.

i18n-pt_BR: synchronized with b74f74b482d8

graft: add a test

graft: fix duplicate filter logic

graft: fix duplicate scan message

util: don't complain about '..' in path components not working on Windows

graft: fix formatting of message

largfiles: drop unused import

consistency: use util.realpath instead of os.path.realpath where useful exceptions: hg: os.path.realpath used before util can be imported tests/run-tests.py: may not import mercurial modules

keyword: use util.realpath instead of os.path.realpath This makes test-keyword.t pass on Python 2.4.1 (e.g. Debian sarge)

posix: workaround for os.path.realpath bug in Python 2.4.1 and before os.path.realpath didn't resolve symlinks that were the first component of the path, see http://bugs.python.org/issue1213894

largefiles: improve markup in module help text

largefiles: remove redundant documentation The extension help text already covered what was in usage.txt and design.txt is now moved to the wiki: http://mercurial.selenic.com/wiki/LargefilesExtension

largefiles: use ui.configpath() where appropriate

largefiles: drop more unnecessary compatibility checks

windows: sanity-check symlink placeholders On Windows, we store symlinks as plain files with the link contents. Via user error or NFS/Samba assistance, these files often end up with 'normal' file contents. Committing these changes thus gives an invalid symlink that can't be checked out on Unix. Here we filter out any modified symlink placeholders that look suspicious when computing status: - more than 1K (looks more like a normal file) - contain NULs (not allowed on Unix, probably a binary) - contains \n (filenames can't contain \n, very unusual for symlinks, very common for files)

largefiles: use util.sha1() instead of hashlib.sha1() everywhere

tests: check for svn >= 1.3 and >= 1.5 in tests that require those versions

convert: add missing import of util, needed for svn < 1.6

run-tests: make sure no_proxy/NO_PROXY are empty to fix test-http-proxy.t If no_proxy (or NO_PROXY) includes localhost, the test for detecting an unreachable proxy fails, because the proxy setting is ignored.

largefiles: test "lfconvert --to-normal" with rename/remove/merge This gets us very close to full test coverage of lfconvert. The only features not tested are: - .hgtags conversion - abort when largefile becomes symlink

largefiles: test lfconvert with rename, remove, and merge

largefiles: beef up test-lfconvert.t so it's more thorough - instead of converting a single changeset with a single file, convert two changesets which each add a mix of normal and large files - make one of the large files not-so-large, but identified as large by filename - use shorter, simpler filenames - put some files in a subdirectory - test that file contents are correctly converted - drop unnecessary cleanup step

largefiles: rearrange how lfconvert detects non-local repos Mainly this is so we can test that code; it has the side benefit of not requiring network I/O to reject non-local repo URLs.