##// END OF EJS Templates
Don't enter an endless loop if remote hg doesn't answer, show remote noise....
Thomas Arendsen Hein -
r2040:cd771126 default
parent child Browse files
Show More
@@ -39,12 +39,21 b' class sshrepository(remoterepository):'
39 # skip any noise generated by remote shell
39 # skip any noise generated by remote shell
40 r = self.do_cmd("between", pairs=("%s-%s" % ("0"*40, "0"*40)))
40 r = self.do_cmd("between", pairs=("%s-%s" % ("0"*40, "0"*40)))
41 l1 = ""
41 l1 = ""
42 while 1:
42 l2 = "dummy"
43 max_noise = 100
44 while l2 and max_noise:
43 l2 = r.readline()
45 l2 = r.readline()
44 self.readerr()
46 self.readerr()
45 if l1 == "1\n" and l2 == "\n":
47 if l1 == "1\n" and l2 == "\n":
46 break
48 break
49 if l1:
50 ui.status(_("remote: %s") % l1)
47 l1 = l2
51 l1 = l2
52 max_noise -= 1
53 else:
54 if l1:
55 ui.status(_("remote: %s") % l1)
56 raise hg.RepoError(_("no response from remote hg"))
48
57
49 def readerr(self):
58 def readerr(self):
50 while 1:
59 while 1:
General Comments 0
You need to be logged in to leave comments. Login now