gerrit添加appkey以及简单添加分支

Posted 写的自己都怕

tags:

篇首语:本文由小常识网(cha138.com)小编为大家整理,主要介绍了gerrit添加appkey以及简单添加分支相关的知识,希望对你有一定的参考价值。

最近团队开放用上gerrit版本项目管理工具,简单说一下appkey配置过程

首先是拿到gerrit分配的账户密码。然后进入到首页,假如是新搭建的应该是没有信息,我这里有一些提交的信息,然后找到右上角你的账户,点开,上面有一个设置按钮,点击进去。如图

进去之后右边有一排菜单,点击SSH Public Keys,会出现key信息,添加你当前使用设备的key,点击Add Key,上面的key是我当前使用设备已绑定的

此时会要求你填入对应key,key的位置一般在C:\\Users\\Administrator\\.ssh目录下,此时有2个文件id_rsa,id_rsa,使用编辑器打开id_rsa文件,复制key,然后粘贴过去,同时创建known_hosts文件

然后点击Add,会出现你绑定的Server Host Key,点击下面的复制按钮,复制key,然后粘贴到你刚才创建的known_hosts文件,至此以及配置完成,现在可以正常拉取你的git文件了

进入对应目录下,使用git clone命令拉取相对应的文件

测试提交一个文件,先用git add test.txt命令上传一个文件,然后用git commit -m \'注释\'给此次上传写一个注释,然后使用git status查看此次上传的一些状态,文件是修改,删除,还是新增等等,此时系统会提示你输入你的名次与邮件名,安装系统提示的格式填写你自己的账户名称与你对应的邮件就ok

然后就是提交了,git push origin HEAD:refs/for/master.提交到对应的分支,注意,此时还是一个重要点,有一个提交id的配对问题,首先打开你刚才拉取项目的目录,在系统种打开隐藏文件(已打开可忽略),进入.git/hooks目录,创建commit-msg文件,写入下面代码,保存,此时就可以正常上传代码至gerrit了。

#!/bin/sh
# From Gerrit Code Review 2.6
#
# Part of Gerrit Code Review (http://code.google.com/p/gerrit/)
#
# Copyright (C) 2009 The android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

unset GREP_OPTIONS

CHANGE_ID_AFTER="Bug|Issue"
MSG="$1"

# Check for, and add if missing, a unique Change-Id
#
add_ChangeId() {
clean_message=`sed -e \'
/^diff --git a\\/.*/{
s///
q
}
/^Signed-off-by:/d
/^#/d
\' "$MSG" | git stripspace`
if test -z "$clean_message"
then
return
fi

# Does Change-Id: already exist? if so, exit (no change).
if grep -i \'^Change-Id:\' "$MSG" >/dev/null
then
return
fi

id=`_gen_ChangeId`
T="$MSG.tmp.$$"
AWK=awk
if [ -x /usr/xpg4/bin/awk ]; then
# Solaris AWK is just too broken
AWK=/usr/xpg4/bin/awk
fi

# How this works:
# - parse the commit message as (textLine+ blankLine*)*
# - assume textLine+ to be a footer until proven otherwise
# - exception: the first block is not footer (as it is the title)
# - read textLine+ into a variable
# - then count blankLines
# - once the next textLine appears, print textLine+ blankLine* as these
# aren\'t footer
# - in END, the last textLine+ block is available for footer parsing
$AWK \'
BEGIN {
# while we start with the assumption that textLine+
# is a footer, the first block is not.
isFooter = 0
footerComment = 0
blankLines = 0
}

# Skip lines starting with "#" without any spaces before it.
/^#/ { next }

# Skip the line starting with the diff command and everything after it,
# up to the end of the file, assuming it is only patch data.
# If more than one line before the diff was empty, strip all but one.
/^diff --git a/ {
blankLines = 0
while (getline) { }
next
}

# Count blank lines outside footer comments
/^$/ && (footerComment == 0) {
blankLines++
next
}

# Catch footer comment
/^\\[[a-zA-Z0-9-]+:/ && (isFooter == 1) {
footerComment = 1
}

/]$/ && (footerComment == 1) {
footerComment = 2
}

# We have a non-blank line after blank lines. Handle this.
(blankLines > 0) {
print lines
for (i = 0; i < blankLines; i++) {
print ""
}

lines = ""
blankLines = 0
isFooter = 1
footerComment = 0
}

# Detect that the current block is not the footer
(footerComment == 0) && (!/^\\[?[a-zA-Z0-9-]+:/ || /^[a-zA-Z0-9-]+:\\/\\//) {
isFooter = 0
}

{
# We need this information about the current last comment line
if (footerComment == 2) {
footerComment = 0
}
if (lines != "") {
lines = lines "\\n";
}
lines = lines $0
}

# Footer handling:
# If the last block is considered a footer, splice in the Change-Id at the
# right place.
# Look for the right place to inject Change-Id by considering
# CHANGE_ID_AFTER. Keys listed in it (case insensitive) come first,
# then Change-Id, then everything else (eg. Signed-off-by:).
#
# Otherwise just print the last block, a new line and the Change-Id as a
# block of its own.
END {
unprinted = 1
if (isFooter == 0) {
print lines "\\n"
lines = ""
}
changeIdAfter = "^(" tolower("\'"$CHANGE_ID_AFTER"\'") "):"
numlines = split(lines, footer, "\\n")
for (line = 1; line <= numlines; line++) {
if (unprinted && match(tolower(footer[line]), changeIdAfter) != 1) {
unprinted = 0
print "Change-Id: I\'"$id"\'"
}
print footer[line]
}
if (unprinted) {
print "Change-Id: I\'"$id"\'"
}
}\' "$MSG" > "$T" && mv "$T" "$MSG" || rm -f "$T"
}
_gen_ChangeIdInput() {
echo "tree `git write-tree`"
if parent=`git rev-parse "HEAD^0" 2>/dev/null`
then
echo "parent $parent"
fi
echo "author `git var GIT_AUTHOR_IDENT`"
echo "committer `git var GIT_COMMITTER_IDENT`"
echo
printf \'%s\' "$clean_message"
}
_gen_ChangeId() {
_gen_ChangeIdInput |
git hash-object -t commit --stdin
}

add_ChangeId

 

以上是关于gerrit添加appkey以及简单添加分支的主要内容,如果未能解决你的问题,请参考以下文章

Gerrit总是在提交补丁集之前进行rebase以避免合并提交

Gerrit常见命令及最佳实践

Gerrit 中使用的常见用法及常见问题记录(更新中)

Gerrit使用简介

Gitlab+Gerrit+Ldap+nginx+mysql 之 Gerrit 操作流程

ubuntu 环境下 gerrit添加ssh key