gitlabber 2.1.0__tar.gz → 2.1.1__tar.gz

{gitlabber-2.1.0/gitlabber.egg-info → gitlabber-2.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gitlabber
-Version: 2.1.0
+Version: 2.1.1
 Summary: A Gitlab clone/pull utility for backing up or cloning Gitlab groups
 Author-email: Erez Mazor <erezmazor@gmail.com>
 License: MIT
@@ -26,6 +26,7 @@ Requires-Dist: pyyaml
 Requires-Dist: pydantic>=2.7
 Requires-Dist: pydantic-settings>=2.7
 Requires-Dist: typer>=0.12
+Requires-Dist: urllib3==2.5.0
 Requires-Dist: rich
 Requires-Dist: GitPython
 Requires-Dist: python-gitlab
@@ -229,7 +230,8 @@ Usage
                             number of concurrent git operations (default: 1)
     --api-concurrency N    number of concurrent API calls for tree building (default: 5)
     -r, --recursive       clone/pull git submodules recursively
-    -F, --use-fetch       clone/fetch git repository (mirrored repositories)
+    -F, --use-fetch       use git fetch instead of pull for updates (normal repositories with working tree)
+    --mirror              create bare mirror repositories (for backups, automatically uses fetch)
     -s, --include-shared  include shared projects in the results
     -g term, --group-search term
                             only include groups matching the search term, filtering done at the API level (useful for large projects, see: https://docs.gitlab.com/ee/api/groups.html#search-for-group works with partial names of path or name)

{gitlabber-2.1.0 → gitlabber-2.1.1}/README.rst

@@ -189,7 +189,8 @@ Usage
                             number of concurrent git operations (default: 1)
     --api-concurrency N    number of concurrent API calls for tree building (default: 5)
     -r, --recursive       clone/pull git submodules recursively
-    -F, --use-fetch       clone/fetch git repository (mirrored repositories)
+    -F, --use-fetch       use git fetch instead of pull for updates (normal repositories with working tree)
+    --mirror              create bare mirror repositories (for backups, automatically uses fetch)
     -s, --include-shared  include shared projects in the results
     -g term, --group-search term
                             only include groups matching the search term, filtering done at the API level (useful for large projects, see: https://docs.gitlab.com/ee/api/groups.html#search-for-group works with partial names of path or name)

{gitlabber-2.1.0 → gitlabber-2.1.1}/gitlabber/__init__.py

@@ -5,4 +5,4 @@ while maintaining the directory structure. It supports filtering, progress
 tracking, and various configuration options.
 """
 
-__version__ = '2.1.0'
+__version__ = '2.1.1'

{gitlabber-2.1.0 → gitlabber-2.1.1}/gitlabber/cli.py

@@ -211,6 +211,7 @@ def run_gitlabber(
     exclude: Optional[str],
     recursive: bool,
     use_fetch: bool,
+    mirror: bool,
     include_shared: bool,
     group_search: Optional[str],
     user_projects: bool,
@@ -244,6 +245,7 @@ def run_gitlabber(
         exclude: Comma-separated glob patterns to exclude
         recursive: Clone submodules recursively
         use_fetch: Use git fetch instead of pull
+        mirror: Create bare mirror repositories (implies use_fetch)
         include_shared: Include shared projects
         group_search: Search term for filtering groups at API level
         user_projects: Fetch only user personal projects
@@ -295,6 +297,7 @@ def run_gitlabber(
             "recursive": recursive,
             "include_shared": include_shared,
             "use_fetch": use_fetch,
+            "mirror": mirror,
             "hide_token": hide_token,
             "user_projects": user_projects,
             "group_search": group_search,
@@ -318,6 +321,7 @@ def run_gitlabber(
         disable_progress=verbose,
         include_shared=include_shared,
         use_fetch=use_fetch,
+        mirror=mirror,
         hide_token=hide_token,
         user_projects=user_projects,
         group_search=group_search,
@@ -458,7 +462,7 @@ def cli(
         False,
         "-F",
         "--use-fetch",
-        help="Use git fetch instead of pull (mirrored repositories)",
+        help="Use git fetch instead of pull for updates (normal repositories with working tree)",
     ),
     exclude_shared: bool = typer.Option(
         False,
@@ -495,6 +499,11 @@ def cli(
         "--store-token",
         help="Store token securely in OS keyring (requires keyring package)",
     ),
+    mirror: bool = typer.Option(
+        False,
+        "--mirror",
+        help="Create bare mirror repositories (for backups, automatically uses fetch)",
+    ),
 ) -> None:
     """Main CLI command for gitlabber.
     
@@ -560,6 +569,7 @@ def cli(
         exclude=exclude,
         recursive=recursive,
         use_fetch=use_fetch,
+        mirror=mirror,
         include_shared=include_shared_value,
         group_search=group_search,
         user_projects=user_projects,

{gitlabber-2.1.0 → gitlabber-2.1.1}/gitlabber/config.py

@@ -80,6 +80,7 @@ class GitlabberConfig(BaseModel):
     disable_progress: bool = False
     include_shared: bool = True
     use_fetch: bool = False
+    mirror: bool = False
     hide_token: bool = False
     user_projects: bool = False
     group_search: Optional[str] = None

{gitlabber-2.1.0 → gitlabber-2.1.1}/gitlabber/git.py

@@ -26,6 +26,7 @@ class GitAction:
     use_fetch: bool = False
     hide_token: bool = False
     git_options: Optional[str] = None
+    mirror: bool = False # New parameter
 
 
 class GitRepository:
@@ -68,7 +69,7 @@ class GitRepository:
         multi_options: list[str] = []
         if action.recursive:
             multi_options.append('--recursive')
-        if action.use_fetch:
+        if action.mirror:  # New parameter
             multi_options.append('--mirror')
         if action.git_options:
             multi_options += action.git_options.split(',')
@@ -132,13 +133,15 @@ class GitRepository:
             GitlabberGitError: If pull operation fails
         """
         log.debug("updating existing project %s", action.path)
-        operation = 'fetching' if action.use_fetch else 'pulling'
+        # Mirror implies use_fetch, so check both
+        should_fetch = action.use_fetch or action.mirror
+        operation = 'fetching' if should_fetch else 'pulling'
         progress_bar.show_progress_detailed(action.node.name, 'project', operation)
         
         try:
             if repo is None:
                 repo = git.Repo(action.path)
-            if not action.use_fetch:
+            if not should_fetch:
                 repo.remotes.origin.pull()
             else:
                 repo.remotes.origin.fetch()
@@ -226,6 +229,7 @@ class GitActionCollector:
         dest: str,
                  recursive: bool = False,
                  use_fetch: bool = False,
+                 mirror: bool = False,
                  hide_token: bool = False,
         git_options: Optional[str] = None
     ):
@@ -235,12 +239,14 @@ class GitActionCollector:
             dest: Destination directory for repositories
             recursive: Whether to clone recursively
             use_fetch: Whether to use git fetch instead of pull
+            mirror: Whether to create bare mirror repositories
             hide_token: Whether to hide token in URLs
             git_options: Additional git options as comma-separated string
         """
         self.dest = Path(dest)
         self.recursive = recursive
         self.use_fetch = use_fetch
+        self.mirror = mirror
         self.hide_token = hide_token
         self.git_options = git_options
 
@@ -272,9 +278,11 @@ class GitActionCollector:
             path_str = str(path)
             
             if child.is_leaf:
+                # Mirror implies use_fetch (mirrors should always use fetch)
+                effective_use_fetch = self.use_fetch or self.mirror
                 actions.append(GitAction(
                     child, path_str, self.recursive, 
-                    self.use_fetch, self.hide_token, self.git_options
+                    effective_use_fetch, self.hide_token, self.git_options, self.mirror
                 ))
             
             if not child.is_leaf:
@@ -307,6 +315,7 @@ class GitSyncManager:
         dest: str,
         recursive: bool = False,
         use_fetch: bool = False,
+        mirror: bool = False,
         hide_token: bool = False,
         git_options: Optional[str] = None
     ) -> None:
@@ -317,6 +326,7 @@ class GitSyncManager:
             dest: Destination directory
             recursive: Whether to clone recursively
             use_fetch: Whether to use git fetch instead of pull
+            mirror: Whether to create bare mirror repositories
             hide_token: Whether to hide token in URLs
             git_options: Additional git options as comma-separated string
         """
@@ -324,7 +334,7 @@ class GitSyncManager:
             self.progress_bar.init_progress(len(root.leaves))
 
         collector = GitActionCollector(
-            dest, recursive, use_fetch, hide_token, git_options
+            dest, recursive, use_fetch, mirror, hide_token, git_options
         )
         actions = collector.collect(root)
 
@@ -343,6 +353,7 @@ def sync_tree(
               disable_progress: bool = False,
               recursive: bool = False,
               use_fetch: bool = False,
+              mirror: bool = False,
               hide_token: bool = False,
     git_options: Optional[str] = None
 ) -> None:
@@ -356,11 +367,12 @@ def sync_tree(
         disable_progress: Whether to disable progress reporting
         recursive: Whether to clone recursively
         use_fetch: Whether to use git fetch instead of pull
+        mirror: Whether to create bare mirror repositories
         hide_token: Whether to hide token in URLs
         git_options: Additional git options as comma-separated string
     """
     manager = GitSyncManager(concurrency, disable_progress)
-    manager.sync(root, dest, recursive, use_fetch, hide_token, git_options)
+    manager.sync(root, dest, recursive, use_fetch, mirror, hide_token, git_options)
 
 
 def get_git_actions(
@@ -368,6 +380,7 @@ def get_git_actions(
     dest: str,
     recursive: bool,
     use_fetch: bool,
+    mirror: bool,
     hide_token: bool,
     git_options: Optional[str] = None
 ) -> list[GitAction]:
@@ -378,13 +391,14 @@ def get_git_actions(
         dest: Destination directory
         recursive: Whether to clone recursively
         use_fetch: Whether to use git fetch instead of pull
+        mirror: Whether to create bare mirror repositories
         hide_token: Whether to hide token in URLs
         git_options: Additional git options as comma-separated string
         
     Returns:
         List of GitAction objects to execute
     """
-    collector = GitActionCollector(dest, recursive, use_fetch, hide_token, git_options)
+    collector = GitActionCollector(dest, recursive, use_fetch, mirror, hide_token, git_options)
     return collector.collect(root)
 
 

{gitlabber-2.1.0 → gitlabber-2.1.1}/gitlabber/gitlab_tree.py

@@ -45,6 +45,7 @@ class GitlabTree:
                  disable_progress: bool = False,
                  include_shared: bool = True,
                  use_fetch: bool = False,
+                 mirror: bool = False,
                  hide_token: bool = False,
                  user_projects: bool = False,
                  group_search: Optional[str] = None,
@@ -69,6 +70,7 @@ class GitlabTree:
             disable_progress: Whether to disable progress bar (used if config not provided)
             include_shared: Whether to include shared projects (used if config not provided)
             use_fetch: Whether to use git fetch instead of pull (used if config not provided)
+            mirror: Whether to create bare mirror repositories (used if config not provided)
             hide_token: Whether to hide token in URLs (used if config not provided)
             user_projects: Whether to fetch only user projects (used if config not provided)
             group_search: Search term for filtering groups (used if config not provided)
@@ -98,6 +100,7 @@ class GitlabTree:
             disable_progress = config.disable_progress
             include_shared = config.include_shared
             use_fetch = config.use_fetch
+            mirror = config.mirror
             hide_token = config.hide_token
             user_projects = config.user_projects
             group_search = config.group_search
@@ -175,6 +178,7 @@ class GitlabTree:
         self.token = token
         self.include_shared = include_shared
         self.use_fetch = use_fetch
+        self.mirror = mirror
         self.hide_token = hide_token
         self.user_projects = user_projects
         self.group_search = group_search
@@ -308,7 +312,7 @@ class GitlabTree:
                      len(self.root.descendants) - len(self.root.leaves), len(self.root.leaves))
             sync_tree(self.root, dest, concurrency=self.concurrency,
                      disable_progress=self.disable_progress, recursive=self.recursive,
-                     use_fetch=self.use_fetch, hide_token=self.hide_token,
+                     use_fetch=self.use_fetch, mirror=self.mirror, hide_token=self.hide_token,
                      git_options=self.git_options)
         except GitlabberGitError:
             # Re-raise git errors as-is

{gitlabber-2.1.0 → gitlabber-2.1.1/gitlabber.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gitlabber
-Version: 2.1.0
+Version: 2.1.1
 Summary: A Gitlab clone/pull utility for backing up or cloning Gitlab groups
 Author-email: Erez Mazor <erezmazor@gmail.com>
 License: MIT
@@ -26,6 +26,7 @@ Requires-Dist: pyyaml
 Requires-Dist: pydantic>=2.7
 Requires-Dist: pydantic-settings>=2.7
 Requires-Dist: typer>=0.12
+Requires-Dist: urllib3==2.5.0
 Requires-Dist: rich
 Requires-Dist: GitPython
 Requires-Dist: python-gitlab
@@ -229,7 +230,8 @@ Usage
                             number of concurrent git operations (default: 1)
     --api-concurrency N    number of concurrent API calls for tree building (default: 5)
     -r, --recursive       clone/pull git submodules recursively
-    -F, --use-fetch       clone/fetch git repository (mirrored repositories)
+    -F, --use-fetch       use git fetch instead of pull for updates (normal repositories with working tree)
+    --mirror              create bare mirror repositories (for backups, automatically uses fetch)
     -s, --include-shared  include shared projects in the results
     -g term, --group-search term
                             only include groups matching the search term, filtering done at the API level (useful for large projects, see: https://docs.gitlab.com/ee/api/groups.html#search-for-group works with partial names of path or name)

{gitlabber-2.1.0 → gitlabber-2.1.1}/gitlabber.egg-info/requires.txt

@@ -4,6 +4,7 @@ pyyaml
 pydantic>=2.7
 pydantic-settings>=2.7
 typer>=0.12
+urllib3==2.5.0
 rich
 GitPython
 python-gitlab

{gitlabber-2.1.0 → gitlabber-2.1.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "gitlabber"
-version = "2.1.0"
+version = "2.1.1"
 description = "A Gitlab clone/pull utility for backing up or cloning Gitlab groups"
 readme = "README.rst"
 requires-python = ">=3.11"
@@ -32,6 +32,7 @@ dependencies = [
     "pydantic>=2.7",
     "pydantic-settings>=2.7",
     "typer>=0.12",
+    "urllib3==2.5.0",
     "rich",
     "GitPython",
     "python-gitlab",