batchfetch 1.3.3__tar.gz → 1.3.5__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: batchfetch
-Version: 1.3.3
+Version: 1.3.5
 Summary: Efficiently clone and pull multiple Git repositories.
 Home-page: https://github.com/jamescherti/batchfetch
 Author: James Cherti
@@ -213,7 +213,7 @@ batchfetch
 
 ## License
 
-Copyright (C) 2024 [James Cherti](https://www.jamescherti.com)
+Copyright (C) 2024-2025 [James Cherti](https://www.jamescherti.com)
 
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 

{batchfetch-1.3.3 → batchfetch-1.3.5}/README.md

@@ -193,7 +193,7 @@ batchfetch
 
 ## License
 
-Copyright (C) 2024 [James Cherti](https://www.jamescherti.com)
+Copyright (C) 2024-2025 [James Cherti](https://www.jamescherti.com)
 
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 

{batchfetch-1.3.3 → batchfetch-1.3.5}/batchfetch/__init__.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (C) 2024 James Cherti
+# Copyright (C) 2024-2025 James Cherti
 # URL: https://github.com/jamescherti/batchfetch
 #
 # This program is free software: you can redistribute it and/or modify it under

{batchfetch-1.3.3 → batchfetch-1.3.5}/batchfetch/batchfetch_base.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (C) 2024 James Cherti
+# Copyright (C) 2024-2025 James Cherti
 # URL: https://github.com/jamescherti/batchfetch
 #
 # This program is free software: you can redistribute it and/or modify it under

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

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (C) 2024 James Cherti
+# Copyright (C) 2024-2025 James Cherti
 # URL: https://github.com/jamescherti/batchfetch
 #
 # This program is free software: you can redistribute it and/or modify it under
@@ -35,6 +35,7 @@ from setproctitle import setproctitle
 
 from .batchfetch_base import BatchFetchError, TaskBatchFetch
 from .batchfetch_git import BatchFetchGit
+from .helpers import collect_parent_dirs
 
 
 class BatchFetchCli:
@@ -100,10 +101,17 @@ class BatchFetchCli:
                           file=sys.stderr)
                     sys.exit(1)
 
-                self.ignore_untracked.add(Path(path).absolute())
-                self.ignore_untracked.add(Path(path).resolve())
+                # The Batchfetch file shouldn't be tracked
+                absolute_batchfetch = Path(path).absolute()
+                self.ignore_untracked.add(absolute_batchfetch)
+
+                resolved_batchfetch = absolute_batchfetch.resolve()
+                self.ignore_untracked.add(resolved_batchfetch)
+
+                # 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"]
@@ -113,9 +121,14 @@ class BatchFetchCli:
 
                 if untracked_paths:
                     for ignore_untracked_path in untracked_paths:
-                        self.ignore_untracked.add(
+                        # Absolute
+                        ignore_untracked_path = \
                             Path(ignore_untracked_path).absolute()
-                        )
+                        self.ignore_untracked.add(ignore_untracked_path)
+
+                        # Resolve
+                        ignore_untracked_path = ignore_untracked_path.resolve()
+                        self.ignore_untracked.add(ignore_untracked_path)
 
                 self._loads(dict(yaml_dict))
         except OSError as err:
@@ -273,10 +286,22 @@ class BatchFetchCli:
     def _find_untracked_paths(self):
         "Find the files that are untracked and should be deleted."
         untracked_paths = set()
+        cwd = Path.cwd()
+        local_ignore_untracked = set()
+
+        for tracked_dir, tracked_filenames in self.tracked_paths.items():
+            actual_filenames = {file.name for file in tracked_dir.iterdir()}
+            self.ignore_untracked |= {tracked_dir}
+            parents = collect_parent_dirs(cwd, tracked_dir)
+            local_ignore_untracked |= parents
+
         for tracked_dir, tracked_filenames in self.tracked_paths.items():
             actual_filenames = {file.name for file in tracked_dir.iterdir()}
             for filename in actual_filenames - tracked_filenames:
                 full_path = tracked_dir / filename
+                if full_path in local_ignore_untracked:
+                    continue
+
                 if full_path in self.ignore_untracked:
                     continue
 
@@ -422,19 +447,21 @@ def command_line_interface():
             print()
 
         os.chdir(args.directory)
-        batchfetch_cli = BatchFetchCli(verbose=args.verbose,
-                                       max_workers=args.jobs,
-                                       check_untracked=args.check_untracked,
-                                       targets=args.targets)
-        batchfetch_cli.load(file)
-
         try:
+            batchfetch_cli = BatchFetchCli(
+                verbose=args.verbose,
+                max_workers=args.jobs,
+                check_untracked=args.check_untracked,
+                targets=args.targets,
+            )
+
+            batchfetch_cli.load(file)
             if not batchfetch_cli.run_tasks():
                 errno = 1
         except KeyboardInterrupt:
             print("Interrupted.", file=sys.stderr)
             errno = 1
-        except BatchFetchError as err:
+        except (yaml.parser.MarkedYAMLError, BatchFetchError) as err:
             print(f"Error: {err}.", file=sys.stderr)
             errno = 1
 

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

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (C) 2024 James Cherti
+# Copyright (C) 2024-2025 James Cherti
 # URL: https://github.com/jamescherti/batchfetch
 #
 # This program is free software: you can redistribute it and/or modify it under
@@ -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.3 → batchfetch-1.3.5}/batchfetch/helpers.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (C) 2024 James Cherti
+# Copyright (C) 2024-2025 James Cherti
 # URL: https://github.com/jamescherti/batchfetch
 #
 # This program is free software: you can redistribute it and/or modify it under
@@ -21,8 +21,9 @@
 import hashlib
 import os
 import shlex
+from pathlib import Path
 from subprocess import PIPE, CalledProcessError, Popen, list2cmdline
-from typing import List, Tuple, Union
+from typing import List, Set, Tuple, Union
 
 
 def md5sum(filename: os.PathLike):
@@ -116,3 +117,25 @@ def run_indent(cmd: Union[List[str], str], spaces: int = 4,
     stderr = indent_raw_output(stderr, spaces)
 
     return (stdout, stderr)
+
+
+def collect_parent_dirs(base_dir: Path, dir: Path) -> Set[Path]:
+    """Collect all parent directories of 'dir' until 'base_dir' is reached.
+
+    If 'dir' is not inside 'base_dir', return None.
+    """
+    parents: Set[Path] = set()
+
+    for dir_path, base_path in [(dir.resolve(), base_dir.resolve()),
+                                (dir.absolute(), base_dir.absolute())]:
+        try:
+            # Check if dir is inside base_dir
+            dir_path.relative_to(base_path)
+        except ValueError:
+            continue
+
+        while dir_path != base_path:
+            parents.add(dir_path)
+            dir_path = dir_path.parent
+
+    return parents

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: batchfetch
-Version: 1.3.3
+Version: 1.3.5
 Summary: Efficiently clone and pull multiple Git repositories.
 Home-page: https://github.com/jamescherti/batchfetch
 Author: James Cherti
@@ -213,7 +213,7 @@ batchfetch
 
 ## License
 
-Copyright (C) 2024 [James Cherti](https://www.jamescherti.com)
+Copyright (C) 2024-2025 [James Cherti](https://www.jamescherti.com)
 
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 

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

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (C) 2024 James Cherti
+# Copyright (C) 2024-2025 James Cherti
 # URL: https://github.com/jamescherti/batchfetch
 #
 # This program is free software: you can redistribute it and/or modify it under
@@ -22,7 +22,7 @@ from setuptools import find_packages, setup
 
 setup(
     name="batchfetch",
-    version="1.3.3",
+    version="1.3.5",
     packages=find_packages(),
     description="Efficiently clone and pull multiple Git repositories.",
     license="GPLv3",