- Apr 22, 2012
-
-
kiilerix authored
f64b25f147d7 established that '... do true ...' shouldn't be used, but that was only enforced on continued lines.
-
kiilerix authored
This removes the pitfall that would make the testpath r'a|b' match 'b' on all lines in .t tests.
-
kiilerix authored
There is no need to use entropy here just to create some content that only will be used for hashing and ignored. This avoids a problem where dd from /dev/urandom on solaris generates too short output.
-
- Apr 23, 2012
-
-
Cesar Mena authored
If the default python encoding was changed from ascii, the attempt to encode as ascii before lower() could throw a UnicodeEncodeError. Catch UnicodeError instead to prevent an unhandled exception.
-
Patrick Mézard authored
cbf2ea2f5ca1 introduced some logic to avoid case-collision detection between source and destination revisions when it does not make sense: clean or to be cleaned working directories. Unfortunately, part of it was flawed and the related test was broken by another bug. This patch disables cross revision case collision detection for updates without option or with --check, if the working directory is clean.
-
Patrick Mézard authored
Aka "we could use dirty() but... yeah let's use it"
-
Patrick Mézard authored
-
- Apr 21, 2012
-
-
Steven Stallion authored
-
- Apr 23, 2012
-
-
Brendan Cully authored
-
- Apr 22, 2012
-
-
kiilerix authored
-
kiilerix authored
Nobody complained over '\0' in test-eol.t. The too strict check becomes a problem when this check is applied to more lines.
-
kiilerix authored
-
kiilerix authored
-
kiilerix authored
The check was broken when it was introduced in 6e4cf8319f54.
-
kiilerix authored
This test gave random failures on slow machines (solaris). The test was added in 6f6e210b38cf as a test case from issue148. It did however require manual setup: The attached script creates such a corruption (you have to add a "import time; time.spleep(3)" in localrepo.addchangegroup before the changegroup manifest are written for example. The test as it is has thus no value as automatic test case. The necessary sleep could be added by a hook, but test-pending.t already tests that.
-
kiilerix authored
The output from the background process was not always interleaved "correctly" with output from the foreground process.
-
kiilerix authored
This should have been caught by check-code.
-
- Apr 18, 2012
-
-
Thomas Arendsen Hein authored
-
- Apr 15, 2012
-
-
Katsunori FUJIWARA authored
if the file in target context causes case-folding collision against one in working context, current implementation aborts merging with it, even thouhg collding one (in target) is the file renamed from collided one (in working). this patch uses file copy information to know whether colliding file is renamed from collided one or not: if so, collision between them is ignored. this patch also avoids collision detection between current context and target context, if working context is clean (with --check/-c) or will be clean (with --clean/-C).
-
- Apr 20, 2012
-
-
durin42 authored
This means that threaded webservers will have more of a chance of doing something useful while the C extension is busy computing a delta. Not doing this was causing problems for Google Code with a 25 meg text file that takes O(7 minutes) to deltify.
-
Kevin Bullock authored
-
Patrick Mézard authored
Here is how export and mq write the "Parent" header: mq: # Parent XXXXX export: # Parent XXXXX then import expects exactly 2 spaces while mq tolerates one or more. So "hg import --exact" truncates mq generated patches header by one character and fails. This patch aligns import "Parent" header parsing on mq one. I do not expect spaces in parent references anytime soon. Reported by Stefan Ring <stefanrin@gmail.com>
-
- Apr 19, 2012
-
-
Adrian Buehlmann authored
As proposed by Christophe Gouiran <christophe.gouiran@eurocopter.com>
-
Idan Kamara authored
-
Idan Kamara authored
-
Idan Kamara authored
-
Idan Kamara authored
-
Katsunori FUJIWARA authored
in hgweb help top page, help topics are localized, but abstracts of commands and extensions are not, although these are already translated. it is because localized messages for them should be explicitly looked up by original ones. this patch looks localized messages up for each commands/extensions.
-
Angel Ezquerra authored
The warning is similar to the warning that was shown before hgsubrepo revert support was added, with the exception that now the subrepo type is shown. For example, when trying to revert a git subrepo located in "include/mygitsub", the warning message would be: include/mygitsub: reverting git subrepos is unsupported
-
Bryan O'Sullivan authored
-
- Apr 18, 2012
-
-
Patrick Mézard authored
Subversion conversion works by picking trunk and branches heads, computing a revision graph from them and converting the selected commits. By design we fail to convert empty revisions so we have to be careful when discovering the revision graph. In this particular issue, the source svn repository was a partial mirror made by svnsync. The funny part is svnsync preserves all revisions including empty ones. Also, we trusted ra.stat(path, stop).created_rev to give us the latest revision with changes in path history up to stop. This assumption broke at least when path is '', that is the repository root, which always returned 'stop' revision despited being empty. The workaround is to first trust ra.stat() but if the returned revision appear empty, search the whole path history from stop to r1 until some changes are found.
-
Patrick Mézard authored
We will call it more than once for reasons detailed later.
-
Patrick Mézard authored
stop=0 could pass for a valid default value at first sight.
-
Steven Stallion authored
The factotum extension used mount and path entries which were too generic. These have been replaced by mountpoint and executable (respectively) to match existing conventions.
-
Matt Mackall authored
-
Matt Mackall authored
-
Matt Mackall authored
The recent introduction of pure/__init__.py causes mercurial/__init__.py to get clobbered by make clean.
-
- Apr 17, 2012
-
-
Matt Mackall authored
-
Idan Kamara authored
The --amend flag can be used to amend the parent of the working directory with a new commit that contains the changes in the parent in addition to those currently reported by "hg status", if there are any. The old commit is stored in a backup bundle in ".hg/strip-backup"(see "hg help bundle" and "hg help unbundle" on how to restore it). Message, user and date are taken from the amended commit unless specified. When a message isn't specified on the command line, the editor will open with the message of the amended commit. It is not possible to amend public changesets (see "hg help phases") or changesets that have children. Behind the scenes, first commit the update (if there is one) as a regular child of the current parent. Then create a new commit on the parent's parent with the updated contents. Then change the working copy parent to this new combined changeset. Finally, strip the amended commit and update commit created in the beginning. An alternative (cleaner?) approach of doing this is suggested here: http://selenic.com/pipermail/mercurial-devel/2012-March/038540.html It is currently not possible to amend merge commits or recursively, this can be added at a later time.
-
Steven Stallion authored
-