# HG changeset patch
# User Alexis S. L. Carvalho <alexis@cecm.usp.br>
# Date 1187403613 10800
# Node ID 86e95b93559afa8e16d5c13f306012d571775954
# Parent  33015dac5df525abd879d8fc559ad01f6184e990# Parent  6d5ed61c508cfdfa0c12fad4cb328b975ad15135
Merge with crew-stable

diff -r 33015dac5df5 -r 86e95b93559a mercurial/httprepo.py
--- a/mercurial/httprepo.py	Fri Aug 17 20:18:05 2007 -0300
+++ b/mercurial/httprepo.py	Fri Aug 17 23:20:13 2007 -0300
@@ -253,7 +253,7 @@
         if user:
             ui.debug(_('http auth: user %s, password %s\n') %
                      (user, passwd and '*' * len(passwd) or 'not set'))
-            passmgr.add_password(None, host, user, passwd or '')
+            passmgr.add_password(None, self._url, user, passwd or '')
 
         handlers.extend((urllib2.HTTPBasicAuthHandler(passmgr),
                          httpdigestauthhandler(passmgr)))
diff -r 33015dac5df5 -r 86e95b93559a mercurial/sshrepo.py
--- a/mercurial/sshrepo.py	Fri Aug 17 20:18:05 2007 -0300
+++ b/mercurial/sshrepo.py	Fri Aug 17 23:20:13 2007 -0300
@@ -175,6 +175,7 @@
     def unbundle(self, cg, heads, source):
         d = self.call("unbundle", heads=' '.join(map(hex, heads)))
         if d:
+            # remote may send "unsynced changes"
             self.raise_(repo.RepoError(_("push refused: %s") % d))
 
         while 1:
@@ -188,14 +189,15 @@
         self.pipeo.flush()
 
         self.readerr()
-        d = self.pipei.readline()
-        if d != '\n':
-            return 1
-
         l = int(self.pipei.readline())
         r = self.pipei.read(l)
-        if not r:
-            return 1
+        if r:
+            # remote may send "unsynced changes"
+            self.raise_(hg.RepoError(_("push failed: %s") % r))
+
+        self.readerr()
+        l = int(self.pipei.readline())
+        r = self.pipei.read(l)
         return int(r)
 
     def addchangegroup(self, cg, source, url):
diff -r 33015dac5df5 -r 86e95b93559a tests/run-tests.py
--- a/tests/run-tests.py	Fri Aug 17 20:18:05 2007 -0300
+++ b/tests/run-tests.py	Fri Aug 17 23:20:13 2007 -0300
@@ -136,8 +136,9 @@
 
     os.chdir("..") # Get back to hg root
     cmd = ('%s setup.py clean --all'
-           ' install --force --home="%s" --install-lib="%s" >%s 2>&1'
-           % (sys.executable, INST, PYTHONDIR, installerrs))
+           ' install --force --home="%s" --install-lib="%s"'
+           ' --install-scripts="%s" >%s 2>&1'
+           % (sys.executable, INST, PYTHONDIR, BINDIR, installerrs))
     vlog("# Running", cmd)
     if os.system(cmd) == 0:
         if not verbose: