tools/git-repo.git/project.py, branch v2.65

sync: Implement fetchcmd for standard Git layouts

2026-06-30T20:20:15+00:00

Introduce support for `repo.fetchcmd` configuration, allowing users to specify a custom command to fetch project data instead of `_RemoteFetch`. When `repo.fetchcmd` is specified, `repo` will execute it instead of `_RemoteFetch` during the network half of sync. Note that `repo.fetchcmd` requires `repo.uselocalgitdirs` to be enabled. The command is executed in a subshell with project-context environment variables, including the new `REPO_TREV` (target revision resolved to a commit hash) and `REPO_PROJECT_FETCH_URL`. After execution, `repo` verifies that the target commit is available and that the tracking ref and FETCH_HEAD are correctly updated. Tested with: ``` > ~/git-repo/repo init -u https://android-review.googlesource.com/platform/manifest \ --repo-url file:///usr/local/google/home/gavinmak/git-repo \ --groups developers \ --no-repo-verify \ --use-local-gitdirs ... > git config --file .repo/manifests.git/config repo.fetchcmd 'mkdir -p $REPO_PATH && cd $REPO_PATH && if [ ! -d .git ]; then git init && git remote add aosp $REPO_PROJECT_FETCH_URL; fi && git fetch aosp $REPO_TREV && git reset --hard $REPO_TREV && mkdir -p .git/refs/remotes/aosp && echo $REPO_TREV > .git/refs/remotes/aosp/main && echo $REPO_TREV > .git/FETCH_HEAD' > ~/git-repo/repo sync -j32 warning: repo is not tracking a remote branch, so it will not receive updates; run `repo init --repo-rev=stable` to fix. You are currently enrolled in Git submodules experiment (go/android-submodules-quickstart). Use --no-use-superproject to override. Syncing: 100% (4/4), done in 1m15.686s Finalizing sync state... repo sync has finished successfully. ``` Bug: 513329573 Change-Id: I754d3f3c78e86fdeee1a72115297a75b571bc497 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/583883 Reviewed-by: Becky Siegel Tested-by: Gavin Mak Commit-Queue: Gavin Mak

status: Show ahead/behind info for local branches

2026-06-30T18:13:14+00:00

When viewing `repo status`, it is difficult to distinguish between branches that have active unpushed changes and stale branches that are fully synced. Previously, developers had to run commands like `repo forall -c "git status"` to see their ahead/behind counts. This change updates Project.PrintWorkTreeStatus to automatically calculate and display the number of commits a branch is ahead and/or behind its upstream tracking branch. We use `git rev-list --left-right --count` to fetch this information natively and efficiently. If the branch is completely synced with upstream, no extra text is shown. Added tests for ahead-only, behind-only, diverged, no-tracking, and fully-synced branch states. Bug: 319412954 Change-Id: I23879b2d472c7a7e11d01b565428a84b1b4f09c1 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/602423 Reviewed-by: Gavin Mak Tested-by: Brian Gan Commit-Queue: Brian Gan

info: Report actual checked-out HEAD revision

2026-06-29T17:50:02+00:00

When `repo info` runs, the reported "Current revision" is resolved using the manifest's target branch tracking ref (e.g. refs/remotes/goog/main). Introduce Project.GetHeadRevisionId(), which gets the checked-out HEAD commit in the worktree, and use it in `repo info` with a fallback to the old behavior if the project is not checked out. Bug: 526685287 Change-Id: I72280ce27daa210cada27d722a94e365644f06e0 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/599481 Reviewed-by: Brian Gan Commit-Queue: Gavin Mak Tested-by: Gavin Mak

git_config: Support SHA-256 object IDs

2026-06-26T22:40:55+00:00

Update ID_RE to match both 40-char (SHA-1) and 64-char (SHA-256) IDs as part of Git 3.0 support. Bug: 483758905 Change-Id: Ie5d9a2a5df4c6e7adda7f1d89f1bfb7724846057 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/600341 Reviewed-by: Brian Gan Tested-by: Gavin Mak Reviewed-by: Mike Frysinger Commit-Queue: Gavin Mak

project: fix sync of shallow projects sharing objdir

2026-06-25T22:28:46+00:00

Repo sync fails when the following conditions are met: * There are several checkouts of the same project in different paths. * The checkouts are using git hashes as revisions (not branches). * There is a clone-depth set on these projects. * sync-c="true" is set in the manifest. * The revision specified in the manifest has moved forward since the first repo init. The sync fails because only the first gitdir gets the "shallow" file, and subsequent dirs can't be synced. Do not optimize away the fetch when the conditions above happen. Simplified the boolean check in Sync_NetworkHalf and _RemoteFetch using has_shallow, renamed loop variable to avoid shadowing. Test: create a manifest matching conditions above, repo init, forward the hash, and repo sync. Test: added tests in test_project.py Bug: 505072873 Originally-by: Elvira Khabirova Change-Id: I37c533c382e34fc5ddab489c5593b9e5d3875be2 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/601441 Tested-by: Sainath Varanasi Reviewed-by: Gavin Mak Commit-Queue: Sainath Varanasi

project: Add REPO_PROJECT_FETCH_URL environment variable

2026-06-16T17:30:47+00:00

Add REPO_PROJECT_FETCH_URL to Project.GetEnvVars(), which resolves to the remote fetch URL of the project. This is useful for exposing the URL to custom fetch commands or other external scripts. Bug: 513329573 Change-Id: Ic2b0a83493934d16bb1152366ee4e1a2c35ea2dc Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/596121 Tested-by: Gavin Mak Reviewed-by: Mike Frysinger Commit-Queue: Gavin Mak

project: handle corrupted projects in DeleteWorktree

2026-06-05T16:16:22+00:00

Catch GitError from IsDirty() during DeleteWorktree so corrupted projects can be cleanly wiped instead of crashing. Bug: 515415221 Change-Id: Ic03ae77c30a722f9aa06f2220747251e0aea4ab7 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/591001 Commit-Queue: Gavin Mak Reviewed-by: Mike Frysinger Tested-by: Gavin Mak

project: Extract project envvar generation to GetEnvVars

2026-05-27T19:58:02+00:00

Move project environment variable setup from subcmds/forall.py to a reusable Project.GetEnvVars() helper method. Bug: 513329573 Change-Id: I3b4b113aa5a086e5fa5eaf4461c7ce517d928610 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/583881 Tested-by: Gavin Mak Commit-Queue: Gavin Mak Reviewed-by: Mike Frysinger

sync: Skip copyfile/linkfile for unavailable projects

2026-05-27T17:36:32+00:00

Commit 5534f16 made UpdateCopyLinkfileList to retry _CopyAndLinkFiles for all projects in the manifest to handle directory-to-symlink transistions. However, for partial sync's (e.g. repo sync ), projects not included in the sync may not have their local directories populated, attempts to perform the operation on unavailable projects would result in dangling symlinks, or errors like: error: Cannot copy file to Fix this by adding a check inside _CopyAndLinkFiles in project.py to so these operations happen only when the project's worktree exists and is a directory. TAG=agy CONV=90f5fca7-2199-4017-8f62-a010b0ab1dbf Change-Id: I9ae1e8d62d8fd129cb4535e574c38339c87af441 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/587501 Reviewed-by: Mike Frysinger Tested-by: Xin Li

init: Add --use-local-gitdirs for standard Git layouts

2026-05-26T17:26:25+00:00

Introduce --use-local-gitdirs to bypass repo's symlink-based layouts in favor of standard local .git directories. Bug: 513329573 Bug: 508146070 Change-Id: I53d1602e61be0b86964529bcbea3dc801471f9c9 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/569001 Tested-by: Gavin Mak Commit-Queue: Gavin Mak Reviewed-by: Dan Willemsen