geoffrey/dotfiles
geoffrey/dotfiles
1
0
Fork 0
Code Issues 7 Pull requests Releases Activity

Misc fixes

Browse source
This commit is contained in:
Geoffrey Frogeye 2024-11-07 14:47:39 +01:00
parent 0d1c2f1975
commit 22b844df2c
Signed by: geoffrey
GPG key ID: C72403E7F82E6AD8
3 changed files with 75 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hm/scripts/jlab
View file

@ -213,13 +213,13 @@ elif sys.argv[1] in ("merge", "mr"):
# so jj has a current bookmark.
mr = glab_get_mr(sys.argv[3])
jj.run("git", "fetch")
if len(JujutsuCommit.log(f"{mr.source_branch} | {mr.target_branch}")) == 1:
if len(jj.log(f"{mr.source_branch} | {mr.target_branch}")) == 1:
title = re.sub(r"^(WIP|Draft): ", "", mr.title)
jj.run("new", mr.source_branch)
jj.run("describe", "-m", title)
jj.run("bookmark", "move", mr.source_branch)
else:
jj.run("bookmark", "edit", mr.source_branch)
jj.run("edit", mr.source_branch)
elif sys.argv[2] in (
# If no MR number/branch is given, insert the current bookmark,
# as the current branch concept doesn't exist in jj