mercurial@49224: new changeset

[Mercurial Commits]

New changeset in mercurial:

https://www.mercurial-scm.org/repo/hg/rev/cdb85d0512b8
changeset:   49224:cdb85d0512b8
bookmark:@
tag: tip
user:Manuel Jacob 
date:Wed May 25 17:23:16 2022 +0200
summary: branching: fix wrong merge conflict resolution from 13dfad0f9f7a

-- 
Repository URL: https://www.mercurial-scm.org/repo/hg
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D5490: commit: remove ignore whitespace option on --interactive (issue6042)

[KenyaCollier (Kenya Collier)]

Herald added a subscriber: mercurial-patches.
KenyaCollier added a comment.


  Your ideas are incredible. The way of encouraging the new talent is truly 
good and completely amazing. I have been looking for high school essay writing 
 blogs and it's simply a 
wonderful time to gather the roles positions and timings.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D5490/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D5490

To: navaneeth.suresh, #hg-reviewers
Cc: mercurial-patches, KenyaCollier, spectral, yuja, durin42, pulkit, 
mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

mercurial@49223: 6 new changesets

[Mercurial Commits]

6 new changesets in mercurial:

https://www.mercurial-scm.org/repo/hg/rev/5b1495c37b0c
changeset:   49218:5b1495c37b0c
user:Pierre-Yves David 
date:Wed May 18 15:55:14 2022 +0100
summary: debugdeltachain: distinct between snapshot and "other" diffs

https://www.mercurial-scm.org/repo/hg/rev/0a86cb154e83
changeset:   49219:0a86cb154e83
user:Pierre-Yves David 
date:Wed May 18 16:07:55 2022 +0100
summary: debugdeltachain: use the symbolic constant to access entry 
information

https://www.mercurial-scm.org/repo/hg/rev/3376b5d9a697
changeset:   49220:3376b5d9a697
user:Pierre-Yves David 
date:Wed May 18 16:50:55 2022 +0100
summary: debugdeltachain: glob variance of "test-generaldelta"

https://www.mercurial-scm.org/repo/hg/rev/75d0775dce7f
changeset:   49221:75d0775dce7f
user:Pierre-Yves David 
date:Wed May 18 17:22:32 2022 +0100
summary: debugdeltachain: also display p1/p2

https://www.mercurial-scm.org/repo/hg/rev/e7d23c512d3d
changeset:   49222:e7d23c512d3d
user:Pierre-Yves David 
date:Wed May 18 17:29:03 2022 +0100
summary: debugdeltachain: document the possible value for deltatype

https://www.mercurial-scm.org/repo/hg/rev/13e523228623
changeset:   49223:13e523228623
bookmark:@
tag: tip
user:Pierre-Yves David 
date:Thu May 19 00:51:36 2022 +0100
summary: debugdeltachain: detect a special case where parents are "skipped"

-- 
Repository URL: https://www.mercurial-scm.org/repo/hg
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Re: [PATCH 1 of 2 stable] worker: do not suppress EINTR

[Manuel Jacob]

On 25/05/2022 14.55, Yuya Nishihara wrote:

On Wed, 25 May 2022 02:30:29 +0200, Manuel Jacob wrote:

# HG changeset patch
# User Manuel Jacob 
# Date 1653433864 -7200
#  Wed May 25 01:11:04 2022 +0200
# Branch stable
# Node ID d058898bdd462b03c5bff38ad40d1f855ea51c23
# Parent  477b5145e1a02715f846ce017b460858a58e03b1
# EXP-Topic worker-pickle-load-EINTR
worker: do not suppress EINTR

Before this change, when IOError with errno EINTR was raised during
pickle.load(), the error was suppressed and loading from other file descriptors
was continued.

On Python 3, system calls failing with EINTR are retried (PEP 475). Therefore,
the removal of this code should not make any difference.

On Python 2, this is not generally the case. CPickle has no handling of EINTR.
In one place it misinterprets it as EOF. In another place, it will raise
IOError. However, this could happen in the middle of the stream. In this case,
if pickle tries to load from the stream later, it will behave wrongly (usually
it will raise an error, but loading of incorrect data or interpreter crashes
are thinkable).


Do we want this (and the partial write fix) on stable?

The problem could occur if the payload were quite large, but I think it's
unlikely. Since writer issues a single os.write() in the original code,
reader wouldn't be interrupted in the middle of pickle message in general.


Yes, the problems fixed by the two series exist, but we can assume that 
they are very unlikely (at least nobody complained so far).


I would be fine either way.


We don't have to think about Python 2 on default, so the patches will get
simplified.


This patch series is essentially no-op on default, except for removing 
the unnecessary (basically dead code) EINTR handling.

___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Re: [PATCH 1 of 2 stable] worker: do not suppress EINTR

[Yuya Nishihara]

On Wed, 25 May 2022 02:30:29 +0200, Manuel Jacob wrote:
> # HG changeset patch
> # User Manuel Jacob 
> # Date 1653433864 -7200
> #  Wed May 25 01:11:04 2022 +0200
> # Branch stable
> # Node ID d058898bdd462b03c5bff38ad40d1f855ea51c23
> # Parent  477b5145e1a02715f846ce017b460858a58e03b1
> # EXP-Topic worker-pickle-load-EINTR
> worker: do not suppress EINTR
> 
> Before this change, when IOError with errno EINTR was raised during
> pickle.load(), the error was suppressed and loading from other file 
> descriptors
> was continued.
> 
> On Python 3, system calls failing with EINTR are retried (PEP 475). Therefore,
> the removal of this code should not make any difference.
> 
> On Python 2, this is not generally the case. CPickle has no handling of EINTR.
> In one place it misinterprets it as EOF. In another place, it will raise
> IOError. However, this could happen in the middle of the stream. In this case,
> if pickle tries to load from the stream later, it will behave wrongly (usually
> it will raise an error, but loading of incorrect data or interpreter crashes
> are thinkable).

Do we want this (and the partial write fix) on stable?

The problem could occur if the payload were quite large, but I think it's
unlikely. Since writer issues a single os.write() in the original code,
reader wouldn't be interrupted in the middle of pickle message in general.

We don't have to think about Python 2 on default, so the patches will get
simplified.
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

mercurial@49217: 2 new changesets (1 on stable)

[Mercurial Commits]

2 new changesets (1 on stable) in mercurial:

https://www.mercurial-scm.org/repo/hg/rev/9ea9445c3223
changeset:   49216:9ea9445c3223
branch:  stable
user:Pierre-Yves David 
date:Tue May 24 11:19:24 2022 +0200
summary: workflow: add a default template for Merge Request

https://www.mercurial-scm.org/repo/hg/rev/13dfad0f9f7a
changeset:   49217:13dfad0f9f7a
bookmark:@
tag: tip
parent:  49212:d3d3495a5749
parent:  49216:9ea9445c3223
user:Raphaël Gomès 
date:Wed May 25 13:28:24 2022 +0200
summary: branching: merge stable into default

-- 
Repository URL: https://www.mercurial-scm.org/repo/hg
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

mercurial@49215: 3 new changesets (3 on stable)

[Mercurial Commits]

3 new changesets (3 on stable) in mercurial:

https://www.mercurial-scm.org/repo/hg/rev/c95e5ba4de1e
changeset:   49213:c95e5ba4de1e
branch:  stable
parent:  49210:cc92ad0e8185
user:Pierre-Yves David 
date:Tue May 24 09:36:40 2022 +0200
summary: run-tests: also send a message in the Keyboard interrupt case

https://www.mercurial-scm.org/repo/hg/rev/eca367970253
changeset:   49214:eca367970253
branch:  stable
user:Pierre-Yves David 
date:Tue May 24 09:57:53 2022 +0200
summary: run-tests: send the test result after freeing the channel

https://www.mercurial-scm.org/repo/hg/rev/8d31ef3017c9
changeset:   49215:8d31ef3017c9
branch:  stable
tag: tip
user:Pierre-Yves David 
date:Tue May 24 10:34:42 2022 +0200
summary: run-tests: prevent race-condition when picking a channel

-- 
Repository URL: https://www.mercurial-scm.org/repo/hg
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Re: [PATCH 1 of 2 stable] worker: do not suppress EINTR

[Raphaël Gomès]

Before I review these (and your previous series), is there a reason why 
you use the ML instead of Heptapod (as per 
https://www.mercurial-scm.org/pipermail/mercurial-devel/2022-May/148466.html 
) considering you're already using it for your pre-submission CI?


On 5/25/22 02:30, Manuel Jacob wrote:

# HG changeset patch
# User Manuel Jacob 
# Date 1653433864 -7200
#  Wed May 25 01:11:04 2022 +0200
# Branch stable
# Node ID d058898bdd462b03c5bff38ad40d1f855ea51c23
# Parent  477b5145e1a02715f846ce017b460858a58e03b1
# EXP-Topic worker-pickle-load-EINTR
worker: do not suppress EINTR

Before this change, when IOError with errno EINTR was raised during
pickle.load(), the error was suppressed and loading from other file descriptors
was continued.

On Python 3, system calls failing with EINTR are retried (PEP 475). Therefore,
the removal of this code should not make any difference.

On Python 2, this is not generally the case. CPickle has no handling of EINTR.
In one place it misinterprets it as EOF. In another place, it will raise
IOError. However, this could happen in the middle of the stream. In this case,
if pickle tries to load from the stream later, it will behave wrongly (usually
it will raise an error, but loading of incorrect data or interpreter crashes
are thinkable).

diff --git a/mercurial/worker.py b/mercurial/worker.py
--- a/mercurial/worker.py
+++ b/mercurial/worker.py
@@ -301,10 +301,6 @@
  selector.unregister(key.fileobj)
  key.fileobj.close()
  openpipes -= 1
-except IOError as e:
-if e.errno == errno.EINTR:
-continue
-raise
  except:  # re-raises
  killworkers()
  cleanup()

___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel