/git-repo

repo - The multiple repository tool (also works on MS Windows!)

Primary LanguagePythonApache License 2.0Apache-2.0

Repo for Microsoft Windows and Linux

This is E.S.R.Labs Repo - just like Google Repo but this one also runs under Microsoft Windows. For more information, see Version Control with Repo and Git.

Repo is a repository management tool that Google built on top of Git. Repo unifies many Git repositories when necessary, does the uploads to a revision control system, and automates parts of the development workflow. Repo is not meant to replace Git, only to make it easier to work with Git in the context of multiple repositories. The repo command is an executable Python script that you can put anywhere in your path. In working with the source files, you will use Repo for across-network operations. For example, with a single Repo command you can download files from multiple repositories into your local working directory.

Setup steps for Microsoft Windows

Fix priviledges to allow for creation of symbolic links

  • If you are a member of the Administrators group you have to turn off User Access Control (UAC) and then restart the computer.

  • Otherwise you have to adjust your user rights to get SeCreateSymbolicLinkPrivilege priviledges. The editrights tools is provided as part of git-repo for Microsoft Windows.

  • Highly experimental (do not use except for developing this feature!): If you prefer to not use symbolic links but junctions for folders and hardlinks for files instead, you have to set the following in your ~/.gitconfig:

      [portable]
      windowsNoSymlinks = true

    This will not require to set the the priviledges as described above.

    Known issue: Hard links are destroyed by git for example when you delete a branch (breaks .git/config). This will destroy the project workspace!

Download and install Git
  • Download Git (http://git-scm.com/downloads)
  • Add Git to your path environment variable: e.g. C:\Program Files (x86)\Git\cmd;
  • Add MinGW to your path environment variable: e.g. C:\Program Files (x86)\Git\bin;
Download and install Python
Download and install Repo either using the Windows Command Shell or Git Bash
Windows Command Shell
md %USERPROFILE%\bin
curl https://raw.githubusercontent.com/esrlabs/git-repo/stable/repo > %USERPROFILE%/bin/repo
curl https://raw.githubusercontent.com/esrlabs/git-repo/stable/repo.cmd > %USERPROFILE%/bin/repo.cmd
Git Bash
mkdir ~/bin
curl https://raw.githubusercontent.com/esrlabs/git-repo/stable/repo > ~/bin/repo
curl https://raw.githubusercontent.com/esrlabs/git-repo/stable/repo.cmd > ~/bin/repo.cmd
  • Add Repo to your path environment variable: %USERPROFILE%\bin;
  • Create a HOME environment variable that points to %USERPROFILE% (necessary for OpenSSH to find its .ssh directory).
  • Create a GIT_EDITOR environment variable that has an editor executable as value. For this, first add the home directory of the editor executable to the path environment variable. GIT_EDITOR can than be set to "notepad++.exe", "gvim.exe", for example.

Setup steps for Linux

Downloading and installing Git and Python
sudo apt-get install git-core
sudo apt-get install python
Download and install Repo
$ mkdir ~/bin
$ PATH=~/bin:$PATH
$ curl https://raw.githubusercontent.com/esrlabs/git-repo/stable/repo > ~/bin/repo
$ chmod a+x ~/bin/repo

Usage

For more detailed instructions regarding git-repo usage, please visit git-repo.

FAQ Troubleshooting

I can not see any colors for repo status

The pager which is used for repo status is set per default to less which is not capable of parsing color codes on Windows. This can be fixed by setting the default pager to more. This can be done by

git config --global core.pager more

. Alternativly, the environment variable GIT_PAGER can be set to more.

I get a WindowsError when initializing my repo with repo init .. in Windows Command Shell

If there is a warning at the beginning of the output which reads states that GPG is not available

warning: gpg (GnuPG) is not available.
warning: Installing it is strongly encouraged.

you have to add gpg.exe to your PATH variable. The executable can be found in your Git installation folder $GIT\usr\bin. When you are using Git Bash, the $Git\usr\bin folder is already added to your PATH.

Changes to original git-repo

Portable changes
  • Added Windows executable repo.cmd
  • Replacing usage of fcntl with sockets for Windows
  • Handling pager and coloring with subprocesses and redirects of sysin, sysout and syserr on Windows
  • Using mklink to create symbolic links on Windows (alternative: use junctions and hardlinks by setting portable.windowsNoSymlinks = true in ~/.gitconfig)
  • fixed some file handling issues / differences
New Features
  • Added push.py sub command to upload and bypass the code review system.
  • Added interactive workflow test

Developer Information

Resyncing with official google repo

For resyncing with the official google repo git, here are the commands for resyncing with the tag v1.12.33 of the official google repo:

# add google git-repo remote with tag
git remote add googlesource https://android.googlesource.com/tools/repo/
git checkout v1.12.33 -b google-latest

# checkout basis for resync
git checkout google-git-repo-base -b update
git merge --allow-unrelated-histories -Xtheirs --squash google-latest
git commit -m "Update: google git-repo v1.12.33"
git rebase stable

# solve conflicts; keep portability in mind

git checkout stable
git rebase update

# cleanup
git branch -D update
git branch -D google-latest