Commit Graph

2417 Commits (885361a676ddcd6d4acb2958967b3e7940819074)
 

Author SHA1 Message Date
iannucci@chromium.org f2fb5e7f8c Have fetch set up tag fetch refspecs.
R=agable@chromium.org
BUG=

Review URL: https://codereview.chromium.org/212413002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@261264 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
nodir@chromium.org ee740705e9 git-number cannot commit-tree without user config
user.name and/or user.email may be not configured, so specify them
explictly for commit-tree.

R=iannucci@chromium.org
BUG=354276

Review URL: https://codereview.chromium.org/222103006

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@261256 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
nodir@chromium.org ead4c7e58f Revert of revert and fix "Now trychange can...
Bug=359292
Original commit: b1391c6a68
Revert: 8e5f7d308fde74c52e321587649c16568e4a9644

Original commit comment:

> Now trychange can store patches in a Git repo

> A git patch repo is cloned to .git/git-try/patches-git, if was not
> cloned before. Otherwise, changes are pulled. Then a patch is committed a
> pushed.

> --revision=auto (Git only) is resolved to the revision the diff is genera
> against.

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@261247 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
iannucci@chromium.org 27e6f9b907 Have depot_tools manpage generation pin asciidoc version too.
R=stip@chromium.org
BUG=

Review URL: https://codereview.chromium.org/223053002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@261235 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
nodir@chromium.org e0536ff702 Revert "Now trychange can store patches in a..."
This reverts commit b1391c6a68.

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@261220 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
borenet@google.com 0a42737b63 Revert of Revert "gclient: Change the .gclient URL mismatch warning into an error." (https://codereview.chromium.org/213483003/)
Reason for revert:
Re-landing this after https://codereview.chromium.org/214813002/

Original issue's description:
> Revert "gclient: Change the .gclient URL mismatch warning into an error."
> 
> This reverts commit c01bff7518.
> 
> BUG=356881
> TBR=iannucci
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=259727

TBR=iannucci@chromium.org,smut@google.com
NOTREECHECKS=true
NOTRY=true
BUG=356881

Review URL: https://codereview.chromium.org/221423004

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@261158 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
hinoka@google.com 563559cdb1 Add a way for git cache to bootstrap off Google Storage.
This is based off the svn tarball bootstrap script in gclient_scm.py
Also included is a new command to create a new zarchive/zipball.

BUG=261741

Review URL: https://codereview.chromium.org/220423002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@261002 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
borenet@google.com 8156c9f768 Ignore anything after '@' in SCMWrapper.DoesRemoteURLMatch
BUG=356881

Review URL: https://codereview.chromium.org/214813002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@260887 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
agable@chromium.org 772efaf8bc Use CheckCallAndFilterAndHeader for git commands.
This causes git commands to be completely silent (they don't even print
______ running 'git foo bar') if the git command itself is completely silent.
This mirrors the behavior of SVN commands. This is useful for commands like
'gclient diff', which should print no output at all if there is no diff.

R=szager@chromium.org, vadimsh@chromium.org

Review URL: https://codereview.chromium.org/218993009

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@260758 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
iannucci@chromium.org 512d97d412 Remember what branches we delete and do not try to reparent them in cleanup.
R=agable@chromium.org
BUG=357367

Review URL: https://codereview.chromium.org/214133006

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@260704 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
nodir@chromium.org b1391c6a68 Now trychange can store patches in a Git repo
A git patch repo is cloned to .git/git-try/patches-git, if was not
cloned before. Otherwise, changes are pulled. Then a patch is committed and
pushed.

--revision=auto (Git only) is resolved to the revision the diff is generated
against.

R=stip@chromium.org, agable@chromium.org, iannucci@chromium.org, maruel@chromium.org
BUG=325882

Review URL: https://codereview.chromium.org/184343003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@260471 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
rnk@chromium.org 2d3c28d5ba Don't put unicode strings into the environment
This fixes 'gclient recurse ...' on Windows.

R=dpranke@chromium.org

Review URL: https://codereview.chromium.org/167443002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@260405 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
pgervais@chromium.org 0752f9bf41 Replaced boto certificate
Removed check on certificate SHA1 in gsutil

BUG=348233

Review URL: https://codereview.chromium.org/212553007

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@260297 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
szager@chromium.org 38a0f57c23 Suppress spurious warning about overriding cache dir.
R=iannucci@chromium.org,hinoka@chromium.org
BUG=

Review URL: https://codereview.chromium.org/216013002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@260078 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
luqui@chromium.org 7f627a9130 Improve error message in subprocess2.py.
BUG=

Review URL: https://codereview.chromium.org/215673002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@260049 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
szager@chromium.org d9f405d4da Re-enable git-1.9.0
There is now a separate XP-compatible release which doesn't have
the performance fix for index-pack.

BUG=
NOTRY=true
R=mmoss@google.com

Review URL: https://codereview.chromium.org/215133002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@260010 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
dpranke@chromium.org a2a0c576ef Fix the gn wrapper to be aware of the --root argument.
The gn binary itself is capable of being run from outside of a
checkout as long as you pass the --root flag.

However, the gn.py wrapper script needs to *also* know where the the
checkout is, in order to figure out how to find the gn binary itself.

This patch changes the wrapper to be aware of the --root arg :).

R=brettw@chromium.org
BUG=

Review URL: https://codereview.chromium.org/212173004

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259998 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
sergeyberezin@chromium.org 782dc94b4f Fixing inadvertant CQ breakage from depot tools change.
CL that cause the issue: https://codereview.chromium.org/183793010

Symptoms: commit queue presubmit checks failed.

BUG=None

Review URL: https://codereview.chromium.org/215163003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259947 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
scottmg@chromium.org 8b17df6f54 win_toolchain: Note that google.com credentials are required
TBR=iannucci@chromium.org

Review URL: https://codereview.chromium.org/213913002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259915 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
hinoka@google.com 8bc4a30f1c Allow prodaccess based gsutil to also write into a bucket
The Telemetry workflow happily uses this gsutil to download artifacts, but they would also like to use the same workflow to upload artifacts.

I don't see a big harm in enabling read_write access for prodaccess based gsutil since its already more restrictive than the normal gsutil auth flow.  I could also be convinced to make this full_control, but that need has not arisen yet.

BUG= 341665

Review URL: https://codereview.chromium.org/148203012

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259761 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
hinoka@google.com c776c1067c Revert of Replaced boto certificate (https://codereview.chromium.org/212993005/)
Reason for revert:
This causes download_from_google_storage to fail:
Failure: CA certificates file does not have expected SHA1 sum; expected: ed024a78d9327f8669b3b117d9eac9e3c9460e9b, actual: 433e5589520cd2f1f29dea3e077cfbc2b74fb78c.

You'll need to also update the expectations on the gsutil side, and then reland.

Test it by running "gsutil ls".

Original issue's description:
> Replaced boto certificate
> 
> BUG=348233
> 
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=259692

TBR=stip@chromium.org,rsleevi@chromium.org,pgervais@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=348233

Review URL: https://codereview.chromium.org/213963002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259744 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
smut@google.com 979809d060 Revert "gclient: Change the .gclient URL mismatch warning into an error."
This reverts commit c01bff7518.

BUG=356881
TBR=iannucci

Review URL: https://codereview.chromium.org/213483003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259727 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
iannucci@chromium.org edeaa81534 Make mark-merge-base cap the marked merge base at the real merge-base.
R=agable@chromium.org
BUG=

Review URL: https://codereview.chromium.org/212213004

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259697 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
iannucci@chromium.org 56a624ac56 Fix the print of the rebase error message, and make the output prettier too.
For some reason .output doesn't throw an AttributeError, but returns None ,
instead. .stdout is the correct attribute.

R=agable@chromium.org
BUG=

Review URL: https://codereview.chromium.org/212493003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259695 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
pgervais@chromium.org e88578a09c Replaced boto certificate
BUG=348233

Review URL: https://codereview.chromium.org/212993005

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259692 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
borenet@google.com c01bff7518 gclient: Change the .gclient URL mismatch warning into an error.
BUG=skia:1638

Review URL: https://codereview.chromium.org/208623004

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259681 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
iannucci@chromium.org 95801c77da Split 'summary' manpages into section 7 (misc).
R=stip@chromium.org
BUG=

Review URL: https://codereview.chromium.org/212593006

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259655 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
iannucci@chromium.org de70b1549f Make udiff print reasonable errors while not on a branch.
R=agable@chromium.org
BUG=

Review URL: https://codereview.chromium.org/212493002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259647 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
iannucci@chromium.org a8378e2fdb Explicitly include root() in the git-map call to git-log.
This is in-place of --remotes. With repos like src.git that have alternate roots
this causes git-map to be faster (since it's not trying to display
origin/master).

R=agable@chromium.org
BUG=

Review URL: https://codereview.chromium.org/212183003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259646 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
pgervais@chromium.org 9979824601 Added OAuth2 authentication to apply_issue
Added oauth2client and httplib to third_party

BUG=348233

Review URL: https://codereview.chromium.org/183793010

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259643 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
agable@chromium.org 6c3c326013 Let ReadOnlyRietveld access the password.
The commit queue can't successfully run presubmit checks on top of
ReadOnlyRietveld because it requires access to the password field to pass
through to presubmit_shim.

R=phajdan.jr@chromium.org

Review URL: https://codereview.chromium.org/197213003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259611 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
iannucci@chromium.org 97231b5fb5 Fix bad interpreters.
Somehow some (but not all) git helper scripts got the wrong interpreter. This
fixes them to use /usr/bin/env.

TBR=agable@chromium.org
BUG=

Review URL: https://codereview.chromium.org/212293002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259522 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
iannucci@chromium.org 7122f7d66b Fix bug in git_squash_branch.py.
main takes args starting from 1, not 0.

TBR=agable@chromium.org
BUG=261738

Review URL: https://codereview.chromium.org/212223002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259521 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
iannucci@chromium.org c050a5b2be Add a family of git-commands to assist with the management of multiple CLs/branches.
git-rebase-update - ensure all branches are up to date
git-new-branch - create branches
git-rename-branch - rename a branch while preserving parentage relationships
git-reparent-branch - change the parent of a branch, including rebasing it correctly onto that new parent.
git-squash-branch - collapse a branch into a single commit
git-upstream-diff - show the diff between the current branch and it's upstream branch
git-mark-merge-base - explicitly set what you want the above tools to consider the merge-base for the current branch.

R=agable@chromium.org, hinoka@chromium.org, stip@chromium.org, szager@chromium.org
BUG=261738

Review URL: https://codereview.chromium.org/184253003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259520 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
iannucci@chromium.org a5d9502e26 Add documentation for git-map-branches, git-map, git-nav-downstream,
git-nav-upstream, as well as introduce a generic 'depot_tools' manpage with a
listing of the other tools.

This change also fully colorizes the EXAMPLE sections for the git-* commands to
reflect their actual appearance on the console (html only, manpage has bolding
hints).

R=agable@chromium.org, szager@chromium.org
BUG=261738

Review URL: https://codereview.chromium.org/200903002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259338 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
isherman@chromium.org b5cded6951 Infer CL author and reviewer list from local state if the issue has not previously been uploaded.
R=agable@chromium.org
BUG=none

Review URL: https://codereview.chromium.org/195793021

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259250 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
szager@chromium.org ff11329dfa Disabled threaded index-pack for known difficult repositories.
BUG=349576
R=mmoss@google.com

Review URL: https://codereview.chromium.org/210063005

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259164 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
borenet@google.com bda475e2f8 gclient: Fix nested checkout bug when validating .gclient
BUG=355492

Review URL: https://codereview.chromium.org/209963002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@258989 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
borenet@google.com 6a9b168463 Add warning batching in gclient_utils
BUG=

Review URL: https://codereview.chromium.org/209393006

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@258982 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
borenet@google.com 88d100836d gclient: in managed mode, warn if .gclient has a mismatched URL
BUG=

Review URL: https://codereview.chromium.org/195913002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@258617 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
deymo@chromium.org 29eb6e62ce my_activity.py: Parse rietveld dates without milliseconds.
Sometimes rietveld returns a datetime without the milliseconds part,
presumably when it is 0. This patch fixes the parsing of those cases.

BUG=chromium:323615
TEST=Ran "my_activity.py --week_of 11/18/13 --user jsbell" which returns "2013-11-18 20:42:30" for a bug.

Review URL: https://codereview.chromium.org/204013009

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@258189 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
phajdan.jr@chromium.org 174772e0ac Fix compatibility for gcl-try/git-try with repos not using tryserver.chromium
BUG=334892

Review URL: https://codereview.chromium.org/205633003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@258174 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
szager@chromium.org b000c1cdb2 Revert git-1.9.0.
I've received a few reports of:

error: inflate: data stream error (incorrect header check)
fatal: serious inflate inconsistency
fatal: index-pack failed
error: Could not fetch origin

TBR=mmoss@chromium.org
BUG=

Review URL: https://codereview.chromium.org/205443003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@258147 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
agable@chromium.org 3926228a5d Remove force push from GitCheckout.commit()
The CQ should not be able to force push -- this allows it to wipe out legitimate
commits if something goes wrong internally. This happened recently, with a CQ
commit orphaning 20 commits from the previous few days. This may have happened
any number of times previously, probably only wiping out one commit at a time,
whenever there was a race between the CQ and a developer's direct commit+push.

Repositories should also protect themselves by disallowing force push in their
ACLs.

BUG=261619

Review URL: https://codereview.chromium.org/196573041

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@258092 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
szager@chromium.org 83f4767a60 Update to git-1.9.0.
Also, allow multiple git installations to exist side-by-side.
This makes it easier to revert back to an old version quickly.

BUG=
R=maruel@chromium.org

Review URL: https://codereview.chromium.org/203463004

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@258058 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
agable@chromium.org 7e8c19df4b Revert changes to checkout.GitCheckout.
Things have gone wrong. This change and subsequent fixes were not as safe as
they should have been. Reverting until we can diagnose exactly what has gone
wrong, and how to prevent it from happening again.

This reverts commit fa3c388ec5.
This reverts commit e569f50330.
This reverts commit 7dc11449f0.

R=rmistry@chromium.org
TBR=rmistry@chromium.org
BUG=261619

Review URL: https://codereview.chromium.org/200923005

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@258003 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
agable@chromium.org fa3c388ec5 Revert making apply_issue assume 'master'
Review URL: https://codereview.chromium.org/204013002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@257841 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
agable@chromium.org e569f50330 Assume 'master' when remote branch not specified.
This prevents apply_patch from attempting to check out a branch tracking 'origin/None'.

R=pgervais@chromium.org

Review URL: https://codereview.chromium.org/202483008

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@257763 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
szager@chromium.org a4e4ef38a2 Fix push-basic.sh. How did it ever pass? We may never know.
BUG=

Review URL: https://codereview.chromium.org/203383005

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@257738 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
szager@chromium.org fc61638380 Rationalize the git config settings for index-pack performance.
BUG=

Review URL: https://codereview.chromium.org/202753003

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