Brodie Rao <brodie@bitheap.org> [Tue, 01 Nov 2011 12:25:54 -0700] rev 15398
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.
Matt Mackall <mpm@selenic.com> [Tue, 01 Nov 2011 12:49:06 -0500] rev 15397
merge with i18n
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 31 Oct 2011 11:27:16 -0200] rev 15396
i18n-pt_BR: synchronized with
a53888685a6c
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 31 Oct 2011 11:24:37 -0200] rev 15395
merge with i18n
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Mon, 31 Oct 2011 20:58:49 +0900] rev 15394
i18n-ja: synchronized with
b357a972d6cd
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Mon, 31 Oct 2011 21:06:18 +0900] rev 15393
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]
Matt Mackall <mpm@selenic.com> [Mon, 31 Oct 2011 15:41:39 -0500] rev 15392
util: add a doctest for empty sha() calls
Hao Lian <hao@fogcreek.com> [Thu, 20 Oct 2011 17:24:59 -0400] rev 15391
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.
Matt Mackall <mpm@selenic.com> [Mon, 31 Oct 2011 14:22:11 -0500] rev 15390
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.
Matt Mackall <mpm@selenic.com> [Mon, 31 Oct 2011 14:22:11 -0500] rev 15389
tests: use md5sum.py instead of sha1sum, add check
Yuya Nishihara <yuya@tcha.org> [Mon, 31 Oct 2011 00:42:32 +0900] rev 15388
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.
Matt Mackall <mpm@selenic.com> [Sun, 30 Oct 2011 12:10:11 -0500] rev 15387
keyword: backout realpath change (
issue3071)
Matt Mackall <mpm@selenic.com> [Sun, 30 Oct 2011 12:10:09 -0500] rev 15386
Matt Mackall <mpm@selenic.com> [Sat, 29 Oct 2011 17:38:13 -0500] rev 15385
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.
Na'Tosha Bard <natosha@unity3d.com> [Fri, 28 Oct 2011 18:50:54 +0200] rev 15384
largefiles: shorten test suite by using log --template
Na'Tosha Bard <natosha@unity3d.com> [Fri, 28 Oct 2011 18:48:24 +0200] rev 15383
largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on
Na'Tosha Bard <natosha@unity3d.com> [Fri, 28 Oct 2011 18:17:44 +0200] rev 15382
largefiles: test that a largefile cannot accidentally be re-added as a regular file
Matt Mackall <mpm@selenic.com> [Sat, 29 Oct 2011 11:02:23 -0500] rev 15381
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.
Martin Geisler <mg@aragost.com> [Fri, 28 Oct 2011 15:00:21 +0200] rev 15380
largefiles: fix uppercase in abort message
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 28 Oct 2011 12:59:50 +0200] rev 15379
Makefile: adjust example, test-merge1 is now test-merge1.t
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 28 Oct 2011 12:44:19 +0200] rev 15378
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.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 28 Oct 2011 11:16:39 +0200] rev 15377
tests: make largefiles test use $HGPORT instead of 8001
Matt Mackall <mpm@selenic.com> [Thu, 27 Oct 2011 18:35:07 -0500] rev 15376
merge in another fix on the wrong branch
Brodie Rao <brodie@bitheap.org> [Thu, 27 Oct 2011 11:57:08 -0700] rev 15375
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
Matt Mackall <mpm@selenic.com> [Thu, 27 Oct 2011 18:15:34 -0500] rev 15374
tests: fix spurious largefiles test failure on Cygwin
Peer Stritzinger <peer@stritzinger.com> [Wed, 26 Oct 2011 18:47:12 +0200] rev 15373
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.
Matt Mackall <mpm@selenic.com> [Thu, 27 Oct 2011 17:22:04 -0500] rev 15372
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.
Hao Lian <hao@fogcreek.com> [Tue, 25 Oct 2011 11:45:28 -0400] rev 15371
largefiles: remove lfutil.createdir, replace calls with util.makedirs
Eli Carter <eli.carter@tektronix.com> [Wed, 26 Oct 2011 14:22:19 -0500] rev 15370
largefiles: fix typo
Eli Carter <eli.carter@tektronix.com> [Wed, 26 Oct 2011 13:48:33 -0500] rev 15369
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.