batchfetch 1.1.3__tar.gz → 1.1.4__tar.gz

{batchfetch-1.1.3/batchfetch.egg-info → batchfetch-1.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: batchfetch
-Version: 1.1.3
+Version: 1.1.4
 Summary: Efficiently clone and pull multiple Git repositories.
 Home-page: https://github.com/jamescherti/batchfetch
 Author: James Cherti

{batchfetch-1.1.3 → batchfetch-1.1.4}/batchfetch/batchfetch_git.py

@@ -46,6 +46,9 @@ class BatchFetchGit(TaskBatchFetch):
     def __init__(self, *args, **kwargs):
         self._git_fetch_origin_done = False
 
+        self.branch_commit_ref = None
+        self.is_branch = False
+
         super().__init__(*args, **kwargs)
         self.env["GIT_TERMINAL_PROMPT"] = "0"
         self.env["GIT_PAGER"] = ""
@@ -132,7 +135,10 @@ class BatchFetchGit(TaskBatchFetch):
                 self._repo_reset()
 
                 git_merge_done = self._repo_pull()
-                git_branch_changed = self._repo_fix_branch()
+                git_branch_changed = False
+                if self.is_branch:
+                    git_branch_changed = self._repo_fix_branch()
+
                 if git_merge_done or git_branch_changed:
                     self._repo_update_submodules()
 
@@ -179,6 +185,19 @@ class BatchFetchGit(TaskBatchFetch):
             # Not a symbolic ref
             self.current_branch = None
 
+        if self.current_branch:
+            try:
+                # If the tag is annotated, it points to a tag object, not
+                # directly to a commit. You need to resolve it to the
+                # commit it points to. Using `git rev-parse
+                # <tagname>^{commit}` allows getting the right reference.
+                commit_ref = self._git_tags("origin/" + self["reference"] +
+                                            "^{commit}")[0]
+                self.branch_commit_ref = commit_ref.strip().lower()
+                self.is_branch = True
+            except GitReferenceDoesNotExist:
+                pass
+
     def _repo_delete(self):
         if not self.git_local_dir.exists():
             self.add_output(self.indent_spaces + "[INFO] Already deleted\n")
@@ -232,29 +251,14 @@ class BatchFetchGit(TaskBatchFetch):
             except GitReferenceDoesNotExist:
                 pass
 
-            if not commit_ref:
-                try:
-                    # If the tag is annotated, it points to a tag object, not
-                    # directly to a commit. You need to resolve it to the
-                    # commit it points to. Using `git rev-parse
-                    # <tagname>^{commit}` allows getting the right reference.
-                    commit_ref = self._git_tags("origin/" + self["reference"] +
-                                                "^{commit}")[0]
-                    commit_ref = commit_ref.strip().lower()
-                except GitReferenceDoesNotExist:
-                    # The branch does not exist. We should git pull in case we
-                    # can get the reference
-                    do_git_pull = True
-                    self.add_output(
-                        self.indent_spaces +
-                        "[INFO] Git fetch origin reason:" +
-                        f"The reference does not exist: {self['reference']}" +
-                        "\n")
-
+            if not commit_ref and not self.is_branch:
+                self.add_output(
+                    self.indent_spaces +
+                    "[INFO] Git fetch origin reason:" +
+                    f"The reference does not exist: {self['reference']}" +
+                    "\n")
 
                 if not do_git_pull:
-                    # Check if it is a branch or a tag such as 1.1.3
-                    is_tag = False
                     try:
                         # Check if the branch is a tag or a branch
                         cmd = ["git", "show-ref", "--verify", "--quiet",
@@ -302,10 +306,11 @@ class BatchFetchGit(TaskBatchFetch):
 
         # Merge
         real_branch = self._git_is_local_branch("HEAD")
-        if real_branch:
+        if real_branch and self.current_branch:
             # TODO: only merge when difference from upstream
             commit_ref_head = self._git_ref(cwd=self.git_local_dir)
-            self._run(["git", "merge", "--ff-only"],
+            self._run(["git", "merge", "--ff-only",
+                       f"origin/{self.current_branch}"],
                       cwd=str(self.git_local_dir), env=self.env)
             git_ref_after_merge = self._git_ref(cwd=self.git_local_dir)
             if commit_ref_head != git_ref_after_merge:
@@ -353,8 +358,7 @@ class BatchFetchGit(TaskBatchFetch):
             origin_url = stdout[0]
         except (subprocess.CalledProcessError, IndexError) as err:
             raise GitRemoteError(
-                f"Failed to modify the Git remote url: {remote_name}") \
-                from err
+                f"Failed to modify the Git remote url: {remote_name}") from err
 
         return origin_url
 
@@ -408,7 +412,8 @@ class BatchFetchGit(TaskBatchFetch):
             # Also check the commit reference in case
             # branch is a commit reference instead of a tag
             try:
-                git_ref_branch = self._git_tags(self["reference"] +
+                git_ref_branch = self._git_tags("origin/" +
+                                                self["reference"] +
                                                 "^{commit}")[0]
             except GitReferenceDoesNotExist as err:
                 raise BatchFetchError(f"The branch '{self['reference']}' "
@@ -486,7 +491,7 @@ class BatchFetchGit(TaskBatchFetch):
                     self._git_fetch_origin()
 
                     cmd = ["git", "branch",
-                        f"--set-upstream-to=origin/{self.current_branch}"]
+                           f"--set-upstream-to=origin/{self.current_branch}"]
                     _, _ = run_simple(cmd, env=self.env,
                                       cwd=self.git_local_dir)
                     # TODO: handle errors

{batchfetch-1.1.3 → batchfetch-1.1.4/batchfetch.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: batchfetch
-Version: 1.1.3
+Version: 1.1.4
 Summary: Efficiently clone and pull multiple Git repositories.
 Home-page: https://github.com/jamescherti/batchfetch
 Author: James Cherti

{batchfetch-1.1.3 → batchfetch-1.1.4}/setup.py

@@ -22,7 +22,7 @@ from setuptools import find_packages, setup
 
 setup(
     name="batchfetch",
-    version="1.1.3",
+    version="1.1.4",
     packages=find_packages(),
     description="Efficiently clone and pull multiple Git repositories.",
     license="GPLv3",