alibaba / git-repo-go Goto Github PK

git-repo is a command-line tool for centralized workflow, can work with Gerrit, AGit-Flow compatible servers. It is written in Golang, and it can be installed easily without further dependency. It provides an easy-to-use solution for multiple repositories which is introduced by Android repo first, and it can also work with a single repository.

Home Page: https://git-repo.info/

License: Apache License 2.0

Makefile 1.95% Shell 48.61% Go 44.68% Perl 3.42% Python 1.34%

agit-flow git-repo

git-repo-go's Introduction

git-repo

repo reimplemented in Golang and many others

git-repo is repo reimplemented in Golang and with many other features. Using git-repo, a developer can create code reviews (pull requests) from client side directly. There will be no fork, no feature branches, and no write permission needed.

git-repo is a command line tool, which adds more sub-commands to git, and works for centralized git workflow like Gerrit, agit-flow of Alibaba.com, and other agit-flow alike protocols...

Installation

Download or compile the binary of git-repo from this repository, and install (copy) the executable of git-repo to proper location, such as /usr/bin of Linux and MacOS, and C:\Windows\system32 of Windows.

After installation, execute the following command to validate the installation:

git repo version

Git aliases installed from git-repo

git-repo installs some useful git configurations for user, some unique alias commands are:

git peer-review => git repo upload --single
git pr => git repo upload --single
git download => git repo download --single

Single repository mode

Create code-review directly from client side

Clone a repository

 git clone https://codeup.teambition.com/gotgit/demo.git

Create a local branch (optional)

 git checkout -b some/topic origin/master

Create commits in worktree...
Create code-review from command line:
```
 git pr
```

There are many options for git pr (or git peer-review, or git review), please check the manual:

    git repo upload --help

Download code-review to local repository for review

A new code-review (pull request) will be created or a old code-review will be refreshed after running git pr. Each code-review has a unique number, such as pull request #123.

Reviewer can download it using command

git download 123

, and make a code review in local worktree.

Update code-review

Repeated command by author will update the code review:

git pr

If a reviewer wants to update a code-review, he or she can run:

git pr --change 123

(suppose 123 is the code review ID, the reviewer just downloaded)

Multiple repositories

git-repo supports android style multiple repositories management.

Init workspace from a manifest project.
```
  git repo init <manifest-url>
```
Clone / update all repositories referenced in the manifest repository.
```
  git repo sync
```
Create a local working branch instead of detached HEAD on all repositories.
```
  git repo start --all some/topic
```
Send changes to remote server to create code reviews.
```
  git repo upload
```

git-repo-go's People

Contributors

Stargazers

Watchers

git-repo-go's Issues

支持的GIT仓库列表说明

建议列举支持的GIT仓库清单。

只在codeup的文档里看到说：

git-repo 可以支持 AGit-Flow 兼容的代码平台以及 Gerrit。

具体的有哪些？github、gitlab、gitee这些能支持吗？

we use gitlab as git server？ what should we do on git server（gitlab） to support git-repo？

该项目还在维护吗？

已经快一年未发新版本了，请问这个项目目前还在维护吗？

谢谢

git repo upload 404?

git repo upload
WARNING: You are suggested to install or upgrade git to version 2.10.0 or above
* The git-interpret-trailers command introduced in git 2.2.0 is used for the Gerrit commit-msg hook.
* sending custom HTTP headers is only supported in git 2.9.0 and above
* Some review options are sent using git push-options which are available in git 2.10.0 and above.
ERROR: 404: bad ssh_info response of 'https://xxxx/ssh_info'
Error: fail to load remotes: origin

FATAL: cannot find repodir or git: 'abandon' is not a git command. See 'git --help'.

命令提示无法找到 repodir 或者无法找到子命令

git repo sync ERROR: bad address for review ''

Hi, Thanks for bring up such a great tool.

What's the problem?

ADE@2-vt0003 MINGW64 /d/CodeBase/AOSP
$ git repo sync
NOTE: fail to check remote server, you may need to install gerrit hooks by hands
ERROR: bad address for review ''

ADE@2-vt0003 MINGW64 /d/CodeBase/AOSP
$ git repo sync
NOTE: fail to check remote server, you may need to install gerrit hooks by hands
ERROR: bad address for review ''
FATAL: fail to rename lockfile to 'D:\CodeBase\AOSP.repo\project.list': rename D:\CodeBase\AOSP.repo\project.list.lock D:\CodeBase\AOSP.repo\project.list: Access is denied.

What did I do?

I copy git-repo.exe to my local executable path (i.e. C:\Program Files\Git\mingw64\bin\git-repo.exe), then it's ok to run git repo version;
$ git repo version
git-repo version 0.7.4
git version 2.24.1.windows.2
I create a repo manifest project, and edit the default.xml to add sub git projects.
I use git repo init -u <my-manifest-project-url to init the repo.
git repo sync, so far so good.
git repo pr, after this, whenever i execute git repo sync again, it shows the above erros.

Need help:

Did I miss some step to use this git-repo tool? What should I do to fix this?
It seems a little complicate to modify gitlab core, so I want to fix the above errors first.

Thanks

更改了default.xml文件，该如何更新整个repo？

git repo init -u http://xxxx.git -b dev

请教一下：如果我修改了git中的default.xml文件，该如何更新repo？

我调用git repo sync 好像不起作用。

不兼容google 的 repo工具格式，所以下载谷歌的开源代码是下载不下来

https://chromium.googlesource.com/chromiumos/

试了一下谷歌的开源项目，用谷歌的repo工具，没问题，可以正常下载。
用阿里的，就不行。。。

本来还以为可以替代掉谷歌的工具，结果发现想多了。。。

还是只能用谷歌的标准，谷歌的工具。

git-pr命令已经被git-extras包含了，何解？

$ g repo version
WARNING: you cannot use the git-repo alias command 'git-pr', it is overrided by '/usr/local/bin/git-pr' installed
git-repo version 0.7.7
git version 2.25.0

在git协议下，当commit里面有lfs时，可以push，但是pr会报错

➜ git-repo-lfs-test git:(master) git pr
Uploading LFS objects: 0% (0/1), 0 B | 0 B/s, done.
batch request: invalid character '0' after top-level value
error: failed to push some refs to 'codeup.aliyun.com:606bafcd32fceefde379cc0e/git-repo-lfs-test.git'

[FAILED] ./ master (upload failed: exit status 1)

如果是https协议就可以正常pr。

'git repo sync' get an error of 'is published (but not merged)' after 'git pr'

Run a bash, we get an error of "Error: branch my_patch is published (but not merged)"

#!/bin/bash
SCRIPT_DIR="$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)"
cd $SCRIPT_DIR
REPO=$HOME/bin/repo

set -ex

DIR=`pwd`/test-sync
rm -rf $DIR && mkdir -p $DIR
cd $DIR

git repo init -u [email protected]:alicpp2/test-repo.git
git repo sync -j 32
git repo start my_patch --all
ls -l

cd test_repo1-x
uuid >> INSTALL
git add INSTALL
git commit -m 'a new commit'
echo x | git pr

cd $DIR
rm -rf xtmp
git clone [email protected]:alicpp2/test-repo1.git xtmp/test-repo1
cd xtmp/test-repo1
uuid >> README
git add README
git commit -m 'change readme'
git push origin HEAD:master

cd $DIR/test_repo1-x
git repo sync

This situation is very common.
If we work on a patch for weeks, we often need to run 'git pr' to generate the merge request for the reviewer and handle with the challenges, do some code changes and run 'git pr' again. Sometimes we must run 'git repo sync' to rebase the newest code but we get an error.

In our team development-faq, I suggest the solution like this

It's awful.

got bad ssh_info error

I can not sync the repos by sync today, got errors below

❯ git repo sync
ERROR: bad ssh_info request to 'https://codeup.aliyun.com/ssh_info': Get "https://codeup.aliyun.com/ssh_info": dial tcp: i/o timeout
NOTE: fail to check remote server, you may need to install gerrit hooks by hands
ERROR: fail to load remotes: origin

my git repo version is

❯ git repo --version
git-repo version 0.7.8
git version 2.32.1 (Apple Git-133)

❯ curl https://codeup.aliyun.com/ssh_info
{"type":"agit","version":2}%

Thanks

Using multi-repo manifests without address for review

When dealing with e.g. manifest repositories e.g. here on github, where there is no address for review in the manifest,
you currently get ERROR: bad address for review ''. Its a bit difficult to add try and add remotes to the repo downloaded repositories from git repo sync.

It would be nice if there was a way to easily add remotes to all the repositories checked out,
It seems like perhaps if there was a --remote-manifest-url to git repo init

git repo upload --remote, gives the impression that it only works with --single repositories, (correct?)
--remote string use specific remote for upload (use with --single)

Is there a nice way to make --remote work with multiple repositories, and if not do you think adding something such as --remote-manifest-url would be a good way to do so?

git pr的时候启动本地文本编辑器错误

git pr 的时候查找文本编辑器路径没有间隔符或间隔符错误，路径查了没问题，请问怎么解决

windows系统 linkfile属性有些问题

【系统信息】
版本 Windows 11 企业版 64Bit
版本 22H2
操作系统版本 22621.1992
体验 Windows Feature Experience Pack 1000.22644.1000.0

目录链接
【manifest】

【报错】

且repo根目录不会创建aa文件夹
文件链接
【manifest】

【报错】

会创建aa文件夹

<linkfile dest="README.md" src="README.md" /> 这个case是可以成功的

请帮忙看下，多谢！

git pr can not deal with shell variable expansion correctly

git pr will truncate the shell variable if the variable contains whitespace characters.

I have double checked the value expansion expression, it seems correct, so there must be something wrong during the processing of git pr

manifest.xml 中 include 的相对路径计算有问题。

用 repo 时
repo init --no-clone-bundle --repo-url https://gitlab.com/firefly-linux/git-repo.git -u https://gitlab.com/firefly-linux/manifests.git -b master -m rk3288_linux_release.xml

repo sync -c --no-tags
正常。

用 git-repo 时
git-repo init --no-clone-bundle -u https://gitlab.com/firefly-linux/manifests.git -b master -m rk3288_linux_release.xml
git-repo sync -c --no-tags

报错：
FATAL: stat /home/firefly/proj/rk3288_linux_release_v2.5.0a_20230510/.repo/rk3288/rk3288_linux_bsp_release_20220304_v2.5.0a.xml: no such file or directory

Feature request: Add github api create merge request

Ref: https://docs.github.com/en/rest/reference/pulls#create-a-pull-request

after local code change, we type git pr

this action will look for if the origin URL was github

If github ,then make API call to create new pull request

we can using .netrc to let git auto know the token to access the github api

Amazing way.

Received HTTP code 500 from proxy after CONNECT

在执行git-repo sync拉取manifest.xml配置的工程
报错 unable to access 'https://git.***.com/***/repo_submodule/': Received HTTP code 500 from proxy after CONNECT

How to submit 'git pr' without opening an editor?

version info:
git-repo version 0.7.6
git version 2.19.1.6.gb485710b

I have some regression tests which would update the code, and it's a bit dangerous to git push directly.
Is there a way to submit 'git pr' without opening an editor?

I tried gir pr --no-edit -y, but still opened the editor.

Not all commands from `repo` implemented in `git-repo-go`

git-repo-go could not be used as a drop-in replacement as not all commands from repo implemented yet.

Version: v0.7.8

Help of git-repo-go

Usage:
  git-repo [flags]
  git-repo [command]

Available Commands:
  abandon     Permanently abandon a development branch with --force option
  download    Download and checkout a code review
  filter      Content filter drivers for git
  forall      Run a shell command in each project
  help        Help about any command
  init        Initialize manifest repo in the current directory
  list        List projects and their associated directories
  manifest    Manifest inspection utility
  prune       Prune (delete) already merged topic branches
  start       Start a new branch for development
  status      Show the working tree status
  sync        Update working tree to the latest revision
  upgrade     Check and upgrade git-repo
  upload      Upload changes for code review
  version     Display the version of git-repo

Flags:
      --config string   config file (default is $HOME/.git-repo.yaml)
      --dryrun          dryrun mode
  -h, --help            help for git-repo
  -q, --quiet           quiet mode
      --single          single mode, no manifest
  -v, --verbose count   verbose mode
  -V, --version         Show version

Help of repo

Usage: repo [-p|--paginate|--no-pager] COMMAND [ARGS]

Options:
  -h, --help            show this help message and exit
  --help-all            show this help message with all subcommands and exit
  -p, --paginate        display command output in the pager
  --no-pager            disable the pager
  --color=COLOR         control color usage: auto, always, never
  --trace               trace git command execution (REPO_TRACE=1)
  --trace-python        trace python command execution
  --time                time repo command execution
  --version             display this version of repo
  --show-toplevel       display the path of the top-level directory of the
                        repo client checkout
  --event-log=EVENT_LOG
                        filename of event log to append timeline to
  --git-trace2-event-log=GIT_TRACE2_EVENT_LOG
                        directory to write git trace2 event log to

The most commonly used repo commands are:
  abandon        Permanently abandon a development branch
  branch         View current topic branches
  branches       View current topic branches
  checkout       Checkout a branch for development
  cherry-pick    Cherry-pick a change.
  diff           Show changes between commit and working tree
  diffmanifests  Manifest diff utility
  download       Download and checkout a change
  gitc-delete    Delete a GITC Client.
  gitc-init      Initialize a GITC Client.
  grep           Print lines matching a pattern
  info           Get info on the manifest branch, current branch or unmerged branches
  init           Initialize a repo client checkout in the current directory
  list           List projects and their associated directories
  overview       Display overview of unmerged project branches
  prune          Prune (delete) already merged topics
  rebase         Rebase local branches on upstream branch
  smartsync      Update working tree to the latest known good revision
  stage          Stage file(s) for commit
  start          Start a new branch for development
  status         Show the working tree status
  sync           Update working tree to the latest revision
  upload         Upload changes for code review

有没有办法简单地是用本地的manifeset.xml来初始化呢？

RT，目前使用的办法是先用repo init -m 指定库上的.xml，然后在本地手动替换manifest.xml，再repo sync，有没有直接一点的办法呢？

打开推送评审模式后应该如何推送PR

git repo upload 是否可以兼容 codeup 的推送凭审模式吗? 还是需要用 foreach 去 push 每个库?

谢谢

git pr --change xxx 不能推送已存在的PR

报错

$ grpr --change 10338772 
ERROR: rename <PROJECT_DIR>/.git/UPLOAD_OPTIONS.d.lock <PROJECT_DIR>/.git/UPLOAD_OPTIONS.d: file exists
Uncommitted changes in mmc-wireless/<REPO_NAME> (did you forget to amend?):
Continue uploading? (y/N) y
Enumerating objects: 40, done.
Counting objects: 100% (40/40), done.
Delta compression using up to 12 threads
Compressing objects: 100% (21/21), done.
Writing objects: 100% (29/29), 3.21 KiB | 1.07 MiB/s, done.
Total 29 (delta 15), reused 0 (delta 0), pack-reused 0
To gitlab.alibaba-inc.com:mmc-wireless/<REPO_NAME>.git
 ! [remote rejected] feature/bar_item_style -> refs/for-review/10338772 (invalid character '<' looking for beginning of value)
error: failed to push some refs to 'gitlab.alibaba-inc.com:mmc-wireless/<REPO_NAME>.git'

----------------------------------------------------------------------
[FAILED] ./              feature/bar_item_style (upload failed: exit status 1)

alias:

$ alias | grep -E 'grcr|grpr'
grcr='git repo download --single'
grpr='git repo upload --single'

在其他分支上通过 grpr 提交了一个PR，然后切新分支再 grcr 拉下来修改，最后用 change 参数更新PR是报错。是内网 gitlab 不支持这样的操作吗？

Use testing.T.TempDir in the tests

We can clean up the tests a bit by starting to use testing.T.TempDir instead of having this in ~20 tests:

git-repo-go/manifest/manifest_test.go

Lines 513 to 519 in 8d46bab

 tmpdir, err := ioutil.TempDir("", "git-repo") 

 if err != nil { 

 log.Fatal(err) 

 } 

 defer func(dir string) { 

 os.RemoveAll(dir) 

 }(tmpdir)

I would normally just have sent a PR, but testing.T.TempDir was introduced in Go 1.15 and I don't know whether it would be okay to require that compiler version given that go.mod states 1.12 and that .github/workflows/go.yml uses Go 1.14 on Mac OS X. Is there any particular reason Mac OS X builds use an older version than what's tested on Linux?

What exactly does "diff driver" mean?

Hi @jiangxin

As the title described, what does diff dirver mean in Git?
It's the sum of all diff configuration variable like diff.algorithm, diff.context, diff.external, diff.tool, diff.wordRegex etc. ?

Thanks!

Recursive manifest includes use the wrong base path

When the manifest contains recursive inclusions,

default.xml -> foo/bar.xml -> foo/base.xml

the original Repo code uses the directory of the top-level file (default.xml) when resolving the path of the included file, i.e. the inclusion filenames would be according to the example above. This is pretty clear when reading the _ParseManifestXml source code and its include_root parameter.

The code in this module instead joins the directory of the current file with the name from the include element, i.e. in the example above it would incorrectly attempt to open foo/foo/base.xml.

git-repo-go/manifest/manifest.go

Line 619 in 8d46bab

f, err := path.AbsJoin(filepath.Dir(file), i.Name)

<manifest>
  <remote name="origin" fetch=".." review="ssh://[email protected]/"></remote>
  <default remote="origin" revision="master" sync-j="8"></default>
  <project name="alicpp2/test-repo1" path="test_repo1" revision="d3c878ac1786e5a6d31b4e8908010580e1f6e584" groups="holo" upstream="master"></project>
  <project name="alicpp2/test-repo2" path="test_repo2" revision="c6d2fa67c86febc802896991414c34c67ea8ee44" groups="holo" upstream="master"></project>
</manifest>

Run the bash to get an error:

#!/bin/bash
SCRIPT_DIR="$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)"
cd $SCRIPT_DIR

set -ex

rm -rf repo && mkdir -p repo
cd repo

git repo init -u [email protected]:alicpp2/test-repo.git -m release.xml
git repo sync -j 32
git repo start my_patch --all

cd test_repo1
touch ZZZ
git add ZZZ
git commit -m 'a test commit'
echo xxx | git repo upload

Expect:
Run 'git repo upload' successfully when users work in a repo with latest-ok version.

当manifest.xml文件中存在某个project的path字段没定义的情况下，会报错

FATAL: duplicate path for project '.' in 'xxxxxxxxxxxx/.repo/manifest.xml'

当manifest.xml文件中存在某个project的path字段没定义的情况下，会报上面的错，

而谷歌的repo实现中，当遇到这种project时，path字段会默认赋值成name的相同值

	tmpdir, err := ioutil.TempDir("", "git-repo")
	if err != nil {
	log.Fatal(err)
	}
	defer func(dir string) {
	os.RemoveAll(dir)
	}(tmpdir)