On our hardy boxes, the python has the json module, but it doesn't
have all the expected methods.  Fallback to simplejson if it
doesn't have json.loads().

Review URL: http://codereview.chromium.org/1520025

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

Review URL: http://codereview.chromium.org/1619005

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

Review URL: http://codereview.chromium.org/1611009

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

With this CL, the patch that is sent to the code review site includes only changes from the nearest common ancestor of the local and the upstream branch.

A diagram:

     /----B <- local branch
----A-----C <- upstream

Previously, the diff would be simply between C and B, whereas now it's between A and C, even if you update C.

This allows you to continously update origin/trunk without having to rebase/merge your local changes all the time, resulting in the need for less rebuilds.

Review URL: http://codereview.chromium.org/1583003

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

Review URL: http://codereview.chromium.org/1324003

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

Convert the warning to error.

Review URL: http://codereview.chromium.org/1232007

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

BUG=http://crosbug.com/1658

Review URL: http://codereview.chromium.org/1307001

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

Review URL: http://codereview.chromium.org/1272003

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

TEST=verified it works in python 2.4
BUG=none

Review URL: http://codereview.chromium.org/1110006

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

TEST=none
BUG=none

Review URL: http://codereview.chromium.org/1105007

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

These are the same that the one in chromium's src/PRESUBMIT.py but slightly more
resilitent to exceptions.
Empirical studies have shown that exceptions in presubmit checks result in
disorientation and lack of willingness to commit.

TEST=OMG new unit tests!

Review URL: http://codereview.chromium.org/1119003

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

Review URL: http://codereview.chromium.org/1116001

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

Review URL: http://codereview.chromium.org/1050005

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

Requested-By: Pawel Hajdan Jr. <phajdan.jr@chromium.org>

Review URL: http://codereview.chromium.org/896006

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

Broken by the @branchname support

Review URL: http://codereview.chromium.org/907004

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

This commit fixes that, though the --snapshot option doesn't work perfectly.

Review URL: http://codereview.chromium.org/900001

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

This simplifies the unit tests and clarify what is what.

Ran pychecker on a few files.

Review URL: http://codereview.chromium.org/874002

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

Review URL: http://codereview.chromium.org/878001

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

Review URL: http://codereview.chromium.org/873002

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

set to sync to the current revisions/hashes on disk

Add a --gclientfile=FILENAME option.  If set, gclient loads FILENAME
rather than .gclient for configuration info.

Patch contributed by jneddo@nvidia.com

BUG=1658
TEST=Verify that --snapshot prints a valid configuration file
     Verify that when --gclientfile is set the correct file is used
     Verify that gclient sync --gclientfile sets the correct revisions

Review URL: http://codereview.chromium.org/672004

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

TBR=maruel
Review URL: http://codereview.chromium.org/702001

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

BUG=http://crosbug.com/1669

Review URL: http://codereview.chromium.org/661229

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

Review URL: http://codereview.chromium.org/669243

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

It does remote connection and can get HTTP 502 when used over http.

Review URL: http://codereview.chromium.org/661280

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

BUG=37104
BUG=chromium-os:1658

Review URL: http://codereview.chromium.org/660299

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

Review URL: http://codereview.chromium.org/652125

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

Also improve GIT.update error handling and verbosity levels

TEST=unit tests
BUG=http://crosbug.com/480
BUG=http://crosbug.com/1136

Review URL: http://codereview.chromium.org/559003

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

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/651022

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

Review URL: http://codereview.chromium.org/650039

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

Review URL: http://codereview.chromium.org/647063

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

I broke this in my last change.

TBR=msb
Review URL: http://codereview.chromium.org/627004

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

It would previously delete and recreate git-cl-repo if it
saw that the remote was different than expected.  This looks
like it was added for the transition from the old SVN repo
to the new git one, but it also has the effect of losing
any local changes that have been made in the repo. :-(

Everyone should be updated by now, so print a helpful error
and exit instead.
Review URL: http://codereview.chromium.org/609002

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

was matching everything. See
http://stackoverflow.com/questions/940822/regular-expression-syntax-for-match-nothing/940856 .

Review URL: http://codereview.chromium.org/601064

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

TEST=none
BUG=34793

Review URL: http://codereview.chromium.org/591002

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

TEST=none
BUG=none

Review URL: http://codereview.chromium.org/570059

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

TEST=totally untested
BUG=34793

Review URL: http://codereview.chromium.org/574017

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

Review URL: http://codereview.chromium.org/564051

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

Moved tests/pymox to third_party/pymox
Moved upload.py to third_party/upload.py
Fixed tests so they can run standalone
Fixed the executable bit on some scripts

TEST=none
BUG=34376
Review URL: http://codereview.chromium.org/562031

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

Review URL: http://codereview.chromium.org/561001

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

TEST=none
BUG=none

Review URL: http://codereview.chromium.org/557082

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