batchfetch 1.3.4__tar.gz → 1.3.5__tar.gz

{batchfetch-1.3.4 → batchfetch-1.3.5}/PKG-INFO

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

{batchfetch-1.3.4 → batchfetch-1.3.5}/batchfetch/batchfetch_cli.py

@@ -111,6 +111,7 @@ class BatchFetchCli:
                 # Paths specified in the batchfetch.yaml file
                 untracked_paths = None
                 if "options" in yaml_dict and \
+                        isinstance(yaml_dict["options"], dict) and \
                         "ignore_untracked" in yaml_dict["options"]:
                     untracked_paths = \
                         yaml_dict["options"]["ignore_untracked"]

{batchfetch-1.3.4 → batchfetch-1.3.5}/batchfetch/batchfetch_git.py

@@ -117,7 +117,7 @@ class BatchFetchGit(TaskBatchFetch):
 
         self.add_output(f"[GIT {update_type}] {self[self.main_key]}"
                         + (f" (Ref: {self['revision']})"
-                           if self["revision"] else "") + "\n")
+                         if self["revision"] else "") + "\n")
 
         try:
             # Delete
@@ -130,32 +130,34 @@ class BatchFetchGit(TaskBatchFetch):
 
             # Update
             if self.git_local_dir.is_dir():
+                do_git_fetch = self["git_pull"]
+
                 # Pre exec
-                self._update_current_branch_name()
+                if do_git_fetch:
+                    self._update_current_branch_name()
+
                 self._repo_fix_remote_origin()
                 self._exec_before(cwd=self.git_local_dir)
 
                 if not self["revision"]:
                     self.values["revision"] = self._run_get_firstline(
-                        "git symbolic-ref refs/remotes/origin/HEAD"
-                    ).split("/")[-1]
+                        "git symbolic-ref --short HEAD")
                     if not self["revision"]:
                         raise BatchFetchError(
                             "Unable to determine the default origin branch"
                         )
 
                     self.add_output(self.indent_spaces +
-                                    f"[INFO] Update revision to: '" +
+                                    "[INFO] Update revision to: '" +
                                     self["revision"] + "'\n")
 
-                git_fetch_done = self._repo_fetch()
+                if do_git_fetch:
+                    git_fetch_done = self._repo_fetch()
 
-                git_branch_changed = False
-                git_branch_changed = self._repo_fix_branch()
+                self._repo_fix_branch()
 
-                git_merge_done = False
                 if git_fetch_done:
-                    git_merge_done = self._git_merge()
+                    self._git_merge()
 
                 if self.get_changed():
                     self._exec_after(cwd=self.git_local_dir)
@@ -192,6 +194,8 @@ class BatchFetchGit(TaskBatchFetch):
 
         :param cmd: Command to be executed. Can be a list or a string.
         :param kwargs: Additional keyword arguments for Popen.
+        :cwd: Current working directory.
+        :env: Environment variables.
         :return: Tuple containing two lists: stdout lines and stderr lines.
         """
         if not cwd:
@@ -264,11 +268,10 @@ class BatchFetchGit(TaskBatchFetch):
         # Merge
         do_git_fetch = self["git_pull"]
         do_git_fetch = False
-        commit_ref = None
 
         try:
             # Check if the revision such as
-            stdout, _ = self._run(["git", "cat-file", "-e", self["revision"]])
+            _, _ = self._run(["git", "cat-file", "-e", self["revision"]])
         except subprocess.CalledProcessError:
             do_git_fetch = True
             self.add_output(

{batchfetch-1.3.4 → batchfetch-1.3.5}/batchfetch.egg-info/PKG-INFO

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

{batchfetch-1.3.4 → batchfetch-1.3.5}/setup.py

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