batchfetch 1.1.5__tar.gz → 1.1.7__tar.gz

{batchfetch-1.1.5/batchfetch.egg-info → batchfetch-1.1.7}/PKG-INFO

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

{batchfetch-1.1.5 → batchfetch-1.1.7}/batchfetch/batchfetch_git.py

@@ -128,7 +128,7 @@ class BatchFetchGit(TaskBatchFetch):
             # Update
             if self.git_local_dir.is_dir():
                 # Pre exec
-                self._update_current_branch()
+                self._update_current_branch_name()
                 self._repo_fix_remote_origin()
                 self._run_pre_exec(cwd=self.git_local_dir)
 
@@ -173,14 +173,16 @@ class BatchFetchGit(TaskBatchFetch):
             return ""
         return output
 
-    def _update_current_branch(self):
+    def _update_current_branch_name(self):
         try:
+            # This returns the branch name
             stdout, _ = run_simple(
                 ["git", "symbolic-ref", "--short", "HEAD"],
                 env=self.env,
                 cwd=self.git_local_dir,
             )
-            self.current_branch = stdout[0]
+            self.current_branch = stdout[0].strip()
+            self.is_branch = True
         except (IndexError, subprocess.CalledProcessError):
             # Not a symbolic ref
             self.current_branch = None
@@ -191,10 +193,9 @@ class BatchFetchGit(TaskBatchFetch):
                 # 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_ref = self._git_tags(self["reference"] +
                                             "^{commit}")[0]
-                self.branch_commit_ref = commit_ref.strip().lower()
-                self.is_branch = True
+                self.branch_commit_ref = commit_ref.strip()
             except GitReferenceDoesNotExist:
                 pass
 
@@ -233,11 +234,13 @@ class BatchFetchGit(TaskBatchFetch):
 
         # Merge
         do_git_pull = self["git_pull"]
-        if not self["reference"]:
+        if self.is_branch:
+            do_git_pull = True
+        elif not self["reference"]:
             do_git_pull = True
             self.add_output(self.indent_spaces +
-                "[INFO] Git fetch origin reason: " +
-                "No 'reference:' specified\n")
+                            "[INFO] Git fetch origin reason: " +
+                            "No 'reference:' specified\n")
         else:
             do_git_pull = False
             commit_ref = None
@@ -246,7 +249,7 @@ class BatchFetchGit(TaskBatchFetch):
                 # Check if the reference such as
                 # 0560fe21d1173b2221fd8c600fab818f7eecbad4 exist
                 commit_ref = self._git_tags(self["reference"])[0]
-                commit_ref = commit_ref.strip().lower()
+                commit_ref = commit_ref.strip()
             except GitReferenceDoesNotExist:
                 pass
 
@@ -280,7 +283,7 @@ class BatchFetchGit(TaskBatchFetch):
             #         # <tagname>^{commit}` allows getting the right
             #         # reference.
             #         commit_ref_head = self._git_tags("HEAD^{commit}")[0]
-            #         commit_ref_head = commit_ref_head.strip().lower()
+            #         commit_ref_head = commit_ref_head.strip()
             #     except GitReferenceDoesNotExist:
             #         # HEAD is detached
             #         commit_ref_head = None
@@ -411,12 +414,17 @@ class BatchFetchGit(TaskBatchFetch):
             # Also check the commit reference in case
             # branch is a commit reference instead of a tag
             try:
+                # Check if the branch exists
                 git_ref_branch = self._git_tags("origin/" +
                                                 self["reference"] +
                                                 "^{commit}")[0]
             except GitReferenceDoesNotExist as err:
-                raise BatchFetchError(f"The branch '{self['reference']}' "
-                                      "does not exist.") from err
+                # Check if the commit ref exists
+                try:
+                    git_ref_branch = self._git_tags(self["reference"])[0]
+                except GitReferenceDoesNotExist as err:
+                    raise BatchFetchError(f"The branch '{self['reference']}' "
+                                          "does not exist.") from err
 
             if git_ref_after_merge != git_ref_branch and \
                     self["reference"] not in git_tags:
@@ -430,7 +438,7 @@ class BatchFetchGit(TaskBatchFetch):
                 branch_changed = True
 
                 # Read branch again
-                self._update_current_branch()
+                self._update_current_branch_name()
 
         return branch_changed
 

{batchfetch-1.1.5 → batchfetch-1.1.7/batchfetch.egg-info}/PKG-INFO

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

{batchfetch-1.1.5 → batchfetch-1.1.7}/setup.py

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