##// END OF EJS Templates
sshrepo: flush stderr before connecting to the hg server
Benoit Boissinot -
r3034:2b0bc36a default
parent child Browse files
Show More
@@ -52,6 +52,9 b' class sshrepository(remoterepository):'
52 return self._url
52 return self._url
53
53
54 def validate_repo(self, ui, sshcmd, args, remotecmd):
54 def validate_repo(self, ui, sshcmd, args, remotecmd):
55 # cleanup up previous run
56 self.cleanup()
57
55 cmd = '%s %s "%s -R %s serve --stdio"'
58 cmd = '%s %s "%s -R %s serve --stdio"'
56 cmd = cmd % (sshcmd, args, remotecmd, self.path)
59 cmd = cmd % (sshcmd, args, remotecmd, self.path)
57
60
@@ -90,7 +93,7 b' class sshrepository(remoterepository):'
90 if not l: break
93 if not l: break
91 self.ui.status(_("remote: "), l)
94 self.ui.status(_("remote: "), l)
92
95
93 def __del__(self):
96 def cleanup(self):
94 try:
97 try:
95 self.pipeo.close()
98 self.pipeo.close()
96 self.pipei.close()
99 self.pipei.close()
@@ -101,6 +104,8 b' class sshrepository(remoterepository):'
101 except:
104 except:
102 pass
105 pass
103
106
107 __del__ = cleanup
108
104 def do_cmd(self, cmd, **args):
109 def do_cmd(self, cmd, **args):
105 self.ui.debug(_("sending %s command\n") % cmd)
110 self.ui.debug(_("sending %s command\n") % cmd)
106 self.pipeo.write("%s\n" % cmd)
111 self.pipeo.write("%s\n" % cmd)
@@ -1,6 +1,7 b''
1 # creating 'local'
1 # creating 'local'
2 adding foo
2 adding foo
3 # init+push to remote2
3 # init+push to remote2
4 remote: abort: repository remote2 not found!
4 changeset: 0:c4e059d443be
5 changeset: 0:c4e059d443be
5 tag: tip
6 tag: tip
6 user: test
7 user: test
@@ -14,6 +15,7 b' remote: adding manifests'
14 remote: adding file changes
15 remote: adding file changes
15 remote: added 1 changesets with 1 changes to 1 files
16 remote: added 1 changesets with 1 changes to 1 files
16 # clone to remote1
17 # clone to remote1
18 remote: abort: repository remote1 not found!
17 searching for changes
19 searching for changes
18 remote: abort: repository remote1 not found!
20 remote: abort: repository remote1 not found!
19 remote: adding changesets
21 remote: adding changesets
General Comments 0
You need to be logged in to leave comments. Login now