1 95fee1d4 2014-11-17 rsc #!/usr/local/plan9/bin/rc
6 95fee1d4 2014-11-17 rsc echo '%' git $*
9 95fee1d4 2014-11-17 rsc if(! ~ $#* 0 && ~ $1 -v) {
15 95fee1d4 2014-11-17 rsc if(~ $#* 0) {
16 95fee1d4 2014-11-17 rsc echo 'usage: codereview <command> <args>' >[1=2]
20 95fee1d4 2014-11-17 rsc if(~ $#PLAN9 0) {
21 95fee1d4 2014-11-17 rsc PLAN9=/usr/local/plan9
23 95fee1d4 2014-11-17 rsc if(! test -d $PLAN9/lib/git) {
24 95fee1d4 2014-11-17 rsc echo 'codereview: cannot find $PLAN9/lib/git' >[1=2]
28 95fee1d4 2014-11-17 rsc if(! test -e $PLAN9/.git/hooks/commit-msg) {
30 95fee1d4 2014-11-17 rsc echo '% ln -s ../../lib/git/commit-msg.hook $PLAN9/.git/hooks/commit-msg'
32 95fee1d4 2014-11-17 rsc ln -s ../../lib/git/commit-msg.hook $PLAN9/.git/hooks/commit-msg
37 95fee1d4 2014-11-17 rsc 9 man 1 codereview
41 95fee1d4 2014-11-17 rsc if(! ~ $#* 0) {
42 95fee1d4 2014-11-17 rsc echo 'usage: codereview pending' >[1=2]
45 01463bac 2014-11-18 rsc $git branch -v
49 32f3c4ad 2014-11-17 rsc if(~ $#* 0) {
50 95fee1d4 2014-11-17 rsc echo 'usage: codereview create branchname' >[1=2]
55 32f3c4ad 2014-11-17 rsc if(! git branch -l | 9 grep '\* master$' >/dev/null) {
56 95fee1d4 2014-11-17 rsc echo 'codereview: create not on master branch; use codereview commit' >[1=2]
60 95fee1d4 2014-11-17 rsc echo '% git branch '$branch' && git commit || git branch -d '$branch >[1=2]
62 0edb0468 2014-11-17 rsc git branch $branch && git checkout $branch && git commit -a $* || git branch -d $branch
66 32f3c4ad 2014-11-17 rsc if(git branch -l | 9 grep '\* master$' >/dev/null) {
67 95fee1d4 2014-11-17 rsc echo 'codereview: commit on master branch; use codereview create <branchname>' >[1=2]
70 95fee1d4 2014-11-17 rsc if(~ `{git merge-base HEAD HEAD} `{git merge-base HEAD master}) {
71 95fee1d4 2014-11-17 rsc # first commit on branch, somehow.
72 95fee1d4 2014-11-17 rsc $git commit $*
75 0edb0468 2014-11-17 rsc $git commit --amend -a $*
79 32f3c4ad 2014-11-17 rsc if(git branch -l | 9 grep '\* master$' >/dev/null) {
80 95fee1d4 2014-11-17 rsc echo 'codereview: upload on master branch' >[1=2]
83 95fee1d4 2014-11-17 rsc if(~ `{git merge-base HEAD HEAD} `{git merge-base HEAD master}) {
84 95fee1d4 2014-11-17 rsc # no commit on branch
85 95fee1d4 2014-11-17 rsc echo 'codereview: no commits yet on this feature branch' >[1=2]
88 95fee1d4 2014-11-17 rsc if(! 9 grep 'machine plan9port-review.googlesource.com' $HOME/.netrc >/dev/null >[2=1]) {
89 95fee1d4 2014-11-17 rsc echo 'codereview: warning: cannot find plan9port-review in netrc' >[1=2]
91 0edb0468 2014-11-17 rsc if(! git status | 9 grep 'nothing to commit, working directory clean' >/dev/null) {
92 0edb0468 2014-11-17 rsc echo 'codereview: warning: local changes not yet committed' >[1=2]
95 95fee1d4 2014-11-17 rsc $git push https://plan9port-review.googlesource.com/plan9 HEAD:refs/for/master >[2=1] | 9 sed 's/.*
//'
99 95fee1d4 2014-11-17 rsc if(! ~ $#* 0) {
100 95fee1d4 2014-11-17 rsc echo 'usage: codereview sync' >[1=2]
103 95fee1d4 2014-11-17 rsc $git fetch -q
105 95fee1d4 2014-11-17 rsc branch=`{git branch -l | 9 sed -n 's/^\* //p'}
106 95fee1d4 2014-11-17 rsc if(~ $branch master) {
107 95fee1d4 2014-11-17 rsc $git merge -q --ff-only origin/master
108 95fee1d4 2014-11-17 rsc exit $status
111 95fee1d4 2014-11-17 rsc if(~ `{git merge-base HEAD HEAD} `{git merge-base HEAD master}) {
112 95fee1d4 2014-11-17 rsc # no commit on branch
113 95fee1d4 2014-11-17 rsc git merge -q --ff-only origin/master
114 95fee1d4 2014-11-17 rsc exit $status
117 95fee1d4 2014-11-17 rsc # Exactly this commit in master. Fast-forward from master and delete this branch.
118 32f3c4ad 2014-11-17 rsc if(git branch -r --contains HEAD | 9 grep '^ *origin/master$' >/dev/null) {
119 95fee1d4 2014-11-17 rsc $git checkout -q master
120 95fee1d4 2014-11-17 rsc $git merge -q --ff-only origin/master
121 95fee1d4 2014-11-17 rsc $git branch -q -d $branch
122 95fee1d4 2014-11-17 rsc exit $status
125 95fee1d4 2014-11-17 rsc changeid=`{git log -n 1 | 9 sed -n 's/^ Change-Id: //p'}
126 95fee1d4 2014-11-17 rsc if(~ $#changeid 0) {
127 95fee1d4 2014-11-17 rsc echo 'codereview: cannot find change id'
128 95fee1d4 2014-11-17 rsc exit changeid
131 32f3c4ad 2014-11-17 rsc if(git log --grep 'Change-Id: '$changeid origin/master | 9 grep . >/dev/null) {
132 95fee1d4 2014-11-17 rsc # Something like this got submitted.
133 95fee1d4 2014-11-17 rsc $git checkout -q master
134 95fee1d4 2014-11-17 rsc $git merge -q --ff-only origin/master
135 95fee1d4 2014-11-17 rsc echo 'Change submitted but perhaps not identical to your copy.' >[1=2]
136 95fee1d4 2014-11-17 rsc echo 'To remove old copy:' git branch -d $branch >[1=2]
140 32f3c4ad 2014-11-17 rsc if(git branch -r --contains master | 9 grep '^ *origin/master$' >/dev/null)
141 95fee1d4 2014-11-17 rsc $git branch -f master origin/master
142 95fee1d4 2014-11-17 rsc $git rebase -q origin/master
145 95fee1d4 2014-11-17 rsc echo 'codereview: unrecognized command '$1 >[1=2]
