Correctly name projects when mirroring

A bug introduced by relative urls caused projects such as manifest.git
to be placed in the root directory instead of the directory they should
by in.

This fix creates and refers to a resolvedFetchUrl in the _XmlRemote
class in order to get a fetchUrl that is never relative.

git_config.py

@@ -575,6 +575,16 @@ class Remote(object):
         self._review_protocol = info[0]
         self._review_host = info[1]
         self._review_port = info[2]
+      elif 'REPO_HOST_PORT_INFO' in os.environ:
+        info = os.environ['REPO_HOST_PORT_INFO']
+        self._review_protocol = 'ssh'
+        self._review_host = info.split(" ")[0]
+        self._review_port = info.split(" ")[1]
+
+        REVIEW_CACHE[u] = (
+          self._review_protocol,
+          self._review_host,
+          self._review_port)
       else:
         try:
           info = urllib2.urlopen(u).read()

main.py

@@ -273,6 +273,24 @@ class _UserAgentHandler(urllib2.BaseHandler):
     req.add_header('User-Agent', _UserAgent())
     return req
 
+class _BasicAuthHandler(urllib2.HTTPBasicAuthHandler):
+  def http_error_auth_reqed(self, authreq, host, req, headers):
+    try:
+      old_add_header = req.add_header
+      def _add_header(name, val):
+        val = val.replace('\n', '')
+        old_add_header(name, val)
+      req.add_header = _add_header
+      return urllib2.AbstractBasicAuthHandler.http_error_auth_reqed(
+        self, authreq, host, req, headers)
+    except:
+      reset = getattr(self, 'reset_retry_count', None)
+      if reset is not None:
+        reset()
+      elif getattr(self, 'retried', None):
+        self.retried = 0
+      raise
+
 def init_http():
   handlers = [_UserAgentHandler()]
 
@@ -287,7 +305,7 @@ def init_http():
     pass
   except IOError:
     pass
-  handlers.append(urllib2.HTTPBasicAuthHandler(mgr))
+  handlers.append(_BasicAuthHandler(mgr))
 
   if 'http_proxy' in os.environ:
     url = os.environ['http_proxy']

manifest_xml.py

@@ -46,16 +46,20 @@ class _XmlRemote(object):
     self.fetchUrl = fetch
     self.manifestUrl = manifestUrl
     self.reviewUrl = review
+    self.resolvedFetchUrl = self._resolveFetchUrl()
 
-  def ToRemoteSpec(self, projectName):
+  def _resolveFetchUrl(self):
-    url = self.fetchUrl.rstrip('/') + '/' + projectName + '.git'
+    url = self.fetchUrl.rstrip('/')
     manifestUrl = self.manifestUrl.rstrip('/')
     # urljoin will get confused if there is no scheme in the base url
     # ie, if manifestUrl is of the form <hostname:port>
     if manifestUrl.find(':') != manifestUrl.find('/') - 1:
         manifestUrl = 'gopher://' + manifestUrl
     url = urlparse.urljoin(manifestUrl, url)
-    url = re.sub(r'^gopher://', '', url)
+    return re.sub(r'^gopher://', '', url)
+
+  def ToRemoteSpec(self, projectName):
+    url = self.resolvedFetchUrl + '/' + projectName
     return RemoteSpec(self.name, url, self.reviewUrl)
 
 class XmlManifest(object):
@@ -368,7 +372,7 @@ class XmlManifest(object):
       raise ManifestParseError, 'refusing to mirror %s' % m_url
 
     if self._default and self._default.remote:
-      url = self._default.remote.fetchUrl
+      url = self._default.remote.resolvedFetchUrl
       if not url.endswith('/'):
         url += '/'
       if m_url.startswith(url):

project.py

@@ -24,6 +24,16 @@ import sys
 import time
 import urllib2
 
+try:
+  import threading as _threading
+except ImportError:
+  import dummy_threading as _threading
+
+try:
+  from os import SEEK_END
+except ImportError:
+  SEEK_END = 2
+
 from color import Coloring
 from git_command import GitCommand
 from git_config import GitConfig, IsId, GetSchemeFromUrl
@@ -34,6 +44,8 @@ from progress import Progress
 
 from git_refs import GitRefs, HEAD, R_HEADS, R_TAGS, R_PUB, R_M
 
+_urllib_lock = _threading.Lock()
+
 def _lwrite(path, content):
   lock = '%s.lock' % path
 
@@ -1455,43 +1467,47 @@ class Project(object):
     done = False
     dest = open(tmpPath, 'a+b')
     try:
-      dest.seek(0, os.SEEK_END)
+      dest.seek(0, SEEK_END)
       pos = dest.tell()
 
-      req = urllib2.Request(srcUrl)
+      _urllib_lock.acquire()
-      if pos > 0:
-        req.add_header('Range', 'bytes=%d-' % pos)
-
       try:
-        r = urllib2.urlopen(req)
+        req = urllib2.Request(srcUrl)
-      except urllib2.HTTPError, e:
+        if pos > 0:
-        def _content_type():
+          req.add_header('Range', 'bytes=%d-' % pos)
-          try:
-            return e.info()['content-type']
-          except:
-            return None
 
-        if e.code == 404:
+        try:
-          keep = False
+          r = urllib2.urlopen(req)
-          return False
+        except urllib2.HTTPError, e:
-        elif _content_type() == 'text/plain':
+          def _content_type():
-          try:
+            try:
-            msg = e.read()
+              return e.info()['content-type']
-            if len(msg) > 0 and msg[-1] == '\n':
+            except:
-              msg = msg[0:-1]
+              return None
-            msg = ' (%s)' % msg
+
-          except:
+          if e.code == 404:
-            msg = ''
+            keep = False
-        else:
+            return False
-          try:
+          elif _content_type() == 'text/plain':
-            from BaseHTTPServer import BaseHTTPRequestHandler
+            try:
-            res = BaseHTTPRequestHandler.responses[e.code]
+              msg = e.read()
-            msg = ' (%s: %s)' % (res[0], res[1])
+              if len(msg) > 0 and msg[-1] == '\n':
-          except:
+                msg = msg[0:-1]
-            msg = ''
+              msg = ' (%s)' % msg
-        raise DownloadError('HTTP %s%s' % (e.code, msg))
+            except:
-      except urllib2.URLError, e:
+              msg = ''
-        raise DownloadError('%s: %s ' % (req.get_host(), str(e)))
+          else:
+            try:
+              from BaseHTTPServer import BaseHTTPRequestHandler
+              res = BaseHTTPRequestHandler.responses[e.code]
+              msg = ' (%s: %s)' % (res[0], res[1])
+            except:
+              msg = ''
+          raise DownloadError('HTTP %s%s' % (e.code, msg))
+        except urllib2.URLError, e:
+          raise DownloadError('%s: %s ' % (req.get_host(), str(e)))
+      finally:
+        _urllib_lock.release()
 
       p = None
       try:

subcmds/help.py

@@ -165,6 +165,7 @@ See 'repo help --all' for a complete list of recognized commands.
         print >>sys.stderr, "repo: '%s' is not a repo command." % name
         sys.exit(1)
 
+      cmd.manifest = self.manifest
       self._PrintCommandHelp(cmd)
 
     else:

subcmds/sync.py

@@ -195,15 +195,11 @@ later is required to fix a server side protocol bug.
 
           fetched.add(project.gitdir)
           pm.update()
-        except BaseException, e:
+        except _FetchError:
-          # Notify the _Fetch() function about all errors.
           err_event.set()
-
+        except:
-          # If we got our own _FetchError, we don't want a stack trace.
+          err_event.set()
-          # However, if we got something else (something in Sync_NetworkHalf?),
+          raise
-          # we'd like one (so re-raise after we've set err_event).
-          if not isinstance(e, _FetchError):
-            raise
       finally:
         if did_lock:
           lock.release()