averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[update-checkout] Add an option --reset-to-remote that can be used with --branch to reset a selected scheme's local branches to the remote branch state.

Browse Source 
This is useful when one has done some quick prototyping work on the various
repos of a scheme that one wants to quickly get rid of.
This commit is contained in:
Michael Gottesman
2016-07-11 13:53:16 -07:00
parent cd59716c78
commit ecddf6bb93
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
utils/update-checkout
View File

@@ -32,12 +32,14 @@ sys.path.append(os.path.join(SCRIPT_DIR, 'swift_build_support'))
from swift_build_support import shell # noqa (E402)
def update_single_repository(repo_path, branch):
def update_single_repository(repo_path, branch, reset_to_remote):
if not os.path.isdir(repo_path):
return
print("--- Updating '" + repo_path + "' ---")
with shell.pushd(repo_path, dry_run=False, echo=False):
shell.call(["git", "fetch"], echo=False)
if branch:
status = shell.capture(['git', 'status', '--porcelain', '-uno'],
echo=False)
@@ -47,10 +49,16 @@ def update_single_repository(repo_path, branch):
exit(1)
shell.call(['git', 'checkout', branch], echo=False)
# If we were asked to reset to the specified branch, do the hard
# reset and return.
if reset_to_remote:
shell.call(['git', 'reset', '--hard', "origin/%s" % branch],
echo=False)
return
# Prior to Git 2.6, this is the way to do a "git pull
# --rebase" that respects rebase.autostash. See
# http://stackoverflow.com/a/30209750/125349
shell.call(["git", "fetch"], echo=False)
shell.call(["git", "rebase", "FETCH_HEAD"], echo=False)
shell.call(["git", "submodule", "update", "--recursive"],
echo=False)
@@ -74,7 +82,8 @@ def update_all_repositories(args, config, scheme_name):
break
update_single_repository(os.path.join(SWIFT_SOURCE_ROOT, repo_name),
repo_branch)
repo_branch,
args.reset_to_remote)
def obtain_additional_swift_sources(
@@ -181,6 +190,10 @@ By default, updates your checkouts of Swift, SourceKit, LLDB, and SwiftPM.""")
help='Obtain Sources for specific branch',
metavar='BRANCH',
dest='scheme')
parser.add_argument(
'--reset-to-remote',
help='Reset each branch to the remote state.',
action='store_true')
parser.add_argument(
"--config",
default=os.path.join(SCRIPT_DIR, "update-checkout-config.json"),
@@ -197,8 +210,8 @@ By default, updates your checkouts of Swift, SourceKit, LLDB, and SwiftPM.""")
validate_config(config)
if clone or clone_with_ssh:
# If branch is None, default to using the default branch alias specified by
# our configuration file.
# If branch is None, default to using the default branch alias
# specified by our configuration file.
if scheme is None:
scheme = config['default-branch-scheme']