169 lines
3.3 KiB
Markdown
169 lines
3.3 KiB
Markdown
|
|
# 🎉 推送成功!后续操作指南
|
|||
|
|
|
|||
|
|
## ✅ 成功信息
|
|||
|
|
|
|||
|
|
您的代码变更已成功推送到 Gerrit:
|
|||
|
|
|
|||
|
|
```
|
|||
|
|
remote: SUCCESS
|
|||
|
|
remote: http://101.43.95.130:8080/c/test-project/+/1 Add README file
|
|||
|
|
```
|
|||
|
|
|
|||
|
|
## 下一步操作
|
|||
|
|
|
|||
|
|
### 1. 查看代码变更
|
|||
|
|
|
|||
|
|
在浏览器中打开变更 URL:
|
|||
|
|
```
|
|||
|
|
http://101.43.95.130:8080/c/test-project/+/1
|
|||
|
|
```
|
|||
|
|
|
|||
|
|
您可以:
|
|||
|
|
- 查看代码变更内容
|
|||
|
|
- 查看文件差异
|
|||
|
|
- 添加评论
|
|||
|
|
- 进行代码评审
|
|||
|
|
|
|||
|
|
### 2. 代码评审流程
|
|||
|
|
|
|||
|
|
#### 评审者操作(如果有其他用户)
|
|||
|
|
|
|||
|
|
1. **查看变更**:打开变更 URL
|
|||
|
|
2. **添加评论**:在代码行上点击添加评论
|
|||
|
|
3. **评审**:
|
|||
|
|
- 点击 "Review" 按钮
|
|||
|
|
- 选择评审结果:
|
|||
|
|
- **+2 Code-Review**:批准(需要管理员权限)
|
|||
|
|
- **+1 Code-Review**:看起来不错
|
|||
|
|
- **-1 Code-Review**:需要修改
|
|||
|
|
- **+1 Verified**:已验证(需要 CI 或管理员)
|
|||
|
|
|
|||
|
|
#### 提交者操作
|
|||
|
|
|
|||
|
|
1. **查看评审意见**:在变更页面查看评论
|
|||
|
|
2. **修改代码**(如果有意见):
|
|||
|
|
```bash
|
|||
|
|
cd /d/ttt/test-project
|
|||
|
|
|
|||
|
|
# 修改代码
|
|||
|
|
# ... 进行修改 ...
|
|||
|
|
|
|||
|
|
# 提交修改
|
|||
|
|
git add .
|
|||
|
|
git commit --amend --no-edit
|
|||
|
|
|
|||
|
|
# 重新推送(会自动更新原变更)
|
|||
|
|
git push origin HEAD:refs/for/master
|
|||
|
|
```
|
|||
|
|
|
|||
|
|
### 3. 合并代码
|
|||
|
|
|
|||
|
|
当变更获得:
|
|||
|
|
- **+2 Code-Review**(批准)
|
|||
|
|
- **+1 Verified**(已验证)
|
|||
|
|
|
|||
|
|
变更会自动合并,或者您可以点击 "Submit" 按钮手动合并。
|
|||
|
|
|
|||
|
|
### 4. 合并后的操作
|
|||
|
|
|
|||
|
|
```bash
|
|||
|
|
cd /d/ttt/test-project
|
|||
|
|
|
|||
|
|
# 更新本地仓库
|
|||
|
|
git checkout master
|
|||
|
|
git pull origin master
|
|||
|
|
|
|||
|
|
# 删除已合并的特性分支(如果有)
|
|||
|
|
git branch -d feature-branch
|
|||
|
|
```
|
|||
|
|
|
|||
|
|
## 优化配置(推荐)
|
|||
|
|
|
|||
|
|
### 创建 SSH 配置文件
|
|||
|
|
|
|||
|
|
为了避免每次都要输入长命令,创建 SSH 配置文件:
|
|||
|
|
|
|||
|
|
```bash
|
|||
|
|
# 创建配置文件
|
|||
|
|
mkdir -p ~/.ssh
|
|||
|
|
cat > ~/.ssh/config << 'EOF'
|
|||
|
|
Host 101.43.95.130
|
|||
|
|
Port 29418
|
|||
|
|
PubkeyAcceptedKeyTypes +ssh-rsa
|
|||
|
|
PubkeyAcceptedAlgorithms +ssh-rsa
|
|||
|
|
EOF
|
|||
|
|
|
|||
|
|
# 设置权限
|
|||
|
|
chmod 600 ~/.ssh/config
|
|||
|
|
```
|
|||
|
|
|
|||
|
|
配置后,以后可以直接使用:
|
|||
|
|
```bash
|
|||
|
|
git push origin HEAD:refs/for/master
|
|||
|
|
```
|
|||
|
|
|
|||
|
|
### 配置 Git 用户信息
|
|||
|
|
|
|||
|
|
```bash
|
|||
|
|
# 配置全局用户信息
|
|||
|
|
git config --global user.name "Your Name"
|
|||
|
|
git config --global user.email "263303411@qq.com"
|
|||
|
|
```
|
|||
|
|
|
|||
|
|
## 常用 Gerrit 操作
|
|||
|
|
|
|||
|
|
### 查看所有变更
|
|||
|
|
|
|||
|
|
访问:`http://101.43.95.130:8080/#/q/status:open`
|
|||
|
|
|
|||
|
|
### 查看我的变更
|
|||
|
|
|
|||
|
|
访问:`http://101.43.95.130:8080/#/q/owner:renjianbo`
|
|||
|
|
|
|||
|
|
### 查看项目
|
|||
|
|
|
|||
|
|
访问:`http://101.43.95.130:8080/#/admin/projects/test-project`
|
|||
|
|
|
|||
|
|
## 完整的开发流程
|
|||
|
|
|
|||
|
|
```bash
|
|||
|
|
# 1. 克隆项目
|
|||
|
|
git clone ssh://renjianbo@101.43.95.130:29418/test-project
|
|||
|
|
cd test-project
|
|||
|
|
|
|||
|
|
# 2. 创建特性分支(可选)
|
|||
|
|
git checkout -b feature/new-feature
|
|||
|
|
|
|||
|
|
# 3. 修改代码
|
|||
|
|
# ... 进行修改 ...
|
|||
|
|
|
|||
|
|
# 4. 提交代码
|
|||
|
|
git add .
|
|||
|
|
git commit -m "Add new feature"
|
|||
|
|
|
|||
|
|
# 5. 推送代码评审
|
|||
|
|
git push origin HEAD:refs/for/master
|
|||
|
|
|
|||
|
|
# 6. 在 Gerrit Web 界面进行评审
|
|||
|
|
|
|||
|
|
# 7. 如果有修改意见,修改后重新推送
|
|||
|
|
git commit --amend
|
|||
|
|
git push origin HEAD:refs/for/master
|
|||
|
|
|
|||
|
|
# 8. 合并后,更新本地仓库
|
|||
|
|
git checkout master
|
|||
|
|
git pull origin master
|
|||
|
|
```
|
|||
|
|
|
|||
|
|
## 恭喜!
|
|||
|
|
|
|||
|
|
您已经成功完成了:
|
|||
|
|
- ✅ Gerrit 安装和配置
|
|||
|
|
- ✅ 项目创建
|
|||
|
|
- ✅ SSH 密钥配置
|
|||
|
|
- ✅ 代码推送
|
|||
|
|
- ✅ 变更创建
|
|||
|
|
|
|||
|
|
现在可以在 Gerrit 中进行代码评审和协作了!
|
|||
|
|
|