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