worktree-aid 1.2__tar.gz → 1.3__tar.gz

{worktree_aid-1.2/worktree_aid.egg-info → worktree_aid-1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: worktree-aid
-Version: 1.2
+Version: 1.3
 Summary: Linux command line tool to aid creating, switching, and removing git worktrees
 Author-email: Mark Blakeney <mark.blakeney@bullet-systems.net>
 License-Expression: GPL-3.0-or-later
@@ -100,7 +100,7 @@ aliases: a
 ### Command `rm`
 
 ```
-usage: wt rm [-h] [-k] [-f] [worktree]
+usage: wt rm [-h] [-k] [-f] [worktree ...]
 
 Remove worktree + branch.
 
@@ -187,8 +187,9 @@ $ yay -S worktree-aid  # or your preferred AUR helper
 ```
 
 You also need to install a fuzzy finder program such as [`fzf`][fzf] which is
-the default used by `worktree-aid`. See [fuzzy finder installation
-instructions](#fuzzy-finder-integration) for possible alternatives.
+the default used by `worktree-aid`. See [fuzzy finder
+installation](#fuzzy-finder-integration) instructions for possible
+alternatives.
 
 ## Setup
 
@@ -233,11 +234,7 @@ The above sets `-R` (for relative display of worktree directories) as default fo
 `wt` command.
 
 The following options are sensible candidates to set as default options:
-
-- `-B/--basedir`,
-- `-R/--relative`,
-- `-U/--no-user`,
-- `-F/--fuzzy`.
+`-B/--basedir`, `-R/--relative`, `-U/--no-user`, `-F/--fuzzy`.
 
 ## Worktree Base Directory
 
@@ -246,9 +243,12 @@ worktrees. It is set to a default as below but you can change this to any
 directory you like. It can be absolute or relative where relative paths are
 relative to base repository directory.
 
-- Default is `-B ../worktrees/{repo}` which is the same as the [Zed] editor uses.
-- E.g. can use `-B ../{repo}.worktrees` which is same as [VS Code] uses.
-- E.g. can use `-B ~/worktrees/{repo}` to put all worktrees in a subdirectory of your home   directory.
+- Default is `-B ../worktrees/{repo}` which is the same as the [Zed] editor
+  uses by default.
+- E.g. can use `-B ../{repo}.worktrees` which is same as [VS Code] uses by
+  default.
+- E.g. can use `-B ~/worktrees/{repo}` to put all worktrees in a subdirectory
+  of your home directory.
 
 The following place-markers can be used in the definition of the base directory:
 
@@ -256,8 +256,8 @@ The following place-markers can be used in the definition of the base directory:
 - `{user}`: Substituted with the name of the user.
 - `{home}`: Substituted with the home directory of the user (also can use `~` at start of a path).
 
-Most likely if you want to set a custom basedir then you will set `-B` as a
-[default option](#default-options).
+Most likely if you want to set a custom base directory then you will set `-B`
+as a [default option](#default-options).
 
 ## Display as Relative Worktree Directories
 
@@ -268,10 +268,10 @@ can enable it in `worktree-aid` by adding the `-R/--relative` option, e.g:
 
 ```sh
 $ wt l
-../development 9796714 [development]
-../milestone1  bc921b8 [milestone1]
-../test        e6d965a [test]
-.              f76b8e0 [main]
+../worktrees/worktree-aid/development 9796714 [development]
+../worktrees/worktree-aid/milestone1  bc921b8 [milestone1]
+../worktrees/worktree-aid/test        e6d965a [test]
+                                      f76b8e0 [main]
 ```
 
 Most likely you will want to set `-R` as a [default option](#default-options).

{worktree_aid-1.2 → worktree_aid-1.3}/README.md

@@ -88,7 +88,7 @@ aliases: a
 ### Command `rm`
 
 ```
-usage: wt rm [-h] [-k] [-f] [worktree]
+usage: wt rm [-h] [-k] [-f] [worktree ...]
 
 Remove worktree + branch.
 
@@ -175,8 +175,9 @@ $ yay -S worktree-aid  # or your preferred AUR helper
 ```
 
 You also need to install a fuzzy finder program such as [`fzf`][fzf] which is
-the default used by `worktree-aid`. See [fuzzy finder installation
-instructions](#fuzzy-finder-integration) for possible alternatives.
+the default used by `worktree-aid`. See [fuzzy finder
+installation](#fuzzy-finder-integration) instructions for possible
+alternatives.
 
 ## Setup
 
@@ -221,11 +222,7 @@ The above sets `-R` (for relative display of worktree directories) as default fo
 `wt` command.
 
 The following options are sensible candidates to set as default options:
-
-- `-B/--basedir`,
-- `-R/--relative`,
-- `-U/--no-user`,
-- `-F/--fuzzy`.
+`-B/--basedir`, `-R/--relative`, `-U/--no-user`, `-F/--fuzzy`.
 
 ## Worktree Base Directory
 
@@ -234,9 +231,12 @@ worktrees. It is set to a default as below but you can change this to any
 directory you like. It can be absolute or relative where relative paths are
 relative to base repository directory.
 
-- Default is `-B ../worktrees/{repo}` which is the same as the [Zed] editor uses.
-- E.g. can use `-B ../{repo}.worktrees` which is same as [VS Code] uses.
-- E.g. can use `-B ~/worktrees/{repo}` to put all worktrees in a subdirectory of your home   directory.
+- Default is `-B ../worktrees/{repo}` which is the same as the [Zed] editor
+  uses by default.
+- E.g. can use `-B ../{repo}.worktrees` which is same as [VS Code] uses by
+  default.
+- E.g. can use `-B ~/worktrees/{repo}` to put all worktrees in a subdirectory
+  of your home directory.
 
 The following place-markers can be used in the definition of the base directory:
 
@@ -244,8 +244,8 @@ The following place-markers can be used in the definition of the base directory:
 - `{user}`: Substituted with the name of the user.
 - `{home}`: Substituted with the home directory of the user (also can use `~` at start of a path).
 
-Most likely if you want to set a custom basedir then you will set `-B` as a
-[default option](#default-options).
+Most likely if you want to set a custom base directory then you will set `-B`
+as a [default option](#default-options).
 
 ## Display as Relative Worktree Directories
 
@@ -256,10 +256,10 @@ can enable it in `worktree-aid` by adding the `-R/--relative` option, e.g:
 
 ```sh
 $ wt l
-../development 9796714 [development]
-../milestone1  bc921b8 [milestone1]
-../test        e6d965a [test]
-.              f76b8e0 [main]
+../worktrees/worktree-aid/development 9796714 [development]
+../worktrees/worktree-aid/milestone1  bc921b8 [milestone1]
+../worktrees/worktree-aid/test        e6d965a [test]
+                                      f76b8e0 [main]
 ```
 
 Most likely you will want to set `-R` as a [default option](#default-options).

{worktree_aid-1.2 → worktree_aid-1.3/worktree_aid.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: worktree-aid
-Version: 1.2
+Version: 1.3
 Summary: Linux command line tool to aid creating, switching, and removing git worktrees
 Author-email: Mark Blakeney <mark.blakeney@bullet-systems.net>
 License-Expression: GPL-3.0-or-later
@@ -100,7 +100,7 @@ aliases: a
 ### Command `rm`
 
 ```
-usage: wt rm [-h] [-k] [-f] [worktree]
+usage: wt rm [-h] [-k] [-f] [worktree ...]
 
 Remove worktree + branch.
 
@@ -187,8 +187,9 @@ $ yay -S worktree-aid  # or your preferred AUR helper
 ```
 
 You also need to install a fuzzy finder program such as [`fzf`][fzf] which is
-the default used by `worktree-aid`. See [fuzzy finder installation
-instructions](#fuzzy-finder-integration) for possible alternatives.
+the default used by `worktree-aid`. See [fuzzy finder
+installation](#fuzzy-finder-integration) instructions for possible
+alternatives.
 
 ## Setup
 
@@ -233,11 +234,7 @@ The above sets `-R` (for relative display of worktree directories) as default fo
 `wt` command.
 
 The following options are sensible candidates to set as default options:
-
-- `-B/--basedir`,
-- `-R/--relative`,
-- `-U/--no-user`,
-- `-F/--fuzzy`.
+`-B/--basedir`, `-R/--relative`, `-U/--no-user`, `-F/--fuzzy`.
 
 ## Worktree Base Directory
 
@@ -246,9 +243,12 @@ worktrees. It is set to a default as below but you can change this to any
 directory you like. It can be absolute or relative where relative paths are
 relative to base repository directory.
 
-- Default is `-B ../worktrees/{repo}` which is the same as the [Zed] editor uses.
-- E.g. can use `-B ../{repo}.worktrees` which is same as [VS Code] uses.
-- E.g. can use `-B ~/worktrees/{repo}` to put all worktrees in a subdirectory of your home   directory.
+- Default is `-B ../worktrees/{repo}` which is the same as the [Zed] editor
+  uses by default.
+- E.g. can use `-B ../{repo}.worktrees` which is same as [VS Code] uses by
+  default.
+- E.g. can use `-B ~/worktrees/{repo}` to put all worktrees in a subdirectory
+  of your home directory.
 
 The following place-markers can be used in the definition of the base directory:
 
@@ -256,8 +256,8 @@ The following place-markers can be used in the definition of the base directory:
 - `{user}`: Substituted with the name of the user.
 - `{home}`: Substituted with the home directory of the user (also can use `~` at start of a path).
 
-Most likely if you want to set a custom basedir then you will set `-B` as a
-[default option](#default-options).
+Most likely if you want to set a custom base directory then you will set `-B`
+as a [default option](#default-options).
 
 ## Display as Relative Worktree Directories
 
@@ -268,10 +268,10 @@ can enable it in `worktree-aid` by adding the `-R/--relative` option, e.g:
 
 ```sh
 $ wt l
-../development 9796714 [development]
-../milestone1  bc921b8 [milestone1]
-../test        e6d965a [test]
-.              f76b8e0 [main]
+../worktrees/worktree-aid/development 9796714 [development]
+../worktrees/worktree-aid/milestone1  bc921b8 [milestone1]
+../worktrees/worktree-aid/test        e6d965a [test]
+                                      f76b8e0 [main]
 ```
 
 Most likely you will want to set `-R` as a [default option](#default-options).

worktree_aid-1.3/worktree_aid.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "1.3",
+  "distance": 0,
+  "node": "g96636984d65e5c8842ec3d42da1b2c72bda998fd",
+  "dirty": false,
+  "branch": "main",
+  "node_date": "2026-08-03"
+}

{worktree_aid-1.2 → worktree_aid-1.3}/worktree_aid.py

@@ -273,12 +273,15 @@ class Trees:
     @classmethod
     def remove_worktree(cls, name: str, args: Namespace) -> Path | None:
         "Remove the worktree and branch with the given name"
-        if name:
-            if not (tree := cls.get_tree(name)):
-                sys.exit(f'error: no worktree found with name "{name}".')
-        else:
-            # If no name is given, remove the current worktree and branch
-            tree = cls.current
+        if not (tree := cls.get_tree(name)):
+            sys.exit(f'error: no worktree found with name "{name}".')
+
+        if tree == cls.toplevel:
+            print(
+                f'warning: not removing top-level worktree "{tree.path}"',
+                file=sys.stderr,
+            )
+            return None
 
         # Change to the top-level worktree directory before deleting a worktree
         # and/or branch, in case the current directory is removed.
@@ -472,8 +475,7 @@ class rm_:
         )
         parser.add_argument(
             'worktree',
-            default='',
-            nargs='?',
+            nargs='*',
             help='worktree + branch name to remove. If not specified then '
             'fuzzy finder will prompt with a list of worktrees, with the '
             'current worktree as the default selection.',
@@ -482,13 +484,17 @@ class rm_:
     @staticmethod
     def run(args: Namespace) -> str | None:
         Trees.fetch(args)
-        if not (name := args.worktree):
-            if not (path := Trees.prompt(args)):
-                return None
-            name = path.name
+        retpath = None
+        for name in args.worktree or ['']:
+            if not name:
+                if not (path := Trees.prompt(args)):
+                    return None
+                name = path.name
 
-        path = Trees.remove_worktree(name, args)
-        return str(path) if path else None
+            if path := Trees.remove_worktree(name, args):
+                retpath = path
+
+        return str(retpath) if retpath else None
 
 
 # COMMAND

worktree_aid-1.2/worktree_aid.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "1.2",
-  "distance": 0,
-  "node": "gcb78b4dc270eb62209b736dedbcf8e12ad2591ec",
-  "dirty": false,
-  "branch": "main",
-  "node_date": "2026-08-02"
-}