Mercurial > hg-stable
changeset 3034:2b0bc36a48d8
sshrepo: flush stderr before connecting to the hg server
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Sat, 02 Sep 2006 21:08:54 +0200 |
| parents | 892eb1b4f973 |
| children | 4d0e0f149581 |
| files | mercurial/sshrepo.py tests/test-init.out |
| diffstat | 2 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/sshrepo.py Thu Aug 31 12:51:02 2006 -0500 +++ b/mercurial/sshrepo.py Sat Sep 02 21:08:54 2006 +0200 @@ -52,6 +52,9 @@ return self._url def validate_repo(self, ui, sshcmd, args, remotecmd): + # cleanup up previous run + self.cleanup() + cmd = '%s %s "%s -R %s serve --stdio"' cmd = cmd % (sshcmd, args, remotecmd, self.path) @@ -90,7 +93,7 @@ if not l: break self.ui.status(_("remote: "), l) - def __del__(self): + def cleanup(self): try: self.pipeo.close() self.pipei.close() @@ -101,6 +104,8 @@ except: pass + __del__ = cleanup + def do_cmd(self, cmd, **args): self.ui.debug(_("sending %s command\n") % cmd) self.pipeo.write("%s\n" % cmd)
--- a/tests/test-init.out Thu Aug 31 12:51:02 2006 -0500 +++ b/tests/test-init.out Sat Sep 02 21:08:54 2006 +0200 @@ -1,6 +1,7 @@ # creating 'local' adding foo # init+push to remote2 +remote: abort: repository remote2 not found! changeset: 0:c4e059d443be tag: tip user: test @@ -14,6 +15,7 @@ remote: adding file changes remote: added 1 changesets with 1 changes to 1 files # clone to remote1 +remote: abort: repository remote1 not found! searching for changes remote: abort: repository remote1 not found! remote: adding changesets