| OLD | NEW |
|---|
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # Copyright 2014 The Chromium Authors. All rights reserved. | 2 # Copyright 2014 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 """Change the upstream of the current branch.""" | 6 """Change the upstream of the current branch.""" |
| 7 | 7 |
| 8 import argparse | 8 import argparse |
| 9 import sys | 9 import sys |
| 10 | 10 |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 62 set_branch_config(branch, 'remote', '.') | 62 set_branch_config(branch, 'remote', '.') |
| 63 set_branch_config(branch, 'merge', new_parent) | 63 set_branch_config(branch, 'merge', new_parent) |
| 64 else: | 64 else: |
| 65 print ("Reparenting %s to track %s (was %s)" | 65 print ("Reparenting %s to track %s (was %s)" |
| 66 % (branch, new_parent, cur_parent)) | 66 % (branch, new_parent, cur_parent)) |
| 67 run('branch', '--set-upstream-to', new_parent, branch) | 67 run('branch', '--set-upstream-to', new_parent, branch) |
| 68 | 68 |
| 69 manual_merge_base(branch, mbase, new_parent) | 69 manual_merge_base(branch, mbase, new_parent) |
| 70 | 70 |
| 71 # TODO(iannucci): ONLY rebase-update the branch which moved (and dependants) | 71 # TODO(iannucci): ONLY rebase-update the branch which moved (and dependants) |
| 72 return git_rebase_update.main(['--no_fetch']) | 72 return git_rebase_update.main(['--no-fetch']) |
| 73 | 73 |
| 74 | 74 |
| 75 if __name__ == '__main__': # pragma: no cover | 75 if __name__ == '__main__': # pragma: no cover |
| 76 sys.exit(main(sys.argv[1:])) | 76 sys.exit(main(sys.argv[1:])) |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 436963005:
Added hyphen-only options (Closed)
Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master