From 63848d444b02f43634d6c0c5f5f156d323e59390 Mon Sep 17 00:00:00 2001 From: AlexisCnockaert Date: Fri, 25 Apr 2025 14:32:19 +0200 Subject: [PATCH 1/5] Maximization fix for ```SystemWindow``` When a window was not resizable, the user could maximize it by a click on the box, which makes no sense --- .../SystemWindow.extension.st | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/src/Polymorph-Widgets/SystemWindow.extension.st b/src/Polymorph-Widgets/SystemWindow.extension.st index b4d0b2d0d6b..9731bc586a4 100644 --- a/src/Polymorph-Widgets/SystemWindow.extension.st +++ b/src/Polymorph-Widgets/SystemWindow.extension.st @@ -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 ] From 1474ffbe495493cafd9ffc3ee0c862061492f263 Mon Sep 17 00:00:00 2001 From: Christophe Demarey Date: Thu, 15 May 2025 16:21:02 +0200 Subject: [PATCH 2/5] do not set a version to a git repo if not specified (will use default branch) --- .../MCGitBasedNetworkRepository.class.st | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Metacello-GitBasedRepository/MCGitBasedNetworkRepository.class.st b/src/Metacello-GitBasedRepository/MCGitBasedNetworkRepository.class.st index 423079905d6..76c2e77aac1 100644 --- a/src/Metacello-GitBasedRepository/MCGitBasedNetworkRepository.class.st +++ b/src/Metacello-GitBasedRepository/MCGitBasedNetworkRepository.class.st @@ -516,7 +516,6 @@ MCGitBasedNetworkRepository >> projectTagsUrlFor: aProjectPath [ { #category : 'accessing' } MCGitBasedNetworkRepository >> projectVersion [ - (projectVersion isNil or: [ projectVersion isEmpty ]) ifTrue: [ projectVersion := 'master' ]. ^ projectVersion ] From 8800e9d28fe6f2b8143efd74e1ab64881fa4e56c Mon Sep 17 00:00:00 2001 From: Christophe Demarey Date: Fri, 16 May 2025 17:08:18 +0200 Subject: [PATCH 3/5] fix description of git repository --- .../MCGitBasedNetworkRepository.class.st | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/src/Metacello-GitBasedRepository/MCGitBasedNetworkRepository.class.st b/src/Metacello-GitBasedRepository/MCGitBasedNetworkRepository.class.st index 76c2e77aac1..14638207238 100644 --- a/src/Metacello-GitBasedRepository/MCGitBasedNetworkRepository.class.st +++ b/src/Metacello-GitBasedRepository/MCGitBasedNetworkRepository.class.st @@ -356,12 +356,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' } @@ -540,11 +542,14 @@ 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' } From 251fa1033195a11a361126b2ddf5ba8f0393067b Mon Sep 17 00:00:00 2001 From: Christophe Demarey Date: Mon, 19 May 2025 11:25:44 +0200 Subject: [PATCH 4/5] define a default Branch Cache Key --- .../MCGitBasedNetworkRepository.class.st | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Metacello-GitBasedRepository/MCGitBasedNetworkRepository.class.st b/src/Metacello-GitBasedRepository/MCGitBasedNetworkRepository.class.st index 14638207238..712b289012a 100644 --- a/src/Metacello-GitBasedRepository/MCGitBasedNetworkRepository.class.st +++ b/src/Metacello-GitBasedRepository/MCGitBasedNetworkRepository.class.st @@ -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 [ @@ -77,7 +83,7 @@ MCGitBasedNetworkRepository class >> downloadCache [ { #category : 'accessing' } MCGitBasedNetworkRepository class >> downloadCacheKey: projectPath version: versionString [ - ^ projectPath , ':::' , versionString + ^ projectPath , ':::' , (versionString ifNil: [ self defaultBranchCacheKey ]) ] { #category : 'utilities' } From 73d05bd7402ba630a7e59fce20281823c19775bf Mon Sep 17 00:00:00 2001 From: Christophe Demarey Date: Tue, 20 May 2025 11:55:25 +0200 Subject: [PATCH 5/5] ensure a valid projectVersionPath --- .../MCGitBasedNetworkRepository.class.st | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Metacello-GitBasedRepository/MCGitBasedNetworkRepository.class.st b/src/Metacello-GitBasedRepository/MCGitBasedNetworkRepository.class.st index 712b289012a..4e2c90e1838 100644 --- a/src/Metacello-GitBasedRepository/MCGitBasedNetworkRepository.class.st +++ b/src/Metacello-GitBasedRepository/MCGitBasedNetworkRepository.class.st @@ -345,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 ] @@ -558,6 +558,12 @@ MCGitBasedNetworkRepository >> projectVersionEscaped [ ^ pv ] +{ #category : 'accessing' } +MCGitBasedNetworkRepository >> projectVersionPath [ + + ^ projectVersion ifNil: [ self class defaultBranchCacheKey ] +] + { #category : 'accessing' } MCGitBasedNetworkRepository >> projectVersionPattern [ "do not set projectVersionPattern unless it _is_ a pattern: includes $#, %*, or $?"