From 072c3a65ad71761e579cc467577343b075a50d57 Mon Sep 17 00:00:00 2001 From: Dale Henrichs Date: Thu, 28 Sep 2023 18:50:33 -0700 Subject: [PATCH] finish filling out the missing remoteName combos for cloneOrUpdateProjectSet variants --- bin/cloneProjectsFromProjectSet.solo | 2 +- .../instance/cloneOrUpdateProject.remoteName.in..st | 6 ++++++ .../instance/cloneOrUpdateProjectSet.pull..st | 5 +++-- .../instance/cloneOrUpdateProjectSet.remoteName..st | 3 +++ .../instance/cloneOrUpdateProjectSet.remoteName.pull..st | 4 ++++ 5 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 src/GsDevKit_stones-Core.package/GDKProjectSet.class/instance/cloneOrUpdateProject.remoteName.in..st create mode 100644 src/GsDevKit_stones-Core.package/GDKProjectSet.class/instance/cloneOrUpdateProjectSet.remoteName..st create mode 100644 src/GsDevKit_stones-Core.package/GDKProjectSet.class/instance/cloneOrUpdateProjectSet.remoteName.pull..st diff --git a/bin/cloneProjectsFromProjectSet.solo b/bin/cloneProjectsFromProjectSet.solo index 58287706..1a8b92b0 100755 --- a/bin/cloneProjectsFromProjectSet.solo +++ b/bin/cloneProjectsFromProjectSet.solo @@ -91,7 +91,7 @@ doit projectDir asFileReference ensureCreateDirectory. Rowan projectTools trace startTracing. self positionalArgs size = 0 - ifTrue: [ projectSet cloneOrUpdateProjectSet: projectDir pull: self update] + ifTrue: [ projectSet cloneOrUpdateProjectSet: projectDir remoteName: self remote pull: self update] ifFalse: [ self positionalArgs do: [:projectName | projectSet cloneOrUpdateProject: projectName remoteName: self remote in: projectDir pull: self update] ]. diff --git a/src/GsDevKit_stones-Core.package/GDKProjectSet.class/instance/cloneOrUpdateProject.remoteName.in..st b/src/GsDevKit_stones-Core.package/GDKProjectSet.class/instance/cloneOrUpdateProject.remoteName.in..st new file mode 100644 index 00000000..cbcc92eb --- /dev/null +++ b/src/GsDevKit_stones-Core.package/GDKProjectSet.class/instance/cloneOrUpdateProject.remoteName.in..st @@ -0,0 +1,6 @@ +installation +cloneOrUpdateProject: projectName remoteName: remoteName in: gitRootPath + "Clone the named project into the gitRootPath directory using the information in the load spec for project. If the project + has already been cloned, then checkout the revision specified in the load spec" + + self cloneOrUpdateProject: projectName remoteName: remoteName in: gitRootPath pull: false \ No newline at end of file diff --git a/src/GsDevKit_stones-Core.package/GDKProjectSet.class/instance/cloneOrUpdateProjectSet.pull..st b/src/GsDevKit_stones-Core.package/GDKProjectSet.class/instance/cloneOrUpdateProjectSet.pull..st index 18743954..2a0a5fb5 100644 --- a/src/GsDevKit_stones-Core.package/GDKProjectSet.class/instance/cloneOrUpdateProjectSet.pull..st +++ b/src/GsDevKit_stones-Core.package/GDKProjectSet.class/instance/cloneOrUpdateProjectSet.pull..st @@ -1,4 +1,5 @@ installation cloneOrUpdateProjectSet: gitRootPath pull: pull - self loadSpecs - keysDo: [ :projectName | self cloneOrUpdateProject: projectName in: gitRootPath pull: pull ] \ No newline at end of file + + self cloneOrUpdateProjectSet: gitRootPath remoteName: 'origin' pull: pull + diff --git a/src/GsDevKit_stones-Core.package/GDKProjectSet.class/instance/cloneOrUpdateProjectSet.remoteName..st b/src/GsDevKit_stones-Core.package/GDKProjectSet.class/instance/cloneOrUpdateProjectSet.remoteName..st new file mode 100644 index 00000000..681dab45 --- /dev/null +++ b/src/GsDevKit_stones-Core.package/GDKProjectSet.class/instance/cloneOrUpdateProjectSet.remoteName..st @@ -0,0 +1,3 @@ +installation +cloneOrUpdateProjectSet: gitRootPath remoteName: remoteName + self cloneOrUpdateProjectSet: gitRootPath remoteName: remoteName pull: false \ No newline at end of file diff --git a/src/GsDevKit_stones-Core.package/GDKProjectSet.class/instance/cloneOrUpdateProjectSet.remoteName.pull..st b/src/GsDevKit_stones-Core.package/GDKProjectSet.class/instance/cloneOrUpdateProjectSet.remoteName.pull..st new file mode 100644 index 00000000..f0f11172 --- /dev/null +++ b/src/GsDevKit_stones-Core.package/GDKProjectSet.class/instance/cloneOrUpdateProjectSet.remoteName.pull..st @@ -0,0 +1,4 @@ +installation +cloneOrUpdateProjectSet: gitRootPath remoteName: remoteName pull: pull + self loadSpecs + keysDo: [ :projectName | self cloneOrUpdateProject: projectName remoteName: remoteName in: gitRootPath pull: pull ] \ No newline at end of file