##// END OF EJS Templates
Fix sshrepo.unbundle...
Alexis S. L. Carvalho -
r5190:6d5ed61c default
parent child Browse files
Show More
@@ -175,6 +175,7 b' class sshrepository(remoterepository):'
175 def unbundle(self, cg, heads, source):
175 def unbundle(self, cg, heads, source):
176 d = self.call("unbundle", heads=' '.join(map(hex, heads)))
176 d = self.call("unbundle", heads=' '.join(map(hex, heads)))
177 if d:
177 if d:
178 # remote may send "unsynced changes"
178 self.raise_(hg.RepoError(_("push refused: %s") % d))
179 self.raise_(hg.RepoError(_("push refused: %s") % d))
179
180
180 while 1:
181 while 1:
@@ -188,14 +189,15 b' class sshrepository(remoterepository):'
188 self.pipeo.flush()
189 self.pipeo.flush()
189
190
190 self.readerr()
191 self.readerr()
191 d = self.pipei.readline()
192 if d != '\n':
193 return 1
194
195 l = int(self.pipei.readline())
192 l = int(self.pipei.readline())
196 r = self.pipei.read(l)
193 r = self.pipei.read(l)
197 if not r:
194 if r:
198 return 1
195 # remote may send "unsynced changes"
196 self.raise_(hg.RepoError(_("push failed: %s") % r))
197
198 self.readerr()
199 l = int(self.pipei.readline())
200 r = self.pipei.read(l)
199 return int(r)
201 return int(r)
200
202
201 def addchangegroup(self, cg, source, url):
203 def addchangegroup(self, cg, source, url):
General Comments 0
You need to be logged in to leave comments. Login now