I can never remember the syntax (and always forget I have to specify the branch to set the upstream branch on) when using "git branch".

This patch just allows git-cl upstream to set the branch if an argument is provided. With no arg it prints the current one as it does today.

Review URL: https://chromiumcodereview.appspot.com/10825285

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@150945 0039d316-1c4b-4281-b951-d872f2087c98

on all modified files, and don't require (c).

BUG=140977
Review URL: https://chromiumcodereview.appspot.com/10824191

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@150417 0039d316-1c4b-4281-b951-d872f2087c98

Using urllib for SSL connections when behind a proxy is known to be
broken.

Upstream has fixed this in urllib2 in Python 2.6.3 and newer so
replace uses of urllib for SSL connections with urllib2 methods.

R=maruel@chromium.org
BUG=134165
TEST=gclient sync behind corporate proxy. Submitting this CL with git_cl.


Review URL: https://chromiumcodereview.appspot.com/10825107

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@149742 0039d316-1c4b-4281-b951-d872f2087c98

Review URL: https://chromiumcodereview.appspot.com/10830108

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@149649 0039d316-1c4b-4281-b951-d872f2087c98

Make 'deplist' and 'depfile' synonyms temporarily during transition of name in gyp.

BUG=
TEST=

Review URL: https://chromiumcodereview.appspot.com/10823120

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@149425 0039d316-1c4b-4281-b951-d872f2087c98

TBR=szager@chromium.org


Review URL: https://chromiumcodereview.appspot.com/10825122

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@149322 0039d316-1c4b-4281-b951-d872f2087c98

TBR=cmp@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10826064

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@149319 0039d316-1c4b-4281-b951-d872f2087c98

This simplifies some of the git-submodule stuff.  For example, deps2hooks.bat
can be changed from this:

@echo off
setlocal
set TMP_GCLIENT_FILE=.tmp.gclient
echo solutions=[{"name":".","url":None,"deps_file":".DEPS.git"}] > %TMP_GCLIENT_FILE%
FOR /F "delims=" %%a in ('call gclient hookinfo --gclientfile=%TMP_GCLIENT_FILE%') do set HOOKINFO=%%a
set HOOKINFO="call %HOOKINFO:;= & call%"
cd ..
cmd /c %HOOKINFO%
del /F src\%TMP_GCLIENT_FILE%
 
... to this:

@echo off
setlocal
call gclient runhooks --spec="solutions=[{'name':'src','url':None,'deps_file':'.DEPS.git'}]"
 

Review URL: https://chromiumcodereview.appspot.com/10835045

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@149223 0039d316-1c4b-4281-b951-d872f2087c98

Review URL: https://chromiumcodereview.appspot.com/10820057

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@148973 0039d316-1c4b-4281-b951-d872f2087c98

Review URL: https://chromiumcodereview.appspot.com/10827059

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@148672 0039d316-1c4b-4281-b951-d872f2087c98

This permits to count the number of check-ins between two revisions. This will
be used by the CQ to determine if a try job 'expired', e.g. it is so old that it
can't be used anymore. The .revisions() function specifically count the number
of commits, instead of just doing arithmetic on the svn revision numbers.

R=cmp@chromium.org
BUG=
TEST=Manually:
  import checkout
  s = checkout.SvnCheckout('/path/to/chrome/src', None, None, None, 'svn://svn.chromium.org/chrome/trunk/src')
  s.revisions(148323, 148330)
  s.revisions(148323, None)
  g = checkout.GitCheckout('.', None, 'master')
  g.revisions('HEAD^^^^^^^^', None)
  g.revisions('HEAD^^', 'HEAD')


Review URL: https://chromiumcodereview.appspot.com/10821011

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@148546 0039d316-1c4b-4281-b951-d872f2087c98

They were not used, causing unnecessary code bloat.

R=cmp@chromium.org
BUG=
TEST=


Review URL: https://chromiumcodereview.appspot.com/10825009

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@148541 0039d316-1c4b-4281-b951-d872f2087c98

Don't compact depdb unless creating at startup.

BUG=
TEST=

Review URL: https://chromiumcodereview.appspot.com/10790119

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@147861 0039d316-1c4b-4281-b951-d872f2087c98

In some enviroments (eg, OSX zh_CN), use 'svn --version' and splitting string
may get error version string. Use 'svn --version --quiet' to do stable svn
version check, which directly returns version string such as '1.7.0'.

BUG=
TEST=


Review URL: https://chromiumcodereview.appspot.com/10805037

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@147670 0039d316-1c4b-4281-b951-d872f2087c98

Don't move cursor when outputting build line to avoid the noise.

BUG=
TEST=

Review URL: https://chromiumcodereview.appspot.com/10790082

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@147558 0039d316-1c4b-4281-b951-d872f2087c98

On both mac and linux, I ran:

git checkout release-120715
ninja
./ninja ninja_test
./ninja_test  # all passed
strip ninja

Changes since the last push:
* ninja now has a functional -V flag that prints version information
* ninja is a lot faster. On my MBP, empty builds go from 1.8s to 1.1s,
  on my linux box from 1.4s to 0.9s
* ninja now has a -l N flag to do parallelsim based on load average

On linux, the binary grew 24 bytes, from 129920 to 129944. I used
gcc 4.4.3 to build ninja.

On mac, it grew from 4200 byte from 120904 to 125104 (likely caused by me
using a newer clang). I used clang r159409 to build ninja.

TBR=maruel@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10810025

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@147557 0039d316-1c4b-4281-b951-d872f2087c98

- remove .recompact file if it exists, before starting a recompact
- merge upstream

BUG=
TEST=

Review URL: https://chromiumcodereview.appspot.com/10790076

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@147494 0039d316-1c4b-4281-b951-d872f2087c98

Use manual file writing, it's just two lines.

TBR=nsylvain@chromium.org
BUG=
TEST=git try works with non-ascii patches


Review URL: https://chromiumcodereview.appspot.com/10815009

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@147447 0039d316-1c4b-4281-b951-d872f2087c98

git cl dcommit statistics were not using --find-copies-harder, scaring the user
off.

R=cmp@chromium.org
BUG=
TEST=


Review URL: https://chromiumcodereview.appspot.com/10795003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@147343 0039d316-1c4b-4281-b951-d872f2087c98

Otherwise, the output was:
  fatal: Needed a single revision
  invalid upstream origin

R=szager@chromium.org
BUG=
TEST=


Review URL: https://chromiumcodereview.appspot.com/10784045

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@147064 0039d316-1c4b-4281-b951-d872f2087c98

Add compacting of dep_database when it exceeds size threshold.

TBR=maruel@google.com

Review URL: https://chromiumcodereview.appspot.com/10789042

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@147049 0039d316-1c4b-4281-b951-d872f2087c98

Cygwin used to have a bug where the number of lock was very limited, causing it
to crash when --jobs was used with a value different than 1. This bug seems to
have been fixed a few months ago as I can't reproduce the anymore after
extensive usage.

R=cmp@chromium.org
BUG=
TEST=


Review URL: https://chromiumcodereview.appspot.com/10689194

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@146798 0039d316-1c4b-4281-b951-d872f2087c98

BUG=
TEST=


Review URL: https://chromiumcodereview.appspot.com/10696202

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@146391 0039d316-1c4b-4281-b951-d872f2087c98

R=cmp@chromium.org
BUG=
TEST=


Review URL: https://chromiumcodereview.appspot.com/10736011

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@146136 0039d316-1c4b-4281-b951-d872f2087c98

R=maruel@chromium.org
BUG=None (AFAIK)
TEST=Turn off networking, run gclient runhooks.

Review URL: https://chromiumcodereview.appspot.com/10750007

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@145878 0039d316-1c4b-4281-b951-d872f2087c98

picking the wrong upstream branch.

Review URL: https://chromiumcodereview.appspot.com/10758011

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@145791 0039d316-1c4b-4281-b951-d872f2087c98

authentication.  Also allow apply_issue.py to specify a username if needed.

BUG=43563
TEST=Make sure that sending try jobs directly from rietveld works.

Review URL: https://chromiumcodereview.appspot.com/10704111

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@145600 0039d316-1c4b-4281-b951-d872f2087c98

Since open() and codecs.open() have different behavior, and codecs.open()
misbehaves on python 2.6, switch to open() with manual str decoding.

TBR=cmp@chromium.org
BUG=
TEST=I failed to reproduce, it's a shot in the dark


Review URL: https://chromiumcodereview.appspot.com/10698089

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@145396 0039d316-1c4b-4281-b951-d872f2087c98

TBR=cmp@chromium.org
BUG=
TEST=manually tested gclient sync works on linux with python 2.6


Review URL: https://chromiumcodereview.appspot.com/10694069

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@145315 0039d316-1c4b-4281-b951-d872f2087c98

Otherwise, the files are opened in 'whatever happens to be the current encoding'
which is highly system-dependent. Even if some files are not encoded with utf-8,
the status quo is even worse. So it's worth trying out.

TBR=cmp@chromium.org
BUG=
TEST=


Review URL: https://chromiumcodereview.appspot.com/10697036

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@145306 0039d316-1c4b-4281-b951-d872f2087c98

Calling IsValidRevision('refs/head/master') will always return True.

TBR=bauerb@chromium.org
BUG=134858
TEST=Tested manually with 'managed': True


Review URL: https://chromiumcodereview.appspot.com/10694022

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@144786 0039d316-1c4b-4281-b951-d872f2087c98

'git rev-parse foo' with foo being any 40 character hex string will succeed.
Strip one char to force git to do a proper hash table lookup.

TBR=bauerb@chromium.org
BUG=
TEST=


Review URL: https://chromiumcodereview.appspot.com/10693008

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@144481 0039d316-1c4b-4281-b951-d872f2087c98

This should make a `gclient sync` faster, especially on Windows, where git hangs regularly.

BUG=none
TEST=gclient sync -v doesn't print "Fetching origin" all the time


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=143898
Reverted: http://src.chromium.org/viewvc/chrome?view=rev&revision=143911

Review URL: https://chromiumcodereview.appspot.com/10668020

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@144451 0039d316-1c4b-4281-b951-d872f2087c98

TBR=maruel@chromium.org

BUG=none
TEST=none


Review URL: https://chromiumcodereview.appspot.com/10663019

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@143911 0039d316-1c4b-4281-b951-d872f2087c98

This should make a `gclient sync` faster, especially on Windows, where git hangs regularly.

BUG=none
TEST=gclient sync -v doesn't print "Fetching origin" all the time


Review URL: https://chromiumcodereview.appspot.com/10668020

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@143898 0039d316-1c4b-4281-b951-d872f2087c98

Review URL: https://chromiumcodereview.appspot.com/10636015

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@143731 0039d316-1c4b-4281-b951-d872f2087c98

- fix FILE* leak when updating build_log version
- push PATH into parent environment in ninja-deplist-helper

BUG=
TEST=

Review URL: https://chromiumcodereview.appspot.com/10630031

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@143663 0039d316-1c4b-4281-b951-d872f2087c98

(ninja.bat is now ninja.exe.)

TBR=maruel@google.com


Review URL: https://chromiumcodereview.appspot.com/10653006

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@143627 0039d316-1c4b-4281-b951-d872f2087c98

Should have been part of http://crrev.com/143525 but I fail at svn.

TBR=maruel@google.com
BUG=
TEST=

Review URL: https://chromiumcodereview.appspot.com/10628019

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@143623 0039d316-1c4b-4281-b951-d872f2087c98

This gets around command-line length limitations.

BUG=
TEST=


Review URL: https://chromiumcodereview.appspot.com/10654002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@143620 0039d316-1c4b-4281-b951-d872f2087c98