D4667: setdiscovery: access future.result() inside command executor

[indygreg (Gregory Szorc)]

indygreg added a comment.


  I'm going to drop this from hg-committed because it introduces deadlock in 
test-http-bad-server.t.
  
  The deadlock is due to buggy future handling in (at least) httppeer. I'll 
keep this patch in my local queue and will try to hack on a fix for the peer.

REPOSITORY
  rHG Mercurial

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

To: martinvonz, #hg-reviewers, indygreg
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D4667: setdiscovery: access future.result() inside command executor

[martinvonz (Martin von Zweigbergk)]

This revision was automatically updated to reflect the committed changes.
Closed by commit rHG63c2b44bbe60: setdiscovery: access future.result() inside 
command executor (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D4667?vs=11201=11205

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

AFFECTED FILES
  mercurial/setdiscovery.py

CHANGE DETAILS

diff --git a/mercurial/setdiscovery.py b/mercurial/setdiscovery.py
--- a/mercurial/setdiscovery.py
+++ b/mercurial/setdiscovery.py
@@ -189,8 +189,7 @@
 fknown = e.callcommand('known', {
 'nodes': [clnode(r) for r in sample],
 })
-
-srvheadhashes, yesno = fheads.result(), fknown.result()
+srvheadhashes, yesno = fheads.result(), fknown.result()
 
 if cl.tip() == nullid:
 if srvheadhashes != [nullid]:



To: martinvonz, #hg-reviewers, indygreg
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel