Skip to content

feat: add checkout option #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mtth merged 2 commits into from
Mar 1, 2025
Merged

feat: add checkout option #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c411f00
feat: add checkout option
mtth Mar 1, 2025
7e958a3
fixup! feat: add checkout option
mtth Mar 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/git_draft/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,15 @@ def callback(_option, _opt, _value, parser) -> None:
parser.add_option(
"-a",
"--assistant",
dest="ASSISTANT",
dest="assistant",
help="assistant key",
default="openai",
)
parser.add_option(
"-c",
"--checkout",
help="check out generated changes",
action="store_true",
)
parser.add_option(
"-d",
Expand Down Expand Up @@ -87,7 +94,9 @@ def main() -> None:
prompt = open_editor(textwrap.dedent(EDITOR_PLACEHOLDER))
else:
prompt = sys.stdin.read()
manager.generate_draft(prompt, assistant, reset=opts.reset)
manager.generate_draft(
prompt, assistant, checkout=opts.checkout, reset=opts.reset
)
elif command == "finalize":
manager.finalize_draft(delete=opts.delete)
elif command == "discard":
Expand Down
6 changes: 4 additions & 2 deletions src/git_draft/manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ def needs_rebase(self, repo: git.Repo) -> bool:
init_commit = repo.commit(self.init_shortsha)
(origin_commit,) = init_commit.parents
head_commit = repo.commit(self.init_note.origin_branch)
return origin_commit == head_commit
return origin_commit != head_commit

@classmethod
def create(cls, repo: git.Repo, sync: Callable[[], str | None]) -> _Branch:
Expand Down Expand Up @@ -148,7 +148,7 @@ def __init__(self, repo: git.Repo) -> None:
self._repo = repo

def generate_draft(
self, prompt: str, assistant: Assistant, reset=False
self, prompt: str, assistant: Assistant, checkout=False, reset=False
) -> None:
if not prompt.strip():
raise ValueError("Empty prompt")
Expand All @@ -165,6 +165,8 @@ def generate_draft(

assistant.run(prompt, _Toolbox(self._repo))
self._repo.index.commit(f"draft! prompt\n\n{prompt}")
if checkout:
self._repo.git.checkout("--", ".")

def finalize_draft(self, delete=False) -> None:
self._exit_draft(True, delete=delete)
Expand Down