- Sep 09, 2020
-
-
Augie Fackler authored
This is broken on Python 3.9rc1, and while it sounds like there may be a fix in Python, we probably also should have this workaround in place in hg. See the bug for more details (including on bugs at redhat and b.p.o). Differential Revision: https://phab.mercurial-scm.org/D9004
-
- Sep 04, 2020
-
-
Matt Harbison authored
I've hit this a couple of times, where pulling with a dirty `wdir` obsoletes `p1` and updating to the successor results in merge conflicts. The problem was resolving them failed immediately, complaining that the old checkout was filtered. The change in `test-rebase-obsolete.t` is because there's an outstanding merge conflict in a rebase operation. The summary prompt to merge seems incorrect for this scenario, but that's an existing issue. Differential Revision: https://phab.mercurial-scm.org/D8980
-
- Sep 02, 2020
-
-
haraldkl authored
When running Mercurial on Python 3 hgweb expects the config variable to be a bytestring. The solution proposed by Anton Shestakov is to use a byteprefix to the literal string defined cgi script as provided in this patch for hgweb.cgi, contrib/hgweb.fcgi and contrib/hgweb.wsgi. I am not sure whether this covers all relevant templates, but I couldn't find others. Differential Revision: https://phab.mercurial-scm.org/D8978
-
- Sep 01, 2020
-
-
Augie Fackler authored
This doesn't work if you have a PyOxidized hg on $PATH, but everything is fine if you just ignore that problem. Differential Revision: https://phab.mercurial-scm.org/D8975
-
Manuel Jacob authored
Starting with Python 3.9, importing importlib.resources (indirectly) imports the zipfile module. Therefore, the module is not suitable for the test. Instead, we can use the ftplib module, which is very unlikely to be imported during the test run.
-
Pulkit Goyal authored
-
Pulkit Goyal authored
-
- Aug 27, 2020
-
-
Pierre-Yves David authored
Kindly reported by Tristan Seligmann <mithrandi@mithrandi.net>
-
- Aug 02, 2020
-
-
Cédric Krier authored
The readline method append to the chunks the content of the _rbuf then there is a loop that call _raw_read which on Python3 call readinto. But the readinto version in mercurial append again the _rbuf content. So this creates the duplicate content. This does not happen in Python2 because _raw_read does not call readinto. Differential Revision: https://phab.mercurial-scm.org/D8859
-
- Aug 03, 2020
-
-
Pulkit Goyal authored
-
Pulkit Goyal authored
-
- Aug 01, 2020
-
-
Pulkit Goyal authored
In fcd0cff3400a I removed the usage of RECORD_RESOLVED_OTHER. However I also removed the reading support, hence if there is any user who runs into merge conflict with older version of hg, upgrades hg and then tries to read mergestate, they will end up with an MergeRecordUnsupportedError.
-
- Jul 25, 2020
-
-
Yuya Nishihara authored
Without this change, dispatch.dispatch() could return before flushing all stdio data. This means chg stdio would print data after receiving the result code. --- tests/test-blackbox.t +++ tests/test-blackbox.t.err @@ -354,13 +354,13 @@ > EOF $ hg log --debug removing $TESTTMP/gone/.hg - warning: cannot write to blackbox.log: $ENOENT$ (no-windows !) warning: cannot write to blackbox.log: $TESTTMP/gone/.hg/blackbox.log: $ENOTDIR$ (windows !) $ cd .. blackbox should disable itself if track is empty $ hg --config blackbox.track= init nothing_tracked + warning: cannot write to blackbox.log: $ENOENT$ $ cd nothing_tracked $ cat >> .hg/hgrc << EOF > [blackbox]
-
- 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
-
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
-