- Sep 29, 2015
-
-
Gregory Szorc authored
This will be used so clone bundles can advertise whether URLs require SNI. This will be explained more in a subsequent patch.
-
- Oct 12, 2015
-
-
Siddharth Agarwal authored
Just like the BC to merge before it, this allows for a maximally consistent state before providing any prompts to the user.
-
Siddharth Agarwal authored
An upcoming patch will touch some code around this area, and I couldn't find any tests related to this.
-
Siddharth Agarwal authored
This basically shows the behavior of resolve with multiple files. An upcoming behavior change will cause this output to also change.
-
Siddharth Agarwal authored
We perform all that we can non-interactively before prompting the user for input via their merge tool. This allows for a maximally consistent state when the user is first prompted. The test output changes indicate the actual behavior change happening.
-
Siddharth Agarwal authored
The section of code that writes out the version of the file cached in the merge state should only be run at preresolve time. This is so that if the premerge keeps around conflict markers, those don't get overwritten before the main merge.
-
Siddharth Agarwal authored
We'll need this for a new 'preresolve' function we're adding.
-
Siddharth Agarwal authored
The resolve function will be broken up into separate pre-resolve and resolve steps.
-
- Oct 09, 2015
-
-
Siddharth Agarwal authored
The current output for a failed merge with conflict markers looks something like: merging foo warning: conflicts during merge. merging foo incomplete! (edit conflicts, then use 'hg resolve --mark') merging bar warning: conflicts during merge. merging bar incomplete! (edit conflicts, then use 'hg resolve --mark') We're going to change the way merges are done to perform all premerges before all merges, so that the output above would look like: merging foo merging bar warning: conflicts during merge. merging foo incomplete! (edit conflicts, then use 'hg resolve --mark') warning: conflicts during merge. merging bar incomplete! (edit conflicts, then use 'hg resolve --mark') The 'warning: conflicts during merge' line has no context, so is pretty confusing. This patch will change the future output to: merging foo merging bar warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') warning: conflicts while merging bar! (edit, then use 'hg resolve --mark') The hint on how to resolve the conflicts makes this a bit unwieldy, but solving that is tricky because we already hint that people run 'hg resolve' to retry unresolved merges. The 'hg resolve --mark' mostly applies to conflict marker based resolution.
-
- Oct 11, 2015
-
-
Siddharth Agarwal authored
We now exit early if we do a premerge, so extra checks are no longer necessary.
-
- Oct 12, 2015
-
-
Augie Fackler authored
-
Siddharth Agarwal authored
This means that in ms.resolve we must call merge after calling premerge. This doesn't yet mean that all premerges happen before any merges -- however, this does get us closer to our goal. The output differences are because we recompute the merge tool. The only user-visible difference caused by this patch is that if the tool is missing we'll print the warning twice. Not a huge deal, though.
-
Siddharth Agarwal authored
The premerge might leave the original file in an unclean state. Therefore it's important to only copy the file in the beginning.
-
Siddharth Agarwal authored
We're soon going to call this function twice, once for premerge and once for merge. This makes sure the "merging" output only gets printed during the premerge step.
-
- Oct 08, 2015
-
-
Siddharth Agarwal authored
It is no longer necessary to indent these parts.
-
- Oct 12, 2015
-
-
Siddharth Agarwal authored
This flag will let us get to our overall goal of performing all premerges before any merges.
-
- Oct 11, 2015
-
-
Siddharth Agarwal authored
In future patches, we'll pause merges after the premerge step. After the premerge step we'll return complete = False.
-
Siddharth Agarwal authored
We'll introduce a separate premerge function that calls the same code.
-
- Oct 08, 2015
-
-
Mads Kiilerich authored
d3908c911d5e introduced nice hexified display of missing nodes. It did however also make missing 20 character revision specifications be shown as hex - very confusing. Users are often wrong and somehow specify revisions that don't exist. Nodes will however rarely be missing ... and they will only look like a user provided revision specification and be all ascii in 1 of 4*10**9. With this change, missing revisions will only be hexified if they really look like binary nodes. This change will thus improve the error reporting UI in the common case and only very rarely make it confusing in the opposite direction of how it was before.
-
- Oct 12, 2015
-
-
Pierre-Yves David authored
Having the simple and tiny branch of the conditional first help readability. The "else" that appears after a screen of code is harder to relate to a conditional.
-
- Oct 09, 2015
-
-
Pierre-Yves David authored
That function is actually not returning public ancestors at all. This is pointed by the second line of the docstring... The bundling behavior was made correct in a5141977198d but with confusion remaining regarding what each function was doing. This close issue4737, because this highlight that shelve is actually -not- bundling too much data (this was actually properly tested).
-
Nathan Goldbaum authored
-
Nathan Goldbaum authored
This should allow easier experimentation with using setuptools in mercurial's build automation, without breaking anything that currently depends on distutils behavior
-
- Oct 12, 2015
-
-
Gijs Kruitbosch authored
-
Anton Shestakov authored
For reference, this was added to paper/coal in bb00a159e594 and to gitweb in b3b57ecbda50.
-
- Oct 09, 2015
-
-
Pierre-Yves David authored
We extend the comment about this code flaw with more code flaw.
-
Pierre-Yves David authored
The idea here is that the code is imperfect, not that it is impossible to get something behaving properly.
-
Pierre-Yves David authored
The current setup requires to pass both a packer and, optionally, the version of the unpacker. This is confusing and error prone as the two value cannot mismatch. Instead, we simply grab the version from the packer. This fixes a bug where requesting a cg2 from 'hg bundle' were reported as changegroup 1. I should have caught that in the initial changeset but I missed it somehow.
-
- Oct 12, 2015
-
-
Emanuele Giaquinta authored
This change makes the test pass on gcc112.fsffrance.org.
-
- Oct 07, 2015
-
-
Emanuele Giaquinta authored
cvsps computes the parent revisions of log entries by walking the cvs log sorted by (rcs, revision) and by iteratively maintaining a 'versions' dictionary which maps a (rcs, branch) pair onto the last revision seen for that pair. When log caching is on and a log cache exists, cvsps fails to set the parent revisions of new log entries because it does not iterate over the log cache in the parents computation. A complication is that a file rcs can change (move to/from the attic), with respect to its value in the log cache, if the file is removed/added back. This patch adds an iteration over the log cache to update the rcs of cached log entries, if changed, and to properly populate the 'versions' dictionary.
-
- Oct 06, 2015
-
-
Matt Mackall authored
This makes it more interruptible.
-
- Oct 11, 2015
-
-
Yuya Nishihara authored
The issue4888 was caused by 0-length obsolete marker. If msize is zero, fm1readmarkers() never ends. This patch adds several bound checks to fm1readmarker(). Therefore, 0-length and invalid-size marker should be rejected.
-
Yuya Nishihara authored
This will make it easy to implement bound checking. Currently fm1readmarker() has no protection for corrupted obsstore and can cause infinite loop or out-of-bound reads.
-
- Oct 08, 2015
-
-
Siddharth Agarwal authored
This isn't really a big deal because the temp files are created in $TMPDIR, but it makes some upcoming work simpler.
-
Pierre-Yves David authored
We have seen the light, please use the new way.
-
Pierre-Yves David authored
The home of 'Abort' is 'error' not 'util' however, a lot of code seems to be confused about that and gives all the credit to 'util' instead of the hardworking 'error'. In a spirit of equity, we break the cycle of injustice and give back to 'error' the respect it deserves. And screw that 'util' poser. For great justice.
-
- Oct 06, 2015
-
-
Pierre-Yves David authored
The variable 'error' conflict with the module name that we would like to import and use in a coming changeset.
-
Pierre-Yves David authored
The variable 'error' conflict with the module name that we would like to import and use in a coming changeset.
-
- Oct 05, 2015
-
-
Christian Delahousse authored
When an user aborts a histedit, many things could go wrong. At a minimum, after a histedit abort failure, their repository should be out of that state. We've found situations where the user could not exit the histedit state without manually deleting the histedit state file. This patch ensures that if any exception happens during an abort, the histedit statefile will be deleted so that users are out of the histedit state and can at least manually get the repo back to a workable condition.
-
- Oct 06, 2015
-
-
Christian Delahousse authored
When the histeditstate class instance has it's clear() method called, there is nothing to check to see if the state file exists before deleting it. It may not exist, which would create an exception. This patch allows clear to be called at any time. This will be needed for the following patch.
-