--- a/hgext/convert/cvs.py Wed Aug 15 16:55:15 2007 -0500
+++ b/hgext/convert/cvs.py Fri Aug 17 00:35:16 2007 -0500
@@ -153,7 +153,7 @@
sck.send("\n".join(["BEGIN AUTH REQUEST", root, user, passw,
"END AUTH REQUEST", ""]))
if sck.recv(128) != "I LOVE YOU\n":
- raise NoRepo("CVS pserver authentication failed")
+ raise util.Abort("CVS pserver authentication failed")
self.writep = self.readp = sck.makefile('r+')
--- a/hgext/mq.py Wed Aug 15 16:55:15 2007 -0500
+++ b/hgext/mq.py Fri Aug 17 00:35:16 2007 -0500
@@ -924,8 +924,6 @@
if line.startswith('diff --git'):
self.diffopts().git = True
break
- patchf.seek(0)
- patchf.truncate()
msg = opts.get('msg', '').rstrip()
if msg:
@@ -940,6 +938,10 @@
ci += 1
del comments[ci]
comments.append(msg)
+
+ patchf.seek(0)
+ patchf.truncate()
+
if comments:
comments = "\n".join(comments) + '\n\n'
patchf.write(comments)
--- a/mercurial/hg.py Wed Aug 15 16:55:15 2007 -0500
+++ b/mercurial/hg.py Fri Aug 17 00:35:16 2007 -0500
@@ -214,6 +214,9 @@
else:
raise util.Abort(_("clone from remote to remote not supported"))
+ if dir_cleanup:
+ dir_cleanup.close()
+
if dest_repo.local():
fp = dest_repo.opener("hgrc", "w", text=True)
fp.write("[paths]\n")
@@ -226,8 +229,6 @@
except:
checkout = dest_repo.changelog.tip()
_update(dest_repo, checkout)
- if dir_cleanup:
- dir_cleanup.close()
return src_repo, dest_repo
finally: