tools/git-repo.git, branch v1.6

Merge

2009-02-10T19:53:40+00:00

Merge

2009-02-10T19:53:30+00:00

Fix color parsing to not crash when user defined colors are set

2009-02-03T00:17:02+00:00

We didn't use the right Python string methods to parse colors. $ git config --global color.status.added yellow managed to cause a stack trace due to undefined methods trim() and lowercase(). Instead use strip() and lower(). Signed-off-by: Shawn O. Pearce

Remove the now unnecessary Makefile

2009-01-26T18:56:45+00:00

In a pure Python project run directly from source we really don't have a need for a Makefile. Previously it held the rule to update the protobuf client from Gerrit1, but now that we have retired that logic we don't need it anymore. Signed-off-by: Shawn O. Pearce

Remove the protobuf based HTTP upload code path

2009-01-26T18:55:39+00:00

Now that Gerrit2 has been released and the only supported upload protocol is direct git push over SSH we no longer need the large and complex protobuf client library, or the upload chunking logic in gerrit_upload.py. Signed-off-by: Shawn O. Pearce

Support Gerrit2's ssh:// based upload

2009-01-06T00:34:27+00:00

In Gerrit2 uploads are sent over "git push ssh://...", as this is a more efficient transport and is easier to code from external scripts and/or direct command line usage by an end-user. Gerrit1's HTTP POST based format is assumed if the review server does not have the /ssh_info URL available on it. Signed-off-by: Shawn O. Pearce

Remove astray comma

2008-12-31T04:45:04+00:00

There's an extra "," at the end of the line, which is causing trouble when the manifest file specifies a revision for a project. Since the default manifest file doesn't specify revisions for the projects, the problem has gone unnoticed. Thanks to Barry Silverman for spotting the issue and providing a patch. Signed-off-by: Marcelo E. Magallon

Correct the REPO_URL in the wrapper script to android.git.kernel.org

2008-12-18T15:21:32+00:00

Signed-off-by: Shawn O. Pearce

Describe upload --replace in upload's help text

2008-12-12T16:04:07+00:00

Signed-off-by: Shawn O. Pearce

Don't accept multiple commits for the same change in upload --replace

2008-12-12T16:01:12+00:00

Gerrit won't permit more than one commit using the same change number during a replacement request, so we should error out if the user has asked for this in their upload edit script. Signed-off-by: Shawn O. Pearce