You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
depot_tools/git_cl
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
..
test Move rietveld local server setup in a separate file. 14 years ago
LICENSE Move git-cl into depot_tools. 15 years ago
PRESUBMIT.py Fix a bug in git_cl/PRESUBMIT.py causing it to fail. 14 years ago
README Move git-cl into depot_tools. 15 years ago
README.codereview Move git-cl into depot_tools. 15 years ago
README.testing Move git-cl into depot_tools. 15 years ago
__init__.py Move git-cl into depot_tools. 15 years ago
git-cl Move git-cl into depot_tools. 15 years ago
git_cl.py Add configuration option for upstream branch and improve guessing the svn branch. 14 years ago
upload.py Partial update of upload.py with r660 patch. 14 years ago

README

# git-cl -- a git-command for integrating reviews on Rietveld
# Copyright (C) 2008 Evan Martin <martine@danga.com>

== Background
Rietveld, also known as http://codereview.appspot.com, is a nice tool
for code reviews.  You upload a patch (and some other data) and it lets
others comment on your patch.

For more on how this all works conceptually, please see README.codereview.
The remainder of this document is the nuts and bolts of using git-cl.

== Install
Copy (symlink) it into your path somewhere, along with Rietveld
upload.py.

== Setup
Run this from your git checkout and answer some questions:
$ git cl config

== How to use it
Make a new branch.  Write some code.  Commit it locally.  Send it for
review:
$ git cl upload
By default, it diffs against whatever branch the current branch is
tracking (see "git checkout --track").  An optional last argument is
passed to "git diff", allowing reviews against other heads.

You'll be asked some questions, and the review issue number will be
associated with your current git branch, so subsequent calls to upload
will update that review rather than making a new one.

== git-svn integration
Review looks good?  Commit the code:
$ git cl dcommit
This does a git-svn dcommit, with a twist: all changes in the diff
will be squashed into a single commit, and the description of the commit
is taken directly from the Rietveld description.  This command also accepts
arguments to "git diff", much like upload.
Try "git cl dcommit --help" for more options.

== Extra commands
Print some status info:
$ git cl status

Edit the issue association on the current branch:
$ git cl issue 1234

Patch in a review:
$ git cl patch <url to full patch>
Try "git cl patch --help" for more options.

vim: tw=72 :