[Bug 6350] New: test-obsolete-distributed.t: test data contains runtime in output

2020-06-09 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=6350 Bug ID: 6350 Summary: test-obsolete-distributed.t: test data contains runtime in output Product: Mercurial Version: 5.4rc0 Hardware: All OS: NetBSD

D8178: heptapod-ci: also run tests for chg on python 2

2020-06-09 Thread marmoute (Pierre-Yves David)
Closed by commit rHGaa568b6c6a10: heptapod-ci: also run tests for chg on python 2 (authored by marmoute). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8178?vs=20967&id=21577 CHANG

[Bug 6351] New: run-tests.py blacklisting fails to work in some situation

2020-06-09 Thread mercurial-bugs
https://bz.mercurial-scm.org/show_bug.cgi?id=6351 Bug ID: 6351 Summary: run-tests.py blacklisting fails to work in some situation Product: Mercurial Version: unspecified Hardware: PC OS: Linux St

Re: [PATCH stable] resourceutil: fix location of line comments

2020-06-09 Thread Pierre-Yves David
Good catch, LGTM On 6/9/20 5:25 AM, Manuel Jacob wrote: # HG changeset patch # User Manuel Jacob # Date 1591673085 -7200 # Tue Jun 09 05:24:45 2020 +0200 # Branch stable # Node ID 6c8384afbf770be2167478fff3cb9b92e1182a06 # Parent 1f114c797961733ea03d0de88390f9555a7edef4 resourceutil: fix

D7944: localrepo: handle ValueError during repository opening

2020-06-09 Thread marmoute (Pierre-Yves David)
marmoute added a comment. This patch is still correct, not sure why it is not it yet. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7944/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7944 To: indygreg, #hg-reviewers, marmoute, baymax Cc: mer

Re: [PATCH 3 of 3] simplemerge: rewrite flag merging loop as expression

2020-06-09 Thread Pierre-Yves David
Sure, I'll wait for these series to get in first. On 6/7/20 1:54 PM, Yuya Nishihara wrote: On Sat, 6 Jun 2020 14:42:00 +0200, Pierre-Yves David wrote: On 6/6/20 5:04 AM, Yuya Nishihara wrote: On Fri, 5 Jun 2020 16:24:17 +0200, Pierre-Yves David wrote: On 6/4/20 4:15 PM, Yuya Nishihara wrote:

Re: [PATCH stable v2] py3: stop using block-buffered stdout to TTY on Python 3

2020-06-09 Thread Pierre-Yves David
Sigh, this seems like a good enough fix for now. We can rewrite the UI layer in rust later ;-) On 6/7/20 12:55 AM, Manuel Jacob wrote: # HG changeset patch # User Manuel Jacob # Date 1591333053 -7200 # Fri Jun 05 06:57:33 2020 +0200 # Branch stable # Node ID d1754bf05591d2aee0f5f9dec185fa

D7177: rebase: introduce optional parent mapping

2020-06-09 Thread marmoute (Pierre-Yves David)
marmoute added a comment. In D7177#128389 , @martinvonz wrote: > Maybe another option is to allow multiple `-d` arguments for this case? Something like `hg rebase -r C -d B -d D`. I haven't thought through BC, but I think that's what I'd pref

D7944: localrepo: handle ValueError during repository opening

2020-06-09 Thread indygreg (Gregory Szorc)
Closed by commit rHG9e5b4dbe8ff2: localrepo: handle ValueError during repository opening (authored by indygreg). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Revision". REPOSITORY rHG Mercuria

Re: Failing tests for mercurial 5.4rc0 and python3

2020-06-09 Thread Pierre-Yves David
This looks like the merge tool is not properly found. Can you report a formal bug on https://bz.mercurial-scm.org/ to start a discussion to debug this ? On 4/23/20 3:56 PM, Vladimir Lomov wrote: Hello, I want to report about failing tests while building and running mercurial with python3 (see

D7177: rebase: introduce optional parent mapping

2020-06-09 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. In D7177#128740 , @marmoute wrote: > In D7177#128389 , @martinvonz wrote: > >> Maybe another option is to allow multiple `-d` arguments for this case? Something like

D7177: rebase: introduce optional parent mapping

2020-06-09 Thread marmoute (Pierre-Yves David)
marmoute added a comment. In D7177#128756 , @martinvonz wrote: > In D7177#128740 , @marmoute wrote: > >> In D7177#128389 , @martinvonz wrote: >>

D7177: rebase: introduce optional parent mapping

2020-06-09 Thread martinvonz (Martin von Zweigbergk)
martinvonz added a comment. In D7177#128757 , @marmoute wrote: > In D7177#128756 , @martinvonz wrote: > >> In D7177#128740 , @marmoute wrote: >>

D8621: phabricator: make it clear what happen when no response

2020-06-09 Thread khanchi97 (Sushil khanchi)
khanchi97 created this revision. Herald added subscribers: mercurial-patches, Kwan. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8621 AFFECTED FILES hgext/phabricator.py tests/test-phabricator.t CHANGE

[PATCH] hgext.git: decode node IDs back into Python strings (issue6349)

2020-06-09 Thread Hollis Blanchard
___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Re: [PATCH] hgext.git: decode node IDs back into Python strings (issue6349)

2020-06-09 Thread Augie Fackler
Empty message? try again? > On Jun 9, 2020, at 16:20, Hollis Blanchard > wrote: > > ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D8353: debugcommands: create new debugantivirusrunning command

2020-06-09 Thread durin42 (Augie Fackler)
durin42 added a comment. Best guess (given I've never hit an AV problem) is that the AV engine would lose its lunch on the EICAR file and alert the user. I figure if the AV engine isn't picking up on it after 2 seconds then it's probably also not a performance issue for us. REPOSITORY rHG

D8622: hgext.git: decode node IDs back into Python strings (issue6349)

2020-06-09 Thread hollisb (Hollis Blanchard)
hollisb created this revision. Herald added a reviewer: durin42. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY db.text_factory = bytes, so the database contains only strings. The object IDs we get from pygit2 are Python strings. b'foo' !=

D8624: wip: this does not help but seems less wrong

2020-06-09 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8624 AFFECTED FILES mercurial/mergestate.py CHANGE DETAILS diff --git a/mercurial

D8623: rebase: add environment variable to allow forcing in-memory rebase

2020-06-09 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a reviewer: martinvonz. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY Use it in a test case where we know the rebase should proceed without incident in-memory, so we can see tracebacks rather th

Re: [PATCH] hgext.git: decode node IDs back into Python strings (issue6349)

2020-06-09 Thread Augie Fackler
Thanks! I'll review there. > On Jun 9, 2020, at 16:51, Hollis Blanchard > wrote: > > Huh. 'hg email --test' worked fine, but without --test yielded an empty body. > > I've resubmitted as D8622 . > Hollis Blanchard > Mentor Graphics Emulation Division > On

D8625: git: add debug logging when there's a mismatch in the cached heads list

2020-06-09 Thread durin42 (Augie Fackler)
durin42 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY The dag rebuild can be expensive, so let's try and avoid bugs where it transparently rebuilds all the time for no reason. This would have prevented the issue f

Re: [PATCH] hgext.git: decode node IDs back into Python strings (issue6349)

2020-06-09 Thread Hollis Blanchard
Huh. 'hg email --test' worked fine, but without --test yielded an empty body. I've resubmitted as D8622 . Hollis Blanchard Mentor Graphics Emulation Division On 6/9/20 1:20 PM, Hollis Blanchard wrote: ___ Mercur

Re: [PATCH stable v2] py3: stop using block-buffered stdout to TTY on Python 3

2020-06-09 Thread Augie Fackler
Agreed, this LGTM. Yuya? I know you've been good at spotting issues in this area that I miss. > On Jun 9, 2020, at 07:21, Pierre-Yves David > wrote: > > Sigh, this seems like a good enough fix for now. We can rewrite the UI layer > in rust later ;-) > > On 6/7/20 12:55 AM, Manuel Jacob wrote

Re: [PATCH 3 of 3] simplemerge: rewrite flag merging loop as expression

2020-06-09 Thread Augie Fackler
On Thu, Jun 04, 2020 at 11:15:43PM +0900, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1591101897 -32400 > # Tue Jun 02 21:44:57 2020 +0900 > # Node ID 970abb8ea2a2d6a086ebfdd9a1130b2fb777640e > # Parent dba0ac9b68381e9610f25d9991bd623f85cbdefd > simplemerge:

Re: [PATCH stable] resourceutil: fix location of line comments

2020-06-09 Thread Augie Fackler
On Tue, Jun 09, 2020 at 01:13:26PM +0200, Pierre-Yves David wrote: > Good catch, LGTM > > On 6/9/20 5:25 AM, Manuel Jacob wrote: > > # HG changeset patch > > # User Manuel Jacob > > # Date 1591673085 -7200 > > # Tue Jun 09 05:24:45 2020 +0200 > > # Branch stable > > # Node ID 6c8384afbf770be2

Re: [PATCH] py3: make ui.write() call fout.flush() per line if fout is a tty or pager

2020-06-09 Thread Augie Fackler
On Sun, Jun 07, 2020 at 08:55:03PM +0900, Yuya Nishihara wrote: > # HG changeset patch > # User Yuya Nishihara > # Date 1591518045 -32400 > # Sun Jun 07 17:20:45 2020 +0900 > # Node ID ee3cd52b4b338e05b0a22cb87580d78f1ad7763d > # Parent 03ba7de6a8b9ab339a6dafab969e890228b4c2f1 > py3: make ui