a98a9f7122d583a9547e9a8b2ab8c14570fc6e54

Author
Cyril Plisko <cyril.plisko@mountall.com>
Committer
GitHub <noreply@github.com>
Date

Message

feat(jj): add `jj` aliases for common workflows (#13179)

- jj bookmark
    Aliases for bookmark subcommands
- jj git push
    Aliases for popular push flags
- jj new "trunk()"
- jj rebase -d "trunk()"
- jj status

Diff

 1diff --git a/plugins/jj/README.md b/plugins/jj/README.md
 2index 541b8f9074234df55407e42ff39e72c91a733950..fd964e30972cc579f49f56a9ea14ce7d460e9333 100644
 3--- a/plugins/jj/README.md
 4+++ b/plugins/jj/README.md
 5@@ -12,6 +12,16 @@ plugins=(... jj)
 6 
 7 | Alias  | Command                       |
 8 | ------ | ----------------------------- |
 9+| jjb    | `jj bookmark`                 |
10+| jjbc   | `jj bookmark create`          |
11+| jjbd   | `jj bookmark delete`          |
12+| jjbf   | `jj bookmark forget`          |
13+| jjbl   | `jj bookmark list`            |
14+| jjbm   | `jj bookmark move`            |
15+| jjbr   | `jj bookmark rename`          |
16+| jjbs   | `jj bookmark set`             |
17+| jjbt   | `jj bookmark track`           |
18+| jjbu   | `jj bookmark untrack`         |
19 | jjc    | `jj commit`                   |
20 | jjcmsg | `jj commit --message`         |
21 | jjd    | `jj diff`                     |
22@@ -22,14 +32,20 @@ plugins=(... jj)
23 | jjgf   | `jj git fetch`                |
24 | jjgfa  | `jj git fetch --all-remotes`  |
25 | jjgp   | `jj git push`                 |
26+| jjgpa  | `jj git push --all`           |
27+| jjgpd  | `jj git push --deleted`       |
28+| jjgpt  | `jj git push --tracked`       |
29 | jjl    | `jj log`                      |
30 | jjla   | `jj log -r "all()"`           |
31 | jjn    | `jj new`                      |
32+| jjnt   | `jj new "trunk()"`            |
33 | jjrb   | `jj rebase`                   |
34+| jjrbm  | `jj rebase -d "trunk()"`      |
35 | jjrs   | `jj restore`                  |
36 | jjrt   | `cd "$(jj root \|\| echo .)"` |
37 | jjsp   | `jj split`                    |
38 | jjsq   | `jj squash`                   |
39+| jjst   | `jj status`                   |
40 
41 ## Prompt usage
42 
43@@ -88,3 +104,4 @@ that.
44 ## Contributors
45 
46 - [nasso](https://github.com/nasso) - Plugin Author
47+- [imp](https://github.com/imp) - Occasional Alias Contributor
48diff --git a/plugins/jj/jj.plugin.zsh b/plugins/jj/jj.plugin.zsh
49index 825460517fb65b943a54231c0f9745c3d27a91f8..696bc380b0b4d4a31f0ce82adfb58dc59d848537 100644
50--- a/plugins/jj/jj.plugin.zsh
51+++ b/plugins/jj/jj.plugin.zsh
52@@ -34,6 +34,16 @@ function jj_prompt_template() {
53 }
54 
55 # Aliases (sorted alphabetically)
56+alias jjb='jj bookmark'
57+alias jjbc='jj bookmark create'
58+alias jjbd='jj bookmark delete'
59+alias jjbf='jj bookmark forget'
60+alias jjbl='jj bookmark list'
61+alias jjbm='jj bookmark move'
62+alias jjbr='jj bookmark rename'
63+alias jjbs='jj bookmark set'
64+alias jjbt='jj bookmark track'
65+alias jjbu='jj bookmark untrack'
66 alias jjc='jj commit'
67 alias jjcmsg='jj commit --message'
68 alias jjd='jj diff'
69@@ -44,11 +54,17 @@ alias jjgcl='jj git clone'
70 alias jjgf='jj git fetch'
71 alias jjgfa='jj git fetch --all-remotes'
72 alias jjgp='jj git push'
73+alias jjgpa='jj git push --all'
74+alias jjgpd='jj git push --deleted'
75+alias jjgpt='jj git push --tracked'
76 alias jjl='jj log'
77 alias jjla='jj log -r "all()"'
78 alias jjn='jj new'
79+alias jjnt='jj new "trunk()"'
80 alias jjrb='jj rebase'
81+alias jjrbm='jj rebase -d "trunk()"'
82 alias jjrs='jj restore'
83 alias jjrt='cd "$(jj root || echo .)"'
84 alias jjsp='jj split'
85 alias jjsq='jj squash'
86+alias jjst='jj status'