Skip to content
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

Jump to bottom

Add --stash as alternative to --clean to update-checkout #71178

Merged
merged 3 commits into from Mar 21, 2024
Merged

Add --stash as alternative to --clean to update-checkout #71178

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf35029
Add `--stash` as alternative to `--clean` to `update-checkout`
MaxDesiatov Jan 26, 2024
b6e475b
Apply suggestions from code review
MaxDesiatov Mar 21, 2024
3c8cdea
Fix linter warnings
MaxDesiatov Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 14 additions & 5 deletions utils/update_checkout/update_checkout/update_checkout.py
View file
Open in desktop
Expand Up @@ -148,7 +148,7 @@ def get_branch_for_repo(config, repo_name, scheme_name, scheme_map,

def update_single_repository(pool_args):
source_root, config, repo_name, scheme_name, scheme_map, tag, timestamp, \
reset_to_remote, should_clean, cross_repos_pr = pool_args
reset_to_remote, should_clean, should_stash, cross_repos_pr = pool_args
repo_path = os.path.join(source_root, repo_name)
if not os.path.isdir(repo_path) or os.path.islink(repo_path):
return
Expand All @@ -171,9 +171,13 @@ def update_single_repository(pool_args):
checkout_target)

# The clean option restores a repository to pristine condition.
if should_clean:
shell.run(['git', 'clean', '-fdx'],
echo=True, prefix=prefix)
if should_clean or should_stash:
if should_stash:
shell.run(['git', 'stash'],
echo=True, prefix=prefix)
elif should_clean:
shell.run(['git', 'clean', '-fdx'],
echo=True, prefix=prefix)
shell.run(['git', 'submodule', 'foreach', '--recursive',
'git', 'clean', '-fdx'],
echo=True, prefix=prefix)
AnthonyLatsis marked this conversation as resolved.
Show resolved Hide resolved
Expand Down Expand Up @@ -343,6 +347,7 @@ def update_all_repositories(args, config, scheme_name, scheme_map, cross_repos_p
timestamp,
args.reset_to_remote,
args.clean,
args.stash,
cross_repos_pr]
pool_args.append(my_args)

Expand Down Expand Up @@ -605,7 +610,11 @@ def main():
action='store_true')
parser.add_argument(
'--clean',
help='Clean unrelated files from each repository.',
help='Clean untracked files from each repository.',
action='store_true')
parser.add_argument(
'--stash',
help='Stash untracked files from each repository.',
action='store_true')
parser.add_argument(
"--config",
Expand Down