| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 # Copyright (C) 2008 Evan Martin <martine@danga.com> | 6 # Copyright (C) 2008 Evan Martin <martine@danga.com> |
| 7 | 7 |
| 8 """A git-command for integrating reviews on Rietveld and Gerrit.""" | 8 """A git-command for integrating reviews on Rietveld and Gerrit.""" |
| 9 | 9 |
| 10 from __future__ import print_function | 10 from __future__ import print_function |
| (...skipping 3061 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3072 'tree-status-url', False) | 3072 'tree-status-url', False) |
| 3073 SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url', True) | 3073 SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url', True) |
| 3074 SetProperty(settings.GetBugPrefix(), 'Bug Prefix', 'bug-prefix', False) | 3074 SetProperty(settings.GetBugPrefix(), 'Bug Prefix', 'bug-prefix', False) |
| 3075 SetProperty(settings.GetRunPostUploadHook(), 'Run Post Upload Hook', | 3075 SetProperty(settings.GetRunPostUploadHook(), 'Run Post Upload Hook', |
| 3076 'run-post-upload-hook', False) | 3076 'run-post-upload-hook', False) |
| 3077 | 3077 |
| 3078 @subcommand.usage('[repo root containing codereview.settings]') | 3078 @subcommand.usage('[repo root containing codereview.settings]') |
| 3079 def CMDconfig(parser, args): | 3079 def CMDconfig(parser, args): |
| 3080 """Edits configuration for this tree.""" | 3080 """Edits configuration for this tree.""" |
| 3081 | 3081 |
| 3082 print('WARNING: git cl config works for Rietveld only.\n' | 3082 print('WARNING: git cl config works for Rietveld only') |
| 3083 'For Gerrit, see http://crbug.com/603116.') | 3083 # TODO(tandrii): remove this once we switch to Gerrit. |
| 3084 # TODO(tandrii): add Gerrit support as part of http://crbug.com/603116. | 3084 # See bugs http://crbug.com/637561 and http://crbug.com/600469. |
| 3085 parser.add_option('--activate-update', action='store_true', | 3085 parser.add_option('--activate-update', action='store_true', |
| 3086 help='activate auto-updating [rietveld] section in ' | 3086 help='activate auto-updating [rietveld] section in ' |
| 3087 '.git/config') | 3087 '.git/config') |
| 3088 parser.add_option('--deactivate-update', action='store_true', | 3088 parser.add_option('--deactivate-update', action='store_true', |
| 3089 help='deactivate auto-updating [rietveld] section in ' | 3089 help='deactivate auto-updating [rietveld] section in ' |
| 3090 '.git/config') | 3090 '.git/config') |
| 3091 options, args = parser.parse_args(args) | 3091 options, args = parser.parse_args(args) |
| 3092 | 3092 |
| 3093 if options.deactivate_update: | 3093 if options.deactivate_update: |
| 3094 RunGit(['config', 'rietveld.autoupdate', 'false']) | 3094 RunGit(['config', 'rietveld.autoupdate', 'false']) |
| (...skipping 1291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4386 If your project has a true, writeable git repository, you probably want to run | 4386 If your project has a true, writeable git repository, you probably want to run |
| 4387 'git cl land' instead. | 4387 'git cl land' instead. |
| 4388 If your project has a git mirror of an upstream SVN master, you probably need | 4388 If your project has a git mirror of an upstream SVN master, you probably need |
| 4389 to run 'git svn init'. | 4389 to run 'git svn init'. |
| 4390 | 4390 |
| 4391 Using the wrong command might cause your commit to appear to succeed, and the | 4391 Using the wrong command might cause your commit to appear to succeed, and the |
| 4392 review to be closed, without actually landing upstream. If you choose to | 4392 review to be closed, without actually landing upstream. If you choose to |
| 4393 proceed, please verify that the commit lands upstream as expected.""" | 4393 proceed, please verify that the commit lands upstream as expected.""" |
| 4394 print(message) | 4394 print(message) |
| 4395 ask_for_data('[Press enter to dcommit or ctrl-C to quit]') | 4395 ask_for_data('[Press enter to dcommit or ctrl-C to quit]') |
| 4396 # TODO(tandrii): kill this post SVN migration with | |
| 4397 # https://codereview.chromium.org/2076683002 | |
| 4398 print('WARNING: chrome infrastructure is migrating SVN repos to Git.\n' | 4396 print('WARNING: chrome infrastructure is migrating SVN repos to Git.\n' |
| 4399 'Please let us know of this project you are committing to:' | 4397 'Please let us know of this project you are committing to:' |
| 4400 ' http://crbug.com/600451') | 4398 ' http://crbug.com/600451') |
| 4401 return SendUpstream(parser, args, 'dcommit') | 4399 return SendUpstream(parser, args, 'dcommit') |
| 4402 | 4400 |
| 4403 | 4401 |
| 4404 @subcommand.usage('[upstream branch to apply against]') | 4402 @subcommand.usage('[upstream branch to apply against]') |
| 4405 def CMDland(parser, args): | 4403 def CMDland(parser, args): |
| 4406 """Commits the current changelist via git.""" | 4404 """Commits the current changelist via git.""" |
| 4407 if settings.GetIsGitSvn() or git_footers.get_footer_svn_id(): | 4405 if settings.GetIsGitSvn() or git_footers.get_footer_svn_id(): |
| (...skipping 869 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5277 if __name__ == '__main__': | 5275 if __name__ == '__main__': |
| 5278 # These affect sys.stdout so do it outside of main() to simplify mocks in | 5276 # These affect sys.stdout so do it outside of main() to simplify mocks in |
| 5279 # unit testing. | 5277 # unit testing. |
| 5280 fix_encoding.fix_encoding() | 5278 fix_encoding.fix_encoding() |
| 5281 setup_color.init() | 5279 setup_color.init() |
| 5282 try: | 5280 try: |
| 5283 sys.exit(main(sys.argv[1:])) | 5281 sys.exit(main(sys.argv[1:])) |
| 5284 except KeyboardInterrupt: | 5282 except KeyboardInterrupt: |
| 5285 sys.stderr.write('interrupted\n') | 5283 sys.stderr.write('interrupted\n') |
| 5286 sys.exit(1) | 5284 sys.exit(1) |
| OLD | NEW |