comparison mercurial/sshrepo.py @ 3766:581665242c07

Use UnexpectedOutput exception instead of RepoError in sshrepo, too.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 02 Dec 2006 22:16:00 +0100
parents 768ba23c948e
children abaee83ce0a6
comparison
equal deleted inserted replaced
3765:768ba23c948e 3766:581665242c07
119 l = r.readline() 119 l = r.readline()
120 self.readerr() 120 self.readerr()
121 try: 121 try:
122 l = int(l) 122 l = int(l)
123 except: 123 except:
124 self.raise_(hg.RepoError(_("unexpected response '%s'") % l)) 124 self.raise_(util.UnexpectedOutput(_("unexpected response:"), l))
125 return r.read(l) 125 return r.read(l)
126 126
127 def lock(self): 127 def lock(self):
128 self.call("lock") 128 self.call("lock")
129 return remotelock(self) 129 return remotelock(self)
142 def heads(self): 142 def heads(self):
143 d = self.call("heads") 143 d = self.call("heads")
144 try: 144 try:
145 return map(bin, d[:-1].split(" ")) 145 return map(bin, d[:-1].split(" "))
146 except: 146 except:
147 self.raise_(hg.RepoError(_("unexpected response '%s'") % (d[:400] + "..."))) 147 self.raise_(util.UnexpectedOutput(_("unexpected response:"), d))
148 148
149 def branches(self, nodes): 149 def branches(self, nodes):
150 n = " ".join(map(hex, nodes)) 150 n = " ".join(map(hex, nodes))
151 d = self.call("branches", nodes=n) 151 d = self.call("branches", nodes=n)
152 try: 152 try:
153 br = [ tuple(map(bin, b.split(" "))) for b in d.splitlines() ] 153 br = [ tuple(map(bin, b.split(" "))) for b in d.splitlines() ]
154 return br 154 return br
155 except: 155 except:
156 self.raise_(hg.RepoError(_("unexpected response '%s'") % (d[:400] + "..."))) 156 self.raise_(util.UnexpectedOutput(_("unexpected response:"), d))
157 157
158 def between(self, pairs): 158 def between(self, pairs):
159 n = "\n".join(["-".join(map(hex, p)) for p in pairs]) 159 n = "\n".join(["-".join(map(hex, p)) for p in pairs])
160 d = self.call("between", pairs=n) 160 d = self.call("between", pairs=n)
161 try: 161 try:
162 p = [ l and map(bin, l.split(" ")) or [] for l in d.splitlines() ] 162 p = [ l and map(bin, l.split(" ")) or [] for l in d.splitlines() ]
163 return p 163 return p
164 except: 164 except:
165 self.raise_(hg.RepoError(_("unexpected response '%s'") % (d[:400] + "..."))) 165 self.raise_(util.UnexpectedOutput(_("unexpected response:"), d))
166 166
167 def changegroup(self, nodes, kind): 167 def changegroup(self, nodes, kind):
168 n = " ".join(map(hex, nodes)) 168 n = " ".join(map(hex, nodes))
169 return self.do_cmd("changegroup", roots=n) 169 return self.do_cmd("changegroup", roots=n)
170 170