Skip to content

Do not set git repo version if not specified #18167

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

Closed
wants to merge 8 commits into from
Closed

Do not set git repo version if not specified #18167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
63848d4
Maximization fix for ```SystemWindow```
AlexisCnockaert Apr 25, 2025
bcc6277
Merge pull request #18118 from AlexisCnockaert/maximizeFix
Ducasse Apr 26, 2025
1474ffb
do not set a version to a git repo if not specified (will use default…
demarey May 15, 2025
899da13
Merge branch 'Pharo13' into fix-git-repo-version
estebanlm May 16, 2025
b10f1eb
Merge branch 'Pharo13' into fix-git-repo-version
estebanlm May 16, 2025
8800e9d
fix description of git repository
demarey May 16, 2025
251fa10
define a default Branch Cache Key
demarey May 19, 2025
73d05bd
ensure a valid projectVersionPath
demarey May 20, 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
44 changes: 30 additions & 14 deletions src/Metacello-GitBasedRepository/MCGitBasedNetworkRepository.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,12 @@ MCGitBasedNetworkRepository class >> cacheDirectoryPath: aString [
self cacheDirectory: (aString ifNotEmpty: [ aString asFileReference ])
]

{ #category : 'accessing' }
MCGitBasedNetworkRepository class >> defaultBranchCacheKey [

^ '-default-branch-'
]

{ #category : 'private' }
MCGitBasedNetworkRepository class >> defaultCacheDirectory [

Expand All @@ -77,7 +83,7 @@ MCGitBasedNetworkRepository class >> downloadCache [

{ #category : 'accessing' }
MCGitBasedNetworkRepository class >> downloadCacheKey: projectPath version: versionString [
^ projectPath , ':::' , versionString
^ projectPath , ':::' , (versionString ifNil: [ self defaultBranchCacheKey ])
]

{ #category : 'utilities' }
Expand Down Expand Up @@ -339,7 +345,7 @@ MCGitBasedNetworkRepository >> asRepositorySpecFor: aMetacelloMCProject [
MCGitBasedNetworkRepository >> calculateRepositoryDirectory [

| directory |
directory := self class projectDirectoryFrom: self projectPath version: self projectVersion.
directory := self class projectDirectoryFrom: self projectPath version: self projectVersionPath.
self repoPath ifNotEmpty: [ directory := directory resolveString: self repoPath ].
^ directory
]
Expand All @@ -356,12 +362,14 @@ MCGitBasedNetworkRepository >> canUpgradeTo: anMCGitBasedRepository [

{ #category : 'descriptions' }
MCGitBasedNetworkRepository >> description [
| desc |
desc := self class description , self projectPath , ':'
, self projectVersionEscaped.
self repoPath isEmpty
ifTrue: [ ^ desc ].
^ desc , '/' , self repoPath

| desc |
desc := self class description , self projectPath.
self projectVersionEscaped ifNotNil: [ :projectVersionEscaped |
desc := desc , ':' , projectVersionEscaped ].

self repoPath isEmpty ifTrue: [ ^ desc ].
^ desc , '/' , self repoPath
]

{ #category : 'accessing' }
Expand Down Expand Up @@ -516,7 +524,6 @@ MCGitBasedNetworkRepository >> projectTagsUrlFor: aProjectPath [
{ #category : 'accessing' }
MCGitBasedNetworkRepository >> projectVersion [

(projectVersion isNil or: [ projectVersion isEmpty ]) ifTrue: [ projectVersion := 'master' ].
^ projectVersion
]

Expand All @@ -541,11 +548,20 @@ MCGitBasedNetworkRepository >> projectVersion: aString [

{ #category : 'accessing' }
MCGitBasedNetworkRepository >> projectVersionEscaped [
| pv |
pv := self projectVersion.
(projectVersion includes: $/)
ifTrue: [ ^ pv copyReplaceAll: '/' with: '\/' ].
^ pv

| pv |
pv := self projectVersion.
pv ifNil: [ ^ nil ].

(projectVersion includes: $/) ifTrue: [
^ pv copyReplaceAll: '/' with: '\/' ].
^ pv
]

{ #category : 'accessing' }
MCGitBasedNetworkRepository >> projectVersionPath [

^ projectVersion ifNil: [ self class defaultBranchCacheKey ]
]

{ #category : 'accessing' }
Expand Down
29 changes: 15 additions & 14 deletions src/Polymorph-Widgets/SystemWindow.extension.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,24 +474,25 @@ SystemWindow >> drawDropShadowOn: aCanvas [
SystemWindow >> expandBoxHit [
"The fullscreen expand box has been hit"

self canBeMaximized ifFalse: [ ^ self ].
self isCollapsed ifTrue: [
self
hide;
collapseOrExpand.
self unexpandedFrame ifNil: [ self unexpandedFrame: fullFrame ].
self
fullscreen;
setExpandBoxBalloonText.
^ self show ].
self
hide;
collapseOrExpand.
self unexpandedFrame ifNil: [ self unexpandedFrame: fullFrame ].
self
fullscreen;
setExpandBoxBalloonText.
^ self show ].
self unexpandedFrame
ifNil: [
self
unexpandedFrame: fullFrame;
fullscreen ]
self
unexpandedFrame: fullFrame;
fullscreen ]
ifNotNil: [
self
bounds: self unexpandedFrame;
unexpandedFrame: nil ].
self
bounds: self unexpandedFrame;
unexpandedFrame: nil ].
self setExpandBoxBalloonText
]

Expand Down