- Jul 26, 2020
-
-
Gregory Szorc authored
This is a follow-up to 72feaeb510b3, which introduced the feature. The key should be documented as part of the format specification inside the extension docstring. Differential Revision: https://phab.mercurial-scm.org/D8838
-
- Jul 28, 2020
-
-
Martin von Zweigbergk authored
The same procedure as every year^Wcycle. Differential Revision: https://phab.mercurial-scm.org/D8839
-
Manuel Jacob authored
Before 0ecb3b11fcad, `wctx._compact()`, was called by `wctx.nofilechanges()` as a side effect. Later, it turned out that this side effect is needed to correctly detect which files changed. See https://phab.mercurial-scm.org/D8733#131949 for the history. The problem could also be triggered by running `tests/test-rebase-parameters.t` with `--extra-config-opt rebase.experimental.inmemory=1`. Differential Revision: https://phab.mercurial-scm.org/D8843
-
Manuel Jacob authored
This partially backs out 6a5dcd754842. The method was and is unused, but a call to it is introduced in the next patch. Differential Revision: https://phab.mercurial-scm.org/D8842
-
- Jul 23, 2020
-
-
Pierre-Yves David authored
The main difference from the previous test is how the changeset was obsoleted. In this case it is an amend so publishing the orphan would also create phase divergence. This must not go unnoticed.
-
Pierre-Yves David authored
This introduce a simple example, more are coming. See inline documentation for details.
-
Pierre-Yves David authored
In this one, orphan was create with and amend instead of a prune.
-
Pierre-Yves David authored
This is introduce a simple example, more are coming. See inline documentation for details.
-
Pierre-Yves David authored
Changeset c26335fa4225 has good intends but introduce significant behavior regressions for multiple important cases. In short there are many case where push would have caught instability creation/propagation that are no longer covered. These behavior have been covered for many years and even if some related case are not currently caught, the covered one should not be regressed. The next four changesets introduce tests for some of these cases. However we could produce many more tests cases since the area is wide and they are many possible combination. (And we should cover them when getting back to this issue) Since 5.5 is one week away, the most reasonable approach seems to back this out while we devise a new way to move forward that preserve the current behavior, catch more issues and also improves the situation that c26335fa4225 target. In addition to the behavior change, c26335fa4225 also introduced output changes. These output changes does not requires a backout per-se, but are part of the same changeset. However they come with a couple of issues that also requires attention: 1) the bulk of the error message have been shoehorned into a multiple line abort message. This seems quite different from what we usually do. The abort message should be a compact and efficient message, with extra details being issued as normal error output beforehand. (with --verbose/--quiet) support. 2) the current output is unbounded, so if there is many (tens, hundreds, thousands, …) of unstable/obsolete changeset involved in the push, the output can quickly become a scary and un-usuable wall of text. So we need some limitation here (same as we have with the remote head list that says A, B , C and # others).
-
Pulkit Goyal authored
On python 2 with chg, `mercurial.error` is omitted while printing error. On other cases it's there in error message. I did tried to understand what might be the cause was unable to find one on quick skim through the code.
-
Pierre-Yves David authored
Spotted by test-check-pyflakes.t
-
- Jul 20, 2020
-
-
Manuel Jacob authored
After having written the notes, I realized that the added points contain changes that were part of the 5.4.2 release. These were never included in any release notes. I asked on IRC whether they should be added to this file or not, but didn’t get an answer to this question. If they should not be added here, I can remove them. Differential Revision: https://phab.mercurial-scm.org/D8770
-
Manuel Jacob authored
The two points were written by me. For some reason, I missed the fact that the other points were indented by one space. Differential Revision: https://phab.mercurial-scm.org/D8769
-
Manuel Jacob authored
Differential Revision: https://phab.mercurial-scm.org/D8768
-
- Jul 22, 2020
-
-
Pulkit Goyal authored
I investigated and it seems like under high load, the child process is already there and no new fork was created. Hence the process was not closed.
-
- Apr 22, 2020
-
-
Connor Sheehan authored
Calling `.format()` on a byte-string does not work, thus causing an exception on Python 3. This commit adds a function to paper over the difference. Differential Revision: https://phab.mercurial-scm.org/D8781
-
Connor Sheehan authored
Fixes a Python 3 compat error when using the external bundle store. Differential Revision: https://phab.mercurial-scm.org/D8780
-
- Jul 20, 2020
-
-
Yuya Nishihara authored
On Python 3, flush() appears not discarding buffered data on EPIPE, and the buffered data will be carried over to the restored stdout.
-
- Jul 21, 2020
-
-
Yuya Nishihara authored
-
- Jul 20, 2020
-
-
Pulkit Goyal authored
-
Pulkit Goyal authored
-
- Jul 18, 2020
-
-
Yuya Nishihara authored
It helps understand which object should be decrefed on goto release.
-
Yuya Nishihara authored
The phaseroots variable is used for two different objects: borrowed set and owned dict of sets. It's hard to track which object should have to be decrefed on error return.
-
Yuya Nishihara authored
"N" means "O" without incref, so we can just return the created tuple.
-
Yuya Nishihara authored
This should never happen, but the code looks wrong without PyErr_Set*() call.
-
Yuya Nishihara authored
-
Yuya Nishihara authored
PySet_Check() does not set an exception.
-
- Jul 19, 2020
-
-
Yuya Nishihara authored
The stat object would be freed on error for the same reason as the previous patch. makestat() can be inlined, but this patch doesn't change it. https://github.com/python/cpython/blob/2.7/Python/modsupport.c#L292 The __APPLE__ code is untested.
-
Yuya Nishihara authored
Since Py_BuildValue() steals the ownership of "N" arguments, these objects would already be freed if Py_BuildValue() returned NULL. https://github.com/python/cpython/blob/2.7/Python/modsupport.c#L292
-
- Jul 20, 2020
-
-
Manuel Jacob authored
The previous regex only matched the first digit, so "clang-format version 10.0.0" was recognized as version 1.
-
- Jul 14, 2020
-
-
Daniel Ploch authored
This enables extensions to define commands that delgate to rebase, evolve, etc. one or more times to also have their own unfinished states for the full sequence of operations without monkey-patching _unfinishedstates. Differential Revision: https://phab.mercurial-scm.org/D8714
-
- Jul 17, 2020
-
-
Manuel Jacob authored
In changeset f55099982bc5, I introduced the message "became empty and became ...", which I was never very happy with. Raphaël Gomès suggested "became empty as ...". That sounds much nicer. Differential Revision: https://phab.mercurial-scm.org/D8765
-
- Jul 18, 2020
-
-
Jörg Sonnenberger authored
Differential Revision: https://phab.mercurial-scm.org/D8767
-
- Jul 14, 2020
-
-
Pulkit Goyal authored
In future patches, I want to add one more return value which represents information which needs to stored and used at commit time. Differential Revision: https://phab.mercurial-scm.org/D8741
-
- Jul 09, 2020
-
-
Pulkit Goyal authored
merge.update() is quite hard to understand, found this an easy win. The end goal is to have better organized merge and mergestate handling and then fix some related bugs. Differential Revision: https://phab.mercurial-scm.org/D8740
-
Pulkit Goyal authored
Understanding that dict is important for understanding how mergestate is performing operations on dirstate. Differential Revision: https://phab.mercurial-scm.org/D8739
-
Pulkit Goyal authored
The old variable name `r` makes it ~impossible to understand what does it mean. One can only understand that after going to callers and hoping that its documented there. I also documented return value of the function involved while I was there. Differential Revision: https://phab.mercurial-scm.org/D8738
-
Pulkit Goyal authored
This function is updating dirstate which sounds like not something which a method on mergestate class should do. Also this just calls another function. Lets directly call that function and remove this reducing mergestate responsibility a bit. There was single caller which is updated. Differential Revision: https://phab.mercurial-scm.org/D8737
-
Pulkit Goyal authored
This makes clear which mergestate record is used for what and group them based on how they are used right now. Differential Revision: https://phab.mercurial-scm.org/D8719
-