New issue
Advanced search Search tips

Issue 640299 link

Starred by 1 user

Issue metadata

Status: Fixed
Owner:
Closed: Jan 2017
Cc:
Components:
EstimatedDays: ----
NextAction: ----
OS: ----
Pri: 2
Type: Bug



Sign in to add a comment

Gerrit git cl upload with dependencies is broken

Project Member Reported by tandrii@chromium.org, Aug 23 2016

Issue description

repro: create two branches, one depending on another and then try uploading one with --dependencies.

here is what I got:

$ git clbp -d --dependencies
Using 50% similarity for rename/copy detection. Override with --similarity.
 infra/services/gnumbd/gnumbd.py | 2 ++
 1 file changed, 2 insertions(+)
remote: Processing changes: new: 1, done            
remote: 
remote: New Changes:        
remote:   https://chromium-review.googlesource.com/374578 base        
remote: 
To https://chromium.googlesource.com/infra/infra.git
 * [new branch]      4c40e6640623f6355cc4503a4c5e8b7ee2965a6c -> refs/for/refs/heads/master%notify=NONE,cc=chromium-reviews@chromium.org,cc=infra-reviews+infra@chromium.org

--dependencies has been specified.
All dependent local branches will be re-uploaded.

Current branch does not have an uploaded CL. We cannot set patchset dependencies without an uploaded CL.
1:tandrii@andrii:/ii/infra a10$ git cl status
Branches associated with reviews:
      12 : https://chromium-review.googlesource.com/372858 (unsent)
     A20 : None 
     a10 : https://chromium-review.googlesource.com/374578 (reply)
    argh : https://chromium-review.googlesource.com/372138 (lgtm)
   dummy : None 
   ghaha : https://chromium-review.googlesource.com/372858 (unsent)
  log100 : https://chromium-review.googlesource.com/356650 (reply)
  master : None 
    test : https://chromium-review.googlesource.com/364480 (lgtm)

Current branch:
a10
Issue number: 374578 (https://chromium-review.googlesource.com/374578)
Issue description:
  base  BUG=  Change-Id: I314c5bdace65fc058313f2e2440f51b3c9c3d0ec
0:tandrii@andrii:/ii/infra a10$ git co A20 
Switched to branch 'A20'
Your branch is ahead of 'a10' by 1 commit.
  (use "git push" to publish your local commits)
0:tandrii@andrii:/ii/infra A20$ git clbp -d --dependencies
Using 50% similarity for rename/copy detection. Override with --similarity.
 infra/services/gnumbd/gnumbd.py | 4 ++++
 1 file changed, 4 insertions(+)
remote: Processing changes: new: 1, done            
remote: 
remote: New Changes:        
remote:   https://chromium-review.googlesource.com/374598 deps        
remote: 
To https://chromium.googlesource.com/infra/infra.git
 * [new branch]      264eff1fb9613177c165f596b18a6827b71bf0aa -> refs/for/refs/heads/master%notify=NONE,cc=chromium-reviews@chromium.org,cc=infra-reviews+infra@chromium.org

--dependencies has been specified.
All dependent local branches will be re-uploaded.

Current branch does not have an uploaded CL. We cannot set patchset dependencies without an uploaded CL.
1:tandrii@andrii:/ii/infra A20$ 

 
Labels: Type-Bug
Labels: Milestone-Dogfood Proj-Gerrit-Migration
Labels: -Pri-1 Pri-2
Argh, I hit this all the time with CL pipelining.
Status: Started (was: Assigned)
Trivial fix: https://chromium-review.googlesource.com/c/432676/ 

This started failing because we've removed patchset from gerrit.
Labels: -Restrict-View-Google
Project Member

Comment 7 by bugdroid1@chromium.org, Jan 26 2017

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/1090fd5b69a9a23652d6a517295bfba01146462c

commit 1090fd5b69a9a23652d6a517295bfba01146462c
Author: Andrii Shyshkalov <tandrii@chromium.org>
Date: Thu Jan 26 08:37:54 2017

Fix git cl upload --dependencies for Gerrit.

BUG= 640299 
R=rmistry@chromium.org,agable@chromium.org

Change-Id: Iac987758065c57a4a08ce98f838fc0c30a8c1a02
Reviewed-on: https://chromium-review.googlesource.com/432676
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>
Reviewed-by: Aaron Gable <agable@chromium.org>

[modify] https://crrev.com/1090fd5b69a9a23652d6a517295bfba01146462c/git_cl.py

Status: Fixed (was: Started)

Sign in to add a comment