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
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
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
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
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
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
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.orgTBR=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
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
- Don't pylint files in .gitignore or .git/info/excludes
- Print full path to modules in pylint.
BUG=
Review URL: https://codereview.chromium.org/202773002
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@257672 0039d316-1c4b-4281-b951-d872f2087c98
We don't want to do a shallow clone into the cache because it is not supported
on versions of git older than 1.9.
BUG=261741
Review URL: https://codereview.chromium.org/198103012
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@257578 0039d316-1c4b-4281-b951-d872f2087c98
If loaded first, Python can then be used to replace JS bootstrapping
logic if appropriate libs are already present in depot_tools.
BUG=328453
AUTHOR=techtonik@gmail.com
R=iannucci@chromium.org, maruel@chromium.org
Review URL: https://codereview.chromium.org/140183007
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@257248 0039d316-1c4b-4281-b951-d872f2087c98
Includes trial documentation for git-freeze and git-thaw, as well as a
make_docs.sh script which generates man and html documentation from the input
asciidoc files, using git 1.9's documentation toolchain.
R=szager@chromium.org, agable@chromium.org
BUG=261738
Review URL: https://codereview.chromium.org/196133007
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@257214 0039d316-1c4b-4281-b951-d872f2087c98
2006-2009/10 was a valid copyright date format before 2011 (when we decided to
use only one year, not a range).
The current directive with copyright is in fact to not change old copyright
dates, so there is no plan to go back and "fix" old files. As such, the
presubmit checks should not be complaining about old files.
BUG=none
Review URL: https://codereview.chromium.org/200643002
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@257181 0039d316-1c4b-4281-b951-d872f2087c98
Note that other waterfalls are not guaranteed to support triggering via HTTP
or SVN. That's why this hardcodes tryserver.chromium.
BUG=334892
Review URL: https://codereview.chromium.org/197553009
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@256947 0039d316-1c4b-4281-b951-d872f2087c98
depot_tools PRESUBMIT.py and tools/build PRESUBMIT.py both run on cq.golo.
If broken dev_appserver.py instances are left around, they will conflict with
master ports.
BUG=351926
Review URL: https://codereview.chromium.org/197073007
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@256721 0039d316-1c4b-4281-b951-d872f2087c98
The commit queue uses checkout.GitCheckout to manage the
local git repository. It resets it to a clean state,
commits patches locally, and pushes those changes to the
golden-source-of-truth repo.
This CL fixes the prepare() method to use the new git-cache
tool, and in the process makes it more consistent, more
readable, and more correct. It also makes minor changes to
other methods to bring them in line with the git-cache
approach.
R=iannucci@chromium.org, rmistry@chromium.org
BUG=261619
Review URL: https://codereview.chromium.org/175873003
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@256681 0039d316-1c4b-4281-b951-d872f2087c98
git_cache rewrites all urls to https://netloc/path when
setting them as remote urls. This doesn't work when the
remote is actually local on disk, and the "url" is a
/path/to/repo. This seems like an unlikely case, but it
is leveraged by testing, and it doesn't hurt to support
it, so now we do.
R=iannucci@chromium.org
BUG=261619
Review URL: https://codereview.chromium.org/196493002
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@256386 0039d316-1c4b-4281-b951-d872f2087c98
git-map: Show your local repo's history in a pseudo-graphical format from the command line.
git-map-branches: Show the topology of all of your branches, and their upstream relationships.
git-nav-upstream: Navigate (checkout) to the upstream branch of the current branch.
git-nav-downstream: Navigate (checkout) to a downstream branch of the current branch. If there's more than one downstream branch, then present a menu to select which one you want.
R=agable@chromium.org, hinoka@chromium.org, stip@chromium.org, szager@chromium.org
BUG=
Review URL: https://codereview.chromium.org/184113002
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@256384 0039d316-1c4b-4281-b951-d872f2087c98
This is an emergency patch to avoid picking up the
upcoming 2.9-rc0 version of gerrit, which requires java 7
and will break the chromeos bots.
BUG=346369
R=davidjames@chromium.org
Review URL: https://codereview.chromium.org/196063003
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@256378 0039d316-1c4b-4281-b951-d872f2087c98
This introduces python_git_runner.sh, and makes git-cl, git-cache, git-number,
and git-try use it.
R=agable@chromium.org, szager@chromium.org
BUG=261738
Review URL: https://codereview.chromium.org/188383002
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@256131 0039d316-1c4b-4281-b951-d872f2087c98
- Don't try to wrap download_from_google_storage --config, instead just
request that the user runs it manually. (This is annoying either way
but making it magically run makes it less clear what's going on, and so
harder to debug when something goes wrong, per linked bug).
- Check that SHA1s are passed as expected on the command line in case
the script is run directly, rather than from gyp_chromium.
R=scherkus@chromium.org
BUG=349596
Review URL: https://codereview.chromium.org/189093017
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@256049 0039d316-1c4b-4281-b951-d872f2087c98
Reason for revert:
Broke `gclient sync` for me, failing with:
Error: 1> Can't update/checkout /Volumes/MacintoshHD2/src/chrome-git/src if an unversioned directory is present. Delete the directory and try again.
For someone else, it broke it with:
% gclient sync
________ unmanaged solution; skipping src
Error: Command svn info --xml returned non-zero exit status 1 in /Users/pawliger/chromium/src/.
<?xml version="1.0" encoding="UTF-8"?>
<info>
svn: E155007: '/Users/pawliger/chromium/src' is not a working copy
Original issue's description:
> Another attempt: gclient: delete mismatching checkouts
>
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=255930
TBR=iannucci@chromium.org,szager@chromium.org,maruel@chromium.org,mmoss@chromium.org,borenet@google.com
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/192323006
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@256005 0039d316-1c4b-4281-b951-d872f2087c98
The gs:// download path is much faster. Move anyone who could have
access to gs://chrome-wintoolchain/ over to that for less pain.
The downside is that we have to prompt them to run
download_from_google_storage --config which people are going to
complain about, but I think this is a better experience overall.
R=iannucci@chromium.org,hinoka@chromium.org
BUG=349964
Review URL: https://codereview.chromium.org/191373002
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@255696 0039d316-1c4b-4281-b951-d872f2087c98
There is an issue where:
1. Lock for asdf.git acquires, which creates asdf.lock
2. asdf.git is cloned into tmp_asdf.git
3. Buildbot crashes, because timeouts
4. neither asdf.lock or tmp_asdf.git/config.lock gets cleaned out on the next unlock.
This aims to fix this issue by aggressively unlocking everything it can find that
vaguely resembles a lock.
BUG=339171
Review URL: https://codereview.chromium.org/187283005
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@255138 0039d316-1c4b-4281-b951-d872f2087c98
iannucci@chromium.org
isherman@chromium.org
szager@chromium.org
borenet@google.com
deymo@chromium.org
phajdan.jr@chromium.org
agable@chromium.org
hinoka@google.com
rvargas@chromium.org
tzik@chromium.org
stip@chromium.org
thestig@chromium.org
scottmg@chromium.org
thakis@chromium.org
plundblad@chromium.org
wittman@chromium.org
mdempsky@chromium.org