tools/git-repo.git/subcmds/upload.py, branch v2.72

upload: add --ignore-remote-commits

2026-11-03T08:10:19+00:00

When uploading a branch that merges another remote-tracking branch (such as an upstream branch into the destination branch), ReviewableBranch only excludes the destination tracking branch (^base). As a result, git rev-list walks the merged parent and counts all merged commits even though they already exist on a remote branch, triggering the unusual commit count warning in _VerifyPendingCommits. Add --ignore-remote-commits to `repo upload` to pass --not --remotes to git rev-list in ReviewableBranch so commits already reachable from refs/remotes/* are excluded from the pending commit list. Test: ./run_tests tests/test_project.py tests/test_subcmds_upload.py Change-Id: Ib1fb864982729e20a621144580fe95daa478eaee Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/651284 Tested-by: Romaric Jodin Reviewed-by: Brian Gan Commit-Queue: Romaric Jodin

style: use `import git_refs` everywhere

2026-10-27T09:00:11+00:00

Align with Google style guides and `import git_refs` as a module rather than import symbols out of it. Change-Id: I4e33ebdf3b06acd94494f32cdf39aa58427cd4b2 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/648703 Reviewed-by: Brian Gan Commit-Queue: Mike Frysinger Tested-by: Mike Frysinger

upload: suppress git push progress when quiet or non-TTY

2026-10-26T21:51:52+00:00

`Project.UploadForReview()` unconditionally passed `--progress` to `git push`, forcing client and remote progress meters (`Counting objects`, `remote: Resolving deltas: 3%..100%`) even on non-TTY stderr or when `-q`/`--quiet` was passed. Meanwhile, `repo upload` ignored `opt.quiet` completely. Move `--progress` injection for `push` into `GitCommand` alongside `fetch` and `clone`, enabling it only when `sys.stderr.isatty()` and none of `--progress`, `--no-progress`, `--quiet`, or `-q` are set. Forward `opt.quiet` from `repo upload` to `Project.UploadForReview()` and pass `--no-progress` to `git push` rather than `--quiet` so Gerrit `remote: https://...` review URLs are still emitted and parsed by `_FindGerritUrls()`. Also suppress the non-error `[OK]` summary banner when `-q`/`--quiet` is set. Bug: 578114287 Change-Id: I88b7b055dcca0db80dae6962886a693fe717c741 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/649663 Tested-by: Gavin Mak Commit-Queue: Gavin Mak Reviewed-by: Brian Gan

style: use `import repo_logging` everywhere

2026-10-23T16:49:36+00:00

Align with Google style guides and `import repo_logging` as a module rather than import symbols out of it. Change-Id: Ie13c1f13be00dbf6dd3814a8780baf6453972237 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/647823 Tested-by: Mike Frysinger Commit-Queue: Mike Frysinger Reviewed-by: Brian Gan

style: use `import error` everywhere

2026-10-23T00:44:11+00:00

Align with Google style guides and `import error` as a module rather than import classes out of it. Change-Id: I8686fbe7887bd6ceac7a07877af63934f0d0ddd2 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/647563 Commit-Queue: Mike Frysinger Reviewed-by: Gavin Mak Reviewed-by: Insaf Latypov Tested-by: Mike Frysinger

upload: reject --fix with --ignore-hooks or --no-verify

2026-10-16T07:18:33+00:00

--fix asks the pre-upload hook to apply its fixups, but: * --no-verify skips the hook entirely, so --fix silently does nothing. * --ignore-hooks uploads the original commits even if the hook fails, so any fixups applied to the working tree are not part of the upload. Whether --fix should then apply fixups or be ignored is ambiguous. Reject both combinations up front, before any hook runs, instead of picking an interpretation. Bug: 562921767 Test: python3 -m pytest tests/test_subcmds_upload.py Change-Id: Ib00ae69004642f2e763212b82e7c39f3b4da52eb Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/642664 Tested-by: Rahul Yadav Reviewed-by: Mike Frysinger Commit-Queue: Rahul Yadav

upload: bypass branch editor with explicit branch and -y

2026-09-09T19:10:24+00:00

When uploading across multiple projects with --yes and an explicit branch specified (via --current-branch / -c or --branch / --br), repo previously still opened the interactive branch selection editor. If an explicit branch and --yes are provided, bypass the interactive editor and upload all matching pending branches directly. Bug: 553024110 Test: python3 -m pytest tests/ Test: flake8 subcmds/upload.py tests/test_subcmds_upload.py Test: isort --check subcmds/upload.py tests/test_subcmds_upload.py Change-Id: I104619603f6e0539d05b01d3eb0292a9145d58db Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/622661 Tested-by: Arif Kasim Reviewed-by: Gavin Mak

upload: reuse the worker current-branch result

2026-09-03T00:45:55+00:00

Carry the current branch through _GatherOne so the parent can report a failed current-branch upload without resolving HEAD a second time. Bug: 553599402 Change-Id: I3fc54be6c10c30470e14f792ff68c0a396519327 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/623905 Reviewed-by: Brian Gan Commit-Queue: Gavin Mak Tested-by: Gavin Mak

upload: prune ref scans for untouched projects and specific branches

2026-08-28T23:07:01+00:00

Benchmark (100 untouched projects): * GetUploadableBranches: 0.985s -> 0.0004s (2,200x faster) * repo upload (3,045 projects): saves ~2.5s of redundant ref scans During `repo upload`, `GetUploadableBranches()` currently scans `self._allrefs` across all projects in the workspace. In large manifests (e.g. Android with 3,000+ projects), `self._allrefs` executes `git for-each-ref`, `git symbolic-ref`, and full filesystem mtime traversals on thousands of projects where no local branch was ever started or modified. Any branch that can be uploaded for review must have upstream tracking configured via `[branch "..."]` sections in `.git/config` (otherwise `branch.LocalMerge` is None and `GetUploadableBranch` returns None). This patch introduces early-pruning fast paths: 1. When no branch subsections exist in `.git/config` (or only 2-part keys like `branch.autosetupmerge`), return [] immediately without touching `_allrefs`. 2. When a `selected_branch` is specified (e.g. `repo upload --br=...`), query `branch.LocalMerge`, `refs/heads/`, and `refs/published/` directly, skipping the whole-tree ref scan. 3. In `subcmds/upload.py`, optimize `_GetMergeBranch` to resolve the merge branch in-memory via `project.CurrentBranch` and `project.GetBranch()` instead of spawning two `GitCommand` processes. Test: ./run_tests tests/test_project.py tests/test_subcmds_upload.py Change-Id: I3c2c9d63a68a393d478e1fb50f548ec8b7d44639 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/623021 Reviewed-by: Brian Gan Commit-Queue: James Hawkins Tested-by: James Hawkins

hooks: add --fix option to auto-apply hook fixes

2026-08-27T10:28:58+00:00

Pass the --fix flag as a keyword argument "fix" to the hook main function. This allows hooks (such as git-repohooks) to decouple automated fix application from the -y/--yes flag so that -y can answer yes to upload confirmation prompts without triggering file mutations. Companion change in git-repohooks: https://gerrit-review.googlesource.com/c/git-repohooks/+/621761 Bug: 546510319 Test: python3 -m pytest tests/test_hooks.py Change-Id: If0288d4791fc0a2aba6e88854e3aa81b0923b664 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/619281 Commit-Queue: Rahul Yadav Tested-by: Rahul Yadav Reviewed-by: Gavin Mak