Skip to content

Commit 6aba6d1

Browse files
committed
support no-pull import update
1 parent f30e969 commit 6aba6d1

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

mx.graalpython/mx_graalpython.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1108,7 +1108,8 @@ def update_import_cmd(args):
11081108
mx.abort("overlays repo must be clean")
11091109
overlaybranch = vc.active_branch(overlaydir)
11101110
if overlaybranch == "master":
1111-
vc.pull(overlaydir)
1111+
if "--no-pull" not in args:
1112+
vc.pull(overlaydir)
11121113
vc.set_branch(overlaydir, current_branch, with_remote=False)
11131114
vc.git_command(overlaydir, ["checkout", current_branch], abortOnError=True)
11141115
elif overlaybranch == current_branch:
@@ -1130,7 +1131,7 @@ def update_import_cmd(args):
11301131
# now update all imports
11311132
for name in imports_to_update:
11321133
for idx, suite_py in enumerate(suite_py_files):
1133-
update_import(name, suite_py, rev=("HEAD" if idx else "origin/master"))
1134+
update_import(name, suite_py, rev=("HEAD" if (idx or "--no-pull" in args) else "origin/master"))
11341135

11351136
# copy files we inline from our imports
11361137
shutil.copy(

0 commit comments

Comments
 (0)