| Bjoern Michaelsen | fe49f23 | 2012-06-20 15:42:27 -0500 | [diff] [blame] | 1 | #!/bin/sh |
| 2 | |
| 3 | #GERRITHOST=gerrit.libreoffice.org |
| 4 | GERRITHOST=logerrit |
| 5 | GERRITURL=ssh://$GERRITHOST/core |
| 6 | |
| 7 | get_SHA_for_change() { |
| Bjoern Michaelsen | 15e9f56 | 2013-03-26 15:39:55 +0100 | [diff] [blame] | 8 | SHA=`ssh ${GERRITHOST?} gerrit query --all-approvals change:$1|grep ref|tail -1|cut -d: -f2` |
| Bjoern Michaelsen | fe49f23 | 2012-06-20 15:42:27 -0500 | [diff] [blame] | 9 | } |
| 10 | |
| Bjoern Michaelsen | 4e15809 | 2012-07-25 01:13:53 +0200 | [diff] [blame] | 11 | submit() { |
| Bjoern Michaelsen | 15e9f56 | 2013-03-26 15:39:55 +0100 | [diff] [blame] | 12 | TYPE=$1 |
| 13 | BRANCH=$2 |
| 14 | if test -z "$BRANCH" |
| 15 | then |
| 16 | BRANCH=`git symbolic-ref HEAD 2> /dev/null` |
| 17 | BRANCH="${BRANCH##refs/heads/}" |
| 18 | if test -z "$BRANCH" |
| 19 | then |
| 20 | echo "no branch specified, and could not guess the current branch" |
| 21 | exit 1 |
| 22 | fi |
| 23 | echo "no branch specified, guessing current branch $BRANCH" |
| 24 | fi |
| 25 | git push $GERRITURL HEAD:refs/$TYPE/$BRANCH |
| Bjoern Michaelsen | 4e15809 | 2012-07-25 01:13:53 +0200 | [diff] [blame] | 26 | } |
| 27 | |
| Michael Meeks | e8943d6 | 2013-03-27 17:26:23 +0000 | [diff] [blame] | 28 | logerrit() { |
| Mathieu Parent | b4f3b35 | 2014-10-03 12:46:36 +0200 | [diff] [blame] | 29 | echo "Host logerrit gerrit.libreoffice.org" |
| Michael Meeks | e8943d6 | 2013-03-27 17:26:23 +0000 | [diff] [blame] | 30 | echo " IdentityFile ~/.ssh/id_rsa" |
| 31 | echo " User $1" |
| 32 | echo " Port 29418" |
| 33 | echo " HostName gerrit.libreoffice.org" |
| 34 | } |
| 35 | |
| Bjoern Michaelsen | fe49f23 | 2012-06-20 15:42:27 -0500 | [diff] [blame] | 36 | case "$1" in |
| Bjoern Michaelsen | 15e9f56 | 2013-03-26 15:39:55 +0100 | [diff] [blame] | 37 | help|--help|"") |
| 38 | echo "Usage: ./logerrit subcommand [options]" |
| 39 | echo "simple and basic tool to interact with LibreOffice gerrit" |
| Bjoern Michaelsen | b910d1d | 2013-03-29 02:03:56 +0100 | [diff] [blame] | 40 | echo "see https://wiki.documentfoundation.org/Development/gerrit for details." |
| 41 | echo |
| Bjoern Michaelsen | 15e9f56 | 2013-03-26 15:39:55 +0100 | [diff] [blame] | 42 | echo "subcommands:" |
| 43 | echo " setup walking you though your gerrit setup" |
| 44 | echo " test test your gerrit setup" |
| 45 | echo |
| 46 | echo " --- for submitters:" |
| 47 | echo " submit [BRANCH] submit your change for review" |
| 48 | echo " resubmit [BRANCH] create a new Change-Id and submit your change for review" |
| 49 | echo " (yes, this modifies your last commit)" |
| 50 | echo " submit-draft [BRANCH] submit your change as draft" |
| 51 | echo " resubmit-draft [BRANCH] create a new Change-Id and submit your change as draft" |
| 52 | echo " (yes, this modifies your last commit)" |
| 53 | echo " (yes, this modifies your last commit)" |
| 54 | echo " nextchange [BRANCH] reset branch to the remote to start with the next change" |
| 55 | echo "Note: drafts are only visibly to yourself and those that you explicitly add as reviewers." |
| 56 | echo |
| 57 | echo " --- for reviewers:" |
| 58 | echo " checkout CHANGEID checkout the changes for review" |
| 59 | echo " pull CHANGEID pull (and merge) the changes on current branch" |
| 60 | echo " cherry-pick CHANGEID cherry-pick the change on current branch" |
| 61 | echo " patch CHANGEID show the change as a patch" |
| Bjoern Michaelsen | 15e9f56 | 2013-03-26 15:39:55 +0100 | [diff] [blame] | 62 | echo " query .... query for changes for review on project core" |
| 63 | echo " <any other gerrit command>" |
| 64 | echo |
| 65 | echo "advanced users should consider using git review instead:" |
| 66 | echo "http://wiki.documentfoundation.org/Development/GitReview" |
| 67 | exit |
| 68 | ;; |
| Bjoern Michaelsen | 646b992 | 2013-03-26 15:26:20 +0100 | [diff] [blame] | 69 | setup) |
| Bjoern Michaelsen | 8c8dc54 | 2013-03-26 23:20:56 +0100 | [diff] [blame] | 70 | cd $(dirname $(readlink -f $0)) |
| Michael Meeks | e8943d6 | 2013-03-27 17:26:23 +0000 | [diff] [blame] | 71 | ssh_home="$HOME/.ssh"; |
| 72 | ssh_key= |
| 73 | created_ssh= |
| 74 | if ! test -d $ssh_home; then |
| 75 | echo "It appears that you have no ssh setup, running ssh-keygen to create that:" |
| 76 | mkdir $ssh_home |
| 77 | chmod 0700 $ssh_home |
| 78 | created_ssh=TRUE |
| 79 | echo |
| 80 | echo "Hit enter to generate an ssh key - you will need to enter a pass-phrase" |
| 81 | echo |
| 82 | read |
| 83 | ssh-keygen -t rsa -f "$ssh_home/id_rsa" |
| 84 | fi |
| 85 | if test -d $ssh_home; then |
| 86 | if test -f "$ssh_home/id_rsa.pub"; then |
| 87 | ssh_key=`cat $ssh_home/id_rsa.pub`; |
| 88 | elif test -f "$ssh_home/id_dsa.pub"; then |
| 89 | ssh_key=`cat $ssh_home/id_dsa.pub`; |
| 90 | fi |
| 91 | fi |
| Bjoern Michaelsen | 646b992 | 2013-03-26 15:26:20 +0100 | [diff] [blame] | 92 | echo "Please go to https://gerrit.libreoffice.org/ and:" |
| Bjoern Michaelsen | 53a536c | 2013-03-26 23:15:11 +0100 | [diff] [blame] | 93 | echo "- press the 'register' button in the top right corner" |
| Bjoern Michaelsen | 646b992 | 2013-03-26 15:26:20 +0100 | [diff] [blame] | 94 | echo "- after login set yourself a username (its recommended to use your IRC-nick)" |
| Michael Meeks | e8943d6 | 2013-03-27 17:26:23 +0000 | [diff] [blame] | 95 | if test "z$ssh_key" = "z"; then |
| 96 | echo "- add your public ssh-key into the ssh keys settings." |
| 97 | else |
| 98 | echo "- paste the key below into the 'Add SSH Public Key' box." |
| 99 | echo |
| 100 | echo "$ssh_key" |
| 101 | echo |
| 102 | fi |
| Bjoern Michaelsen | 646b992 | 2013-03-26 15:26:20 +0100 | [diff] [blame] | 103 | echo |
| 104 | echo "Note that you need to register additional email addresses, if you want to" |
| 105 | echo "commit from them. Additional emails must be confirmed with repling to the" |
| Miklos Vajna | 1ed4210 | 2013-03-26 16:21:37 +0100 | [diff] [blame] | 106 | echo "invitation mail it sends you." |
| Bjoern Michaelsen | 646b992 | 2013-03-26 15:26:20 +0100 | [diff] [blame] | 107 | echo |
| Bjoern Michaelsen | 15e9f56 | 2013-03-26 15:39:55 +0100 | [diff] [blame] | 108 | read -p 'Which user name did you choose? ' GERRITUSER |
| Michael Meeks | e8943d6 | 2013-03-27 17:26:23 +0000 | [diff] [blame] | 109 | if test "z$created_ssh" = "z"; then |
| 110 | echo |
| 111 | echo "Please now add the following to your ~/.ssh/config, creating the file if needed:" |
| 112 | echo |
| 113 | logerrit $GERRITUSER |
| 114 | echo |
| 115 | else |
| 116 | echo "Automatically creating your ssh config" |
| 117 | (logerrit $GERRITUSER) > "$ssh_home/config" |
| 118 | fi |
| 119 | # setup the remote properly ... |
| 120 | git config remote.origin.pushurl ssh://logerrit/core |
| Bjoern Michaelsen | 646b992 | 2013-03-26 15:26:20 +0100 | [diff] [blame] | 121 | echo "To see if your setup was successful, run './logerrit test' then." |
| Bjoern Michaelsen | 8c8dc54 | 2013-03-26 23:20:56 +0100 | [diff] [blame] | 122 | # a good place to make sure the hooks are set up |
| 123 | ./g -z |
| Bjoern Michaelsen | 646b992 | 2013-03-26 15:26:20 +0100 | [diff] [blame] | 124 | ;; |
| Bjoern Michaelsen | 15e9f56 | 2013-03-26 15:39:55 +0100 | [diff] [blame] | 125 | test) |
| 126 | if test -n "`ssh $GERRITHOST 2>&1|grep \"Welcome to Gerrit Code Review\"`" |
| 127 | then |
| 128 | echo "Your gerrit setup was successful!" |
| 129 | else |
| 130 | echo "There seems to be trouble." |
| 131 | echo "please have the output of: ssh -vvvv logerrit" |
| 132 | echo "at hand when looking for help." |
| 133 | fi |
| 134 | ;; |
| 135 | submit) |
| 136 | submit 'for' $2 |
| 137 | ;; |
| Bjoern Michaelsen | 4e15809 | 2012-07-25 01:13:53 +0200 | [diff] [blame] | 138 | resubmit) |
| 139 | git log -1 --pretty=%B | grep -v ^Change-Id: | git commit --amend -F - |
| Bjoern Michaelsen | 15e9f56 | 2013-03-26 15:39:55 +0100 | [diff] [blame] | 140 | submit 'for' $2 |
| Bjoern Michaelsen | 4e15809 | 2012-07-25 01:13:53 +0200 | [diff] [blame] | 141 | ;; |
| Bjoern Michaelsen | 15e9f56 | 2013-03-26 15:39:55 +0100 | [diff] [blame] | 142 | submit-draft) |
| 143 | submit drafts $2 |
| 144 | ;; |
| 145 | resubmit-draft) |
| 146 | git log -1 --pretty=%B | grep -v ^Change-Id: | git commit --amend -F - |
| 147 | submit drafts $2 |
| 148 | ;; |
| 149 | nextchange) |
| 150 | if test -n "`git status -s -uno`" |
| 151 | then |
| 152 | echo "You have uncommitted changes. Please commit or stash these:" |
| 153 | git status |
| 154 | exit 1 |
| 155 | fi |
| 156 | CHANGEID=`git log --format=format:%b -1 HEAD|grep Change-Id|cut -d: -f2|tr -d \ ` |
| 157 | if test -z "$CHANGEID" |
| 158 | then |
| 159 | CHANGEID="NOCHANGEID" |
| 160 | fi |
| 161 | BACKUPBRANCH=backup/$CHANGEID-`date +%F-%H%M%S` |
| 162 | git branch $BACKUPBRANCH |
| 163 | echo "current state backed up as $BACKUPBRANCH" |
| 164 | BRANCH=$2 |
| 165 | if test -z "$BRANCH" |
| 166 | then |
| 167 | BRANCH=`git symbolic-ref HEAD 2> /dev/null` |
| 168 | BRANCH="${BRANCH##refs/heads/}" |
| 169 | if test -z "$BRANCH" |
| 170 | then |
| 171 | echo "no branch specified, and could not guess the current branch" |
| 172 | exit 1 |
| 173 | fi |
| 174 | echo "no branch specified, guessing current branch $BRANCH" |
| 175 | fi |
| 176 | git reset --hard remotes/origin/$BRANCH |
| 177 | ;; |
| Bjoern Michaelsen | 15e9f56 | 2013-03-26 15:39:55 +0100 | [diff] [blame] | 178 | checkout) |
| 179 | get_SHA_for_change $2 |
| 180 | git fetch $GERRITURL $SHA && git checkout FETCH_HEAD |
| 181 | ;; |
| Bjoern Michaelsen | d588e1c | 2013-03-26 23:26:06 +0100 | [diff] [blame] | 182 | review) |
| 183 | echo "'./logerrit review' has be removed as obsolete." |
| 184 | echo "Please use either:" |
| 185 | echo " - git-review: https://wiki.documentfoundation.org/Development/GitReview" |
| 186 | echo " - or the web-UI directly: https://gerrit.libreoffice.org/" |
| 187 | echo "Both provide a better experience." |
| 188 | exit 1; |
| 189 | ;; |
| Bjoern Michaelsen | 15e9f56 | 2013-03-26 15:39:55 +0100 | [diff] [blame] | 190 | pull) |
| 191 | get_SHA_for_change $2 |
| 192 | git pull $GERRITURL $SHA |
| 193 | ;; |
| 194 | cherry-pick) |
| 195 | get_SHA_for_change $2 |
| 196 | git fetch $GERRITURL $SHA && git cherry-pick FETCH_HEAD |
| 197 | ;; |
| 198 | patch) |
| 199 | get_SHA_for_change $2 |
| 200 | git fetch $GERRITURL $SHA && git format-patch -1 --stdout FETCH_HEAD |
| 201 | ;; |
| 202 | query) |
| 203 | shift |
| 204 | ssh ${GERRITHOST?} gerrit query project:core $@ |
| 205 | ;; |
| 206 | *) |
| 207 | ssh ${GERRITHOST?} gerrit $@ |
| 208 | ;; |
| Bjoern Michaelsen | fe49f23 | 2012-06-20 15:42:27 -0500 | [diff] [blame] | 209 | esac |