1 95fee1d4 2014-11-17 rsc #!/usr/local/plan9/bin/rc
  2 95fee1d4 2014-11-17 rsc 
  3 95fee1d4 2014-11-17 rsc git=git
  4 95fee1d4 2014-11-17 rsc show=false
  5 95fee1d4 2014-11-17 rsc fn gitshow {
  6 95fee1d4 2014-11-17 rsc 	echo '%' git $*
  7 95fee1d4 2014-11-17 rsc 	git $*
  8 95fee1d4 2014-11-17 rsc }
  9 95fee1d4 2014-11-17 rsc if(! ~ $#* 0 && ~ $1 -v) {
 10 95fee1d4 2014-11-17 rsc 	git=gitshow
 11 95fee1d4 2014-11-17 rsc 	show=true
 12 95fee1d4 2014-11-17 rsc 	shift
 13 95fee1d4 2014-11-17 rsc }
 14 95fee1d4 2014-11-17 rsc 	
 15 95fee1d4 2014-11-17 rsc if(~ $#* 0) {
 16 95fee1d4 2014-11-17 rsc 	echo 'usage: codereview <command> <args>' >[1=2]
 17 95fee1d4 2014-11-17 rsc 	exit usage
 18 95fee1d4 2014-11-17 rsc }
 19 95fee1d4 2014-11-17 rsc 
 20 95fee1d4 2014-11-17 rsc if(~ $#PLAN9 0) {
 21 95fee1d4 2014-11-17 rsc 	PLAN9=/usr/local/plan9
 22 95fee1d4 2014-11-17 rsc }
 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]
 25 95fee1d4 2014-11-17 rsc 	exit git
 26 95fee1d4 2014-11-17 rsc }
 27 95fee1d4 2014-11-17 rsc 
 28 95fee1d4 2014-11-17 rsc if(! test -e $PLAN9/.git/hooks/commit-msg) {
 29 95fee1d4 2014-11-17 rsc 	if($show) {
 30 95fee1d4 2014-11-17 rsc 		echo '% ln -s ../../lib/git/commit-msg.hook $PLAN9/.git/hooks/commit-msg'
 31 95fee1d4 2014-11-17 rsc 	}
 32 95fee1d4 2014-11-17 rsc 	ln -s ../../lib/git/commit-msg.hook $PLAN9/.git/hooks/commit-msg
 33 95fee1d4 2014-11-17 rsc }
 34 95fee1d4 2014-11-17 rsc 
 35 95fee1d4 2014-11-17 rsc switch($1) {
 36 95fee1d4 2014-11-17 rsc case help
 37 95fee1d4 2014-11-17 rsc 	9 man 1 codereview
 38 95fee1d4 2014-11-17 rsc 
 39 95fee1d4 2014-11-17 rsc case pending
 40 95fee1d4 2014-11-17 rsc 	shift
 41 95fee1d4 2014-11-17 rsc 	if(! ~ $#* 0) {
 42 95fee1d4 2014-11-17 rsc 		echo 'usage: codereview pending' >[1=2]
 43 95fee1d4 2014-11-17 rsc 		exit usage
 44 95fee1d4 2014-11-17 rsc 	}
 45 95fee1d4 2014-11-17 rsc 	$git branch --list
 46 95fee1d4 2014-11-17 rsc 
 47 95fee1d4 2014-11-17 rsc case create
 48 95fee1d4 2014-11-17 rsc 	shift
 49 95fee1d4 2014-11-17 rsc 	if(! ~ $#* 1) {
 50 95fee1d4 2014-11-17 rsc 		echo 'usage: codereview create branchname' >[1=2]
 51 95fee1d4 2014-11-17 rsc 		exit usage
 52 95fee1d4 2014-11-17 rsc 	}
 53 95fee1d4 2014-11-17 rsc 	branch=$1
 54 95fee1d4 2014-11-17 rsc 	if(! git branch -l | 9 grep '\* master$') {
 55 95fee1d4 2014-11-17 rsc 		echo 'codereview: create not on master branch; use codereview commit' >[1=2]
 56 95fee1d4 2014-11-17 rsc 		exit master
 57 95fee1d4 2014-11-17 rsc 	}
 58 95fee1d4 2014-11-17 rsc 	if($show) {
 59 95fee1d4 2014-11-17 rsc 		echo '% git branch '$branch' && git commit || git branch -d '$branch >[1=2]
 60 95fee1d4 2014-11-17 rsc 	}
 61 95fee1d4 2014-11-17 rsc 	git branch $branch && git commit $* || git branch -d $branch
 62 95fee1d4 2014-11-17 rsc 
 63 95fee1d4 2014-11-17 rsc case commit
 64 95fee1d4 2014-11-17 rsc 	shift
 65 95fee1d4 2014-11-17 rsc 	if(git branch -l | 9 grep '\* master$') {
 66 95fee1d4 2014-11-17 rsc 		echo 'codereview: commit on master branch; use codereview create <branchname>' >[1=2]
 67 95fee1d4 2014-11-17 rsc 		exit master
 68 95fee1d4 2014-11-17 rsc 	}
 69 95fee1d4 2014-11-17 rsc 	if(~ `{git merge-base HEAD HEAD} `{git merge-base HEAD master}) {
 70 95fee1d4 2014-11-17 rsc 		# first commit on branch, somehow.
 71 95fee1d4 2014-11-17 rsc 		$git commit $*
 72 95fee1d4 2014-11-17 rsc 		exit $status
 73 95fee1d4 2014-11-17 rsc 	}
 74 95fee1d4 2014-11-17 rsc 	$git commit --amend $*
 75 95fee1d4 2014-11-17 rsc 	exit $status
 76 95fee1d4 2014-11-17 rsc 
 77 95fee1d4 2014-11-17 rsc case upload
 78 95fee1d4 2014-11-17 rsc 	if(git branch -l | 9 grep '\* master$') {
 79 95fee1d4 2014-11-17 rsc 		echo 'codereview: upload on master branch' >[1=2]
 80 95fee1d4 2014-11-17 rsc 		exit master
 81 95fee1d4 2014-11-17 rsc 	}
 82 95fee1d4 2014-11-17 rsc 	if(~ `{git merge-base HEAD HEAD} `{git merge-base HEAD master}) {
 83 95fee1d4 2014-11-17 rsc 		# no commit on branch
 84 95fee1d4 2014-11-17 rsc 		echo 'codereview: no commits yet on this feature branch' >[1=2]
 85 95fee1d4 2014-11-17 rsc 		exit commit
 86 95fee1d4 2014-11-17 rsc 	}
 87 95fee1d4 2014-11-17 rsc 	if(! 9 grep 'machine plan9port-review.googlesource.com' $HOME/.netrc >/dev/null >[2=1]) {
 88 95fee1d4 2014-11-17 rsc 		echo 'codereview: warning: cannot find plan9port-review in netrc' >[1=2]
 89 95fee1d4 2014-11-17 rsc 	}
 90 95fee1d4 2014-11-17 rsc 	$git push https://plan9port-review.googlesource.com/plan9 HEAD:refs/for/master >[2=1] | 9 sed 's/.*
//'
 91 95fee1d4 2014-11-17 rsc 
 92 95fee1d4 2014-11-17 rsc case sync
 93 95fee1d4 2014-11-17 rsc 	shift
 94 95fee1d4 2014-11-17 rsc 	if(! ~ $#* 0) {
 95 95fee1d4 2014-11-17 rsc 		echo 'usage: codereview sync' >[1=2]
 96 95fee1d4 2014-11-17 rsc 		exit usage
 97 95fee1d4 2014-11-17 rsc 	}
 98 95fee1d4 2014-11-17 rsc 	$git fetch -q
 99 95fee1d4 2014-11-17 rsc 	
100 95fee1d4 2014-11-17 rsc 	branch=`{git branch -l | 9 sed -n 's/^\* //p'}
101 95fee1d4 2014-11-17 rsc 	if(~ $branch master) {
102 95fee1d4 2014-11-17 rsc 		$git merge -q --ff-only origin/master
103 95fee1d4 2014-11-17 rsc 		exit $status
104 95fee1d4 2014-11-17 rsc 	}
105 95fee1d4 2014-11-17 rsc 
106 95fee1d4 2014-11-17 rsc 	if(~ `{git merge-base HEAD HEAD} `{git merge-base HEAD master}) {
107 95fee1d4 2014-11-17 rsc 		# no commit on branch
108 95fee1d4 2014-11-17 rsc 		git merge -q --ff-only origin/master
109 95fee1d4 2014-11-17 rsc 		exit $status
110 95fee1d4 2014-11-17 rsc 	}
111 95fee1d4 2014-11-17 rsc 
112 95fee1d4 2014-11-17 rsc 	# Exactly this commit in master. Fast-forward from master and delete this branch.
113 95fee1d4 2014-11-17 rsc 	if(git branch -r --contains HEAD | 9 grep '^ *origin/master$') {
114 95fee1d4 2014-11-17 rsc 		$git checkout -q master
115 95fee1d4 2014-11-17 rsc 		$git merge -q --ff-only origin/master
116 95fee1d4 2014-11-17 rsc 		$git branch -q -d $branch
117 95fee1d4 2014-11-17 rsc 		exit $status
118 95fee1d4 2014-11-17 rsc 	}
119 95fee1d4 2014-11-17 rsc 	
120 95fee1d4 2014-11-17 rsc 	changeid=`{git log -n 1 | 9 sed -n 's/^    Change-Id: //p'}
121 95fee1d4 2014-11-17 rsc 	if(~ $#changeid 0) {
122 95fee1d4 2014-11-17 rsc 		echo 'codereview: cannot find change id'
123 95fee1d4 2014-11-17 rsc 		exit changeid
124 95fee1d4 2014-11-17 rsc 	}
125 95fee1d4 2014-11-17 rsc 
126 95fee1d4 2014-11-17 rsc 	if(git log --grep 'Change-Id: '$changeid origin/master | 9 grep .) {
127 95fee1d4 2014-11-17 rsc 		# Something like this got submitted.
128 95fee1d4 2014-11-17 rsc 		$git checkout -q master
129 95fee1d4 2014-11-17 rsc 		$git merge -q --ff-only origin/master
130 95fee1d4 2014-11-17 rsc 		echo 'Change submitted but perhaps not identical to your copy.' >[1=2]
131 95fee1d4 2014-11-17 rsc 		echo 'To remove old copy:' git branch -d $branch >[1=2]
132 95fee1d4 2014-11-17 rsc 		exit 1
133 95fee1d4 2014-11-17 rsc 	}
134 95fee1d4 2014-11-17 rsc 	
135 95fee1d4 2014-11-17 rsc 	if(git branch -r --contains master | 9 grep '^ *origin/master$')
136 95fee1d4 2014-11-17 rsc 		$git branch -f master origin/master
137 95fee1d4 2014-11-17 rsc 	$git rebase -q origin/master
138 95fee1d4 2014-11-17 rsc 
139 95fee1d4 2014-11-17 rsc case *
140 95fee1d4 2014-11-17 rsc 	echo 'codereview: unrecognized command '$1 >[1=2]
141 95fee1d4 2014-11-17 rsc 	exit usage
142 95fee1d4 2014-11-17 rsc }