easy-worktree 0.0.3__tar.gz → 0.0.5__tar.gz

{easy_worktree-0.0.3 → easy_worktree-0.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: easy-worktree
-Version: 0.0.3
+Version: 0.0.5
 Summary: Git worktree を簡単に管理するための CLI ツール
 Project-URL: Homepage, https://github.com/igtm/easy-worktree
 Project-URL: Repository, https://github.com/igtm/easy-worktree
@@ -184,11 +184,11 @@ wt clean --all              # Remove all clean worktrees without confirmation
 Create symbolic link shortcuts to frequently used worktrees.
 
 ```bash
-wt alias current feature-123           # Create alias named 'current'
-wt alias dev feature-xyz               # Create alias named 'dev'
-wt alias --override current hoge3      # Override existing alias
-wt alias --list                        # List all aliases
-wt alias --remove current              # Remove an alias
+wt alias current feature-123    # Create alias named 'current'
+wt alias dev feature-xyz        # Create alias named 'dev'
+wt alias current hoge3          # Automatically override existing alias
+wt alias --list                 # List all aliases
+wt alias --remove current       # Remove an alias
 ```
 
 ### Check status of all worktrees

{easy_worktree-0.0.3 → easy_worktree-0.0.5}/README.md

@@ -163,11 +163,11 @@ wt clean --all              # Remove all clean worktrees without confirmation
 Create symbolic link shortcuts to frequently used worktrees.
 
 ```bash
-wt alias current feature-123           # Create alias named 'current'
-wt alias dev feature-xyz               # Create alias named 'dev'
-wt alias --override current hoge3      # Override existing alias
-wt alias --list                        # List all aliases
-wt alias --remove current              # Remove an alias
+wt alias current feature-123    # Create alias named 'current'
+wt alias dev feature-xyz        # Create alias named 'dev'
+wt alias current hoge3          # Automatically override existing alias
+wt alias --list                 # List all aliases
+wt alias --remove current       # Remove an alias
 ```
 
 ### Check status of all worktrees

{easy_worktree-0.0.3 → easy_worktree-0.0.5}/README_ja.md

@@ -161,11 +161,11 @@ wt clean --all              # すべての clean worktree を削除（確認な
 よく使う worktree にシンボリックリンクでショートカットを作成できます。
 
 ```bash
-wt alias current feature-123           # current という名前でエイリアス作成
-wt alias dev feature-xyz               # dev という名前でエイリアス作成
-wt alias --override current hoge3      # 既存のエイリアスを上書き
-wt alias --list                        # エイリアス一覧を表示
-wt alias --remove current              # エイリアスを削除
+wt alias current feature-123    # current という名前でエイリアス作成
+wt alias dev feature-xyz        # dev という名前でエイリアス作成
+wt alias current hoge3          # 既存のエイリアスを自動的に上書き
+wt alias --list                 # エイリアス一覧を表示
+wt alias --remove current       # エイリアスを削除
 ```
 
 ### 全 worktree の状態を確認

{easy_worktree-0.0.3 → easy_worktree-0.0.5}/easy_worktree/__init__.py

@@ -128,9 +128,9 @@ MESSAGES = {
         'en': 'Usage: wt alias <name> <worktree> | wt alias --list | wt alias --remove <name>',
         'ja': '使用方法: wt alias <名前> <worktree> | wt alias --list | wt alias --remove <名前>'
     },
-    'alias_exists_suggestion': {
-        'en': 'To override, use: wt alias --override {} {}',
-        'ja': '上書きするには次を実行してください: wt alias --override {} {}'
+    'alias_updated': {
+        'en': 'Updated alias: {} -> {}',
+        'ja': 'エイリアスを更新しました: {} -> {}'
     },
     'no_clean_targets': {
         'en': 'No worktrees to clean',
@@ -454,56 +454,104 @@ def cmd_add(args: list[str]):
             check=False
         )
     else:
-        # 新しいブランチを作成
+        # ブランチ名として work_name を使用
         branch_name = work_name
-        # デフォルトブランチを探す（origin/main または origin/master）
-        result = run_command(
-            ["git", "symbolic-ref", "refs/remotes/origin/HEAD", "--short"],
+
+        # ローカルまたはリモートにブランチが既に存在するかチェック
+        check_local = run_command(
+            ["git", "rev-parse", "--verify", branch_name],
+            cwd=base_dir,
+            check=False
+        )
+        check_remote = run_command(
+            ["git", "rev-parse", "--verify", f"origin/{branch_name}"],
             cwd=base_dir,
             check=False
         )
 
-        if result.returncode == 0 and result.stdout.strip():
-            base_branch = result.stdout.strip()
+        if check_local.returncode == 0 or check_remote.returncode == 0:
+            # 既存ブランチを使用
+            if check_remote.returncode == 0:
+                # リモートブランチが存在する場合
+                print(msg('creating_worktree', worktree_path))
+                result = run_command(
+                    ["git", "worktree", "add", str(worktree_path), f"origin/{branch_name}"],
+                    cwd=base_dir,
+                    check=False
+                )
+            else:
+                # ローカルブランチのみ存在する場合
+                print(msg('creating_worktree', worktree_path))
+                result = run_command(
+                    ["git", "worktree", "add", str(worktree_path), branch_name],
+                    cwd=base_dir,
+                    check=False
+                )
         else:
-            # symbolic-ref が失敗した場合は手動でチェック
-            result_main = run_command(
-                ["git", "rev-parse", "--verify", "origin/main"],
+            # 新しいブランチを作成
+            # デフォルトブランチを探す（origin/main または origin/master）
+            result = run_command(
+                ["git", "symbolic-ref", "refs/remotes/origin/HEAD", "--short"],
                 cwd=base_dir,
                 check=False
             )
-            result_master = run_command(
-                ["git", "rev-parse", "--verify", "origin/master"],
+
+            if result.returncode == 0 and result.stdout.strip():
+                base_branch = result.stdout.strip()
+            else:
+                # symbolic-ref が失敗した場合は手動でチェック
+                result_main = run_command(
+                    ["git", "rev-parse", "--verify", "origin/main"],
+                    cwd=base_dir,
+                    check=False
+                )
+                result_master = run_command(
+                    ["git", "rev-parse", "--verify", "origin/master"],
+                    cwd=base_dir,
+                    check=False
+                )
+
+                if result_main.returncode == 0:
+                    base_branch = "origin/main"
+                elif result_master.returncode == 0:
+                    base_branch = "origin/master"
+                else:
+                    print(msg('error', msg('default_branch_not_found')), file=sys.stderr)
+                    sys.exit(1)
+
+            print(msg('creating_branch', base_branch, work_name))
+            result = run_command(
+                ["git", "worktree", "add", "-b", work_name, str(worktree_path), base_branch],
                 cwd=base_dir,
                 check=False
             )
 
-            if result_main.returncode == 0:
-                base_branch = "origin/main"
-            elif result_master.returncode == 0:
-                base_branch = "origin/master"
-            else:
-                print(msg('error', msg('default_branch_not_found')), file=sys.stderr)
-                sys.exit(1)
-
-        print(msg('creating_branch', base_branch, work_name))
-        result = run_command(
-            ["git", "worktree", "add", "-b", work_name, str(worktree_path), base_branch],
-            cwd=base_dir,
-            check=False
-        )
-
     if result.returncode == 0:
         print(msg('completed_worktree', worktree_path))
 
         # エイリアスを作成
         if alias_name:
             alias_path = base_dir.parent / alias_name
-            if alias_path.exists():
-                print(msg('error', msg('already_exists', alias_name)), file=sys.stderr)
-                print(msg('alias_exists_suggestion', alias_name, work_name), file=sys.stderr)
+
+            # 既存かどうかをチェック
+            is_updating = alias_path.is_symlink()
+
+            # 既存のシンボリックリンクを削除
+            if alias_path.is_symlink():
+                alias_path.unlink()
+            elif alias_path.exists():
+                # シンボリックリンクではないファイル/ディレクトリが存在
+                print(msg('error', f'{alias_name} exists but is not a symlink'), file=sys.stderr)
+                # post-add hook を実行
+                run_post_add_hook(worktree_path, work_name, base_dir, branch_name)
+                sys.exit(0)  # worktree は作成できたので正常終了
+
+            # シンボリックリンクを作成
+            alias_path.symlink_to(worktree_path, target_is_directory=True)
+
+            if is_updating:
+                print(msg('alias_updated', alias_name, work_name))
             else:
-                alias_path.symlink_to(worktree_path, target_is_directory=True)
                 print(msg('alias_created', alias_name, work_name))
 
         # post-add hook を実行
@@ -676,6 +724,14 @@ def cmd_clean(args: list[str]):
     # worktree 情報を取得
     worktrees = get_worktree_info(base_dir)
 
+    # エイリアスで使われている worktree を取得
+    parent_dir = base_dir.parent
+    aliased_worktrees = set()
+    for item in parent_dir.iterdir():
+        if item.is_symlink() and item.name != '_base':
+            target = item.resolve()
+            aliased_worktrees.add(target)
+
     # 削除対象を抽出（_baseは除外）
     targets = []
     now = datetime.now()
@@ -687,6 +743,10 @@ def cmd_clean(args: list[str]):
         if path.name == '_base':
             continue
 
+        # エイリアスで使われている worktree は除外
+        if path in aliased_worktrees:
+            continue
+
         # clean状態のものだけが対象
         if not wt.get('is_clean'):
             continue
@@ -789,11 +849,6 @@ def cmd_alias(args: list[str]):
         print(msg('alias_removed', alias_name))
         return
 
-    # --override オプションをチェック
-    override = '--override' in args
-    if override:
-        args.remove('--override')
-
     # エイリアス作成
     if len(args) < 2:
         print(msg('usage_alias'), file=sys.stderr)
@@ -810,19 +865,19 @@ def cmd_alias(args: list[str]):
         print(msg('error', f'Worktree not found: {worktree_name}'), file=sys.stderr)
         sys.exit(1)
 
-    # エイリアスがすでに存在するかチェック
+    # エイリアスがすでに存在する場合は上書き
     if alias_path.exists():
-        if not override:
-            print(msg('error', msg('already_exists', alias_name)), file=sys.stderr)
-            print(msg('alias_exists_suggestion', alias_name, worktree_name), file=sys.stderr)
-            sys.exit(1)
-        # --override が指定されている場合は既存のエイリアスを削除
         if alias_path.is_symlink():
             alias_path.unlink()
-
-    # シンボリックリンクを作成
-    alias_path.symlink_to(worktree_path, target_is_directory=True)
-    print(msg('alias_created', alias_name, worktree_name))
+            alias_path.symlink_to(worktree_path, target_is_directory=True)
+            print(msg('alias_updated', alias_name, worktree_name))
+        else:
+            print(msg('error', f'{alias_name} exists but is not a symlink'), file=sys.stderr)
+            sys.exit(1)
+    else:
+        # シンボリックリンクを作成
+        alias_path.symlink_to(worktree_path, target_is_directory=True)
+        print(msg('alias_created', alias_name, worktree_name))
 
 
 def cmd_status(args: list[str]):
@@ -897,8 +952,7 @@ def show_help():
         print("  rm <作業名>                         - worktree を削除")
         print("  remove <作業名>                     - worktree を削除")
         print("  clean [--dry-run] [--days N]       - 未使用の worktree を削除")
-        print("  alias <名前> <worktree>            - worktree のエイリアスを作成")
-        print("  alias --override <名前> <worktree> - エイリアスを上書き")
+        print("  alias <名前> <worktree>            - worktree のエイリアスを作成/更新")
         print("  alias --list                        - エイリアス一覧を表示")
         print("  alias --remove <名前>              - エイリアスを削除")
         print("  status [--dirty] [--short]         - 全 worktree の状態を表示")
@@ -921,8 +975,7 @@ def show_help():
         print("  rm <work_name>                       - Remove a worktree")
         print("  remove <work_name>                   - Remove a worktree")
         print("  clean [--dry-run] [--days N]        - Remove unused worktrees")
-        print("  alias <name> <worktree>             - Create an alias for a worktree")
-        print("  alias --override <name> <worktree>  - Override an existing alias")
+        print("  alias <name> <worktree>             - Create or update an alias for a worktree")
         print("  alias --list                         - List aliases")
         print("  alias --remove <name>               - Remove an alias")
         print("  status [--dirty] [--short]          - Show status of all worktrees")
@@ -935,7 +988,7 @@ def show_help():
 
 def show_version():
     """Show version information"""
-    print("easy-worktree version 0.0.3")
+    print("easy-worktree version 0.0.5")
 
 
 def main():

{easy_worktree-0.0.3 → easy_worktree-0.0.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "easy-worktree"
-version = "0.0.3"
+version = "0.0.5"
 description = "Git worktree を簡単に管理するための CLI ツール"
 readme = "README.md"
 requires-python = ">=3.11"