Fix GitCheckout.prepare to be sane and use git-cache

Fix GitCheckout to be sane and use git-cache

The commit queue uses checkout.GitCheckout to manage the
local git repository. It resets it to a clean state,
commits patches locally, and pushes those changes to the
golden-source-of-truth repo.

This CL fixes the prepare() method to use the new git-cache
tool, and in the process makes it more consistent, more
readable, and more correct. It also makes minor changes to
other methods to bring them in line with the git-cache
approach.

R=iannucci@chromium.org, rmistry@chromium.org
BUG=261619
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=256681

[agable, 2014-02-24 22:35:48]

This rewrites the 'prepare' method of checkout.GitCheckout to use the new
git-cache tool. This makes it sane -- the logic it was using before made
virtually no sense, was unnecessarily convoluted, and ended up doing the wrong
thing. This should be clearer, more correct, and more efficient too.

[rmistry, 2014-02-24 23:13:38]

On 2014/02/24 22:35:48, agable wrote:
> This rewrites the 'prepare' method of checkout.GitCheckout to use the new
> git-cache tool. This makes it sane -- the logic it was using before made
> virtually no sense, was unnecessarily convoluted, and ended up doing the wrong
> thing. This should be clearer, more correct, and more efficient too.

This *looks right* but I have not tested it yet.
But "Unfortunately, no commit queue actually *uses* this git workflow yet, so we
weren't aware of how broken it is. This is the first change to fix it." is
incorrect.
The skiabuildbot CQ uses it and has never run into any problems (so far), also
as part of the initial completion of the GitCheckout logic I had tested it
against a test repository. If you detail exactly what was broken before it will
help me understand the previous problems.
Also, you should add maruel as a reviewer since you are removing a lot of the
logic he had in his previous incomplete incarnation of GitCheckout.

[rmistry, 2014-02-24 23:17:03]

https://codereview.chromium.org/175873003/diff/1/checkout.py
File checkout.py (right):

https://codereview.chromium.org/175873003/diff/1/checkout.py#newcode722
checkout.py:722: self._sync_remote_branch()
You removed this method but the call still exists, this tells me you have not
tested this end-to-end yet, I highly recommend testing it against a dummy
repository first, I can provide one to you if you do not have one to test
against.

[agable, 2014-02-24 23:23:04]

Aha, I hadn't noted the difference between _gen_skia and _gen_skiabuildbot.

The primary error that led me to believe this couldn't possibly be working in
production is the old line 608. The old prepare() only removes 'working_branch'
if no revision is passed in. This simply makes no sense, especially since
apply_patch() fails if 'working_branch' already exists.  So the workflow of
"prepare, apply, oh no this doesn't work we should move on to the next change,
prepare, apply" doesn't work. I realize now that this is mitigated by the fact
that the CQ does a prepare() to HEAD when abandoning a patch, and commit()
removes 'working_branch' itself, so this bad logic is covered by other places...
but it was still bad.

Adding maruel@ to take a look too.

[agable, 2014-02-24 23:24:20]

https://codereview.chromium.org/175873003/diff/1/checkout.py
File checkout.py (right):

https://codereview.chromium.org/175873003/diff/1/checkout.py#newcode722
checkout.py:722: self._sync_remote_branch()
On 2014/02/24 23:17:04, rmistry wrote:
> You removed this method but the call still exists, this tells me you have not
> tested this end-to-end yet, I highly recommend testing it against a dummy
> repository first, I can provide one to you if you do not have one to test
> against.

Correct, this patchset does not represent any end-to-end testing including
committing yet. It is so far just a rewrite of the prepare() method.

[rmistry, 2014-02-25 13:23:13]

https://codereview.chromium.org/175873003/diff/1/checkout.py
File checkout.py (right):

https://codereview.chromium.org/175873003/diff/1/checkout.py#newcode578
checkout.py:578: ['cache', 'populate', self.git_url], timeout=FETCH_TIMEOUT)
Disclaimer: I have never used git cache before.

Do you need to specify -c dir_name here?
When I tried
$ git cache populate https://skia.googlesource.com/buildbot
It gave me:

Usage: git cache populate [options] [url of repo to add to or update in cache]
git cache: error: No cache directory specified on command line or in
cache.cachepath.

Same for the cache exists call below.


Also, when I tried 'git cache' on my desktop (git version
1.9.0.rc1.175.g0b1dcb5), git cache was unrecognized.
But on another machine with git version 1.7.9.5 it worked (but needed -c
specified). If it only exists in particular versions then that might be a
problem.

https://codereview.chromium.org/175873003/diff/1/checkout.py#newcode722
checkout.py:722: self._sync_remote_branch()
On 2014/02/24 23:24:20, agable wrote:
> On 2014/02/24 23:17:04, rmistry wrote:
> > You removed this method but the call still exists, this tells me you have
not
> > tested this end-to-end yet, I highly recommend testing it against a dummy
> > repository first, I can provide one to you if you do not have one to test
> > against.
> 
> Correct, this patchset does not represent any end-to-end testing including
> committing yet. It is so far just a rewrite of the prepare() method.

The method call was here to make sure that the branch is synced appropriately
before we start again, should we try to maintain the same behavior?

[rmistry, 2014-02-25 13:24:50]

On 2014/02/24 23:23:04, agable wrote:
> Aha, I hadn't noted the difference between _gen_skia and _gen_skiabuildbot.
> 
> The primary error that led me to believe this couldn't possibly be working in
> production is the old line 608. The old prepare() only removes
'working_branch'
> if no revision is passed in. This simply makes no sense, especially since
> apply_patch() fails if 'working_branch' already exists.  So the workflow of
> "prepare, apply, oh no this doesn't work we should move on to the next change,
> prepare, apply" doesn't work. I realize now that this is mitigated by the fact
> that the CQ does a prepare() to HEAD when abandoning a patch, and commit()
> removes 'working_branch' itself, so this bad logic is covered by other
places...
> but it was still bad.

Please add this explanation to the CL description. Also, you might want to
remove the part about no commit queue using it yet.

> 
> Adding maruel@ to take a look too.

[rmistry, 2014-02-25 13:26:11]

On 2014/02/24 23:24:20, agable wrote:
> https://codereview.chromium.org/175873003/diff/1/checkout.py
> File checkout.py (right):
> 
> https://codereview.chromium.org/175873003/diff/1/checkout.py#newcode722
> checkout.py:722: self._sync_remote_branch()
> On 2014/02/24 23:17:04, rmistry wrote:
> > You removed this method but the call still exists, this tells me you have
not
> > tested this end-to-end yet, I highly recommend testing it against a dummy
> > repository first, I can provide one to you if you do not have one to test
> > against.
> 
> Correct, this patchset does not represent any end-to-end testing including
> committing yet. It is so far just a rewrite of the prepare() method.

Please test end-to-end before submitting. I do not want skiabuildbot CQ to be a
guinea pig :)

[agable, 2014-02-25 16:57:21]

On 2014/02/25 13:23:13, rmistry wrote:
> https://codereview.chromium.org/175873003/diff/1/checkout.py
> File checkout.py (right):
> 
> https://codereview.chromium.org/175873003/diff/1/checkout.py#newcode578
> checkout.py:578: ['cache', 'populate', self.git_url], timeout=FETCH_TIMEOUT)
> Disclaimer: I have never used git cache before.

Good, it only got checked in this week :)

> Do you need to specify -c dir_name here?
> When I tried
> $ git cache populate https://skia.googlesource.com/buildbot
> It gave me:
> 
> Usage: git cache populate [options] [url of repo to add to or update in cache]
> git cache: error: No cache directory specified on command line or in
> cache.cachepath.
> 
> Same for the cache exists call below.

These calls either need -c cache_dir or we need to git config --global
cache.cachepath cache_dir. The latter is preferable.

> 
> Also, when I tried 'git cache' on my desktop (git version
> 1.9.0.rc1.175.g0b1dcb5), git cache was unrecognized.
> But on another machine with git version 1.7.9.5 it worked (but needed -c
> specified). If it only exists in particular versions then that might be a
> problem.

git cache exists everywhere an up-to-date depot_tools is in $PATH, and works
will all versions of Git that infra-team supports.

> 
> https://codereview.chromium.org/175873003/diff/1/checkout.py#newcode722
> checkout.py:722: self._sync_remote_branch()
> On 2014/02/24 23:24:20, agable wrote:
> > On 2014/02/24 23:17:04, rmistry wrote:
> > > You removed this method but the call still exists, this tells me you have
> not
> > > tested this end-to-end yet, I highly recommend testing it against a dummy
> > > repository first, I can provide one to you if you do not have one to test
> > > against.
> > 
> > Correct, this patchset does not represent any end-to-end testing including
> > committing yet. It is so far just a rewrite of the prepare() method.
> 
> The method call was here to make sure that the branch is synced appropriately
> before we start again, should we try to maintain the same behavior?

_sync_remote_branch() is doing pretty much entirely the wrong thing. Pulling is
a bad operation to have in an automated tool, since it can fail so many ways.
What the new prepare() does is instead make sure that the repo objects contain
everything we need, and then directly checks out a raw hash or origin/master.
This will do the same -- delete the branch, fetch, and check out origin/master.
That's a much safer way to make sure we're in a good state.

On 2014/02/25 13:24:50, rmistry wrote:
> On 2014/02/24 23:23:04, agable wrote:
> > Aha, I hadn't noted the difference between _gen_skia and _gen_skiabuildbot.
> > 
> > The primary error that led me to believe this couldn't possibly be working
in
> > production is the old line 608. The old prepare() only removes
> 'working_branch'
> > if no revision is passed in. This simply makes no sense, especially since
> > apply_patch() fails if 'working_branch' already exists.  So the workflow of
> > "prepare, apply, oh no this doesn't work we should move on to the next
change,
> > prepare, apply" doesn't work. I realize now that this is mitigated by the
fact
> > that the CQ does a prepare() to HEAD when abandoning a patch, and commit()
> > removes 'working_branch' itself, so this bad logic is covered by other
> places...
> > but it was still bad.
> 
> Please add this explanation to the CL description. Also, you might want to
> remove the part about no commit queue using it yet.
> 

CL description will be updated when I upload the second patchset.

> > 
> > Adding maruel@ to take a look too.


On 2014/02/25 13:26:11, rmistry wrote:
> On 2014/02/24 23:24:20, agable wrote:
> > https://codereview.chromium.org/175873003/diff/1/checkout.py
> > File checkout.py (right):
> > 
> > https://codereview.chromium.org/175873003/diff/1/checkout.py#newcode722
> > checkout.py:722: self._sync_remote_branch()
> > On 2014/02/24 23:17:04, rmistry wrote:
> > > You removed this method but the call still exists, this tells me you have
> not
> > > tested this end-to-end yet, I highly recommend testing it against a dummy
> > > repository first, I can provide one to you if you do not have one to test
> > > against.
> > 
> > Correct, this patchset does not represent any end-to-end testing including
> > committing yet. It is so far just a rewrite of the prepare() method.
> 
> Please test end-to-end before submitting. I do not want skiabuildbot CQ to be
a
> guinea pig :)

Obviously :)

[rmistry, 2014-02-25 17:32:51]

On 2014/02/25 16:57:21, agable wrote:
> On 2014/02/25 13:23:13, rmistry wrote:
> > https://codereview.chromium.org/175873003/diff/1/checkout.py
> > File checkout.py (right):
> > 
> > https://codereview.chromium.org/175873003/diff/1/checkout.py#newcode578
> > checkout.py:578: ['cache', 'populate', self.git_url], timeout=FETCH_TIMEOUT)
> > Disclaimer: I have never used git cache before.
> 
> Good, it only got checked in this week :)
> 
> > Do you need to specify -c dir_name here?
> > When I tried
> > $ git cache populate https://skia.googlesource.com/buildbot
> > It gave me:
> > 
> > Usage: git cache populate [options] [url of repo to add to or update in
cache]
> > git cache: error: No cache directory specified on command line or in
> > cache.cachepath.
> > 
> > Same for the cache exists call below.
> 
> These calls either need -c cache_dir or we need to git config --global
> cache.cachepath cache_dir. The latter is preferable.
> 
> > 
> > Also, when I tried 'git cache' on my desktop (git version
> > 1.9.0.rc1.175.g0b1dcb5), git cache was unrecognized.
> > But on another machine with git version 1.7.9.5 it worked (but needed -c
> > specified). If it only exists in particular versions then that might be a
> > problem.
> 
> git cache exists everywhere an up-to-date depot_tools is in $PATH, and works
> will all versions of Git that infra-team supports.

Ah that makes sense. Thanks for the explanation.

> 
> > 
> > https://codereview.chromium.org/175873003/diff/1/checkout.py#newcode722
> > checkout.py:722: self._sync_remote_branch()
> > On 2014/02/24 23:24:20, agable wrote:
> > > On 2014/02/24 23:17:04, rmistry wrote:
> > > > You removed this method but the call still exists, this tells me you
have
> > not
> > > > tested this end-to-end yet, I highly recommend testing it against a
dummy
> > > > repository first, I can provide one to you if you do not have one to
test
> > > > against.
> > > 
> > > Correct, this patchset does not represent any end-to-end testing including
> > > committing yet. It is so far just a rewrite of the prepare() method.
> > 
> > The method call was here to make sure that the branch is synced
appropriately
> > before we start again, should we try to maintain the same behavior?
> 
> _sync_remote_branch() is doing pretty much entirely the wrong thing. Pulling
is
> a bad operation to have in an automated tool, since it can fail so many ways.
> What the new prepare() does is instead make sure that the repo objects contain
> everything we need, and then directly checks out a raw hash or origin/master.
> This will do the same -- delete the branch, fetch, and check out
origin/master.
> That's a much safer way to make sure we're in a good state.

So this is trying to negate what could go wrong with pulling. In practice
skiabuildbot has worked without problems, it failed once when the history was
deleted but I expected that to fail. One possible reason is that skiabuildbot is
not used very often, maybe in a CQ like chromium which is very active pulling
would cause the problems you described.
Either way your description SGTM.

> 
> On 2014/02/25 13:24:50, rmistry wrote:
> > On 2014/02/24 23:23:04, agable wrote:
> > > Aha, I hadn't noted the difference between _gen_skia and
_gen_skiabuildbot.
> > > 
> > > The primary error that led me to believe this couldn't possibly be working
> in
> > > production is the old line 608. The old prepare() only removes
> > 'working_branch'
> > > if no revision is passed in. This simply makes no sense, especially since
> > > apply_patch() fails if 'working_branch' already exists.  So the workflow
of
> > > "prepare, apply, oh no this doesn't work we should move on to the next
> change,
> > > prepare, apply" doesn't work. I realize now that this is mitigated by the
> fact
> > > that the CQ does a prepare() to HEAD when abandoning a patch, and commit()
> > > removes 'working_branch' itself, so this bad logic is covered by other
> > places...
> > > but it was still bad.
> > 
> > Please add this explanation to the CL description. Also, you might want to
> > remove the part about no commit queue using it yet.
> > 
> 
> CL description will be updated when I upload the second patchset.
> 
> > > 
> > > Adding maruel@ to take a look too.
> 
> 
> On 2014/02/25 13:26:11, rmistry wrote:
> > On 2014/02/24 23:24:20, agable wrote:
> > > https://codereview.chromium.org/175873003/diff/1/checkout.py
> > > File checkout.py (right):
> > > 
> > > https://codereview.chromium.org/175873003/diff/1/checkout.py#newcode722
> > > checkout.py:722: self._sync_remote_branch()
> > > On 2014/02/24 23:17:04, rmistry wrote:
> > > > You removed this method but the call still exists, this tells me you
have
> > not
> > > > tested this end-to-end yet, I highly recommend testing it against a
dummy
> > > > repository first, I can provide one to you if you do not have one to
test
> > > > against.
> > > 
> > > Correct, this patchset does not represent any end-to-end testing including
> > > committing yet. It is so far just a rewrite of the prepare() method.
> > 
> > Please test end-to-end before submitting. I do not want skiabuildbot CQ to
be
> a
> > guinea pig :)
> 
> Obviously :)

[agable, 2014-02-26 00:27:28]

On 2014/02/25 17:32:51, rmistry wrote:
> On 2014/02/25 16:57:21, agable wrote:
> > On 2014/02/25 13:23:13, rmistry wrote:
> > > https://codereview.chromium.org/175873003/diff/1/checkout.py
> > > File checkout.py (right):
> > > 
> > > https://codereview.chromium.org/175873003/diff/1/checkout.py#newcode578
> > > checkout.py:578: ['cache', 'populate', self.git_url],
timeout=FETCH_TIMEOUT)
> > > Disclaimer: I have never used git cache before.
> > 
> > Good, it only got checked in this week :)
> > 
> > > Do you need to specify -c dir_name here?
> > > When I tried
> > > $ git cache populate https://skia.googlesource.com/buildbot
> > > It gave me:
> > > 
> > > Usage: git cache populate [options] [url of repo to add to or update in
> cache]
> > > git cache: error: No cache directory specified on command line or in
> > > cache.cachepath.
> > > 
> > > Same for the cache exists call below.
> > 
> > These calls either need -c cache_dir or we need to git config --global
> > cache.cachepath cache_dir. The latter is preferable.
> > 
> > > 
> > > Also, when I tried 'git cache' on my desktop (git version
> > > 1.9.0.rc1.175.g0b1dcb5), git cache was unrecognized.
> > > But on another machine with git version 1.7.9.5 it worked (but needed -c
> > > specified). If it only exists in particular versions then that might be a
> > > problem.
> > 
> > git cache exists everywhere an up-to-date depot_tools is in $PATH, and works
> > will all versions of Git that infra-team supports.
> 
> Ah that makes sense. Thanks for the explanation.
> 
> > 
> > > 
> > > https://codereview.chromium.org/175873003/diff/1/checkout.py#newcode722
> > > checkout.py:722: self._sync_remote_branch()
> > > On 2014/02/24 23:24:20, agable wrote:
> > > > On 2014/02/24 23:17:04, rmistry wrote:
> > > > > You removed this method but the call still exists, this tells me you
> have
> > > not
> > > > > tested this end-to-end yet, I highly recommend testing it against a
> dummy
> > > > > repository first, I can provide one to you if you do not have one to
> test
> > > > > against.
> > > > 
> > > > Correct, this patchset does not represent any end-to-end testing
including
> > > > committing yet. It is so far just a rewrite of the prepare() method.
> > > 
> > > The method call was here to make sure that the branch is synced
> appropriately
> > > before we start again, should we try to maintain the same behavior?
> > 
> > _sync_remote_branch() is doing pretty much entirely the wrong thing. Pulling
> is
> > a bad operation to have in an automated tool, since it can fail so many
ways.
> > What the new prepare() does is instead make sure that the repo objects
contain
> > everything we need, and then directly checks out a raw hash or
origin/master.
> > This will do the same -- delete the branch, fetch, and check out
> origin/master.
> > That's a much safer way to make sure we're in a good state.
> 
> So this is trying to negate what could go wrong with pulling. In practice
> skiabuildbot has worked without problems, it failed once when the history was
> deleted but I expected that to fail. One possible reason is that skiabuildbot
is
> not used very often, maybe in a CQ like chromium which is very active pulling
> would cause the problems you described.
> Either way your description SGTM.
> 
> > 
> > On 2014/02/25 13:24:50, rmistry wrote:
> > > On 2014/02/24 23:23:04, agable wrote:
> > > > Aha, I hadn't noted the difference between _gen_skia and
> _gen_skiabuildbot.
> > > > 
> > > > The primary error that led me to believe this couldn't possibly be
working
> > in
> > > > production is the old line 608. The old prepare() only removes
> > > 'working_branch'
> > > > if no revision is passed in. This simply makes no sense, especially
since
> > > > apply_patch() fails if 'working_branch' already exists.  So the workflow
> of
> > > > "prepare, apply, oh no this doesn't work we should move on to the next
> > change,
> > > > prepare, apply" doesn't work. I realize now that this is mitigated by
the
> > fact
> > > > that the CQ does a prepare() to HEAD when abandoning a patch, and
commit()
> > > > removes 'working_branch' itself, so this bad logic is covered by other
> > > places...
> > > > but it was still bad.
> > > 
> > > Please add this explanation to the CL description. Also, you might want to
> > > remove the part about no commit queue using it yet.
> > > 
> > 
> > CL description will be updated when I upload the second patchset.
> > 
> > > > 
> > > > Adding maruel@ to take a look too.
> > 
> > 
> > On 2014/02/25 13:26:11, rmistry wrote:
> > > On 2014/02/24 23:24:20, agable wrote:
> > > > https://codereview.chromium.org/175873003/diff/1/checkout.py
> > > > File checkout.py (right):
> > > > 
> > > > https://codereview.chromium.org/175873003/diff/1/checkout.py#newcode722
> > > > checkout.py:722: self._sync_remote_branch()
> > > > On 2014/02/24 23:17:04, rmistry wrote:
> > > > > You removed this method but the call still exists, this tells me you
> have
> > > not
> > > > > tested this end-to-end yet, I highly recommend testing it against a
> dummy
> > > > > repository first, I can provide one to you if you do not have one to
> test
> > > > > against.
> > > > 
> > > > Correct, this patchset does not represent any end-to-end testing
including
> > > > committing yet. It is so far just a rewrite of the prepare() method.
> > > 
> > > Please test end-to-end before submitting. I do not want skiabuildbot CQ to
> be
> > a
> > > guinea pig :)
> > 
> > Obviously :)

This (https://paste.googleplex.com/6003042235187200) is a log of a run of the
skiabuildbot commit queue using the patchset I just uploaded and the following
local diffs:
* A little more printf debugging
* A crippled git push
* A commented-out "ReviewerLgtmVerifier"

I'm now setting up a fake project and an experimental repo with a unique baseurl
so I can do full testing using read-write Rietveld and read-write repo.

[agable, 2014-02-26 20:31:28]

Success. PTAL

Created the following fake project in projects.py:
def _gen_mytest(user, root_dir, options):
  """Generates a PendingManager commit queue for testing purposes.

  Adds the following verifiers to the PendingManager:
  * ProjectBaseUrlVerifier
  * TreeStatusVerifier
  """
  rietveld_obj = projects_utils.RietveldFactory(root_dir, options)
  test_git_url = 'https://chromium.googlesource.com/infra/sandbox'
  local_checkout = checkout.GitCheckout(
      root_dir=root_dir,
      project_name='mytest',
      remote_branch='master',
      git_url=test_git_url,
      commit_user=user)
  context_obj = context.Context(
      rietveld_obj,
      local_checkout,
      async_push.AsyncPush(
          'https://chromium-status.appspot.com/cq',
          projects_utils.GetStatusPassword(
              root_dir,
              'chromium',
              'chromium-status.appspot.com'
          )
      ),
      server_hooks_missing=True)

  project_bases = [
      '^%s(?:\.git)?%s$' % (re.escape(test_git_url), BRANCH_MATCH),
  ]
  verifiers_no_patch = [
      project_base.ProjectBaseUrlVerifier(project_bases),
  ]
  verifiers = [
      tree_status.TreeStatusVerifier('https://chromium-status.appspot.com'),
  ]

  return pending_manager.PendingManager(
      context_obj,
      verifiers_no_patch,
      verifiers)


Ran the CQ:
./commit_queue.py -v --no-dry-run --project=mytest


Filed this CL: https://codereview.chromium.org/181783003


Got this committed:
https://chromium.googlesource.com/infra/sandbox/+/40293bde65eec4e60fd4317ab3b...

[agable, 2014-02-27 21:21:45]

On 2014/02/26 20:31:28, agable wrote:
> Success. PTAL
> 
> Created the following fake project in projects.py:
> def _gen_mytest(user, root_dir, options):
>   """Generates a PendingManager commit queue for testing purposes.
> 
>   Adds the following verifiers to the PendingManager:
>   * ProjectBaseUrlVerifier
>   * TreeStatusVerifier
>   """
>   rietveld_obj = projects_utils.RietveldFactory(root_dir, options)
>   test_git_url = 'https://chromium.googlesource.com/infra/sandbox'
>   local_checkout = checkout.GitCheckout(
>       root_dir=root_dir,
>       project_name='mytest',
>       remote_branch='master',
>       git_url=test_git_url,
>       commit_user=user)
>   context_obj = context.Context(
>       rietveld_obj,
>       local_checkout,
>       async_push.AsyncPush(
>           'https://chromium-status.appspot.com/cq',
>           projects_utils.GetStatusPassword(
>               root_dir,
>               'chromium',
>               'chromium-status.appspot.com'
>           )
>       ),
>       server_hooks_missing=True)
> 
>   project_bases = [
>       '^%s(?:\.git)?%s$' % (re.escape(test_git_url), BRANCH_MATCH),
>   ]
>   verifiers_no_patch = [
>       project_base.ProjectBaseUrlVerifier(project_bases),
>   ]
>   verifiers = [
>       tree_status.TreeStatusVerifier('https://chromium-status.appspot.com'),
>   ]
> 
>   return pending_manager.PendingManager(
>       context_obj,
>       verifiers_no_patch,
>       verifiers)
> 
> 
> Ran the CQ:
> ./commit_queue.py -v --no-dry-run --project=mytest
> 
> 
> Filed this CL: https://codereview.chromium.org/181783003
> 
> 
> Got this committed:
>
https://chromium.googlesource.com/infra/sandbox/+/40293bde65eec4e60fd4317ab3b...

Ping, esp. to iannucci@ for git sanity and to maruel@ for depot tools sanity.

[agable, 2014-03-04 17:34:58]

Ping again.

[agable, 2014-03-07 18:35:18]

On 2014/03/04 17:34:58, agable wrote:
> Ping again.

Ping to everyone, no bystander effect please.

[rmistry, 2014-03-07 18:39:00]

I dont think you are waiting on me, but LGTM still to get the ball rolling.

[iannucci, 2014-03-08 10:15:06]

lgtm

https://chromiumcodereview.appspot.com/175873003/diff/70001/checkout.py
File checkout.py (right):

https://chromiumcodereview.appspot.com/175873003/diff/70001/checkout.py#newco...
checkout.py:597: if not re.match(r'[0-9a-f]{40}$', revision):
add a (?i) to make this case insensitive

What about short-hashes?

[agable, 2014-03-11 17:23:29]

https://codereview.chromium.org/175873003/diff/70001/checkout.py
File checkout.py (right):

https://codereview.chromium.org/175873003/diff/70001/checkout.py#newcode597
checkout.py:597: if not re.match(r'[0-9a-f]{40}$', revision):
On 2014/03/08 10:15:06, iannucci wrote:
> add a (?i) to make this case insensitive

Done

> What about short-hashes?

Our systems shouldn't be passing around short hashes. Short hashes are solely
for ease-of-use for developers, and should only be used in display contexts.

[agable, 2014-03-11 17:23:40]

The CQ bit was checked by agable@chromium.org

[commit-bot: I haz the power, 2014-03-11 17:23:44]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/agable@chromium.org/175873003/90001

[commit-bot: I haz the power, 2014-03-11 17:26:15]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-11 17:26:17]

Presubmit check for 175873003-90001 failed and returned exit status 1.

Running presubmit commit checks ...
Checking out rietveld...
Running save-description-on-failure.sh
Running push-basic.sh
Running upstream.sh
Running submit-from-new-dir.sh
Running abandon.sh
Running submodule-merge-test.sh
Running upload-local-tracking-branch.sh
Running hooks.sh
Running post-dcommit-hook-test.sh
Running upload-stale.sh
Running patch.sh
Running basic.sh

** Presubmit ERRORS **
tests/checkout_test.py (41.51s) failed
Traceback (most recent call last):
  File "/b/depot_tools/git_cache.py", line 323, in <module>
    sys.exit(main(sys.argv[1:]))
  File "/b/depot_tools/git_cache.py", line 319, in main
    return dispatcher.execute(OptionParser(), argv)
  File "/b/depot_tools/subcommand.py", line 245, in execute
    return command(parser, args[1:])
  File "/b/depot_tools/git_cache.py", line 218, in CMDpopulate
    RunGit(fetch_cmd, filter_fn=filter_fn, cwd=tempdir, retry=True)
  File "/b/depot_tools/git_cache.py", line 55, in RunGit
    gclient_utils.CheckCallAndFilter([GIT_EXECUTABLE] + cmd, **kwargs)
  File "/b/depot_tools/gclient_utils.py", line 494, in CheckCallAndFilter
    rv, args, kwargs.get('cwd', None), None, None)
subprocess2.CalledProcessError: Command git fetch origin returned non-zero exit
status 128 in /b/git-cache/tmplZc1fY-tmp-trialo_o1im-repos-git-repo_1
ETraceback (most recent call last):
  File "/b/depot_tools/git_cache.py", line 323, in <module>
    sys.exit(main(sys.argv[1:]))
  File "/b/depot_tools/git_cache.py", line 319, in main
    return dispatcher.execute(OptionParser(), argv)
  File "/b/depot_tools/subcommand.py", line 245, in execute
    return command(parser, args[1:])
  File "/b/depot_tools/git_cache.py", line 218, in CMDpopulate
    RunGit(fetch_cmd, filter_fn=filter_fn, cwd=tempdir, retry=True)
  File "/b/depot_tools/git_cache.py", line 55, in RunGit
    gclient_utils.CheckCallAndFilter([GIT_EXECUTABLE] + cmd, **kwargs)
  File "/b/depot_tools/gclient_utils.py", line 494, in CheckCallAndFilter
    rv, args, kwargs.get('cwd', None), None, None)
subprocess2.CalledProcessError: Command git fetch origin returned non-zero exit
status 128 in /b/git-cache/tmp71UlIf-tmp-trialo_o1im-repos-git-repo_1
ETraceback (most recent call last):
  File "/b/depot_tools/git_cache.py", line 323, in <module>
    sys.exit(main(sys.argv[1:]))
  File "/b/depot_tools/git_cache.py", line 319, in main
    return dispatcher.execute(OptionParser(), argv)
  File "/b/depot_tools/subcommand.py", line 245, in execute
    return command(parser, args[1:])
  File "/b/depot_tools/git_cache.py", line 218, in CMDpopulate
    RunGit(fetch_cmd, filter_fn=filter_fn, cwd=tempdir, retry=True)
  File "/b/depot_tools/git_cache.py", line 55, in RunGit
    gclient_utils.CheckCallAndFilter([GIT_EXECUTABLE] + cmd, **kwargs)
  File "/b/depot_tools/gclient_utils.py", line 494, in CheckCallAndFilter
    rv, args, kwargs.get('cwd', None), None, None)
subprocess2.CalledProcessError: Command git fetch origin returned non-zero exit
status 128 in /b/git-cache/tmp3lZHy7-tmp-trialo_o1im-repos-git-repo_1
ETraceback (most recent call last):
  File "/b/depot_tools/git_cache.py", line 323, in <module>
    sys.exit(main(sys.argv[1:]))
  File "/b/depot_tools/git_cache.py", line 319, in main
    return dispatcher.execute(OptionParser(), argv)
  File "/b/depot_tools/subcommand.py", line 245, in execute
    return command(parser, args[1:])
  File "/b/depot_tools/git_cache.py", line 218, in CMDpopulate
    RunGit(fetch_cmd, filter_fn=filter_fn, cwd=tempdir, retry=True)
  File "/b/depot_tools/git_cache.py", line 55, in RunGit
    gclient_utils.CheckCallAndFilter([GIT_EXECUTABLE] + cmd, **kwargs)
  File "/b/depot_tools/gclient_utils.py", line 494, in CheckCallAndFilter
    rv, args, kwargs.get('cwd', None), None, None)
subprocess2.CalledProcessError: Command git fetch origin returned non-zero exit
status 128 in /b/git-cache/tmpN0iKUh-tmp-trialo_o1im-repos-git-repo_1
E...................
======================================================================
ERROR: testAll (__main__.GitCheckout)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/checkout_test.py", line 455, in testAll
    self._check_base(self._get_co(None), root, None)
  File "tests/checkout_test.py", line 382, in _check_base
    git_rev = co.prepare(None)
  File "/b/commit-queue/workdir/tools/depot_tools/checkout.py", line 581, in
prepare
    ['cache', 'populate', self.git_url], timeout=FETCH_TIMEOUT, cwd=None)
  File "/b/commit-queue/workdir/tools/depot_tools/checkout.py", line 748, in
_check_call_git
    return subprocess2.check_call_out(['git'] + args, **kwargs)
  File "/b/commit-queue/workdir/tools/depot_tools/subprocess2.py", line 477, in
check_call_out
    returncode, args, kwargs.get('cwd'), out[0], out[1])
CalledProcessError: Command git cache populate /tmp/trialo_o1iM/repos/git/repo_1
returned non-zero exit status 1

======================================================================
ERROR: testException (__main__.GitCheckout)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/checkout_test.py", line 460, in testException
    'While running git apply --index -p1;\n  fatal: corrupt patch at line '
  File "tests/checkout_test.py", line 187, in _check_exception
    co.prepare(None)
  File "/b/commit-queue/workdir/tools/depot_tools/checkout.py", line 581, in
prepare
    ['cache', 'populate', self.git_url], timeout=FETCH_TIMEOUT, cwd=None)
  File "/b/commit-queue/workdir/tools/depot_tools/checkout.py", line 748, in
_check_call_git
    return subprocess2.check_call_out(['git'] + args, **kwargs)
  File "/b/commit-queue/workdir/tools/depot_tools/subprocess2.py", line 477, in
check_call_out
    returncode, args, kwargs.get('cwd'), out[0], out[1])
CalledProcessError: Command git cache populate /tmp/trialo_o1iM/repos/git/repo_1
returned non-zero exit status 1

======================================================================
ERROR: testMove (__main__.GitCheckout)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/checkout_test.py", line 471, in testMove
    self._check_move(co)
  File "tests/checkout_test.py", line 215, in _check_move
    co.prepare(None)
  File "/b/commit-queue/workdir/tools/depot_tools/checkout.py", line 581, in
prepare
    ['cache', 'populate', self.git_url], timeout=FETCH_TIMEOUT, cwd=None)
  File "/b/commit-queue/workdir/tools/depot_tools/checkout.py", line 748, in
_check_call_git
    return subprocess2.check_call_out(['git'] + args, **kwargs)
  File "/b/commit-queue/workdir/tools/depot_tools/subprocess2.py", line 477, in
check_call_out
    returncode, args, kwargs.get('cwd'), out[0], out[1])
CalledProcessError: Command git cache populate /tmp/trialo_o1iM/repos/git/repo_1
returned non-zero exit status 1

======================================================================
ERROR: testProcess (__main__.GitCheckout)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/checkout_test.py", line 464, in testProcess
    self._test_process(self._get_co)
  File "tests/checkout_test.py", line 203, in _test_process
    co.prepare(None)
  File "/b/commit-queue/workdir/tools/depot_tools/checkout.py", line 581, in
prepare
    ['cache', 'populate', self.git_url], timeout=FETCH_TIMEOUT, cwd=None)
  File "/b/commit-queue/workdir/tools/depot_tools/checkout.py", line 748, in
_check_call_git
    return subprocess2.check_call_out(['git'] + args, **kwargs)
  File "/b/commit-queue/workdir/tools/depot_tools/subprocess2.py", line 477, in
check_call_out
    returncode, args, kwargs.get('cwd'), out[0], out[1])
CalledProcessError: Command git cache populate /tmp/trialo_o1iM/repos/git/repo_1
returned non-zero exit status 1

----------------------------------------------------------------------
Ran 23 tests in 41.076s

FAILED (errors=4)


Presubmit checks took 125.3s to calculate.

Was the presubmit check useful? If not, run "git cl presubmit -v"
to figure out which PRESUBMIT.py was run, then run git blame
on the file to figure out who to ask for help.

[agable, 2014-03-12 00:13:04]

The CQ bit was checked by agable@chromium.org

[commit-bot: I haz the power, 2014-03-12 00:13:12]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/agable@chromium.org/175873003/110001

[commit-bot: I haz the power, 2014-03-12 00:15:54]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-12 00:15:55]

Presubmit check for 175873003-110001 failed and returned exit status 1.

Running presubmit commit checks ...
Checking out rietveld...
Running save-description-on-failure.sh
Running push-basic.sh
Running upstream.sh
Running submit-from-new-dir.sh
Running abandon.sh
Running submodule-merge-test.sh
Running upload-local-tracking-branch.sh
Running hooks.sh
Running post-dcommit-hook-test.sh
Running upload-stale.sh
Running patch.sh
Running basic.sh

** Presubmit ERRORS **
tests/checkout_test.py (90.35s) failed
Traceback (most recent call last):
  File "/b/depot_tools/git_cache.py", line 323, in <module>
    sys.exit(main(sys.argv[1:]))
  File "/b/depot_tools/git_cache.py", line 319, in main
    return dispatcher.execute(OptionParser(), argv)
  File "/b/depot_tools/subcommand.py", line 245, in execute
    return command(parser, args[1:])
  File "/b/depot_tools/git_cache.py", line 218, in CMDpopulate
    RunGit(fetch_cmd, filter_fn=filter_fn, cwd=tempdir, retry=True)
  File "/b/depot_tools/git_cache.py", line 55, in RunGit
    gclient_utils.CheckCallAndFilter([GIT_EXECUTABLE] + cmd, **kwargs)
  File "/b/depot_tools/gclient_utils.py", line 494, in CheckCallAndFilter
    rv, args, kwargs.get('cwd', None), None, None)
subprocess2.CalledProcessError: Command git fetch origin returned non-zero exit
status 128 in /b/git-cache/tmpDZNkDX-tmp-trialtq4pnl-repos-git-repo_1
ETraceback (most recent call last):
  File "/b/depot_tools/git_cache.py", line 323, in <module>
    sys.exit(main(sys.argv[1:]))
  File "/b/depot_tools/git_cache.py", line 319, in main
    return dispatcher.execute(OptionParser(), argv)
  File "/b/depot_tools/subcommand.py", line 245, in execute
    return command(parser, args[1:])
  File "/b/depot_tools/git_cache.py", line 218, in CMDpopulate
    RunGit(fetch_cmd, filter_fn=filter_fn, cwd=tempdir, retry=True)
  File "/b/depot_tools/git_cache.py", line 55, in RunGit
    gclient_utils.CheckCallAndFilter([GIT_EXECUTABLE] + cmd, **kwargs)
  File "/b/depot_tools/gclient_utils.py", line 494, in CheckCallAndFilter
    rv, args, kwargs.get('cwd', None), None, None)
subprocess2.CalledProcessError: Command git fetch origin returned non-zero exit
status 128 in /b/git-cache/tmpxLb826-tmp-trialtq4pnl-repos-git-repo_1
ETraceback (most recent call last):
  File "/b/depot_tools/git_cache.py", line 323, in <module>
    sys.exit(main(sys.argv[1:]))
  File "/b/depot_tools/git_cache.py", line 319, in main
    return dispatcher.execute(OptionParser(), argv)
  File "/b/depot_tools/subcommand.py", line 245, in execute
    return command(parser, args[1:])
  File "/b/depot_tools/git_cache.py", line 218, in CMDpopulate
    RunGit(fetch_cmd, filter_fn=filter_fn, cwd=tempdir, retry=True)
  File "/b/depot_tools/git_cache.py", line 55, in RunGit
    gclient_utils.CheckCallAndFilter([GIT_EXECUTABLE] + cmd, **kwargs)
  File "/b/depot_tools/gclient_utils.py", line 494, in CheckCallAndFilter
    rv, args, kwargs.get('cwd', None), None, None)
subprocess2.CalledProcessError: Command git fetch origin returned non-zero exit
status 128 in /b/git-cache/tmp0gy8B2-tmp-trialtq4pnl-repos-git-repo_1
ETraceback (most recent call last):
  File "/b/depot_tools/git_cache.py", line 323, in <module>
    sys.exit(main(sys.argv[1:]))
  File "/b/depot_tools/git_cache.py", line 319, in main
    return dispatcher.execute(OptionParser(), argv)
  File "/b/depot_tools/subcommand.py", line 245, in execute
    return command(parser, args[1:])
  File "/b/depot_tools/git_cache.py", line 218, in CMDpopulate
    RunGit(fetch_cmd, filter_fn=filter_fn, cwd=tempdir, retry=True)
  File "/b/depot_tools/git_cache.py", line 55, in RunGit
    gclient_utils.CheckCallAndFilter([GIT_EXECUTABLE] + cmd, **kwargs)
  File "/b/depot_tools/gclient_utils.py", line 494, in CheckCallAndFilter
    rv, args, kwargs.get('cwd', None), None, None)
subprocess2.CalledProcessError: Command git fetch origin returned non-zero exit
status 128 in /b/git-cache/tmpu0yy9k-tmp-trialtq4pnl-repos-git-repo_1
E...................
======================================================================
ERROR: testAll (__main__.GitCheckout)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/checkout_test.py", line 455, in testAll
    self._check_base(self._get_co(None), root, None)
  File "tests/checkout_test.py", line 382, in _check_base
    git_rev = co.prepare(None)
  File "/b/commit-queue/workdir/tools/depot_tools/checkout.py", line 581, in
prepare
    ['cache', 'populate', self.git_url], timeout=FETCH_TIMEOUT, cwd=None)
  File "/b/commit-queue/workdir/tools/depot_tools/checkout.py", line 749, in
_check_call_git
    return subprocess2.check_call_out(['git'] + args, **kwargs)
  File "/b/commit-queue/workdir/tools/depot_tools/subprocess2.py", line 477, in
check_call_out
    returncode, args, kwargs.get('cwd'), out[0], out[1])
CalledProcessError: Command git cache populate /tmp/trialTq4pNl/repos/git/repo_1
returned non-zero exit status 1

======================================================================
ERROR: testException (__main__.GitCheckout)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/checkout_test.py", line 460, in testException
    'While running git apply --index -p1;\n  fatal: corrupt patch at line '
  File "tests/checkout_test.py", line 187, in _check_exception
    co.prepare(None)
  File "/b/commit-queue/workdir/tools/depot_tools/checkout.py", line 581, in
prepare
    ['cache', 'populate', self.git_url], timeout=FETCH_TIMEOUT, cwd=None)
  File "/b/commit-queue/workdir/tools/depot_tools/checkout.py", line 749, in
_check_call_git
    return subprocess2.check_call_out(['git'] + args, **kwargs)
  File "/b/commit-queue/workdir/tools/depot_tools/subprocess2.py", line 477, in
check_call_out
    returncode, args, kwargs.get('cwd'), out[0], out[1])
CalledProcessError: Command git cache populate /tmp/trialTq4pNl/repos/git/repo_1
returned non-zero exit status 1

======================================================================
ERROR: testMove (__main__.GitCheckout)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/checkout_test.py", line 471, in testMove
    self._check_move(co)
  File "tests/checkout_test.py", line 215, in _check_move
    co.prepare(None)
  File "/b/commit-queue/workdir/tools/depot_tools/checkout.py", line 581, in
prepare
    ['cache', 'populate', self.git_url], timeout=FETCH_TIMEOUT, cwd=None)
  File "/b/commit-queue/workdir/tools/depot_tools/checkout.py", line 749, in
_check_call_git
    return subprocess2.check_call_out(['git'] + args, **kwargs)
  File "/b/commit-queue/workdir/tools/depot_tools/subprocess2.py", line 477, in
check_call_out
    returncode, args, kwargs.get('cwd'), out[0], out[1])
CalledProcessError: Command git cache populate /tmp/trialTq4pNl/repos/git/repo_1
returned non-zero exit status 1

======================================================================
ERROR: testProcess (__main__.GitCheckout)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/checkout_test.py", line 464, in testProcess
    self._test_process(self._get_co)
  File "tests/checkout_test.py", line 203, in _test_process
    co.prepare(None)
  File "/b/commit-queue/workdir/tools/depot_tools/checkout.py", line 581, in
prepare
    ['cache', 'populate', self.git_url], timeout=FETCH_TIMEOUT, cwd=None)
  File "/b/commit-queue/workdir/tools/depot_tools/checkout.py", line 749, in
_check_call_git
    return subprocess2.check_call_out(['git'] + args, **kwargs)
  File "/b/commit-queue/workdir/tools/depot_tools/subprocess2.py", line 477, in
check_call_out
    returncode, args, kwargs.get('cwd'), out[0], out[1])
CalledProcessError: Command git cache populate /tmp/trialTq4pNl/repos/git/repo_1
returned non-zero exit status 1

----------------------------------------------------------------------
Ran 23 tests in 89.983s

FAILED (errors=4)


Presubmit checks took 158.3s to calculate.

[agable, 2014-03-12 01:51:43]

The CQ bit was checked by agable@chromium.org

[commit-bot: I haz the power, 2014-03-12 01:51:49]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/agable@chromium.org/175873003/130001

[commit-bot: I haz the power, 2014-03-12 01:53:20]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-12 01:53:20]

Presubmit check for 175873003-130001 failed and returned exit status 1.

Running presubmit commit checks ...
Checking out rietveld...
Running save-description-on-failure.sh
Running push-basic.sh
Running upstream.sh
Running submit-from-new-dir.sh
Running abandon.sh
Running submodule-merge-test.sh
Running upload-local-tracking-branch.sh
Running hooks.sh
Running post-dcommit-hook-test.sh
Running upload-stale.sh
Running patch.sh
Running basic.sh

** Presubmit ERRORS **
tests/checkout_test.py (38.44s) failed
Traceback (most recent call last):
  File "/b/depot_tools/git_cache.py", line 323, in <module>
    sys.exit(main(sys.argv[1:]))
  File "/b/depot_tools/git_cache.py", line 319, in main
    return dispatcher.execute(OptionParser(), argv)
  File "/b/depot_tools/subcommand.py", line 245, in execute
    return command(parser, args[1:])
  File "/b/depot_tools/git_cache.py", line 218, in CMDpopulate
    RunGit(fetch_cmd, filter_fn=filter_fn, cwd=tempdir, retry=True)
  File "/b/depot_tools/git_cache.py", line 55, in RunGit
    gclient_utils.CheckCallAndFilter([GIT_EXECUTABLE] + cmd, **kwargs)
  File "/b/depot_tools/gclient_utils.py", line 494, in CheckCallAndFilter
    rv, args, kwargs.get('cwd', None), None, None)
subprocess2.CalledProcessError: Command git fetch origin returned non-zero exit
status 128 in /b/git-cache/tmpsnSUAP-tmp-trialpckuag-repos-git-repo_1
ETraceback (most recent call last):
  File "/b/depot_tools/git_cache.py", line 323, in <module>
    sys.exit(main(sys.argv[1:]))
  File "/b/depot_tools/git_cache.py", line 319, in main
    return dispatcher.execute(OptionParser(), argv)
  File "/b/depot_tools/subcommand.py", line 245, in execute
    return command(parser, args[1:])
  File "/b/depot_tools/git_cache.py", line 218, in CMDpopulate
    RunGit(fetch_cmd, filter_fn=filter_fn, cwd=tempdir, retry=True)
  File "/b/depot_tools/git_cache.py", line 55, in RunGit
    gclient_utils.CheckCallAndFilter([GIT_EXECUTABLE] + cmd, **kwargs)
  File "/b/depot_tools/gclient_utils.py", line 494, in CheckCallAndFilter
    rv, args, kwargs.get('cwd', None), None, None)
subprocess2.CalledProcessError: Command git fetch origin returned non-zero exit
status 128 in /b/git-cache/tmpLi_BtR-tmp-trialpckuag-repos-git-repo_1
ETraceback (most recent call last):
  File "/b/depot_tools/git_cache.py", line 323, in <module>
    sys.exit(main(sys.argv[1:]))
  File "/b/depot_tools/git_cache.py", line 319, in main
    return dispatcher.execute(OptionParser(), argv)
  File "/b/depot_tools/subcommand.py", line 245, in execute
    return command(parser, args[1:])
  File "/b/depot_tools/git_cache.py", line 218, in CMDpopulate
    RunGit(fetch_cmd, filter_fn=filter_fn, cwd=tempdir, retry=True)
  File "/b/depot_tools/git_cache.py", line 55, in RunGit
    gclient_utils.CheckCallAndFilter([GIT_EXECUTABLE] + cmd, **kwargs)
  File "/b/depot_tools/gclient_utils.py", line 494, in CheckCallAndFilter
    rv, args, kwargs.get('cwd', None), None, None)
subprocess2.CalledProcessError: Command git fetch origin returned non-zero exit
status 128 in /b/git-cache/tmp74BjcH-tmp-trialpckuag-repos-git-repo_1
ETraceback (most recent call last):
  File "/b/depot_tools/git_cache.py", line 323, in <module>
    sys.exit(main(sys.argv[1:]))
  File "/b/depot_tools/git_cache.py", line 319, in main
    return dispatcher.execute(OptionParser(), argv)
  File "/b/depot_tools/subcommand.py", line 245, in execute
    return command(parser, args[1:])
  File "/b/depot_tools/git_cache.py", line 218, in CMDpopulate
    RunGit(fetch_cmd, filter_fn=filter_fn, cwd=tempdir, retry=True)
  File "/b/depot_tools/git_cache.py", line 55, in RunGit
    gclient_utils.CheckCallAndFilter([GIT_EXECUTABLE] + cmd, **kwargs)
  File "/b/depot_tools/gclient_utils.py", line 494, in CheckCallAndFilter
    rv, args, kwargs.get('cwd', None), None, None)
subprocess2.CalledProcessError: Command git fetch origin returned non-zero exit
status 128 in /b/git-cache/tmpuYdVBR-tmp-trialpckuag-repos-git-repo_1
E...................
======================================================================
ERROR: testAll (__main__.GitCheckout)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/checkout_test.py", line 455, in testAll
    self._check_base(self._get_co(None), root, None)
  File "tests/checkout_test.py", line 382, in _check_base
    git_rev = co.prepare(None)
  File "/b/commit-queue/workdir/tools/depot_tools/checkout.py", line 581, in
prepare
    ['cache', 'populate', self.git_url], timeout=FETCH_TIMEOUT, cwd=None)
  File "/b/commit-queue/workdir/tools/depot_tools/checkout.py", line 749, in
_check_call_git
    return subprocess2.check_call_out(['git'] + args, **kwargs)
  File "/b/commit-queue/workdir/tools/depot_tools/subprocess2.py", line 477, in
check_call_out
    returncode, args, kwargs.get('cwd'), out[0], out[1])
CalledProcessError: Command git cache populate /tmp/trialPcKuaG/repos/git/repo_1
returned non-zero exit status 1

======================================================================
ERROR: testException (__main__.GitCheckout)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/checkout_test.py", line 460, in testException
    'While running git apply --index -p1;\n  fatal: corrupt patch at line '
  File "tests/checkout_test.py", line 187, in _check_exception
    co.prepare(None)
  File "/b/commit-queue/workdir/tools/depot_tools/checkout.py", line 581, in
prepare
    ['cache', 'populate', self.git_url], timeout=FETCH_TIMEOUT, cwd=None)
  File "/b/commit-queue/workdir/tools/depot_tools/checkout.py", line 749, in
_check_call_git
    return subprocess2.check_call_out(['git'] + args, **kwargs)
  File "/b/commit-queue/workdir/tools/depot_tools/subprocess2.py", line 477, in
check_call_out
    returncode, args, kwargs.get('cwd'), out[0], out[1])
CalledProcessError: Command git cache populate /tmp/trialPcKuaG/repos/git/repo_1
returned non-zero exit status 1

======================================================================
ERROR: testMove (__main__.GitCheckout)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/checkout_test.py", line 471, in testMove
    self._check_move(co)
  File "tests/checkout_test.py", line 215, in _check_move
    co.prepare(None)
  File "/b/commit-queue/workdir/tools/depot_tools/checkout.py", line 581, in
prepare
    ['cache', 'populate', self.git_url], timeout=FETCH_TIMEOUT, cwd=None)
  File "/b/commit-queue/workdir/tools/depot_tools/checkout.py", line 749, in
_check_call_git
    return subprocess2.check_call_out(['git'] + args, **kwargs)
  File "/b/commit-queue/workdir/tools/depot_tools/subprocess2.py", line 477, in
check_call_out
    returncode, args, kwargs.get('cwd'), out[0], out[1])
CalledProcessError: Command git cache populate /tmp/trialPcKuaG/repos/git/repo_1
returned non-zero exit status 1

======================================================================
ERROR: testProcess (__main__.GitCheckout)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/checkout_test.py", line 464, in testProcess
    self._test_process(self._get_co)
  File "tests/checkout_test.py", line 203, in _test_process
    co.prepare(None)
  File "/b/commit-queue/workdir/tools/depot_tools/checkout.py", line 581, in
prepare
    ['cache', 'populate', self.git_url], timeout=FETCH_TIMEOUT, cwd=None)
  File "/b/commit-queue/workdir/tools/depot_tools/checkout.py", line 749, in
_check_call_git
    return subprocess2.check_call_out(['git'] + args, **kwargs)
  File "/b/commit-queue/workdir/tools/depot_tools/subprocess2.py", line 477, in
check_call_out
    returncode, args, kwargs.get('cwd'), out[0], out[1])
CalledProcessError: Command git cache populate /tmp/trialPcKuaG/repos/git/repo_1
returned non-zero exit status 1

----------------------------------------------------------------------
Ran 23 tests in 38.198s

FAILED (errors=4)


Presubmit checks took 86.5s to calculate.

[agable, 2014-03-12 02:04:58]

The CQ bit was checked by agable@chromium.org

[commit-bot: I haz the power, 2014-03-12 02:05:02]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/agable@chromium.org/175873003/130001

[commit-bot: I haz the power, 2014-03-12 02:08:29]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-12 02:08:30]

Presubmit check for 175873003-130001 failed and returned exit status 1.

Running presubmit commit checks ...
Checking out rietveld...
Running save-description-on-failure.sh
Running push-basic.sh
Running upstream.sh
Running submit-from-new-dir.sh
Running abandon.sh
Running submodule-merge-test.sh
Running upload-local-tracking-branch.sh
Running hooks.sh
Running post-dcommit-hook-test.sh
Running upload-stale.sh
Running patch.sh
Running basic.sh

** Presubmit ERRORS **
tests/checkout_test.py (9.79s) failed
From /b/git-cache/-tmp-trialezz84h-repos-git-repo_1
 * branch            master     -> FETCH_HEAD
From /b/git-cache/-tmp-trialezz84h-repos-git-repo_1
 * branch            master     -> FETCH_HEAD
FFrom /b/git-cache/-tmp-trialezz84h-repos-git-repo_1
 * branch            master     -> FETCH_HEAD
.From /b/git-cache/-tmp-trialezz84h-repos-git-repo_1
 * branch            master     -> FETCH_HEAD
.From /b/git-cache/-tmp-trialezz84h-repos-git-repo_1
 * branch            master     -> FETCH_HEAD
....................
======================================================================
FAIL: testAll (__main__.GitCheckout)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/checkout_test.py", line 455, in testAll
    self._check_base(self._get_co(None), root, None)
  File "tests/checkout_test.py", line 404, in _check_base
    self.assertTree(self.get_trunk(True), root)
  File
"/b/commit-queue/workdir/tools/depot_tools/testing_support/fake_repos.py", line
810, in assertTree
    self.assertEquals(diff, [])
AssertionError: {'extra': 'dummy\n', 'bin_file': '\x00',
'new_dir/subdir/new_file': 'A new file\nshould exist.\n', 'chrome/file.cc':
('a\nbb\nccc\ndd\ne\nFOO!\nff\nggg\nhh\ni\njj\nkkk\nll\nm\nnn\nooo\npp\nq\n',
'a\nbb\nccc\ndd\ne\nff\nggg\nhh\ni\njj\nkkk\nll\nm\nnn\nooo\npp\nq\n')} != []

----------------------------------------------------------------------
Ran 23 tests in 9.541s

FAILED (failures=1)


Presubmit checks took 202.7s to calculate.

[agable, 2014-03-12 16:28:35]

The CQ bit was checked by agable@chromium.org

[agable, 2014-03-12 16:28:47]

The CQ bit was unchecked by agable@chromium.org

[agable, 2014-03-12 16:33:24]

The CQ bit was checked by agable@chromium.org

[agable, 2014-03-12 16:34:39]

The CQ bit was unchecked by agable@chromium.org

[agable, 2014-03-12 16:34:39]

The CQ bit was checked by agable@chromium.org

[agable, 2014-03-12 16:57:17]

The CQ bit was unchecked by agable@chromium.org

[agable, 2014-03-12 19:04:41]

On 2014/03/12 16:57:17, agable wrote:
> The CQ bit was unchecked by mailto:agable@chromium.org

Please excuse all the spam above; took a long time to figure out why it was
failing on CQ but not on my local machine. Robbie, please take a look at the
diff since Patch 4.

[iannucci, 2014-03-12 21:14:17]

lgtm

[agable, 2014-03-12 22:35:10]

The CQ bit was checked by agable@chromium.org

[commit-bot: I haz the power, 2014-03-12 22:35:15]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/agable@chromium.org/175873003/150001

[commit-bot: I haz the power, 2014-03-12 22:37:34]

Change committed as 256681

[szager1, 2014-03-18 00:37:19]

This is totally broken if the git config cache.cachepath is unset.  That's quite
a bold assumption.

[szager1, 2014-03-18 00:47:04]

Also, the depot_tools tests now leave a bunch of garbage in the git cache.