Show More
@@ -153,7 +153,7 b' class convert_cvs(converter_source):' | |||||
153 | sck.send("\n".join(["BEGIN AUTH REQUEST", root, user, passw, |
|
153 | sck.send("\n".join(["BEGIN AUTH REQUEST", root, user, passw, | |
154 | "END AUTH REQUEST", ""])) |
|
154 | "END AUTH REQUEST", ""])) | |
155 | if sck.recv(128) != "I LOVE YOU\n": |
|
155 | if sck.recv(128) != "I LOVE YOU\n": | |
156 |
raise |
|
156 | raise util.Abort("CVS pserver authentication failed") | |
157 |
|
157 | |||
158 | self.writep = self.readp = sck.makefile('r+') |
|
158 | self.writep = self.readp = sck.makefile('r+') | |
159 |
|
159 |
@@ -924,8 +924,6 b' class queue:' | |||||
924 | if line.startswith('diff --git'): |
|
924 | if line.startswith('diff --git'): | |
925 | self.diffopts().git = True |
|
925 | self.diffopts().git = True | |
926 | break |
|
926 | break | |
927 | patchf.seek(0) |
|
|||
928 | patchf.truncate() |
|
|||
929 |
|
927 | |||
930 | msg = opts.get('msg', '').rstrip() |
|
928 | msg = opts.get('msg', '').rstrip() | |
931 | if msg: |
|
929 | if msg: | |
@@ -940,6 +938,10 b' class queue:' | |||||
940 | ci += 1 |
|
938 | ci += 1 | |
941 | del comments[ci] |
|
939 | del comments[ci] | |
942 | comments.append(msg) |
|
940 | comments.append(msg) | |
|
941 | ||||
|
942 | patchf.seek(0) | |||
|
943 | patchf.truncate() | |||
|
944 | ||||
943 | if comments: |
|
945 | if comments: | |
944 | comments = "\n".join(comments) + '\n\n' |
|
946 | comments = "\n".join(comments) + '\n\n' | |
945 | patchf.write(comments) |
|
947 | patchf.write(comments) |
@@ -214,6 +214,9 b' def clone(ui, source, dest=None, pull=Fa' | |||||
214 | else: |
|
214 | else: | |
215 | raise util.Abort(_("clone from remote to remote not supported")) |
|
215 | raise util.Abort(_("clone from remote to remote not supported")) | |
216 |
|
216 | |||
|
217 | if dir_cleanup: | |||
|
218 | dir_cleanup.close() | |||
|
219 | ||||
217 | if dest_repo.local(): |
|
220 | if dest_repo.local(): | |
218 | fp = dest_repo.opener("hgrc", "w", text=True) |
|
221 | fp = dest_repo.opener("hgrc", "w", text=True) | |
219 | fp.write("[paths]\n") |
|
222 | fp.write("[paths]\n") | |
@@ -226,8 +229,6 b' def clone(ui, source, dest=None, pull=Fa' | |||||
226 | except: |
|
229 | except: | |
227 | checkout = dest_repo.changelog.tip() |
|
230 | checkout = dest_repo.changelog.tip() | |
228 | _update(dest_repo, checkout) |
|
231 | _update(dest_repo, checkout) | |
229 | if dir_cleanup: |
|
|||
230 | dir_cleanup.close() |
|
|||
231 |
|
232 | |||
232 | return src_repo, dest_repo |
|
233 | return src_repo, dest_repo | |
233 | finally: |
|
234 | finally: |
General Comments 0
You need to be logged in to leave comments.
Login now