| OLD | NEW | 
|   1 #!/usr/bin/python |   1 #!/usr/bin/python | 
|   2 # Copyright (c) 2010 The Chromium Authors. All rights reserved. |   2 # Copyright (c) 2010 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 """Wrapper for trychange.py for git checkout.""" |   5 """Wrapper for trychange.py for git checkout.""" | 
|   6  |   6  | 
|   7 import logging |   7 import logging | 
|   8 import sys |   8 import sys | 
|   9  |   9  | 
|  10 import breakpad |  10 import breakpad | 
|  11  |  11  | 
|  12 import gclient_utils |  12 import gclient_utils | 
|  13 from scm import GIT |  13 from scm import GIT | 
 |  14 import third_party.upload | 
|  14 import trychange |  15 import trychange | 
|  15  |  16  | 
|  16  |  17  | 
|  17 def GetRietveldIssueNumber(): |  18 def GetRietveldIssueNumber(): | 
|  18   try: |  19   try: | 
|  19     return GIT.Capture( |  20     return GIT.Capture( | 
|  20         ['config', 'branch.%s.rietveldissue' % GIT.GetBranch(None)]) |  21         ['config', 'branch.%s.rietveldissue' % GIT.GetBranch(None)]) | 
|  21   except gclient_utils.Error: |  22   except gclient_utils.Error: | 
|  22     return None |  23     return None | 
|  23  |  24  | 
| (...skipping 20 matching lines...) Expand all  Loading... | 
|  44     args.extend([ |  45     args.extend([ | 
|  45         '--issue', GetRietveldIssueNumber(), |  46         '--issue', GetRietveldIssueNumber(), | 
|  46         '--patchset', patchset, |  47         '--patchset', patchset, | 
|  47     ]) |  48     ]) | 
|  48   else: |  49   else: | 
|  49     rietveld_url = GetRietveldServerUrl() |  50     rietveld_url = GetRietveldServerUrl() | 
|  50     if rietveld_url: |  51     if rietveld_url: | 
|  51       args.extend(['--rietveld_url', GetRietveldServerUrl()]) |  52       args.extend(['--rietveld_url', GetRietveldServerUrl()]) | 
|  52   # Hack around a limitation in logging. |  53   # Hack around a limitation in logging. | 
|  53   logging.getLogger().handlers = [] |  54   logging.getLogger().handlers = [] | 
|  54   sys.exit(trychange.TryChange( |  55   try: | 
|  55     args, file_list=[], swallow_exception=False, |  56     sys.exit(trychange.TryChange( | 
|  56     prog='git-try', |  57         args, file_list=[], swallow_exception=False, | 
|  57     extra_epilog='\n' |  58         prog='git-try', | 
|  58                   'git-try will diff against your tracked branch and will ' |  59         extra_epilog='\n' | 
|  59                       'detect your rietveld\n' |  60                      'git-try will diff against your tracked branch and will ' | 
|  60                   'code review if you are using git-cl\n')) |  61                      'detect your rietveld\n' | 
 |  62                      'code review if you are using git-cl\n')) | 
 |  63   except third_party.upload.ClientLoginError, e: | 
 |  64     print('Got an exception while trying to log in to Rietveld.') | 
 |  65     print(str(e)) | 
| OLD | NEW |