launchpad-reviewers team mailing list archive

[Nobuto Murata <mp+453279@xxxxxxxxxxxxxxxxxx>]

Nobuto Murata has proposed merging ~nobuto/lp-codeimport:verbose into lp-codeimport:master.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #2038975 in Launchpad code imports: "No hint of timeout in Fetching remote repository"
  https://bugs.launchpad.net/lp-codeimport/+bug/2038975

For more details, see:
https://code.launchpad.net/~nobuto/lp-codeimport/+git/lp-codeimport/+merge/453279
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~nobuto/lp-codeimport:verbose into lp-codeimport:master.

diff --git a/lib/lp/codehosting/codeimport/worker.py b/lib/lp/codehosting/codeimport/worker.py
index 9bd9444..0afc073 100644
--- a/lib/lp/codehosting/codeimport/worker.py
+++ b/lib/lp/codehosting/codeimport/worker.py
@@ -1178,7 +1178,8 @@ class GitToGitImportWorker(ImportWorker):
         self._logger.info("Getting existing repository from hosting service.")
         try:
             self._runGit(
-                "clone", "--progress", "--mirror", target_url, "repository")
+                "clone", "--progress", "--verbose", "--mirror",
+                target_url, "repository")
         except subprocess.CalledProcessError as e:
             self._logger.info(
                 "Unable to get existing repository from hosting service: "
@@ -1193,7 +1194,8 @@ class GitToGitImportWorker(ImportWorker):
                 "remote", "add", "source", self.source_details.url,
                 cwd="repository")
             self._runGit(
-                "fetch", "--progress", "--prune", "source", "+refs/*:refs/*",
+                "fetch", "--progress", "--verbose", "--prune",
+                "source", "+refs/*:refs/*",
                 cwd="repository")
             try:
                 new_head = self._getHead("repository", "source")
@@ -1213,14 +1215,15 @@ class GitToGitImportWorker(ImportWorker):
                 # Push the target of HEAD first to ensure that it is always
                 # available.
                 self._runGit(
-                    "push", "--progress", target_url,
+                    "push", "--progress", "--verbose", target_url,
                     "+%s:%s" % (new_head, new_head), cwd="repository")
                 try:
                     self._setHead(target_url, new_head)
                 except GitProtocolError as e:
                     self._logger.info("Unable to set default branch: %s" % e)
             self._runGit(
-                "push", "--progress", "--mirror", target_url, cwd="repository")
+                "push", "--progress", "--verbose", "--mirror",
+                target_url, cwd="repository")
         except subprocess.CalledProcessError as e:
             self._logger.info(
                 "Unable to push to hosting service: git push exited %s" %