Commit Graph

10 Commits (b12008466d565e1d73256be702a88ca6b84d5b58)

Author SHA1 Message Date
mmoss@chromium.org 2ad160097a Make auto-svn also configure the current svn branch (if any).
With this change, and running 'git auto-svn' whenever starting work on a
new upstream branch, much git-svn confusion and mayhem can be avoided.
For example:

$ git checkout -b drover_2403 branch-heads/2403
$ git svn info --url
  svn://svn.chromium.org/chrome-internal/trunk/tools/build
  # git-svn still thinks it's dealing with trunk.
$ git auto-svn
...
$ git svn info --url
  svn://svn.chromium.org/chrome-internal/branches/2403/tools/build
  # That's better.

R=agable@chromium.org, amineer@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@296667 0039d316-1c4b-4281-b951-d872f2087c98
10 years ago
tandrii@chromium.org 6c14310ef8 Make git auto-svn fail if git svn fetch fails.
R=agable@chromium.org
BUG=437397

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@295630 0039d316-1c4b-4281-b951-d872f2087c98
10 years ago
mmoss@chromium.org f0e4152061 Improve "dcommit in git repo" error message.
R=agable@chromium.org, iannucci@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@295609 0039d316-1c4b-4281-b951-d872f2087c98
10 years ago
sbc@chromium.org 013731e832 Handle KeyboardInterrupt consistently in python scripts
Handle KeyboardInterrupt gracefully rather the printing a
backtrace. Most users of these tools don't expect a
backtrace when then hit Ctrl-C.

Also, fix a few other inconsistencies found in the python
startup code of these different scripts:
- always call main function 'main' (rather than 'Main')
- always return 0 from main function
- if main takes args never include argv[0]

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@294250 0039d316-1c4b-4281-b951-d872f2087c98
10 years ago
tandrii@chromium.org cdb7bd50ea Fail noisily when git auto-svn can't authenticate.
R=agable@chromium.org
BUG=N/A

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@293277 0039d316-1c4b-4281-b951-d872f2087c98
10 years ago
kjellander@chromium.org 77b74b5cf2 Revert of git_auto_svn.py: Rewrite http SVN URLs to https (patchset #3 id:40001 of https://codereview.chromium.org/745473003/)
Reason for revert:
This actually makes the Git mirrors unusable for git svn, since there's a mismatch between the svn remote URL and the URLs of the git-svn-id footers in each Git commit (which confuses scripts like git_cl.py and makes uploading and committing CLs impossible).

Original issue's description:
> git_auto_svn.py: Rewrite http SVN URLs to https
>
> BUG=435091
> TESTED=Ran the following:
> git clone https://chromium.googlesource.com/external/webrtc
> cd webrtc
> git auto-svn
> cat .git/config
> Verified the URL was using http before this patch, and https after applying it.
>
> R=agable@chromium.org, mmoss@chromium.org
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=293041

TBR=agable@chromium.org,mmoss@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=435091

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@293148 0039d316-1c4b-4281-b951-d872f2087c98
10 years ago
kjellander@chromium.org 34458d40c4 git_auto_svn.py: Rewrite http SVN URLs to https
BUG=435091
TESTED=Ran the following:
git clone https://chromium.googlesource.com/external/webrtc
cd webrtc
git auto-svn
cat .git/config
Verified the URL was using http before this patch, and https after applying it.

R=agable@chromium.org, mmoss@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@293041 0039d316-1c4b-4281-b951-d872f2087c98
10 years ago
sbc@chromium.org 8b4900e77f Handle unusual case in rebase-update where second rebase attempt works.
Previously we just added an assert here but better
to simply succeed in this case, while outputting
the intial failure message.

BUG=425696

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@292687 0039d316-1c4b-4281-b951-d872f2087c98
10 years ago
agable@chromium.org 9c99943d35 Make git auto-svn idempotent.
By directly using git-config rather than git-svn-init, this ensures that
crazy values don't get set. It could be "safer" (e.g. check to see if any
other git-svn configuration already exists and prompt before overwriting it),
but I think that simplicity is better here.

R=pgervais@chromium.org
BUG=425838

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@292640 0039d316-1c4b-4281-b951-d872f2087c98
11 years ago
agable@chromium.org d629fb4084 Introduct git-auto-svn
This tool can automatically set up the necessary git-svn metadata for our
repos that live in SVN but are mirrored to Chrome.

R=iannucci@chromium.org, tandrii@chromium.org
BUG=418973

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

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