Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(195)

Issue 14104005: Fix 236148: Avoid triggering a pager in internal git commands. (Closed)

Created:
7 years, 8 months ago by Daniel Bratell
Modified:
7 years, 5 months ago
Reviewers:
iannucci, M-A Ruel
CC:
chromium-reviews, Dirk Pranke, cmp-cc_chromium.org, iannucci+depot_tools_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/tools/depot_tools.git@master
Visibility:
Public.

Description

Fix 236148: Avoid triggering a pager in internal git commands. BUG=236148 Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=197872

Patch Set 1 #

Patch Set 2 : Fixed some tests and other calls too. #

Unified diffs Side-by-side diffs Delta from patch set Stats (+177 lines, -128 lines) Patch
M git_cl.py View 1 7 chunks +14 lines, -9 lines 0 comments Download
M scm.py View 1 1 chunk +2 lines, -1 line 0 comments Download
M tests/git_cl_test.py View 1 7 chunks +161 lines, -118 lines 0 comments Download

Messages

Total messages: 11 (0 generated)
iannucci
It may be worth just forcing the PAGER environment variable to be set but empty. ...
7 years, 7 months ago (2013-04-28 03:30:41 UTC) #1
iannucci
On 2013/04/28 03:30:41, iannucci wrote: > It may be worth just forcing the PAGER environment ...
7 years, 7 months ago (2013-04-28 03:33:21 UTC) #2
Daniel Bratell
On 2013/04/28 03:33:21, iannucci wrote: > On 2013/04/28 03:30:41, iannucci wrote: > > It may ...
7 years, 7 months ago (2013-04-29 06:48:33 UTC) #3
M-A Ruel
On 2013/04/29 06:48:33, bratell wrote: > On 2013/04/28 03:33:21, iannucci wrote: > > On 2013/04/28 ...
7 years, 7 months ago (2013-05-01 14:15:32 UTC) #4
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/bratell@opera.com/14104005/2001
7 years, 7 months ago (2013-05-02 09:10:08 UTC) #5
commit-bot: I haz the power
Change committed as 197872
7 years, 7 months ago (2013-05-02 09:11:44 UTC) #6
iannucci
On 2013/05/02 09:11:44, I haz the power (commit-bot) wrote: > Change committed as 197872 Hm... ...
7 years, 6 months ago (2013-06-25 23:25:45 UTC) #7
Daniel Bratell
On 2013/06/25 23:25:45, iannucci wrote: > On 2013/05/02 09:11:44, I haz the power (commit-bot) wrote: ...
7 years, 6 months ago (2013-06-26 07:47:18 UTC) #8
iannucci
On 2013/06/26 07:47:18, bratell wrote: > On 2013/06/25 23:25:45, iannucci wrote: > > On 2013/05/02 ...
7 years, 6 months ago (2013-06-26 22:15:23 UTC) #9
Daniel Bratell
On 2013/06/26 22:15:23, iannucci wrote: > On 2013/06/26 07:47:18, bratell wrote: > > On 2013/06/25 ...
7 years, 5 months ago (2013-06-27 07:23:26 UTC) #10
iannucci
7 years, 5 months ago (2013-06-27 17:22:39 UTC) #11
Message was sent while issue was closed.
On 2013/06/27 07:23:26, bratell wrote:
> On 2013/06/26 22:15:23, iannucci wrote:
> > On 2013/06/26 07:47:18, bratell wrote:
> > > On 2013/06/25 23:25:45, iannucci wrote:
> > > > On 2013/05/02 09:11:44, I haz the power (commit-bot) wrote:
> > > > > Change committed as 197872
> > > > 
> > > > Hm... I think this change broke all of tests/*.sh :/
> > > > 
> > > > I'm not sure why CQ didn't catch it though. Here's an example:
> > > > https://chromiumcodereview.appspot.com/17644004/
> > > 
> > > I am not that good at decoding the output there. I only see "FAILED". Do
you
> > > know what goes wrong more in detail and I can try fixing it?
> > 
> > I'm not sure, but when I run it locally, I'll get stuff like:
> > patch.sh failed
> > Command /usr/local/google/home/iannucci/s/depot_tools/tests/patch.sh
returned
> > non-zero exit status 1 in
/usr/local/google/home/iannucci/s/depot_tools/tests
> > Setting up test SVN repo...
> > Setting up test git-svn repo...
> > TESTING: upload succeeds (needs a server running on localhost)
> > Command "git --no-pager config user.email" failed.
> > 
> > FAILURE: upload succeeds (needs a server running on localhost)
> > 
> > Could we revert this, and just do e.g. `os.environ['PAGER'] = 'cat';
> > os.environ['GIT_PAGER'] = 'cat'` ?
> 
> I would not mind a patch that uses GIT_PAGER=cat (as told by
> https://www.kernel.org/pub/software/scm/git/docs/ ). When I wrote this patch I
> wasn't convinced that was portable but it should be according to documentation
> and that would be much cleaner and less visible (and thus less scary).
> 
> On the other hand, I can't see why you think this patch is the cause of that
> failure. Seems much more likely there is something unseen that goes wrong in
> that test case.

Huh weird... So previously, I tried running `git --no-pager config user.name`,
and it exit'd 1 with no output. I just tried it again and it exits 0 with the
correct output. 

*looks back through bash history*

Or, I just mistyped the command :(

OH! I know what it is... it's totally my fault. I don't have a global git
user.email set up (I set it per-repo, because some are @google, some are
@chromium, and some are my own private repos). The tests create a new repo, and
they assume that the global email is set correctly (which, in my case, it's
not).

This has nothing to do with your CL at all. Sorry about that! I'll put up
another one to fix the tests though.

Powered by Google App Engine
This is Rietveld 408576698