Show More
@@ -18,7 +18,7 b' class sshrepository(remoterepository):' | |||
|
18 | 18 | |
|
19 | 19 | m = re.match(r'ssh://(([^@]+)@)?([^:/]+)(:(\d+))?(/(.*))?', path) |
|
20 | 20 | if not m: |
|
21 |
|
|
|
21 | self.repoerror(_("couldn't parse location %s") % path) | |
|
22 | 22 | |
|
23 | 23 | self.user = m.group(2) |
|
24 | 24 | self.host = m.group(3) |
@@ -38,7 +38,7 b' class sshrepository(remoterepository):' | |||
|
38 | 38 | ui.note('running %s\n' % cmd) |
|
39 | 39 | res = os.system(cmd) |
|
40 | 40 | if res != 0: |
|
41 |
|
|
|
41 | self.repoerror(_("could not create remote repo")) | |
|
42 | 42 | |
|
43 | 43 | self.validate_repo(ui, sshcmd, args, remotecmd) |
|
44 | 44 | |
@@ -70,7 +70,7 b' class sshrepository(remoterepository):' | |||
|
70 | 70 | lines.append(l) |
|
71 | 71 | max_noise -= 1 |
|
72 | 72 | else: |
|
73 |
|
|
|
73 | self.repoerror(_("no suitable response from remote hg")) | |
|
74 | 74 | |
|
75 | 75 | self.capabilities = () |
|
76 | 76 | lines.reverse() |
@@ -87,6 +87,10 b' class sshrepository(remoterepository):' | |||
|
87 | 87 | if not l: break |
|
88 | 88 | self.ui.status(_("remote: "), l) |
|
89 | 89 | |
|
90 | def repoerror(self, msg): | |
|
91 | self.cleanup() | |
|
92 | raise hg.RepoError(msg) | |
|
93 | ||
|
90 | 94 | def cleanup(self): |
|
91 | 95 | try: |
|
92 | 96 | self.pipeo.close() |
@@ -117,7 +121,7 b' class sshrepository(remoterepository):' | |||
|
117 | 121 | try: |
|
118 | 122 | l = int(l) |
|
119 | 123 | except: |
|
120 |
|
|
|
124 | self.repoerror(_("unexpected response '%s'") % l) | |
|
121 | 125 | return r.read(l) |
|
122 | 126 | |
|
123 | 127 | def lock(self): |
@@ -132,7 +136,7 b' class sshrepository(remoterepository):' | |||
|
132 | 136 | try: |
|
133 | 137 | return map(bin, d[:-1].split(" ")) |
|
134 | 138 | except: |
|
135 |
|
|
|
139 | self.repoerror(_("unexpected response '%s'") % (d[:400] + "...")) | |
|
136 | 140 | |
|
137 | 141 | def branches(self, nodes): |
|
138 | 142 | n = " ".join(map(hex, nodes)) |
@@ -141,7 +145,7 b' class sshrepository(remoterepository):' | |||
|
141 | 145 | br = [ tuple(map(bin, b.split(" "))) for b in d.splitlines() ] |
|
142 | 146 | return br |
|
143 | 147 | except: |
|
144 |
|
|
|
148 | self.repoerror(_("unexpected response '%s'") % (d[:400] + "...")) | |
|
145 | 149 | |
|
146 | 150 | def between(self, pairs): |
|
147 | 151 | n = "\n".join(["-".join(map(hex, p)) for p in pairs]) |
@@ -150,7 +154,7 b' class sshrepository(remoterepository):' | |||
|
150 | 154 | p = [ l and map(bin, l.split(" ")) or [] for l in d.splitlines() ] |
|
151 | 155 | return p |
|
152 | 156 | except: |
|
153 |
|
|
|
157 | self.repoerror(_("unexpected response '%s'") % (d[:400] + "...")) | |
|
154 | 158 | |
|
155 | 159 | def changegroup(self, nodes, kind): |
|
156 | 160 | n = " ".join(map(hex, nodes)) |
@@ -159,7 +163,7 b' class sshrepository(remoterepository):' | |||
|
159 | 163 | def unbundle(self, cg, heads, source): |
|
160 | 164 | d = self.call("unbundle", heads=' '.join(map(hex, heads))) |
|
161 | 165 | if d: |
|
162 |
|
|
|
166 | self.repoerror(_("push refused: %s") % d) | |
|
163 | 167 | |
|
164 | 168 | while 1: |
|
165 | 169 | d = cg.read(4096) |
@@ -185,7 +189,7 b' class sshrepository(remoterepository):' | |||
|
185 | 189 | def addchangegroup(self, cg, source, url): |
|
186 | 190 | d = self.call("addchangegroup") |
|
187 | 191 | if d: |
|
188 |
|
|
|
192 | self.repoerror(_("push refused: %s") % d) | |
|
189 | 193 | while 1: |
|
190 | 194 | d = cg.read(4096) |
|
191 | 195 | if not d: break |
@@ -1,7 +1,7 b'' | |||
|
1 | 1 | # creating 'remote' |
|
2 | 2 | # repo not found error |
|
3 | remote: abort: repository nonexistent not found! | |
|
3 | 4 | abort: no suitable response from remote hg! |
|
4 | remote: abort: repository nonexistent not found! | |
|
5 | 5 | # clone remote via stream |
|
6 | 6 | streaming all changes |
|
7 | 7 | XXX files to transfer, XXX bytes of data |
General Comments 0
You need to be logged in to leave comments.
Login now