feat: require sync (#66)

This is a prerequisite to improving the conflict/merge flow.

Also refactor to omit the `gitpython` dependency.

Author: mtth

README.md

@@ -24,3 +24,6 @@ pipx install git-draft[openai]
 * Mechanism for reporting feedback from a bot, and possibly allowing user to
   interactively respond.
 * Add MCP bot.
+* Store configuration in `gitconfig` as `draft.*` entries. This can be used for
+  example to set a unique repo ID, and default bot to use per repo (or more
+  widely via shared `gitconfig` files).

docs/git-draft.adoc

@@ -19,9 +19,8 @@ IMPORTANT: `git-draft` is WIP.
 
 [verse]
 git draft [options] [--generate] [--accept... | --no-accept] [--bot BOT]
-                    [--edit] [--reset | --no-reset] [--sync | --no-sync]
-                    [TEMPLATE [VARIABLE...]]
-git draft [options] --finalize [--delete] [--sync | --no-sync]
+                    [--edit] [--reset | --no-reset] [TEMPLATE [VARIABLE...]]
+git draft [options] --finalize [--delete]
 git draft [options] --show-drafts [--json]
 git draft [options] --show-prompts [--json] [PROMPT]
 git draft [options] --show-templates [--json | [--edit] TEMPLATE]
@@ -96,11 +95,6 @@ git draft [options] --show-templates [--json | [--edit] TEMPLATE]
   Lists available templates.
   With an template name argument, displays the corresponding template's contents or, if the `--edit` option is set, opens an interactive editor.
 
--s::
---sync::
---no-sync::
-  Create a sync commit with any changes.
-
 -t TIMEOUT::
 --timeout=TIMEOUT::
   Action timeout.

poetry.lock

@@ -7,7 +7,6 @@ readme = "README.md"
 dynamic = ["version"]
 requires-python = ">=3.12"
 dependencies = [
-  "gitpython (>=3.1.44,<4)",
   "jinja2 (>=3.1.5,<4)",
   "prettytable (>=3.15.1,<4)",
   "xdg-base-dirs (>=6.0.2,<7)",

pyproject.toml

@@ -94,12 +94,6 @@ def callback(
         help="use JSON for table output",
         action="store_true",
     )
-    parser.add_option(
-        "-s",
-        "--sync",
-        help="commit prior worktree changes separately",
-        action="store_true",
-    )
 
     parser.add_option(
         "--no-accept",
@@ -114,12 +108,6 @@ def callback(
         dest="reset",
         action="store_false",
     )
-    parser.add_option(
-        "--no-sync",
-        help="do not commit intermediate worktree changes",
-        dest="sync",
-        action="store_false",
-    )
     parser.add_option(
         "--reset",
         help="reset index before generating a new draft",
@@ -160,7 +148,7 @@ def on_rename_file(
         self,
         src_path: PurePosixPath,
         dst_path: PurePosixPath,
-        _reason: str | None
+        _reason: str | None,
     ) -> None:
         print(f"Renamed {src_path} to {dst_path}.")
 
@@ -233,7 +221,6 @@ def main() -> None:  # noqa: PLR0912 PLR0915
                 prompt_transform=open_editor if editable else None,
                 tool_visitors=[ToolPrinter()],
                 reset=config.reset if opts.reset is None else opts.reset,
-                sync=config.sync if opts.sync is None else opts.sync,
             )
             match accept:
                 case Accept.MANUAL:
@@ -245,10 +232,7 @@ def main() -> None:  # noqa: PLR0912 PLR0915
                 case _:
                     raise UnreachableError()
         case "finalize":
-            draft = drafter.finalize_draft(
-                delete=opts.delete,
-                sync=config.sync if opts.sync is None else opts.sync,
-            )
+            draft = drafter.finalize_draft(delete=opts.delete)
             print(f"Finalized {draft.branch_name}.")
         case "show-drafts":
             table = drafter.history_table(args[0] if args else None)

src/git_draft/__main__.py

@@ -42,7 +42,6 @@ class Config:
     bots: Sequence[BotConfig] = dataclasses.field(default_factory=lambda: [])
     log_level: int = logging.INFO
     reset: bool = True
-    sync: bool = False
 
     @staticmethod
     def folder_path() -> Path:
@@ -74,6 +73,17 @@ class BotConfig:
     pythonpath: str | None = None
 
 
+type RepoID = str
+
+
+@dataclasses.dataclass(frozen=True)
+class RepoConfig:  # TODO: Use
+    """Repository-specific config"""
+
+    repo_id: str
+    bot_name: str | None = None
+
+
 def config_string(arg: str) -> str:
     """Dereferences environment value if the input starts with `$`"""
     return os.environ[arg[1:]] if arg and arg.startswith("$") else arg