Skip to content

Commit 417768b

Browse files
dalehenrichdalehenrich
committed
Issue #37:almost completed the PREVIEW work ... providing info prior to doing the pull request updates
1 parent 2810702 commit 417768b

11 files changed

Lines changed: 279 additions & 176 deletions

‎bin/cloneProjectsFromProjectSet.solo‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ SuperDoitOptionalOptionWithRequiredArg long: 'remote' default: 'origin'.
66
SuperDoitRequiredOptionWithRequiredArg long: 'projectSet'.
77
SuperDoitOptionalOptionWithRequiredArg long: 'projectDirectory'.
88
SuperDoitOptionalOptionWithNoArg long: 'update'.
9+
SuperDoitOptionalOptionWithNoArg long: 'preview'.
910
}
1011
%
1112
usage
@@ -43,6 +44,9 @@ OPTIONS
4344
Path to directory where the projects will be cloned. If not
4445
specified the projectDirectory associated with the project set
4546
is used.
47+
--preview If present log whether or not a pull request is needed. Useful
48+
to manually review the state of projects PRIOR to doing a pull
49+
request.
4650
--update If present, a pull request will be issued for the origin remote
4751
to update the repository to the latest version of the branch
4852
available.
@@ -57,6 +61,7 @@ EXAMPLES
5761
$basename
5862
$basename --registry=bosch --projectSet=dev --remote=https Rowan \
5963
--projectDirectory=/home/dhenrich/bosch1/_exp_git
64+
$basename -r=bosch --projectSet=_stones Rowan --preview
6065
$basename -r=bosch --projectSet=_stones Rowan --update
6166
-----
6267
%
@@ -113,9 +118,9 @@ doit
113118
projectDir asFileReference ensureCreateDirectory.
114119
Rowan projectTools trace startTracing.
115120
self positionalArgs size = 0
116-
ifTrue: [ projectSet cloneOrUpdateProjectSet: projectDir remoteName: self remote pull: self update]
121+
ifTrue: [ projectSet cloneOrUpdateProjectSet: projectDir remoteName: self remote preview: self preview pull: self update]
117122
ifFalse: [
118123
self positionalArgs do: [:projectName |
119-
projectSet cloneOrUpdateProject: projectName remoteName: self remote in: projectDir pull: self update] ].
124+
projectSet cloneOrUpdateProject: projectName remoteName: self remote in: projectDir preview: self preview pull: self update] ].
120125
true
121126
%

‎bin/createProjectSet.solo‎

Lines changed: 43 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ OPTIONS
3838
Name of the project set.
3939
--empty Creates a new empty project set to replace the original, if
4040
one exists.
41-
--json
41+
--json=<externals_st_json>
4242
Populate projectSet for gemstone development (using
43-
git@git.gemtalksystems.com:gemstone.git) as the remote git
44-
host. The json file is read from stdin. If a project set
45-
with the same name exists, the info from the JSON file will
43+
git@git.gemtalksystems.com:gemstone.git) as the remote origin git
44+
host. The json file is read from <externals_st_json>. If a project
45+
set with the same name exists, the info from the JSON file will
4646
be added to the existing project set.
4747

4848
EXAMPLES
@@ -102,6 +102,25 @@ populateProjectSet: projectSet type: type from: stonSpecDictionaryFilePath
102102
projectSet populateProjectSetGitUrl: type from: (specDictionary at: self key) ]
103103
ifFalse: [self error: 'The dictionary of type ', type printString , ' is not supported.', ' (', self basename, ')'].
104104
%
105+
method
106+
gsOnlyProjectList
107+
"list of gemstone projects that are not present on github"
108+
^ { 'gbj' }
109+
%
110+
method
111+
githubOnlyProjectList
112+
"list of gemstone projects that are not present on github"
113+
^ { 'STON' }
114+
%
115+
method
116+
githubOrganizationFor: projectName
117+
({'GsTestStats' . 'superDoit' } includes: projectName)
118+
ifTrue: [ ^ 'dalehenrich/' ]
119+
ifFalse: [
120+
({'GsDevKit_stones' . 'GsDevKit_upgrade'} includes: projectName)
121+
ifTrue: [ ^ 'GsDevKit/' ]
122+
ifFalse: [ ^ 'GemTalk/' ]]
123+
%
105124
doit
106125
| registryClass stonesRegistry name projectSet stonSpecDictionaryFilePath type |
107126
self preDoitSpecLoad: [:spec |
@@ -144,18 +163,33 @@ doit
144163
{ projectAlias : [ projectName, branch ] } "
145164
dict := STON fromStream: stream ].
146165
dict keysAndValuesDo: [:projectAlias :fields |
147-
| specDict projectName branch |
166+
| specDict projectName branch gitUrls |
148167
projectName := fields at: 1.
149168
branch := fields at: 2.
150169
specDict := projectSet loadSpecs at: projectAlias ifAbsentPut: [Dictionary new].
151170
specDict
152171
at: 'revision'
153172
put: branch.
154-
(specDict
173+
gitUrls := specDict
155174
at: 'gitUrls'
156-
ifAbsentPut: [Dictionary new])
157-
at: 'gs'
158-
put: 'git@git.gemtalksystems.com:', projectName.
175+
ifAbsentPut: [Dictionary new].
176+
(self gsOnlyProjectList includes: projectName)
177+
ifTrue: [
178+
gitUrls
179+
at: 'origin'
180+
put: 'git@git.gemtalksystems.com:', projectName ]
181+
ifFalse: [
182+
(self githubOnlyProjectList includes: projectName)
183+
ifTrue: [
184+
gitUrls
185+
at: 'origin'
186+
put: 'git@github.com:', (self githubOrganizationFor: projectName), projectName, '.git' ]
187+
ifFalse: [
188+
gitUrls
189+
at: 'origin'
190+
put: 'git@github.com:', (self githubOrganizationFor: projectName), projectName, '.git';
191+
at: 'gs'
192+
put: 'git@git.gemtalksystems.com:', projectName ] ].
159193
projectAlias ~= projectName
160194
ifTrue: [
161195
specDict

‎src/GsDevKit_stones-Core.package/GDKProjectSet.class/instance/cloneOrUpdateProject.in..st‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
installation
22
cloneOrUpdateProject: projectName in: gitRootPath
33
"Clone the named project into the gitRootPath directory using the information in the load spec for project. If the project
4-
has already been cloned, then checkout the revision specified in the load spec"
4+
has already been cloned, then checkout the revision specified in the load spec and display a message about whether or not a pull request is needed"
55

6-
self cloneOrUpdateProject: projectName remoteName: 'origin' in: gitRootPath pull: false
6+
self cloneOrUpdateProject: projectName remoteName: 'origin' in: gitRootPath preview: true pull: false

‎src/GsDevKit_stones-Core.package/GDKProjectSet.class/instance/cloneOrUpdateProject.in.pull..st‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
installation
22
cloneOrUpdateProject: projectName in: gitRootPath pull: pull
33
"Clone the named project into the gitRootPath directory using the information in the load spec for project. If the project
4-
has already been cloned, then checkout the revision specified in the load spec"
4+
has already been cloned, then checkout the revision specified in the load spec. If pull is true, then perform a pull request
5+
to update to the latest branch. If pull is false, print a message indicating whether or not a pull request is needed."
56

6-
self cloneOrUpdateProject: projectName remoteName: 'origin' in: gitRootPath pull: pull
7+
self cloneOrUpdateProject: projectName remoteName: 'origin' in: gitRootPath preview: pull not pull: pull

‎src/GsDevKit_stones-Core.package/GDKProjectSet.class/instance/cloneOrUpdateProject.remoteName.in..st‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
installation
22
cloneOrUpdateProject: projectName remoteName: remoteName in: gitRootPath
33
"Clone the named project into the gitRootPath directory using the information in the load spec for project. If the project
4-
has already been cloned, then checkout the revision specified in the load spec"
4+
has already been cloned, then checkout the revision specified in the load spec. Display a message about whether
5+
or not a pull request is needed"
56

6-
self cloneOrUpdateProject: projectName remoteName: remoteName in: gitRootPath pull: false
7+
self cloneOrUpdateProject: projectName remoteName: remoteName in: gitRootPath preview: true pull: false

‎src/GsDevKit_stones-Core.package/GDKProjectSet.class/instance/cloneOrUpdateProject.remoteName.in.preview..st‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
installation
2+
cloneOrUpdateProject: projectName remoteName: remoteName in: gitRootPath preview: preview
3+
"Clone the named project into the gitRootPath directory using the information in the load spec for project. If the project
4+
has already been cloned, then checkout the revision specified in the load spec. If preview is true display a message
5+
about whether or not a pull request is needed"
6+
7+
self
8+
cloneOrUpdateProject: projectName
9+
remoteName: remoteName
10+
in: gitRootPath
11+
preview: preview
12+
pull: false

‎src/GsDevKit_stones-Core.package/GDKProjectSet.class/instance/cloneOrUpdateProject.remoteName.in.preview.pull..st‎

Lines changed: 175 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,175 @@
1+
installation
2+
cloneOrUpdateProject: projectDirName remoteName: remoteName in: gitRootPath preview: preview pull: pull
3+
"Clone the project into the gitRootPath directory using the information in the load spec for project. If the project
4+
has already been cloned, then checkout the revision specified in the load spec. The loadSpecs are indexed by
5+
projectDirName to allow for multiple copies of the project in the same directory. Normally, projectDirName
6+
and projectName are the same."
7+
8+
| wasTracing gitTool specDict gitUrls gitProjectRef gitUrl cloned projectName title stdout |
9+
(wasTracing := Rowan projectTools trace isTracing)
10+
ifTrue: [ Rowan projectTools trace stopTracing ].
11+
gitTool := Rowan gitTools.
12+
specDict := self loadSpecs at: projectDirName.
13+
gitUrls := specDict at: 'gitUrls'.
14+
gitUrl := gitUrls at: remoteName.
15+
projectName := specDict at: 'projectName' ifAbsent: [ projectDirName ].
16+
gitProjectRef := gitRootPath asFileReference / projectDirName.
17+
cloned := false.
18+
title := 'Clone or update ' , projectName.
19+
projectDirName = projectName
20+
ifFalse: [ title := title , ' as ' , projectDirName ].
21+
stdout := GsFile stdout.
22+
stdout
23+
cr;
24+
nextPutAll: '====================';
25+
cr;
26+
nextPutAll: 'Directory ' , gitProjectRef basename printString;
27+
cr;
28+
nextPutAll: 'Project ' , projectName printString;
29+
cr;
30+
nextPutAll: '====================';
31+
cr;
32+
tab;
33+
nextPutAll: 'Remote ' , remoteName;
34+
cr;
35+
tab;
36+
nextPutAll: 'In directory ' , gitProjectRef fullName.
37+
gitProjectRef exists
38+
ifTrue: [
39+
(Rowan gitTools gitstatusIn: gitProjectRef fullName with: '--porcelain') isEmpty
40+
not
41+
ifTrue: [
42+
"the git repository has unsaved modifications, so abort the operation"
43+
self
44+
error:
45+
'There are unsaved changes in ' , gitProjectRef fullName printString
46+
, '. We cannot clone or update a repository with unsaved changes' ] ]
47+
ifFalse: [
48+
| originArg dirNameArg |
49+
"GIT CLONE"
50+
originArg := ''.
51+
remoteName ~= 'origin'
52+
ifTrue: [ originArg := ' --origin ' , remoteName , ' ' ].
53+
dirNameArg := ''.
54+
projectName = projectDirName
55+
ifFalse: [ dirNameArg := ' ' , projectDirName ].
56+
stdout
57+
cr;
58+
tab;
59+
nextPutAll: 'Cloning ' , gitUrl , ' to ' , projectDirName.
60+
stdout
61+
cr;
62+
nextPutAll:
63+
(gitTool
64+
gitcloneIn: gitRootPath
65+
with: originArg , gitUrl , dirNameArg
66+
logging: false).
67+
cloned := true ].
68+
(specDict at: 'revision' ifAbsent: [ ])
69+
ifNotNil: [ :revision |
70+
stdout
71+
cr;
72+
tab;
73+
nextPutAll: 'Set ' , projectDirName , ' revision to ' , revision.
74+
cloned
75+
ifTrue: [
76+
"GIT SWITCH"
77+
stdout
78+
cr;
79+
tab;
80+
nextPutAll:
81+
'Switch (after clone) ' , remoteName , '/' , revision , ' -t -C ' , revision;
82+
cr;
83+
nextPutAll:
84+
(gitTool
85+
performGitCommand: 'switch'
86+
in: gitProjectRef fullName
87+
with: ' ' , remoteName , '/' , revision , ' -t -C ' , revision) ]
88+
ifFalse: [
89+
pull
90+
ifTrue: [
91+
"GIT FETCH
92+
GIT SWITCH
93+
GIT PULL"
94+
stdout
95+
cr;
96+
tab;
97+
nextPutAll: 'Fetch --all '.
98+
stdout
99+
cr;
100+
nextPutAll: (gitTool gitfetchIn: gitProjectRef with: ' --all').
101+
stdout
102+
cr;
103+
tab;
104+
nextPutAll:
105+
'Switch (after fetch) ' , remoteName , '/' , revision , ' -t -C ' , revision.
106+
stdout
107+
cr;
108+
nextPutAll:
109+
(gitTool
110+
performGitCommand: 'switch'
111+
in: gitProjectRef fullName
112+
with: ' ' , remoteName , '/' , revision , ' -t -C ' , revision).
113+
stdout
114+
cr;
115+
tab;
116+
nextPutAll:
117+
'Pull ' , projectName , ' revision: ' , revision , ' from remote: ' , remoteName.
118+
stdout
119+
cr;
120+
nextPutAll:
121+
(gitTool gitpullIn: gitProjectRef fullName remote: remoteName branch: revision) ]
122+
ifFalse: [
123+
preview
124+
ifTrue: [
125+
| currentBranchName |
126+
currentBranchName := Rowan gitTools
127+
gitBranchNameIn: gitProjectRef fullName.
128+
stdout
129+
cr;
130+
nextPutAll: 'Current BRANCHNAME: ' , currentBranchName.
131+
revision = currentBranchName
132+
ifTrue: [
133+
stdout
134+
cr;
135+
nextPutAll: 'PREVIEW:: FETCH and PULL ' , currentBranchName ]
136+
ifFalse: [
137+
stdout
138+
cr;
139+
nextPutAll: '------ Preview FETCH,';
140+
cr;
141+
nextPutAll: '***';
142+
tab;
143+
nextPutAll: 'SWITCH TO ' , revision , ' FROM ' , currentBranchName;
144+
cr;
145+
tab;
146+
nextPutAll: ' and PULL';
147+
nextPutAll: ' ' , revision ] ] ] ] ].
148+
cloned
149+
ifTrue: [
150+
"GIT REMOTE ADD"
151+
(gitUrls keys reject: [ :each | each = remoteName ])
152+
do: [ :theRemote |
153+
self
154+
gitAddRemoteIn: gitProjectRef fullName
155+
remote: theRemote
156+
gitUrl: (gitUrls at: theRemote) ]. "GIT FETCH --all"
157+
stdout
158+
cr;
159+
tab;
160+
nextPutAll: 'Fetch --all '.
161+
stdout
162+
cr;
163+
nextPutAll: (gitTool gitfetchIn: gitProjectRef with: ' --all') ].
164+
stdout
165+
cr;
166+
nextPutAll: '------ branches';
167+
cr;
168+
nextPutAll: (Rowan gitTools gitbranchIn: gitProjectRef fullName with: '');
169+
cr;
170+
nextPutAll: '==========';
171+
cr;
172+
nextPutAll: '==========';
173+
cr.
174+
wasTracing
175+
ifTrue: [ Rowan projectTools trace startTracing ]

0 commit comments

Comments
 (0)