Skip to content

Allow switching between overrides #1588

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 27, 2025
Merged

Allow switching between overrides #1588

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3e92c15
Add support for being able to switch between --override-repository di…
juj Aug 23, 2025
80c967f
Add missing cwd
juj Aug 23, 2025
a02d8d0
Cleanup
juj Aug 23, 2025
9f396db
Avoid f strings
juj Aug 26, 2025
143bb4d
Fix typo
juj Aug 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Cleanup
  • Loading branch information
@juj
juj committed Aug 23, 2025
commit a02d8d09dad0c29aa545d80d02be5c662e07861b
11 changes: 2 additions & 9 deletions emsdk.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -882,16 +882,9 @@ def git_pull(repo_path, branch_or_tag, remote_name='origin'):
return True


def git_clone_checkout_and_pull(url, dstpath, branch, override_remote_name=None):
def git_clone_checkout_and_pull(url, dstpath, branch, override_remote_name='origin'):
debug_print(f'git_clone_checkout_and_pull(url={url}, dstpath={dstpath}, branch={branch}, override_remote_name={override_remote_name})')

# When overriding, name the local branch as 'remote_branch' to distinguish
# from origin's branches with the same name
if override_remote_name:
pass#branch = f'{override_remote_name}_{branch}'
else:
override_remote_name = 'origin'

# Make sure the repository is cloned first
success = git_clone(url, dstpath, branch, override_remote_name)
if not success:
Expand Down Expand Up @@ -1890,7 +1883,7 @@ def install_tool(self):
elif hasattr(self, 'custom_install_script') and self.custom_install_script == 'build_ccache':
success = build_ccache(self)
elif hasattr(self, 'git_branch'):
success = git_clone_checkout_and_pull(url, self.installation_path(), self.git_branch, getattr(self, 'remote_name', None))
success = git_clone_checkout_and_pull(url, self.installation_path(), self.git_branch, getattr(self, 'remote_name', 'origin'))
elif url.endswith(ARCHIVE_SUFFIXES):
success = download_and_extract(url, self.installation_path(),
filename_prefix=getattr(self, 'download_prefix', ''))
Expand Down