- Nov 01, 2011
-
-
Matt Mackall authored
-
Matt Mackall authored
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.
-
Brodie Rao authored
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 authored
-
- Oct 31, 2011
-
-
Wagner Bruna authored
-
Wagner Bruna authored
-
Katsunori FUJIWARA authored
-
Katsunori FUJIWARA authored
# 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 authored
-
- Oct 20, 2011
-
-
Hao Lian authored
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.
-
- Oct 31, 2011
-
-
Matt Mackall authored
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 authored
-
- Oct 30, 2011
-
-
Yuya Nishihara authored
The issue was partially fixed by b357a972d6cd, but there were missing variables to run build_hgextindex.
-
Matt Mackall authored
-
Matt Mackall authored
-
- Oct 29, 2011
-
-
Matt Mackall authored
When largefiles is enabled, commands on large repositories which don't require largefiles could be slowed down substantially. Disable checking this for every command.
-
- Oct 28, 2011
-
-
Na'Tosha Bard authored
-
Na'Tosha Bard authored
largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on
-
Na'Tosha Bard authored
-
- Oct 29, 2011
-
-
Matt Mackall authored
Using util.realpath turns out to create complex issues on both Mac and Windows. Back this change out for the release.
-
- Oct 28, 2011
-
-
Martin Geisler authored
-
Thomas Arendsen Hein authored
-
Thomas Arendsen Hein authored
$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 authored
-
- Oct 27, 2011
-
-
Matt Mackall authored
-
Brodie Rao authored
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 authored
-
- Oct 26, 2011
-
-
Peer Stritzinger authored
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.
-
- Oct 27, 2011
-
-
Matt Mackall authored
- 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.
-
- Oct 25, 2011
-
-
Hao Lian authored
-
- Oct 26, 2011
-
-
Eli Carter authored
-
Eli Carter authored
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.
-
Stefano Tortarolo authored
-
Matt Mackall authored
-
- Oct 25, 2011
-
-
Greg Ward authored
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).
-
Greg Ward authored
It works fine; I'm just getting the test coverage up.
-
- Oct 26, 2011
-
-
Matt Mackall authored
-
- Oct 24, 2011
-
-
Patrick Mezard authored
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'.
-
Wagner Bruna authored
-
Matt Mackall authored
-