mirror of
https://github.com/facebook/sapling.git
synced 2024-10-08 15:57:43 +03:00
Merge with crew
This commit is contained in:
commit
7065cf1716
@ -153,7 +153,7 @@ class convert_cvs(converter_source):
|
||||
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+')
|
||||
|
||||
|
@ -924,8 +924,6 @@ class queue:
|
||||
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 @@ class queue:
|
||||
ci += 1
|
||||
del comments[ci]
|
||||
comments.append(msg)
|
||||
|
||||
patchf.seek(0)
|
||||
patchf.truncate()
|
||||
|
||||
if comments:
|
||||
comments = "\n".join(comments) + '\n\n'
|
||||
patchf.write(comments)
|
||||
|
@ -214,6 +214,9 @@ def clone(ui, source, dest=None, pull=False, rev=None, update=True,
|
||||
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 @@ def clone(ui, source, dest=None, pull=False, rev=None, update=True,
|
||||
except:
|
||||
checkout = dest_repo.changelog.tip()
|
||||
_update(dest_repo, checkout)
|
||||
if dir_cleanup:
|
||||
dir_cleanup.close()
|
||||
|
||||
return src_repo, dest_repo
|
||||
finally:
|
||||
|
Loading…
Reference in New Issue
Block a user