Commit Graph

14 Commits (5fe603e8c7a2d858d4a2356b51831dc9120679ef)

Author SHA1 Message Date
bauerb@chromium.org b4a75c4cd4 Use reset --soft to squash before dcomitting.
Using reset --soft doesn't require touching the working copy, so it should be faster and not require rebuilds.

BUG=none
TEST=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@77267 0039d316-1c4b-4281-b951-d872f2087c98
14 years ago
maruel@chromium.org b92e4804a8 Set cwd to the root of the git checkout when running git svn info.
URL value is dependent on the local directory. The current directory would
affect Base URL on Rietveld otherwise.

Do not use Repository Root instead of URL since git svn clone foo -T bar
wouldn't be correctly based.

Update RunCommand() to be able to pass cwd argument.

TEST=git cl upload is broken if I break this code.
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@76791 0039d316-1c4b-4281-b951-d872f2087c98
14 years ago
bauerb@chromium.org ade368c40d Add configuration option for upstream branch and improve guessing the svn branch.
The svn branch heuristic does roughly the same thing git-svn does: We first iterate backwards over the history to find the svn URL (like svn://svn.chromium.org/chrome/trunk/src). Then we go through all defined svn-remote section looking for one where the URL is the root of the svn URL (svn://svn.chromium.org/chrome in that case), and the fetch spec looks like "trunk/src:remotes/origin/trunk". If the base URL + left part (trunk/src) is the full URL, the right part (remotes/origin/trunk) is the git ref that is updated when we do a `git svn fetch`! This works for git-svn branches that fetch from trunk as well as milestone branches.

BUG=none
TEST=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@76364 0039d316-1c4b-4281-b951-d872f2087c98
14 years ago
maruel@chromium.org b2a7c3358f Add support for git cl upload --cc foo@example.com
It is useful sometimes to cc someone without marking this person as a reviewer.

TEST=none
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@76093 0039d316-1c4b-4281-b951-d872f2087c98
14 years ago
chase@chromium.org f340d1d6a7 Only set --cc when it's the first upload.
BUG=none
TEST=second git-cl upload of a CL doesn't set CC again
Review URL: http://codereview.chromium.org/6546042

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@75531 0039d316-1c4b-4281-b951-d872f2087c98
14 years ago
maruel@chromium.org e04657a2c5 Fix a bug in git_cl/PRESUBMIT.py causing it to fail.
When I renamed setup_mock to local_rietveld, I had forgot one place in
PRESUBMIT.py.

TBR=evan
BUG=none
TEST=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@74627 0039d316-1c4b-4281-b951-d872f2087c98
14 years ago
maruel@chromium.org 5b78c7262b Move rietveld local server setup in a separate file.
This makes the code more comprehensible and reusable.

BUG=none
TEST=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@74623 0039d316-1c4b-4281-b951-d872f2087c98
14 years ago
maruel@chromium.org 082cccdbb4 Partial update of upload.py with r660 patch.
Make json files known as a text mimetype so that they can be seen in reviews.

Original review at http://codereview.appspot.com/4133046/

Also make sure that the copy in third_party and in git_cl are the same. I'll
remove the copy in git_cl in a later change.

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@74116 0039d316-1c4b-4281-b951-d872f2087c98
14 years ago
msb@chromium.org bf1a7ba957 Update git_cl to look at right Tree Status URL for Chromium OS.
Improves output of git cl tree to use Chromium OS status, not Chromium Status.

BUG=chromium-os:11449
TEST=Output of 'git cl tree' for Chromium OS includes output from Chromium OS instead of from Chromium.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@73292 0039d316-1c4b-4281-b951-d872f2087c98
14 years ago
thakis@chromium.org cde3bb69d2 Tweak an informative message that has mislead at least 3 people so far.
Review URL: http://codereview.chromium.org/6331008

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@71893 0039d316-1c4b-4281-b951-d872f2087c98
14 years ago
maruel@chromium.org df947ea846 Improve parsing of committed hash to be more resilient.
TEST=Verified that if this code breaks, the presubmit checks fail.
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@71229 0039d316-1c4b-4281-b951-d872f2087c98
14 years ago
maruel@chromium.org 0ba7f967e1 Add support for post-dcommit/post-push hooks.
Patch contributed by sadrul@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@71097 0039d316-1c4b-4281-b951-d872f2087c98
14 years ago
chase@chromium.org c76e675fb5 Update the index in SendUpstream before tree check.
BUG=none
TEST=git cl dcommit/push performs an index update before
checking if the tree is dirty
Review URL: http://codereview.chromium.org/6172003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@70908 0039d316-1c4b-4281-b951-d872f2087c98
14 years ago
chase@chromium.org cc51cd03e0 Move git-cl into depot_tools.
BUG=none
TEST=git-cl works after move
Review URL: http://codereview.chromium.org/5012006

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