Commit Graph

2058 Commits (ca35be31122f7ff712b2d955ec148f44e9b06156)
 

Author SHA1 Message Date
raphael.kubo.da.costa@intel.com 233fb7d050 The scripts are simple enough and should work fine under any POSIX shell,
which is particularly helpful when one is using `gclient sync' on a platform
that does not have /bin/bash (ie. it's installed in another location or not
present at all), since the hooks are automatically added to the git
checkouts.

While here, just `exec' the scripts directly instead of invoking another
shell by hand and remove the redundant `exit 0' lines.

R=cmp@chromium.org,dpranke@chromium.org,szager@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@214181 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
ilevy@chromium.org 08218ed6c4 Revert 214177 "Use plain sh instead of bash in the git template ..."
> Use plain sh instead of bash in the git template hooks.
> 
> The scripts are simple enough and should work fine under any POSIX shell,
> which is particularly helpful when one is using `gclient sync' on a platform
> that does not have /bin/bash (ie. it's installed in another location or not
> present at all), since the hooks are automatically added to the git
> checkouts.
> 
> While here, just `exec' the scripts directly instead of invoking another
> shell by hand and remove the redundant `exit 0' lines.
> 
> R=cmp@chromium.org,dpranke@chromium.org,szager@chromium.org

TBR=raphael.kubo.da.costa@intel.com

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@214178 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
raphael.kubo.da.costa@intel.com 2666f735b1 Use plain sh instead of bash in the git template hooks.
The scripts are simple enough and should work fine under any POSIX shell,
which is particularly helpful when one is using `gclient sync' on a platform
that does not have /bin/bash (ie. it's installed in another location or not
present at all), since the hooks are automatically added to the git
checkouts.

While here, just `exec' the scripts directly instead of invoking another
shell by hand and remove the redundant `exit 0' lines.

R=cmp@chromium.org,dpranke@chromium.org,szager@chromium.org

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@214177 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
ilevy@chromium.org a0d4757e90 Specify admin port for local rietveld.
Latest dev appengine server defaults admin port to 8000
which isn't always available and can cause spurious
failures.

R=maruel@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@214050 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
ilevy@chromium.org 9414599a01 Add anonymous-only option to apply_issue
Add an option to apply_issue to fail if anonymous access
triggers a login prompt.
- cherry-pick upload.py rietveld cl 37c73ece82d0 which
   allows clients to request no authentication.

BUG=240634

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@214023 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
ilevy@chromium.org 8d1a14ffd3 Fix depot_tools tests external dependency
git cl was using system git cl.
- replace git cl status with GIT_CL_STATUS var
- add tested depot_tools to tip of PATH.

R=maruel@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@214021 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
maruel@chromium.org 885f65199c Disable colors if not a tty.
Otherwise this breaks git cl unit tests.

Update references to 'git cl' in git cl smoke tests to $GIT_CL.

TBR=ilevy@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@214019 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
iannucci@chromium.org d9c1b20095 Revert "Revert "Improve description layout. Improve coloring and add legend in help.""
This reverts commit c0594f37a1.

Because I reverted the wrong thing >_<

TBR=maruel@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@213551 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
iannucci@chromium.org c0594f37a1 Revert "Improve description layout. Improve coloring and add legend in help."
This reverts commit 44a82fa84b.

Broke git cl apply <issue>

TBR=maruel@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@213545 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
maruel@chromium.org 44a82fa84b Improve description layout. Improve coloring and add legend in help.
Convert monkey patching to class inheritance for OptionParser usage in:
commit_queue.py, gclient.py and trychange.py.

Monkey patching confuses the hell out of pylint.

R=jochen@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@213423 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
jochen@chromium.org a26e04734b Correctly pass the issue number as "issue" parameter to Changelist ctor
Instead of as branchref. Because it's an issue. Not a branchref.

Also, add myself as owner.

BUG=none
R=maruel@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@213387 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
maruel@chromium.org 1033efd0da Add color support to git cl and fetch issue properties in parallel.
Add cache for issue properties.

Add --fast option in case the HTTP requests become an issue.

Everyone loves colors:
- White means no issue is associated with the branch.
- Red means no email was sent to request a review. Also red if the issue doesn't
  exist anymore.
- Blue means the issue was not LGTM'ed yet.
- Green means the issue was LGTM'ed and is likely ready to commit or be CQ'ed.

R=iannucci@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@213265 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
maruel@chromium.org e25c75b0ba Cleanup 'git cl status' in preparation to add new features.
Reduce the number of conditions and use more early exits to reduce the number of
code paths.

R=iannucci@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@213173 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
maruel@chromium.org cf0877805e Simplify code; no need to pass issue arg to GetApprovingReviewers().
The class already knows the issue number.

R=iannucci@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@213083 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
maruel@chromium.org cbd760f9bd Add a prefix to temporary file to enter CL description.
So that if the process dies in the middle, the files are easier to spot and
delete.

R=iannucci@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@213081 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
ilevy@chromium.org 3534aa56f4 Allow gclient clone in non-empty directories
Add an option in DEPS files to clone a project into a temp dir
and then copy into expected final dir.  This allows checking out a
git repo into a folder which is non-empty. It is useful for projects
that are embedded in src/ but want to specify the revision of
src/ in the embedded project (such as android private).

BUG=165280

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@212720 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
szager@chromium.org 3592f93a85 Add .git-credentials file.
TBR=cmp@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@212687 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
iannucci@chromium.org 578e5e548f Catch and print OSError instead of Exception.
Also open the altfile with 'w' because we assume ownership over the object
alternates. The logic to correctly support other alternates would be quite
complex, so don't even imply support.

R=maruel@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@212426 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
iannucci@chromium.org f3ec5784d3 Check to see if a dependency was skipped in custom_deps, and if so, skip it in
recurse.

R=maruel@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@212373 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
szager@chromium.org 3e2fff2e03 Download gerrit.war to depot_tools, not cwd.
Also, fix preferred_email.

TBR=cmp@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@212149 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
iannucci@chromium.org 976a14dc97 When switching to/from a cache git dir, try to reuse as much data as possible.
R=szager@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@212140 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
thestig@chromium.org fbb00c4a11 Fix a corner case in my_reviews.py's median latency calculation.
Review URL: https://chromiumcodereview.appspot.com/19460002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@211880 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
szager@chromium.org ef2ba74b87 Utility for bootstrapping a local gerrit instance.
BUG=
R=cmp@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@211865 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
ilevy@chromium.org 4380c80db7 Fix GenerateDiff -- don't strip whitespace.
BUG=259434
R=iannucci

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@211483 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
szager@chromium.org ecb7542302 Get rid of place-holder for commit-msg hook.
This caused problems for repo-based projects that need to install the
standard Change-Id commit-msg hook.

With the commit-msg hook gone, we can also reinstate the --template
argument to 'git clone'.

BUG=235215
R=iannucci@chromium.org, ilevy@chromium.org, maruel@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@211464 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
ilevy@chromium.org 4aad18539d Partial revert of r211446
Broke parsing got_revision.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@211462 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
ilevy@chromium.org c28d377739 Print time of long running hook actions
We can use this to evaluate the usefulness of making hooks run in parallel.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@211446 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
groby@chromium.org 2327994797 Create a temporary dir for patch to do its work.
BUG=259665

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@211443 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
szager@chromium.org 3ce4184f8c Document the use of GIT_ASKPASS and SSH_ASKPASS.
BUG=
R=dpranke@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@211148 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
ilevy@chromium.org cc56ee4cac Fix pylint presubmit failure
Caused by crrev.com/210695

TBR=maruel@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@210949 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
tapted@chromium.org 6a0b07c12a Default to using --3way when using `git cl patch` with git >= 1.7.12
Git introduced a --3way argument to `apply` in version 1.7.12 [1]. This
provides a much nicer way to apply issues from Rietveld.

After this change, `git cl patch` will add --3way after checking the git
version for support.

[1] f247b10aa0

BUG=None
TEST=Ran `git cl patch <issue>` with both clean and unclean patches,
also checked behaviour of --reject is preserved.
R=maruel@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@210695 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
szager@chromium.org 7f834ad2f1 Do not prompt for passwords
Forcing function for developers to create a .netrc file.
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@210686 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
petermayo@chromium.org e79161aa2d Add custom hooks.
Sometimes we wish to pull in a complicated dependency but want to
suppress or replace one or more of the hooks rules.  Say for example
we want to use a different way of generating the projects, or
have a different set of landmine expectations.

Here we add a custom_hooks section mirroring custom_deps to allow us to
override sections we have identified in the DEPS file.  To do so,
we add an optional name to the elements of the hooks list, and overwrite
those whose name matches.

Conventions between included DEPS and the .gclient as to the meanings of the
name are equivalent to the meaning of the customized deps, and so do not
benefit from further structure or definition.

BUG=None
TEST=local unit test

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@210573 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
bratell@opera.com 82b91cd1a8 Replace --no-pager with GIT_PAGER=cat
--no-pager looks ugly in logs and output and makes commands harder to
read. Setting an environment variable is better.

This is a followup to https://chromiumcodereview.appspot.com/14104005/
which added --no-pager.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@210503 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
ilevy@chromium.org 224ba24fef Fix bug with parsing capitalized git shas
Fix identification of shas that contain capitalized
hexadecimal characters.  Addresses comments from
http://crrev.com/18262002/

R=maruel@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@210429 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
iannucci@chromium.org 87b091128b Do not assume that every subproject needs to contain a diff.
This is especially useful when you want to do something like:

git try -s third_party/WebKit

from the chromium root checkout.

R=dpranke@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@210409 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
ilevy@chromium.org a926a1eb04 Add ilevy to depot_tools WATCHLIST
TBR=maruel@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@210223 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
iannucci@chromium.org 4a4b33b99c Do not use named arguments to call positional arguments.
See bug.

TBR=szager@chromium.org
BUG=257299

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@210222 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
iannucci@chromium.org e6ebb4efd6 Fix tests for nag_max=30.
Test breakage introduced by f10ffa9069.

TBR=joi@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@210220 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
joi@chromium.org f10ffa9069 Set timeout before killing a process to 30 times the 30-second nag
timer, i.e. ~900 seconds.

This should at least help make 'fetch chromium' slightly more reliable
over somewhat slow connections.

BUG=230691,247173
R=rogerta@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@210190 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
iannucci@chromium.org 396e1a6d9e If we're running in nohooks mode, don't bother to accumulate file_list in gclient.
This enables significant time savings, especially since file_list only exists to
enable file-specific hooks (which, AFAIK, nothing actually uses). On a z620
(linux) using the cached git repos, a first-time `gclient sync --nohooks` takes:
  * (with)    131.06s user 14.10s  system 117% cpu 2:03.89 total
  * (without) 482.13s user 189.35s system 144% cpu 7:45.63 total

This change makes nohooks cause file_list to be None if we don't need to
accumulate it, and updates GitWrapper and SvnWrapper appropriately.

R=szager@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@210026 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
iannucci@chromium.org 53456aa2a9 Add a git cache for gclient sync operations.
Instead of cloning straight into place, clones are made to a global cache dir,
and then local (using --shared) clones are made from the cache to the final
resting place. This means the 'final' clones are full repos with no shenanigans,
meaning that branches, commits, etc. all work, which should allow the rest of
the gclient ecosystem to work without change as well.

The primary benefit is, of course, reduced network IO, and a much lower cost for
'clobber' operations (assuming we don't clobber the cache). It also means that
a given bot can have a greater number of checkouts, since the entire git history
will only be stored once per machine, instead of once per checkout.

R=dpranke@chromium.org, szager@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@210024 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
ilevy@chromium.org a41249c2b3 Misc gclient cleanup
- Use config --local for properties that should be local.
- Remove git fetch retry logic, it should not be necessary
  with the googlesource hosts.
- Include .strip() in GIT.Capture, simplifying other calls.
- Safer testing of whether dep revision is a sha.
- Fix refs/remotes/ DEPS branch detection

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@209825 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
iannucci@chromium.org b837688ee6 Set core.deltaBaseCacheLimit on fetch-type operations in gclient.
R=dpranke@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@209483 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
petermayo@chromium.org 3e31fca15b Add an alternate default boto file for bootstrapping source.
Able to pull internal tools, but distinct from the source that
those tools may eventually build.

TBR=cmp@chromium.org
BUG=252226
TEST=local buildslave

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@209166 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
iannucci@chromium.org d4fffee1c5 Add --upstream option to gclient to scrape git checkouts back to upstream state.
This will be used on the bots when calling apply_patch, which commits to git
repos.

R=dpranke@chromium.org,szager@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@209040 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
ukai@chromium.org e4d906fcec pass boto_path to Gsutil
R=hinoka@chromium.org,maruel@chromium.org
BUG=254817

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@209037 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
iannucci@chromium.org 2a070f3027 Fix git tests to work regardless of global gitconfig.
Previously if one or both of these values were unset, the tests would simply fail
because `git config` returns 1.

R=dpranke@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@208966 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
hinoka@chromium.org 0477f8c1f8 Adds --config option to download_from_google_storage.py
In order to support both developer workflow and not breaking bots, if the script
fails on a 403 in a bucket, it'll print a message asking developers to run
"download_from_google_storage --config" in order to create a new boto file.

This is not done automatically because it would break bots (Imagine hitting a 403,
and then gsutil wiping the .boto file, waiting for input, then dying).

BUG=231699,176331

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@208806 0039d316-1c4b-4281-b951-d872f2087c98
12 years ago
iannucci@chromium.org 1005629013 Revert "Add --no-commit option to apply_issue for use with git on the bots."
This reverts commit 012dc07ce5.

Revert "Partially revert r208574 to get the CQ working again (hopefully)."

This reverts commit 74105cd2a0.

Pull the --no-commit change out completely.

TBR=dpranke@chromium.org
BUG=254556

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

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