From c686146a9a05806d997b03f41e495c629bb2a647 Mon Sep 17 00:00:00 2001 From: Eva Krebs Date: Sat, 17 Jul 2021 12:16:16 +0200 Subject: [PATCH 01/19] start minimal ui (remove stuff, add clone button) --- src/BaselineOfSquot.package/.squot-contents | 2 +- src/FileSystem-Git.package/.squot-contents | 2 +- src/Squit.package/.squot-contents | 2 +- .../SwaSquitBrowser.class}/README.md | 0 .../instance/buildButtonBar..st | 40 +++++++++++++++++++ .../instance/buildCloneButton..st | 23 +++++++++++ .../instance/buildCommitList..st | 24 +++++++++++ .../instance/buildCommitSearchPanel..st | 11 +++++ .../instance/buildProjectBranchPanel..st | 12 ++++++ .../instance/buildProjectList..st | 12 ++++++ .../SwaSquitBrowser.class/instance/clone.st | 8 ++++ .../instance/offerToAddFirstProject.st | 2 + .../methodProperties.json | 12 ++++++ .../SwaSquitBrowser.class}/properties.json | 6 +-- .../SwaSquitInteractiveClone.class}/README.md | 0 .../instance/clone.st | 8 ++++ .../instance/createRepository.st | 8 ++++ .../instance/registerWorkingCopy.st | 9 +++++ .../instance/requestProjectName.st | 6 +++ .../methodProperties.json | 8 ++++ .../properties.json | 8 ++-- .../monticello.meta/categories.st | 1 + src/SquotTonel-Core.package/.squot-contents | 2 +- src/SquotTonel-Tests.package/.squot-contents | 2 +- .../class/squotTonelSerializer.st | 4 ++ .../methodProperties.json | 5 +++ .../PackageInfo.extension/properties.json | 2 + .../instance/testFindTonelPackage.st | 12 ------ .../methodProperties.json | 5 --- .../properties.json | 2 - .../instance/isInsideCypressDirectory..st | 5 +++ .../instance/tonelPackageLocator.st | 18 +++++++++ .../methodProperties.json | 6 +++ .../properties.json | 2 + .../instance/trackPackage.st | 4 -- .../methodProperties.json | 5 --- .../README.md | 0 .../class/canReadObjectSerializedBy..st | 3 ++ .../class/initialize.st | 4 ++ .../class/unload.st | 3 ++ .../instance/fillContentOf.from..st | 11 +++++ .../methodProperties.json | 7 ++++ .../properties.json | 14 +++++++ .../testCanReadFromTonelSerializer.st | 4 -- .../methodProperties.json | 5 --- .../instance/package.st | 3 -- .../instance/setUp.st | 12 ------ .../instance/tearDown.st | 3 -- .../instance/testCypressToTonel.st | 24 ----------- .../instance/testTonelToCypress.st | 24 ----------- .../methodProperties.json | 9 ----- .../properties.json | 18 --------- .../instance/testFindsMultiplePackages.st | 18 --------- .../testFindsPackageInSubdirectory.st | 10 ----- .../instance/testFindsPackageUnderRoot.st | 10 ----- ...esCypressPackagesWithMethodNamedPackage.st | 10 ----- .../methodProperties.json | 8 ---- .../instance/artifactWithoutTimestamps..st | 9 ----- .../instance/sampleArtifact.st | 17 -------- .../sampleArtifactWithoutTimestamps.st | 9 ----- .../instance/setUp.st | 8 ---- .../instance/tearDown.st | 7 ---- .../instance/testWriteAndReadOfPackage.st | 21 ---------- ...testWriteAndReadOfPackageWithTimestamps.st | 25 ------------ .../instance/withoutTimestamps..st | 13 ------ .../methodProperties.json | 12 ------ .../properties.json | 21 ---------- .../README.md | 0 .../class/rewritePath.for..st | 12 ++++++ .../class/userFriendlyTitle.st | 3 ++ .../instance/propertiesFileContents.st | 7 ++++ .../instance/version.st | 3 ++ .../instance/write..st | 8 ++++ .../writeMCSnapshot.forPackageNamed.from..st | 5 +++ ...forPackageNamed.packageProperties.from..st | 9 +++++ .../methodProperties.json | 10 +++++ .../properties.json | 14 +++++++ .../instance/testRewriteCypressPath.st | 8 ---- ...estRewriteEmptyPathAddsPackageDirectory.st | 8 ---- .../testRewritePathAddsPackageDirectory.st | 8 ---- ...stRewritePathWithPackageAlreadyIncluded.st | 8 ---- .../instance/testWritesPropertiesFile.st | 12 ------ .../methodProperties.json | 9 ----- .../TemporarySystemChangeFile.class/README.md | 0 .../instance/delete.st | 4 -- .../instance/directory.st | 4 -- .../instance/genericChangesName.st | 3 -- .../instance/prefixChangesName.st | 3 -- .../instance/prefixGeneral.st | 3 -- .../instance/randomString.st | 3 -- .../instance/tempChangesName.st | 3 -- .../instance/useStandardChangesFile.st | 5 --- .../instance/useTemporaryChangesFile.st | 5 --- .../methodProperties.json | 13 ------ .../properties.json | 15 ------- .../instance/currentPackageProperties.st | 9 +++++ .../methodProperties.json | 5 +++ .../TonelReader.extension/properties.json | 2 + .../README.md | 0 .../instance/fileUtils.st | 3 ++ .../methodProperties.json | 5 +++ .../properties.json | 6 +-- .../README.md | 0 .../instance/fileUtils.st | 3 ++ .../methodProperties.json | 5 +++ .../properties.json | 6 +-- .../monticello.meta/categories.st | 2 +- src/VersionControl.package/.squot-contents | 2 +- 108 files changed, 391 insertions(+), 462 deletions(-) rename src/{SquotTonel-Tests.package/SquotTonelAutotrackingTest.class => Squit.package/SwaSquitBrowser.class}/README.md (100%) create mode 100644 src/Squit.package/SwaSquitBrowser.class/instance/buildButtonBar..st create mode 100644 src/Squit.package/SwaSquitBrowser.class/instance/buildCloneButton..st create mode 100644 src/Squit.package/SwaSquitBrowser.class/instance/buildCommitList..st create mode 100644 src/Squit.package/SwaSquitBrowser.class/instance/buildCommitSearchPanel..st create mode 100644 src/Squit.package/SwaSquitBrowser.class/instance/buildProjectBranchPanel..st create mode 100644 src/Squit.package/SwaSquitBrowser.class/instance/buildProjectList..st create mode 100644 src/Squit.package/SwaSquitBrowser.class/instance/clone.st create mode 100644 src/Squit.package/SwaSquitBrowser.class/instance/offerToAddFirstProject.st create mode 100644 src/Squit.package/SwaSquitBrowser.class/methodProperties.json rename src/{SquotTonel-Tests.package/SquotTonelSerializerTest.class => Squit.package/SwaSquitBrowser.class}/properties.json (58%) rename src/{SquotTonel-Tests.package/SquotTonelDeserializerTest.class => Squit.package/SwaSquitInteractiveClone.class}/README.md (100%) create mode 100644 src/Squit.package/SwaSquitInteractiveClone.class/instance/clone.st create mode 100644 src/Squit.package/SwaSquitInteractiveClone.class/instance/createRepository.st create mode 100644 src/Squit.package/SwaSquitInteractiveClone.class/instance/registerWorkingCopy.st create mode 100644 src/Squit.package/SwaSquitInteractiveClone.class/instance/requestProjectName.st create mode 100644 src/Squit.package/SwaSquitInteractiveClone.class/methodProperties.json rename src/{SquotTonel-Tests.package/SquotTonelAutotrackingTest.class => Squit.package/SwaSquitInteractiveClone.class}/properties.json (51%) create mode 100644 src/SquotTonel-Tests.package/PackageInfo.extension/class/squotTonelSerializer.st create mode 100644 src/SquotTonel-Tests.package/PackageInfo.extension/methodProperties.json create mode 100644 src/SquotTonel-Tests.package/PackageInfo.extension/properties.json delete mode 100644 src/SquotTonel-Tests.package/SquotFileStoreArtifactGuessingTest.extension/instance/testFindTonelPackage.st delete mode 100644 src/SquotTonel-Tests.package/SquotFileStoreArtifactGuessingTest.extension/methodProperties.json delete mode 100644 src/SquotTonel-Tests.package/SquotFileStoreArtifactGuessingTest.extension/properties.json create mode 100644 src/SquotTonel-Tests.package/SquotFileSystemStore.extension/instance/isInsideCypressDirectory..st create mode 100644 src/SquotTonel-Tests.package/SquotFileSystemStore.extension/instance/tonelPackageLocator.st create mode 100644 src/SquotTonel-Tests.package/SquotFileSystemStore.extension/methodProperties.json create mode 100644 src/SquotTonel-Tests.package/SquotFileSystemStore.extension/properties.json delete mode 100644 src/SquotTonel-Tests.package/SquotTonelAutotrackingTest.class/instance/trackPackage.st delete mode 100644 src/SquotTonel-Tests.package/SquotTonelAutotrackingTest.class/methodProperties.json rename src/SquotTonel-Tests.package/{SquotTonelFileTreeConversionTest.class => SquotTonelDeserializer.class}/README.md (100%) create mode 100644 src/SquotTonel-Tests.package/SquotTonelDeserializer.class/class/canReadObjectSerializedBy..st create mode 100644 src/SquotTonel-Tests.package/SquotTonelDeserializer.class/class/initialize.st create mode 100644 src/SquotTonel-Tests.package/SquotTonelDeserializer.class/class/unload.st create mode 100644 src/SquotTonel-Tests.package/SquotTonelDeserializer.class/instance/fillContentOf.from..st create mode 100644 src/SquotTonel-Tests.package/SquotTonelDeserializer.class/methodProperties.json create mode 100644 src/SquotTonel-Tests.package/SquotTonelDeserializer.class/properties.json delete mode 100644 src/SquotTonel-Tests.package/SquotTonelDeserializerTest.class/instance/testCanReadFromTonelSerializer.st delete mode 100644 src/SquotTonel-Tests.package/SquotTonelDeserializerTest.class/methodProperties.json delete mode 100644 src/SquotTonel-Tests.package/SquotTonelFileTreeConversionTest.class/instance/package.st delete mode 100644 src/SquotTonel-Tests.package/SquotTonelFileTreeConversionTest.class/instance/setUp.st delete mode 100644 src/SquotTonel-Tests.package/SquotTonelFileTreeConversionTest.class/instance/tearDown.st delete mode 100644 src/SquotTonel-Tests.package/SquotTonelFileTreeConversionTest.class/instance/testCypressToTonel.st delete mode 100644 src/SquotTonel-Tests.package/SquotTonelFileTreeConversionTest.class/instance/testTonelToCypress.st delete mode 100644 src/SquotTonel-Tests.package/SquotTonelFileTreeConversionTest.class/methodProperties.json delete mode 100644 src/SquotTonel-Tests.package/SquotTonelFileTreeConversionTest.class/properties.json delete mode 100644 src/SquotTonel-Tests.package/SquotTonelPackageLocatorTest.class/instance/testFindsMultiplePackages.st delete mode 100644 src/SquotTonel-Tests.package/SquotTonelPackageLocatorTest.class/instance/testFindsPackageInSubdirectory.st delete mode 100644 src/SquotTonel-Tests.package/SquotTonelPackageLocatorTest.class/instance/testFindsPackageUnderRoot.st delete mode 100644 src/SquotTonel-Tests.package/SquotTonelPackageLocatorTest.class/instance/testIgnoresCypressPackagesWithMethodNamedPackage.st delete mode 100644 src/SquotTonel-Tests.package/SquotTonelPackageLocatorTest.class/methodProperties.json delete mode 100644 src/SquotTonel-Tests.package/SquotTonelReadWriteTest.class/instance/artifactWithoutTimestamps..st delete mode 100644 src/SquotTonel-Tests.package/SquotTonelReadWriteTest.class/instance/sampleArtifact.st delete mode 100644 src/SquotTonel-Tests.package/SquotTonelReadWriteTest.class/instance/sampleArtifactWithoutTimestamps.st delete mode 100644 src/SquotTonel-Tests.package/SquotTonelReadWriteTest.class/instance/setUp.st delete mode 100644 src/SquotTonel-Tests.package/SquotTonelReadWriteTest.class/instance/tearDown.st delete mode 100644 src/SquotTonel-Tests.package/SquotTonelReadWriteTest.class/instance/testWriteAndReadOfPackage.st delete mode 100644 src/SquotTonel-Tests.package/SquotTonelReadWriteTest.class/instance/testWriteAndReadOfPackageWithTimestamps.st delete mode 100644 src/SquotTonel-Tests.package/SquotTonelReadWriteTest.class/instance/withoutTimestamps..st delete mode 100644 src/SquotTonel-Tests.package/SquotTonelReadWriteTest.class/methodProperties.json delete mode 100644 src/SquotTonel-Tests.package/SquotTonelReadWriteTest.class/properties.json rename src/SquotTonel-Tests.package/{SquotTonelPackageLocatorTest.class => SquotTonelSerializer.class}/README.md (100%) create mode 100644 src/SquotTonel-Tests.package/SquotTonelSerializer.class/class/rewritePath.for..st create mode 100644 src/SquotTonel-Tests.package/SquotTonelSerializer.class/class/userFriendlyTitle.st create mode 100644 src/SquotTonel-Tests.package/SquotTonelSerializer.class/instance/propertiesFileContents.st create mode 100644 src/SquotTonel-Tests.package/SquotTonelSerializer.class/instance/version.st create mode 100644 src/SquotTonel-Tests.package/SquotTonelSerializer.class/instance/write..st create mode 100644 src/SquotTonel-Tests.package/SquotTonelSerializer.class/instance/writeMCSnapshot.forPackageNamed.from..st create mode 100644 src/SquotTonel-Tests.package/SquotTonelSerializer.class/instance/writeMCSnapshot.forPackageNamed.packageProperties.from..st create mode 100644 src/SquotTonel-Tests.package/SquotTonelSerializer.class/methodProperties.json create mode 100644 src/SquotTonel-Tests.package/SquotTonelSerializer.class/properties.json delete mode 100644 src/SquotTonel-Tests.package/SquotTonelSerializerTest.class/instance/testRewriteCypressPath.st delete mode 100644 src/SquotTonel-Tests.package/SquotTonelSerializerTest.class/instance/testRewriteEmptyPathAddsPackageDirectory.st delete mode 100644 src/SquotTonel-Tests.package/SquotTonelSerializerTest.class/instance/testRewritePathAddsPackageDirectory.st delete mode 100644 src/SquotTonel-Tests.package/SquotTonelSerializerTest.class/instance/testRewritePathWithPackageAlreadyIncluded.st delete mode 100644 src/SquotTonel-Tests.package/SquotTonelSerializerTest.class/instance/testWritesPropertiesFile.st delete mode 100644 src/SquotTonel-Tests.package/SquotTonelSerializerTest.class/methodProperties.json delete mode 100644 src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/README.md delete mode 100644 src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/instance/delete.st delete mode 100644 src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/instance/directory.st delete mode 100644 src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/instance/genericChangesName.st delete mode 100644 src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/instance/prefixChangesName.st delete mode 100644 src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/instance/prefixGeneral.st delete mode 100644 src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/instance/randomString.st delete mode 100644 src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/instance/tempChangesName.st delete mode 100644 src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/instance/useStandardChangesFile.st delete mode 100644 src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/instance/useTemporaryChangesFile.st delete mode 100644 src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/methodProperties.json delete mode 100644 src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/properties.json create mode 100644 src/SquotTonel-Tests.package/TonelReader.extension/instance/currentPackageProperties.st create mode 100644 src/SquotTonel-Tests.package/TonelReader.extension/methodProperties.json create mode 100644 src/SquotTonel-Tests.package/TonelReader.extension/properties.json rename src/SquotTonel-Tests.package/{SquotTonelReadWriteTest.class => TonelReaderForFileSystem.class}/README.md (100%) create mode 100644 src/SquotTonel-Tests.package/TonelReaderForFileSystem.class/instance/fileUtils.st create mode 100644 src/SquotTonel-Tests.package/TonelReaderForFileSystem.class/methodProperties.json rename src/SquotTonel-Tests.package/{SquotTonelDeserializerTest.class => TonelReaderForFileSystem.class}/properties.json (58%) rename src/SquotTonel-Tests.package/{SquotTonelSerializerTest.class => TonelWriterForFileSystem.class}/README.md (100%) create mode 100644 src/SquotTonel-Tests.package/TonelWriterForFileSystem.class/instance/fileUtils.st create mode 100644 src/SquotTonel-Tests.package/TonelWriterForFileSystem.class/methodProperties.json rename src/SquotTonel-Tests.package/{SquotTonelPackageLocatorTest.class => TonelWriterForFileSystem.class}/properties.json (54%) diff --git a/src/BaselineOfSquot.package/.squot-contents b/src/BaselineOfSquot.package/.squot-contents index b5d4d4099..4b0df335b 100644 --- a/src/BaselineOfSquot.package/.squot-contents +++ b/src/BaselineOfSquot.package/.squot-contents @@ -1,6 +1,6 @@ SquotTrackedObjectMetadata { #objectClassName : #PackageInfo, + #slotOverrides : { }, #objectsReplacedByNames : true, - #slotOverrides : IdentityDictionary { }, #serializer : #SquotCypressCodeSerializer } \ No newline at end of file diff --git a/src/FileSystem-Git.package/.squot-contents b/src/FileSystem-Git.package/.squot-contents index b5d4d4099..4b0df335b 100644 --- a/src/FileSystem-Git.package/.squot-contents +++ b/src/FileSystem-Git.package/.squot-contents @@ -1,6 +1,6 @@ SquotTrackedObjectMetadata { #objectClassName : #PackageInfo, + #slotOverrides : { }, #objectsReplacedByNames : true, - #slotOverrides : IdentityDictionary { }, #serializer : #SquotCypressCodeSerializer } \ No newline at end of file diff --git a/src/Squit.package/.squot-contents b/src/Squit.package/.squot-contents index b5d4d4099..4b0df335b 100644 --- a/src/Squit.package/.squot-contents +++ b/src/Squit.package/.squot-contents @@ -1,6 +1,6 @@ SquotTrackedObjectMetadata { #objectClassName : #PackageInfo, + #slotOverrides : { }, #objectsReplacedByNames : true, - #slotOverrides : IdentityDictionary { }, #serializer : #SquotCypressCodeSerializer } \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/SquotTonelAutotrackingTest.class/README.md b/src/Squit.package/SwaSquitBrowser.class/README.md similarity index 100% rename from src/SquotTonel-Tests.package/SquotTonelAutotrackingTest.class/README.md rename to src/Squit.package/SwaSquitBrowser.class/README.md diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/buildButtonBar..st b/src/Squit.package/SwaSquitBrowser.class/instance/buildButtonBar..st new file mode 100644 index 000000000..ab990b7bb --- /dev/null +++ b/src/Squit.package/SwaSquitBrowser.class/instance/buildButtonBar..st @@ -0,0 +1,40 @@ +toolbuilder +buildButtonBar: builder + | buttonBar commitButton pullButton pushButton | + buttonBar := builder pluggablePanelSpec new + layout: #horizontal; + "spacing: -1;" + children: OrderedCollection new; + frame: (LayoutFrame new leftFraction: 0 offset: 0; + topFraction: 0.6 offset: -25; + rightFraction: 1 offset: 0; + bottomFraction: 0.6 offset: 0) + yourself. + + commitButton := builder pluggableActionButtonSpec new. + commitButton + model: self; + label: 'Commit'; + enabled: #hasProjectSelection; + action: #actionCommit; + help: 'Commit your current changes.'. + + pullButton := builder pluggableActionButtonSpec new. + pullButton + model: self; + label: 'Pull'; + enabled: #hasBranchSelection; + action: #actionPull; + help: 'Pull commits into the active branch from its tracked remote branch.'. + + pushButton := builder pluggableActionButtonSpec new. + pushButton + model: self; + label: 'Push'; + enabled: #hasBranchSelection; + action: #actionPush; + help: 'Push commits to a remote.'. + + buttonBar children addAll: { + commitButton. pushButton. pullButton}. + ^ buttonBar \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/buildCloneButton..st b/src/Squit.package/SwaSquitBrowser.class/instance/buildCloneButton..st new file mode 100644 index 000000000..6a2cf85af --- /dev/null +++ b/src/Squit.package/SwaSquitBrowser.class/instance/buildCloneButton..st @@ -0,0 +1,23 @@ +toolbuilder +buildCloneButton: builder + + | buttonBar cloneButton | + buttonBar := builder pluggablePanelSpec new + layout: #horizontal; + "spacing: -1;" + children: OrderedCollection new; + frame: (LayoutFrame new leftFraction: 0 offset: 0; + topFraction: 0 offset: 0; + rightFraction: 1 offset: 0; + bottomFraction: 0.1 offset: 0) + yourself. + + cloneButton := builder pluggableActionButtonSpec new. + cloneButton + model: self; + label: 'Clone'; + action: #actionProjectClone; + help: 'Clone a new project.'. + + buttonBar children addAll: {cloneButton}. + ^ buttonBar \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/buildCommitList..st b/src/Squit.package/SwaSquitBrowser.class/instance/buildCommitList..st new file mode 100644 index 000000000..d62bf296f --- /dev/null +++ b/src/Squit.package/SwaSquitBrowser.class/instance/buildCommitList..st @@ -0,0 +1,24 @@ +toolbuilder +buildCommitList: builder + ^ builder pluggableTreeSpec new + model: self; + hScrollBarPolicy: #whenNeeded; + roots: #commitList; + nodeClass: SquitVersionWrapper; + getSelected: #commitSelection; + setSelected: #commitSelection:; + menu: #commitListMenu:; + dragItem: #dragFromCommitList:; + dropAccept: #wantsCommitListDrop:type:from:; + dropItem: #dropOnCommitList:on:copyIndicated:; + keyPress: #commitListKey:from:; + columns: { + [:listMorph | (listMorph filteredItems collect: [:item | + item preferredWidthOfColumn: 1]) max]. + [:listMorph | (listMorph filteredItems collect: [:item | + item preferredWidthOfColumn: 2]) max]. + nil "take all the space"}; + frame: (LayoutFrame new leftFraction: 0 offset: 0; + topFraction: 0 offset: 0; + rightFraction: 1 offset: 0; + bottomFraction: 1 offset: 0) \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/buildCommitSearchPanel..st b/src/Squit.package/SwaSquitBrowser.class/instance/buildCommitSearchPanel..st new file mode 100644 index 000000000..020c53b5e --- /dev/null +++ b/src/Squit.package/SwaSquitBrowser.class/instance/buildCommitSearchPanel..st @@ -0,0 +1,11 @@ +toolbuilder +buildCommitSearchPanel: builder + ^ builder pluggablePanelSpec new + wantsResizeHandles: true; + model: self; + children: {self buildCommitList: builder". + self buildSearchPanel: builder"}; + frame: (LayoutFrame new leftFraction: 0.2 offset: 0; + topFraction: 0 offset: 0; + rightFraction: 1 offset: 0; + bottomFraction: 0.6 offset: -25) \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/buildProjectBranchPanel..st b/src/Squit.package/SwaSquitBrowser.class/instance/buildProjectBranchPanel..st new file mode 100644 index 000000000..3d18905a4 --- /dev/null +++ b/src/Squit.package/SwaSquitBrowser.class/instance/buildProjectBranchPanel..st @@ -0,0 +1,12 @@ +toolbuilder +buildProjectBranchPanel: builder + ^ builder pluggablePanelSpec new + wantsResizeHandles: true; + model: self; + children: {self buildProjectList: builder. + self buildCloneButton: builder". + self buildBranchList: builder"}; + frame: (LayoutFrame new leftFraction: 0 offset: 0; + topFraction: 0 offset: 0; + rightFraction: 0.2 offset: 0; + bottomFraction: 0.6 offset: -25) \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/buildProjectList..st b/src/Squit.package/SwaSquitBrowser.class/instance/buildProjectList..st new file mode 100644 index 000000000..6275537bb --- /dev/null +++ b/src/Squit.package/SwaSquitBrowser.class/instance/buildProjectList..st @@ -0,0 +1,12 @@ +toolbuilder +buildProjectList: builder + ^ builder pluggableListSpec new + model: self; + list: #projectList; + getIndex: #projectIndex; + setIndex: #projectIndex:; + dragItem: #dragFromProjectList:; + dropAccept: #wantsProjectListDrop:type:from:; + dropItem: #dropOnProjectList:at:copyIndicated:; + menu: #projectListMenu:; + frame: (0@0.1 corner: 1@1) \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/clone.st b/src/Squit.package/SwaSquitBrowser.class/instance/clone.st new file mode 100644 index 000000000..cef50c04d --- /dev/null +++ b/src/Squit.package/SwaSquitBrowser.class/instance/clone.st @@ -0,0 +1,8 @@ +actions on working copies +clone + | operation | + operation := SwaSquitInteractiveClone new. + [operation clone] + on: SquitBadRemote do: + [:e | e retry]. + Project current addDeferredUIMessage: [self refresh]. \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/offerToAddFirstProject.st b/src/Squit.package/SwaSquitBrowser.class/instance/offerToAddFirstProject.st new file mode 100644 index 000000000..e5ab48939 --- /dev/null +++ b/src/Squit.package/SwaSquitBrowser.class/instance/offerToAddFirstProject.st @@ -0,0 +1,2 @@ +actions +offerToAddFirstProject \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/methodProperties.json b/src/Squit.package/SwaSquitBrowser.class/methodProperties.json new file mode 100644 index 000000000..f8a412523 --- /dev/null +++ b/src/Squit.package/SwaSquitBrowser.class/methodProperties.json @@ -0,0 +1,12 @@ +{ + "class" : { + }, + "instance" : { + "buildButtonBar:" : "ek 7/17/2021 12:07", + "buildCloneButton:" : "ek 7/17/2021 11:32", + "buildCommitList:" : "ek 7/17/2021 11:11", + "buildCommitSearchPanel:" : "ek 7/17/2021 11:09", + "buildProjectBranchPanel:" : "ek 7/17/2021 11:25", + "buildProjectList:" : "ek 7/17/2021 11:30", + "clone" : "ek 7/17/2021 11:50", + "offerToAddFirstProject" : "ek 7/17/2021 11:37" } } diff --git a/src/SquotTonel-Tests.package/SquotTonelSerializerTest.class/properties.json b/src/Squit.package/SwaSquitBrowser.class/properties.json similarity index 58% rename from src/SquotTonel-Tests.package/SquotTonelSerializerTest.class/properties.json rename to src/Squit.package/SwaSquitBrowser.class/properties.json index 76dc99396..818d785b6 100644 --- a/src/SquotTonel-Tests.package/SquotTonelSerializerTest.class/properties.json +++ b/src/Squit.package/SwaSquitBrowser.class/properties.json @@ -1,5 +1,5 @@ { - "category" : "SquotTonel-Tests", + "category" : "Squit-Hackday", "classinstvars" : [ ], "classvars" : [ @@ -7,8 +7,8 @@ "commentStamp" : "", "instvars" : [ ], - "name" : "SquotTonelSerializerTest", + "name" : "SwaSquitBrowser", "pools" : [ ], - "super" : "TestCase", + "super" : "SquitBrowser", "type" : "normal" } diff --git a/src/SquotTonel-Tests.package/SquotTonelDeserializerTest.class/README.md b/src/Squit.package/SwaSquitInteractiveClone.class/README.md similarity index 100% rename from src/SquotTonel-Tests.package/SquotTonelDeserializerTest.class/README.md rename to src/Squit.package/SwaSquitInteractiveClone.class/README.md diff --git a/src/Squit.package/SwaSquitInteractiveClone.class/instance/clone.st b/src/Squit.package/SwaSquitInteractiveClone.class/instance/clone.st new file mode 100644 index 000000000..db15610c9 --- /dev/null +++ b/src/Squit.package/SwaSquitInteractiveClone.class/instance/clone.st @@ -0,0 +1,8 @@ +as yet unclassified +clone + self requestProjectName ifNil: [^ nil]. + self requestUrl ifNil: [^ nil]. + self createRepository ifNil: [^ nil]. + repository withUnitOfWork: + [self fetchAndSetUp ifNil: [^ nil]]. + self registerWorkingCopy ifNil: [^ nil]. \ No newline at end of file diff --git a/src/Squit.package/SwaSquitInteractiveClone.class/instance/createRepository.st b/src/Squit.package/SwaSquitInteractiveClone.class/instance/createRepository.st new file mode 100644 index 000000000..32de441dc --- /dev/null +++ b/src/Squit.package/SwaSquitInteractiveClone.class/instance/createRepository.st @@ -0,0 +1,8 @@ +as yet unclassified +createRepository + | repositoryPath | + directory := (FileDirectory default on: 'squot_repos', FileDirectory slash, name) assureExistence. + directory ifNil: [^ nil]. + repositoryPath := directory pathName. + repository := SquitRepository new initializeInDirectory: (FileSystem disk root resolve: repositoryPath). + ^ repository \ No newline at end of file diff --git a/src/Squit.package/SwaSquitInteractiveClone.class/instance/registerWorkingCopy.st b/src/Squit.package/SwaSquitInteractiveClone.class/instance/registerWorkingCopy.st new file mode 100644 index 000000000..5c8c60a3f --- /dev/null +++ b/src/Squit.package/SwaSquitInteractiveClone.class/instance/registerWorkingCopy.st @@ -0,0 +1,9 @@ +as yet unclassified +registerWorkingCopy + + workingCopy := SquotWorkingCopy newOnObjectMemory. + workingCopy repository: repository. + self setLoadedHistorianFromHead. + workingCopy name: name. + workingCopy register. + ^ workingCopy \ No newline at end of file diff --git a/src/Squit.package/SwaSquitInteractiveClone.class/instance/requestProjectName.st b/src/Squit.package/SwaSquitInteractiveClone.class/instance/requestProjectName.st new file mode 100644 index 000000000..3bdb31795 --- /dev/null +++ b/src/Squit.package/SwaSquitInteractiveClone.class/instance/requestProjectName.st @@ -0,0 +1,6 @@ +as yet unclassified +requestProjectName + + name := SquotGUI request: 'Project name:'. + name ifEmpty: [name := nil]. + ^ name \ No newline at end of file diff --git a/src/Squit.package/SwaSquitInteractiveClone.class/methodProperties.json b/src/Squit.package/SwaSquitInteractiveClone.class/methodProperties.json new file mode 100644 index 000000000..7da5febdc --- /dev/null +++ b/src/Squit.package/SwaSquitInteractiveClone.class/methodProperties.json @@ -0,0 +1,8 @@ +{ + "class" : { + }, + "instance" : { + "clone" : "ek 7/17/2021 11:59", + "createRepository" : "ek 7/17/2021 12:02", + "registerWorkingCopy" : "ek 7/17/2021 12:01", + "requestProjectName" : "ek 7/17/2021 12:00" } } diff --git a/src/SquotTonel-Tests.package/SquotTonelAutotrackingTest.class/properties.json b/src/Squit.package/SwaSquitInteractiveClone.class/properties.json similarity index 51% rename from src/SquotTonel-Tests.package/SquotTonelAutotrackingTest.class/properties.json rename to src/Squit.package/SwaSquitInteractiveClone.class/properties.json index 623394f82..854bea78f 100644 --- a/src/SquotTonel-Tests.package/SquotTonelAutotrackingTest.class/properties.json +++ b/src/Squit.package/SwaSquitInteractiveClone.class/properties.json @@ -1,14 +1,14 @@ { - "category" : "SquotTonel-Tests", + "category" : "Squit-Hackday", "classinstvars" : [ ], "classvars" : [ ], "commentStamp" : "", "instvars" : [ - ], - "name" : "SquotTonelAutotrackingTest", + "name" ], + "name" : "SwaSquitInteractiveClone", "pools" : [ ], - "super" : "SquotPackageAutotrackingTest", + "super" : "SquitInteractiveClone", "type" : "normal" } diff --git a/src/Squit.package/monticello.meta/categories.st b/src/Squit.package/monticello.meta/categories.st index 3f0e30f61..2a548f81e 100644 --- a/src/Squit.package/monticello.meta/categories.st +++ b/src/Squit.package/monticello.meta/categories.st @@ -3,4 +3,5 @@ SystemOrganization addCategory: #'Squit-Exceptions'! SystemOrganization addCategory: #'Squit-UI'! SystemOrganization addCategory: #'Squit-UI-Support'! SystemOrganization addCategory: #'Squit-Tests'! +SystemOrganization addCategory: #'Squit-Hackday'! SystemOrganization addCategory: #'Squit-Tests-UI'! diff --git a/src/SquotTonel-Core.package/.squot-contents b/src/SquotTonel-Core.package/.squot-contents index b5d4d4099..4b0df335b 100644 --- a/src/SquotTonel-Core.package/.squot-contents +++ b/src/SquotTonel-Core.package/.squot-contents @@ -1,6 +1,6 @@ SquotTrackedObjectMetadata { #objectClassName : #PackageInfo, + #slotOverrides : { }, #objectsReplacedByNames : true, - #slotOverrides : IdentityDictionary { }, #serializer : #SquotCypressCodeSerializer } \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/.squot-contents b/src/SquotTonel-Tests.package/.squot-contents index b5d4d4099..4b0df335b 100644 --- a/src/SquotTonel-Tests.package/.squot-contents +++ b/src/SquotTonel-Tests.package/.squot-contents @@ -1,6 +1,6 @@ SquotTrackedObjectMetadata { #objectClassName : #PackageInfo, + #slotOverrides : { }, #objectsReplacedByNames : true, - #slotOverrides : IdentityDictionary { }, #serializer : #SquotCypressCodeSerializer } \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/PackageInfo.extension/class/squotTonelSerializer.st b/src/SquotTonel-Tests.package/PackageInfo.extension/class/squotTonelSerializer.st new file mode 100644 index 000000000..7c4f52147 --- /dev/null +++ b/src/SquotTonel-Tests.package/PackageInfo.extension/class/squotTonelSerializer.st @@ -0,0 +1,4 @@ +*SquotTonel-Core-trackable +squotTonelSerializer + + ^ SquotTonelSerializer \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/PackageInfo.extension/methodProperties.json b/src/SquotTonel-Tests.package/PackageInfo.extension/methodProperties.json new file mode 100644 index 000000000..f90b78f65 --- /dev/null +++ b/src/SquotTonel-Tests.package/PackageInfo.extension/methodProperties.json @@ -0,0 +1,5 @@ +{ + "class" : { + "squotTonelSerializer" : "jr 3/17/2019 00:37" }, + "instance" : { + } } diff --git a/src/SquotTonel-Tests.package/PackageInfo.extension/properties.json b/src/SquotTonel-Tests.package/PackageInfo.extension/properties.json new file mode 100644 index 000000000..7da79deb3 --- /dev/null +++ b/src/SquotTonel-Tests.package/PackageInfo.extension/properties.json @@ -0,0 +1,2 @@ +{ + "name" : "PackageInfo" } diff --git a/src/SquotTonel-Tests.package/SquotFileStoreArtifactGuessingTest.extension/instance/testFindTonelPackage.st b/src/SquotTonel-Tests.package/SquotFileStoreArtifactGuessingTest.extension/instance/testFindTonelPackage.st deleted file mode 100644 index f289cdb44..000000000 --- a/src/SquotTonel-Tests.package/SquotFileStoreArtifactGuessingTest.extension/instance/testFindTonelPackage.st +++ /dev/null @@ -1,12 +0,0 @@ -*SquotTonel-Tests-tests -testFindTonelPackage - | packageDir snapshot | - packageDir := fileStore directory / 'src' / 'Test'. - packageDir ensureDirectory. - (packageDir / 'package.st') ensureFile. - self assert: ((snapshot := fileStore captureLazySnapshot) - includesObjectAt: 'src/Test'); - assert: SquotTonelSerializer name - equals: ((snapshot artifactAt: 'src/Test') storeInfo serializer); - assert: ((snapshot artifactAt: 'src/Test') shadowOfTrackedObject respondsTo: #packageName) - description: 'not a SquotPackageShadow'. \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/SquotFileStoreArtifactGuessingTest.extension/methodProperties.json b/src/SquotTonel-Tests.package/SquotFileStoreArtifactGuessingTest.extension/methodProperties.json deleted file mode 100644 index 3580f0f6b..000000000 --- a/src/SquotTonel-Tests.package/SquotFileStoreArtifactGuessingTest.extension/methodProperties.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "testFindTonelPackage" : "jr 4/7/2019 21:39" } } diff --git a/src/SquotTonel-Tests.package/SquotFileStoreArtifactGuessingTest.extension/properties.json b/src/SquotTonel-Tests.package/SquotFileStoreArtifactGuessingTest.extension/properties.json deleted file mode 100644 index dc673c211..000000000 --- a/src/SquotTonel-Tests.package/SquotFileStoreArtifactGuessingTest.extension/properties.json +++ /dev/null @@ -1,2 +0,0 @@ -{ - "name" : "SquotFileStoreArtifactGuessingTest" } diff --git a/src/SquotTonel-Tests.package/SquotFileSystemStore.extension/instance/isInsideCypressDirectory..st b/src/SquotTonel-Tests.package/SquotFileSystemStore.extension/instance/isInsideCypressDirectory..st new file mode 100644 index 000000000..94b63c6b9 --- /dev/null +++ b/src/SquotTonel-Tests.package/SquotFileSystemStore.extension/instance/isInsideCypressDirectory..st @@ -0,0 +1,5 @@ +*SquotTonel-Core-guessing +isInsideCypressDirectory: aFile + " guess if we are inside a Cypress directory right now which happens to contain a package.st file " + + ^ (aFile resolve: '../..') name endsWith: '.package' diff --git a/src/SquotTonel-Tests.package/SquotFileSystemStore.extension/instance/tonelPackageLocator.st b/src/SquotTonel-Tests.package/SquotFileSystemStore.extension/instance/tonelPackageLocator.st new file mode 100644 index 000000000..3af6b7b4a --- /dev/null +++ b/src/SquotTonel-Tests.package/SquotFileSystemStore.extension/instance/tonelPackageLocator.st @@ -0,0 +1,18 @@ +*SquotTonel-Core-guessing +tonelPackageLocator + + "Look for directories with package.st" + ^ SquotArtifactLocator new + detectBlock: [:fileOrDirectory :search :locator | + fileOrDirectory isDirectory + ifTrue: [(fileOrDirectory entries + anySatisfy: [:eachEntry | + eachEntry basename = 'package.st' and: + [eachEntry isFile and: [(self isInsideCypressDirectory: fileOrDirectory) not]]]) + ifTrue: [search addArtifact: + (self forgeLazyArtifactAt: fileOrDirectory + deserializerFactory: SquotTonelDeserializer + serializerFactory: SquotTonelSerializer + objectClass: PackageInfo)] + ifFalse: [search visitSubdirectories: fileOrDirectory with: locator]]]; + yourself \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/SquotFileSystemStore.extension/methodProperties.json b/src/SquotTonel-Tests.package/SquotFileSystemStore.extension/methodProperties.json new file mode 100644 index 000000000..0f4e1c22c --- /dev/null +++ b/src/SquotTonel-Tests.package/SquotFileSystemStore.extension/methodProperties.json @@ -0,0 +1,6 @@ +{ + "class" : { + }, + "instance" : { + "isInsideCypressDirectory:" : "tobe 1/6/2021 12:58", + "tonelPackageLocator" : "tobe 1/6/2021 12:58" } } diff --git a/src/SquotTonel-Tests.package/SquotFileSystemStore.extension/properties.json b/src/SquotTonel-Tests.package/SquotFileSystemStore.extension/properties.json new file mode 100644 index 000000000..053072453 --- /dev/null +++ b/src/SquotTonel-Tests.package/SquotFileSystemStore.extension/properties.json @@ -0,0 +1,2 @@ +{ + "name" : "SquotFileSystemStore" } diff --git a/src/SquotTonel-Tests.package/SquotTonelAutotrackingTest.class/instance/trackPackage.st b/src/SquotTonel-Tests.package/SquotTonelAutotrackingTest.class/instance/trackPackage.st deleted file mode 100644 index 0408f8145..000000000 --- a/src/SquotTonel-Tests.package/SquotTonelAutotrackingTest.class/instance/trackPackage.st +++ /dev/null @@ -1,4 +0,0 @@ -as yet unclassified -trackPackage - workingCopy addPackageNamed: package name at: 'src/', package name. - (workingCopy artifactAt: self packagePath) serializer: SquotTonelSerializer. \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/SquotTonelAutotrackingTest.class/methodProperties.json b/src/SquotTonel-Tests.package/SquotTonelAutotrackingTest.class/methodProperties.json deleted file mode 100644 index 828f55f6f..000000000 --- a/src/SquotTonel-Tests.package/SquotTonelAutotrackingTest.class/methodProperties.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "trackPackage" : "jr 1/26/2020 23:20" } } diff --git a/src/SquotTonel-Tests.package/SquotTonelFileTreeConversionTest.class/README.md b/src/SquotTonel-Tests.package/SquotTonelDeserializer.class/README.md similarity index 100% rename from src/SquotTonel-Tests.package/SquotTonelFileTreeConversionTest.class/README.md rename to src/SquotTonel-Tests.package/SquotTonelDeserializer.class/README.md diff --git a/src/SquotTonel-Tests.package/SquotTonelDeserializer.class/class/canReadObjectSerializedBy..st b/src/SquotTonel-Tests.package/SquotTonelDeserializer.class/class/canReadObjectSerializedBy..st new file mode 100644 index 000000000..98029d77b --- /dev/null +++ b/src/SquotTonel-Tests.package/SquotTonelDeserializer.class/class/canReadObjectSerializedBy..st @@ -0,0 +1,3 @@ +Squot deserialization +canReadObjectSerializedBy: serializerName + ^ serializerName beginsWith: 'SquotTonelSerializer' "version?" \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/SquotTonelDeserializer.class/class/initialize.st b/src/SquotTonel-Tests.package/SquotTonelDeserializer.class/class/initialize.st new file mode 100644 index 000000000..ce381df76 --- /dev/null +++ b/src/SquotTonel-Tests.package/SquotTonelDeserializer.class/class/initialize.st @@ -0,0 +1,4 @@ +class initialization +initialize + "SquotTonelDeserializer initialize" + SquotFileSystemStore addDeserializerFactory: self. \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/SquotTonelDeserializer.class/class/unload.st b/src/SquotTonel-Tests.package/SquotTonelDeserializer.class/class/unload.st new file mode 100644 index 000000000..a90349574 --- /dev/null +++ b/src/SquotTonel-Tests.package/SquotTonelDeserializer.class/class/unload.st @@ -0,0 +1,3 @@ +initialize-release +unload + SquotFileSystemStore removeDeserializerFactory: self. \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/SquotTonelDeserializer.class/instance/fillContentOf.from..st b/src/SquotTonel-Tests.package/SquotTonelDeserializer.class/instance/fillContentOf.from..st new file mode 100644 index 000000000..1b527b445 --- /dev/null +++ b/src/SquotTonel-Tests.package/SquotTonelDeserializer.class/instance/fillContentOf.from..st @@ -0,0 +1,11 @@ +Squot deserialization +fillContentOf: anArtifact from: aDirectory + | packageName snapshot packageShadow reader | + packageName := aDirectory basename. + reader := TonelReader on: aDirectory parent fileName: packageName. + snapshot := reader snapshot. + packageShadow := SquotPackageShadow + forPackageNamed: packageName + withSnapshot: snapshot + tonelProperties: reader currentPackageProperties. + anArtifact content: (SquotShadowGraph withSingleShadow: packageShadow). \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/SquotTonelDeserializer.class/methodProperties.json b/src/SquotTonel-Tests.package/SquotTonelDeserializer.class/methodProperties.json new file mode 100644 index 000000000..b9fbb629d --- /dev/null +++ b/src/SquotTonel-Tests.package/SquotTonelDeserializer.class/methodProperties.json @@ -0,0 +1,7 @@ +{ + "class" : { + "canReadObjectSerializedBy:" : "jr 2/16/2019 18:04", + "initialize" : "jr 3/10/2019 22:18", + "unload" : "jr 8/9/2020 21:30" }, + "instance" : { + "fillContentOf:from:" : "jr 12/4/2020 23:38" } } diff --git a/src/SquotTonel-Tests.package/SquotTonelDeserializer.class/properties.json b/src/SquotTonel-Tests.package/SquotTonelDeserializer.class/properties.json new file mode 100644 index 000000000..1c289bc21 --- /dev/null +++ b/src/SquotTonel-Tests.package/SquotTonelDeserializer.class/properties.json @@ -0,0 +1,14 @@ +{ + "category" : "SquotTonel-Core", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + "directory" ], + "name" : "SquotTonelDeserializer", + "pools" : [ + ], + "super" : "SquotDeserializer", + "type" : "normal" } diff --git a/src/SquotTonel-Tests.package/SquotTonelDeserializerTest.class/instance/testCanReadFromTonelSerializer.st b/src/SquotTonel-Tests.package/SquotTonelDeserializerTest.class/instance/testCanReadFromTonelSerializer.st deleted file mode 100644 index 8ec04f910..000000000 --- a/src/SquotTonel-Tests.package/SquotTonelDeserializerTest.class/instance/testCanReadFromTonelSerializer.st +++ /dev/null @@ -1,4 +0,0 @@ -tests -testCanReadFromTonelSerializer - self assert: - (SquotTonelDeserializer canReadObjectSerializedBy: SquotTonelSerializer new name). \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/SquotTonelDeserializerTest.class/methodProperties.json b/src/SquotTonel-Tests.package/SquotTonelDeserializerTest.class/methodProperties.json deleted file mode 100644 index 31d38b393..000000000 --- a/src/SquotTonel-Tests.package/SquotTonelDeserializerTest.class/methodProperties.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "testCanReadFromTonelSerializer" : "jr 2/16/2019 18:05" } } diff --git a/src/SquotTonel-Tests.package/SquotTonelFileTreeConversionTest.class/instance/package.st b/src/SquotTonel-Tests.package/SquotTonelFileTreeConversionTest.class/instance/package.st deleted file mode 100644 index 15bb7f680..000000000 --- a/src/SquotTonel-Tests.package/SquotTonelFileTreeConversionTest.class/instance/package.st +++ /dev/null @@ -1,3 +0,0 @@ -tests -package - ^ workingCopy artifacts detect: [:each | each isLoaded] \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/SquotTonelFileTreeConversionTest.class/instance/setUp.st b/src/SquotTonel-Tests.package/SquotTonelFileTreeConversionTest.class/instance/setUp.st deleted file mode 100644 index e5f48be09..000000000 --- a/src/SquotTonel-Tests.package/SquotTonelFileTreeConversionTest.class/instance/setUp.st +++ /dev/null @@ -1,12 +0,0 @@ -running -setUp - repository := SquotFileTestRepository new initializeInDirectory: FileSystem memory root. - workingCopy := - repository createWorkingCopy - store: SquotImageStore new; - yourself. - classFactory := ClassFactoryForTestCase new. - (SystemChangeNotifier uniqueInstance doSilently: [classFactory newClass]) - compileSilently: 'testMethod ^ 42'. - self suppressProgressDisplayDuring: - [workingCopy add: (PackageInfo named: classFactory packageName) at: 'src']. \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/SquotTonelFileTreeConversionTest.class/instance/tearDown.st b/src/SquotTonel-Tests.package/SquotTonelFileTreeConversionTest.class/instance/tearDown.st deleted file mode 100644 index 7a52eedf8..000000000 --- a/src/SquotTonel-Tests.package/SquotTonelFileTreeConversionTest.class/instance/tearDown.st +++ /dev/null @@ -1,3 +0,0 @@ -running -tearDown - SystemChangeNotifier uniqueInstance doSilently: [classFactory cleanUp]. \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/SquotTonelFileTreeConversionTest.class/instance/testCypressToTonel.st b/src/SquotTonel-Tests.package/SquotTonelFileTreeConversionTest.class/instance/testCypressToTonel.st deleted file mode 100644 index 661ae3f74..000000000 --- a/src/SquotTonel-Tests.package/SquotTonelFileTreeConversionTest.class/instance/testCypressToTonel.st +++ /dev/null @@ -1,24 +0,0 @@ -tests -testCypressToTonel - | originalPath newPath directoryDepth | - self package serializer: SquotCypressCodeSerializer. - originalPath := self package path. - directoryDepth := originalPath occurrencesOf: $/. - workingCopy saveVersionWithMessage: 'write as Cypress'. - self deny: ((workingCopy baseVersion snapshotDirectory / 'src') entries - includes: classFactory packageName) - description: 'Tonel directory exists'. - self package serializer: SquotTonelSerializer. - self assert: 1 equals: (workingCopy artifacts select: #isLoaded) size description: 'duplicate artifacts'. - newPath := self package path. - workingCopy saveVersionWithMessage: 'convert to Tonel'. - self deny: ((workingCopy baseVersion snapshotDirectory / 'src') entries - includes: classFactory packageName, '.package') - description: 'Cypress directory still exists'. - self deny: originalPath = newPath description: ['Package path should have changed']. - self assert: directoryDepth - equals: (newPath occurrencesOf: $/) - description: 'Profileration of subdirectories'. - self assert: 1 equals: directoryDepth description: 'Too many subdirectories'. - (workingCopy baseVersion snapshotDirectory / 'src' / '.properties') readStreamDo: - [:stream | self assert: (stream upToEnd includesSubstring: '#tonel')]. \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/SquotTonelFileTreeConversionTest.class/instance/testTonelToCypress.st b/src/SquotTonel-Tests.package/SquotTonelFileTreeConversionTest.class/instance/testTonelToCypress.st deleted file mode 100644 index 80dae8cc7..000000000 --- a/src/SquotTonel-Tests.package/SquotTonelFileTreeConversionTest.class/instance/testTonelToCypress.st +++ /dev/null @@ -1,24 +0,0 @@ -tests -testTonelToCypress - | originalPath newPath directoryDepth | - self package serializer: SquotTonelSerializer. - originalPath := self package path. - directoryDepth := originalPath occurrencesOf: $/. - workingCopy saveVersionWithMessage: 'write as Tonel'. - self deny: ((workingCopy baseVersion snapshotDirectory / 'src') entries - includes: classFactory packageName, '.package') - description: 'Cypress directory exists'. - self package serializer: SquotCypressCodeSerializer. - self assert: 1 equals: (workingCopy artifacts select: #isLoaded) size description: 'duplicate artifacts'. - newPath := self package path. - workingCopy saveVersionWithMessage: 'convert to Cypress'. - self deny: ((workingCopy baseVersion snapshotDirectory / 'src') entries - includes: classFactory packageName) - description: 'Tonel directory still exists'. - self deny: originalPath = newPath description: ['Package path should have changed']. - self assert: directoryDepth - equals: (newPath occurrencesOf: $/) - description: 'Profileration of subdirectories'. - self assert: 1 equals: directoryDepth description: 'Too many subdirectories'. - (workingCopy baseVersion snapshotDirectory / 'src' / '.properties') readStreamDo: - [:stream | self assert: (stream upToEnd includesSubstring: '#filetree')]. \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/SquotTonelFileTreeConversionTest.class/methodProperties.json b/src/SquotTonel-Tests.package/SquotTonelFileTreeConversionTest.class/methodProperties.json deleted file mode 100644 index 5e5a980f0..000000000 --- a/src/SquotTonel-Tests.package/SquotTonelFileTreeConversionTest.class/methodProperties.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "package" : "jr 10/12/2020 23:12", - "setUp" : "jr 9/13/2020 22:59", - "tearDown" : "jr 12/23/2019 17:11", - "testCypressToTonel" : "jr 10/12/2020 23:11", - "testTonelToCypress" : "jr 10/12/2020 23:11" } } diff --git a/src/SquotTonel-Tests.package/SquotTonelFileTreeConversionTest.class/properties.json b/src/SquotTonel-Tests.package/SquotTonelFileTreeConversionTest.class/properties.json deleted file mode 100644 index 322aac58d..000000000 --- a/src/SquotTonel-Tests.package/SquotTonelFileTreeConversionTest.class/properties.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "category" : "SquotTonel-Tests", - "classinstvars" : [ - ], - "classtraitcomposition" : "TTestCaseSuppressingProgressDisplay classTrait", - "classvars" : [ - ], - "commentStamp" : "", - "instvars" : [ - "repository", - "workingCopy", - "classFactory" ], - "name" : "SquotTonelFileTreeConversionTest", - "pools" : [ - ], - "super" : "TestCase", - "traitcomposition" : "TTestCaseSuppressingProgressDisplay", - "type" : "normal" } diff --git a/src/SquotTonel-Tests.package/SquotTonelPackageLocatorTest.class/instance/testFindsMultiplePackages.st b/src/SquotTonel-Tests.package/SquotTonelPackageLocatorTest.class/instance/testFindsMultiplePackages.st deleted file mode 100644 index 38836ef88..000000000 --- a/src/SquotTonel-Tests.package/SquotTonelPackageLocatorTest.class/instance/testFindsMultiplePackages.st +++ /dev/null @@ -1,18 +0,0 @@ -tests -testFindsMultiplePackages - | artifactsFound | - "given" - #('X' 'Y') - do: [:each | (rootDirectory / each) ensureDirectory. - (rootDirectory / each / 'package.st') ensureFile ]. - "decoys" - (rootDirectory / 'WithoutPackageSt') ensureDirectory. - "when" - artifactsFound := SquotFileSearchForArtifacts new - visit: rootDirectory with: fileStore tonelPackageLocator; - runSearch; - artifactsFound. - "then" - self assert: (artifactsFound anySatisfy: [:each | each path = 'X']); - assert: (artifactsFound anySatisfy: [:each | each path = 'Y']); - assert: artifactsFound size = 2. \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/SquotTonelPackageLocatorTest.class/instance/testFindsPackageInSubdirectory.st b/src/SquotTonel-Tests.package/SquotTonelPackageLocatorTest.class/instance/testFindsPackageInSubdirectory.st deleted file mode 100644 index 5dfdab0bc..000000000 --- a/src/SquotTonel-Tests.package/SquotTonelPackageLocatorTest.class/instance/testFindsPackageInSubdirectory.st +++ /dev/null @@ -1,10 +0,0 @@ -tests -testFindsPackageInSubdirectory - | artifactsFound | - (rootDirectory / 'src' / 'Xyz') ensureDirectory. - (rootDirectory / 'src' / 'Xyz' / 'package.st') ensureFile. - artifactsFound := SquotFileSearchForArtifacts new - visit: rootDirectory with: fileStore tonelPackageLocator; - runSearch; - artifactsFound. - self assert: (artifactsFound anySatisfy: [:each | each path = 'src/Xyz']). \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/SquotTonelPackageLocatorTest.class/instance/testFindsPackageUnderRoot.st b/src/SquotTonel-Tests.package/SquotTonelPackageLocatorTest.class/instance/testFindsPackageUnderRoot.st deleted file mode 100644 index 517e31d5a..000000000 --- a/src/SquotTonel-Tests.package/SquotTonelPackageLocatorTest.class/instance/testFindsPackageUnderRoot.st +++ /dev/null @@ -1,10 +0,0 @@ -tests -testFindsPackageUnderRoot - | artifactsFound | - (rootDirectory / 'Xyz') ensureDirectory. - (rootDirectory / 'Xyz' / 'package.st') ensureFile. - artifactsFound := SquotFileSearchForArtifacts new - visit: rootDirectory with: fileStore tonelPackageLocator; - runSearch; - artifactsFound. - self assert: (artifactsFound anySatisfy: [:each | each path = 'Xyz']). \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/SquotTonelPackageLocatorTest.class/instance/testIgnoresCypressPackagesWithMethodNamedPackage.st b/src/SquotTonel-Tests.package/SquotTonelPackageLocatorTest.class/instance/testIgnoresCypressPackagesWithMethodNamedPackage.st deleted file mode 100644 index ef747a93a..000000000 --- a/src/SquotTonel-Tests.package/SquotTonelPackageLocatorTest.class/instance/testIgnoresCypressPackagesWithMethodNamedPackage.st +++ /dev/null @@ -1,10 +0,0 @@ -tests -testIgnoresCypressPackagesWithMethodNamedPackage - | artifactsFound | - (rootDirectory / 'Xyz.package' / 'A.class' / 'instance') ensureDirectory. - (rootDirectory / 'Xyz.package' / 'A.class' / 'instance' / 'package.st') ensureFile. - artifactsFound := SquotFileSearchForArtifacts new - visit: rootDirectory with: fileStore tonelPackageLocator; - runSearch; - artifactsFound. - self assert: artifactsFound isEmpty. \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/SquotTonelPackageLocatorTest.class/methodProperties.json b/src/SquotTonel-Tests.package/SquotTonelPackageLocatorTest.class/methodProperties.json deleted file mode 100644 index 2b853c2f7..000000000 --- a/src/SquotTonel-Tests.package/SquotTonelPackageLocatorTest.class/methodProperties.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "testFindsMultiplePackages" : "jr 3/10/2019 21:29", - "testFindsPackageInSubdirectory" : "jr 3/10/2019 21:30", - "testFindsPackageUnderRoot" : "jr 3/10/2019 21:30", - "testIgnoresCypressPackagesWithMethodNamedPackage" : "jr 1/9/2021 15:09" } } diff --git a/src/SquotTonel-Tests.package/SquotTonelReadWriteTest.class/instance/artifactWithoutTimestamps..st b/src/SquotTonel-Tests.package/SquotTonelReadWriteTest.class/instance/artifactWithoutTimestamps..st deleted file mode 100644 index 81b2469ca..000000000 --- a/src/SquotTonel-Tests.package/SquotTonelReadWriteTest.class/instance/artifactWithoutTimestamps..st +++ /dev/null @@ -1,9 +0,0 @@ -test data -artifactWithoutTimestamps: anArtifact - | packageShadow | - packageShadow := anArtifact shadowOfTrackedObject. - ^ anArtifact copyWithDifferentContent: - (SquotShadowGraph withSingleShadow: - (packageShadow copy - snapshot: (self withoutTimestamps: packageShadow asMCSnapshot); - yourself)) \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/SquotTonelReadWriteTest.class/instance/sampleArtifact.st b/src/SquotTonel-Tests.package/SquotTonelReadWriteTest.class/instance/sampleArtifact.st deleted file mode 100644 index 18d6ce781..000000000 --- a/src/SquotTonel-Tests.package/SquotTonelReadWriteTest.class/instance/sampleArtifact.st +++ /dev/null @@ -1,17 +0,0 @@ -test data -sampleArtifact - | sampleMethod definitions | - (sampleClass isNil or: [sampleClass isObsolete]) ifTrue: - [sampleClass := classFactory newClass. - sampleClass compile: 'a ^ #a' classified: 'constants' withStamp: 'jr 12/4/2020 20:39' notifying: nil. - sampleClass classComment: 'This is a test class' stamp: 'jr 12/4/2020 20:39']. - sampleMethod := sampleClass >> #a. - samplePackage := PackageInfo named: sampleClass category. - definitions := {sampleClass asClassDefinition. - sampleMethod methodReference asMethodDefinition. - MCOrganizationDefinition categories: (Array with: sampleClass category)}. - ^ (((MCSnapshot fromDefinitions: definitions) - asSquotArtifactForPackage: samplePackage) - path: (sampleArtifactPath := 'src/', samplePackage name); - initializeDefaultStoreInfoFor: samplePackage; - yourself) \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/SquotTonelReadWriteTest.class/instance/sampleArtifactWithoutTimestamps.st b/src/SquotTonel-Tests.package/SquotTonelReadWriteTest.class/instance/sampleArtifactWithoutTimestamps.st deleted file mode 100644 index 8be174b82..000000000 --- a/src/SquotTonel-Tests.package/SquotTonelReadWriteTest.class/instance/sampleArtifactWithoutTimestamps.st +++ /dev/null @@ -1,9 +0,0 @@ -test data -sampleArtifactWithoutTimestamps - | artifact | - artifact := self sampleArtifact. - artifact shadowOfTrackedObject - setPackageName: samplePackage name - snapshot: (self withoutTimestamps: artifact shadowOfTrackedObject asMCSnapshot) - tonelProperties: Dictionary new. - ^ artifact \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/SquotTonelReadWriteTest.class/instance/setUp.st b/src/SquotTonel-Tests.package/SquotTonelReadWriteTest.class/instance/setUp.st deleted file mode 100644 index cf80ebd5e..000000000 --- a/src/SquotTonel-Tests.package/SquotTonelReadWriteTest.class/instance/setUp.st +++ /dev/null @@ -1,8 +0,0 @@ -running -setUp - rootDirectory := FileSystem memory root. - serializer := SquotTonelSerializer writingBelow: rootDirectory. - deserializer := SquotTonelDeserializer new. - classFactory := ClassFactoryForTestCase new. - changesFile := TemporarySystemChangeFile new. - changesFile useTemporaryChangesFile. \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/SquotTonelReadWriteTest.class/instance/tearDown.st b/src/SquotTonel-Tests.package/SquotTonelReadWriteTest.class/instance/tearDown.st deleted file mode 100644 index 076920ec7..000000000 --- a/src/SquotTonel-Tests.package/SquotTonelReadWriteTest.class/instance/tearDown.st +++ /dev/null @@ -1,7 +0,0 @@ -running -tearDown - [classFactory cleanUp] - ensure: - [changesFile - useStandardChangesFile; - delete]. \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/SquotTonelReadWriteTest.class/instance/testWriteAndReadOfPackage.st b/src/SquotTonel-Tests.package/SquotTonelReadWriteTest.class/instance/testWriteAndReadOfPackage.st deleted file mode 100644 index b2c672576..000000000 --- a/src/SquotTonel-Tests.package/SquotTonelReadWriteTest.class/instance/testWriteAndReadOfPackage.st +++ /dev/null @@ -1,21 +0,0 @@ -tests -testWriteAndReadOfPackage - | classFile original readArtifact | - original := self sampleArtifact. - serializer write: original. - classFile := rootDirectory - resolve: 'src/', samplePackage name, '/', sampleClass name, '.class.st'. - self assert: classFile exists description: 'class source not found'. - readArtifact := original copyWithDifferentContent: nil. - classFactory cleanUp. - deserializer - fillContentOf: readArtifact - from: (rootDirectory resolve: sampleArtifactPath). - self assert: (readArtifact shadowOfTrackedObject isKindOf: SquotPackageShadow); - assert: samplePackage name - equals: readArtifact shadowOfTrackedObject packageName; - assert: (readArtifact shadowOfTrackedObject asMCSnapshot - patchRelativeToBase: - (self artifactWithoutTimestamps: original) shadowOfTrackedObject asMCSnapshot) - isEmpty; - deny: (readArtifact diffAgainst: (self artifactWithoutTimestamps: original)) hasChanges. \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/SquotTonelReadWriteTest.class/instance/testWriteAndReadOfPackageWithTimestamps.st b/src/SquotTonel-Tests.package/SquotTonelReadWriteTest.class/instance/testWriteAndReadOfPackageWithTimestamps.st deleted file mode 100644 index 7545add25..000000000 --- a/src/SquotTonel-Tests.package/SquotTonelReadWriteTest.class/instance/testWriteAndReadOfPackageWithTimestamps.st +++ /dev/null @@ -1,25 +0,0 @@ -tests -testWriteAndReadOfPackageWithTimestamps - | original shadow readArtifact | - original := self sampleArtifact. - classFactory cleanUp. - original := original copyWithDifferentContent: - (SquotShadowGraph withSingleShadow: - ((shadow := original shadowOfTrackedObject) copy - setPackageName: shadow packageName snapshot: shadow asMCSnapshot tonelProperties: (shadow tonelProperties at: TonelWriter squeakChangestamp put: true; yourself))). - "Full roundtrip: write-read-write-read." - serializer write: original. - readArtifact := original copyWithDifferentContent: nil. - deserializer - fillContentOf: readArtifact - from: (rootDirectory resolve: sampleArtifactPath). - serializer write: readArtifact. - readArtifact content: nil. - deserializer - fillContentOf: readArtifact - from: (rootDirectory resolve: sampleArtifactPath). - self assert: (readArtifact shadowOfTrackedObject asMCSnapshot - patchRelativeToBase: - original shadowOfTrackedObject asMCSnapshot) - isEmpty; - deny: (readArtifact diffAgainst: original) hasChanges. \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/SquotTonelReadWriteTest.class/instance/withoutTimestamps..st b/src/SquotTonel-Tests.package/SquotTonelReadWriteTest.class/instance/withoutTimestamps..st deleted file mode 100644 index 03aa61c7a..000000000 --- a/src/SquotTonel-Tests.package/SquotTonelReadWriteTest.class/instance/withoutTimestamps..st +++ /dev/null @@ -1,13 +0,0 @@ -tests -withoutTimestamps: aMCSnapshot - ^ MCSnapshot fromDefinitions: - (aMCSnapshot definitions collect: - [:each | each isMethodDefinition - ifTrue: [MCMethodDefinition - className: each className - classIsMeta: each classIsMeta - selector: each selector - category: each category - timeStamp: nil - source: each source] - ifFalse: [each]]) \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/SquotTonelReadWriteTest.class/methodProperties.json b/src/SquotTonel-Tests.package/SquotTonelReadWriteTest.class/methodProperties.json deleted file mode 100644 index d566a7c93..000000000 --- a/src/SquotTonel-Tests.package/SquotTonelReadWriteTest.class/methodProperties.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "artifactWithoutTimestamps:" : "jr 12/4/2020 22:26", - "sampleArtifact" : "jr 12/6/2020 19:49", - "sampleArtifactWithoutTimestamps" : "jr 12/4/2020 20:23", - "setUp" : "jr 12/4/2020 22:58", - "tearDown" : "jr 12/4/2020 23:49", - "testWriteAndReadOfPackage" : "jr 12/4/2020 22:24", - "testWriteAndReadOfPackageWithTimestamps" : "jr 12/4/2020 23:19", - "withoutTimestamps:" : "jr 2/16/2019 18:36" } } diff --git a/src/SquotTonel-Tests.package/SquotTonelReadWriteTest.class/properties.json b/src/SquotTonel-Tests.package/SquotTonelReadWriteTest.class/properties.json deleted file mode 100644 index 533c55e0b..000000000 --- a/src/SquotTonel-Tests.package/SquotTonelReadWriteTest.class/properties.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "category" : "SquotTonel-Tests", - "classinstvars" : [ - ], - "classvars" : [ - ], - "commentStamp" : "jr 12/4/2020 20:42", - "instvars" : [ - "rootDirectory", - "serializer", - "sampleClass", - "samplePackage", - "sampleArtifactPath", - "deserializer", - "classFactory", - "changesFile" ], - "name" : "SquotTonelReadWriteTest", - "pools" : [ - ], - "super" : "TestCase", - "type" : "normal" } diff --git a/src/SquotTonel-Tests.package/SquotTonelPackageLocatorTest.class/README.md b/src/SquotTonel-Tests.package/SquotTonelSerializer.class/README.md similarity index 100% rename from src/SquotTonel-Tests.package/SquotTonelPackageLocatorTest.class/README.md rename to src/SquotTonel-Tests.package/SquotTonelSerializer.class/README.md diff --git a/src/SquotTonel-Tests.package/SquotTonelSerializer.class/class/rewritePath.for..st b/src/SquotTonel-Tests.package/SquotTonelSerializer.class/class/rewritePath.for..st new file mode 100644 index 000000000..0550e1536 --- /dev/null +++ b/src/SquotTonel-Tests.package/SquotTonelSerializer.class/class/rewritePath.for..st @@ -0,0 +1,12 @@ +path rewriting +rewritePath: path for: anObjectGraph + "Append package directory if necessary." + | elements packageName | + elements := path squotPathSegments. + packageName := anObjectGraph startShadow packageName. + elements ifEmpty: [^ packageName]. + (elements last = packageName) ifTrue: [^ path]. + (elements last beginsWith: packageName) + ifTrue: [^ elements allButLast, {packageName} + joinSeparatedBy: SquotPath delimiter asString] + ifFalse: [^ path, SquotPath delimiter, packageName] \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/SquotTonelSerializer.class/class/userFriendlyTitle.st b/src/SquotTonel-Tests.package/SquotTonelSerializer.class/class/userFriendlyTitle.st new file mode 100644 index 000000000..eb54cef58 --- /dev/null +++ b/src/SquotTonel-Tests.package/SquotTonelSerializer.class/class/userFriendlyTitle.st @@ -0,0 +1,3 @@ +user interface +userFriendlyTitle + ^ 'Tonel format' \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/SquotTonelSerializer.class/instance/propertiesFileContents.st b/src/SquotTonel-Tests.package/SquotTonelSerializer.class/instance/propertiesFileContents.st new file mode 100644 index 000000000..0e3d2207a --- /dev/null +++ b/src/SquotTonel-Tests.package/SquotTonelSerializer.class/instance/propertiesFileContents.st @@ -0,0 +1,7 @@ +serializing +propertiesFileContents + "To mimic IceBerg repositories." + ^ '{ + #format : #tonel +} +' \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/SquotTonelSerializer.class/instance/version.st b/src/SquotTonel-Tests.package/SquotTonelSerializer.class/instance/version.st new file mode 100644 index 000000000..27cb7b3ab --- /dev/null +++ b/src/SquotTonel-Tests.package/SquotTonelSerializer.class/instance/version.st @@ -0,0 +1,3 @@ +Squot serialization +version + ^ '1' \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/SquotTonelSerializer.class/instance/write..st b/src/SquotTonel-Tests.package/SquotTonelSerializer.class/instance/write..st new file mode 100644 index 000000000..fd2fd6cd6 --- /dev/null +++ b/src/SquotTonel-Tests.package/SquotTonelSerializer.class/instance/write..st @@ -0,0 +1,8 @@ +Squot serialization +write: anArtifact + self assert: anArtifact storeInfo objectClassName = 'PackageInfo'. + directory := rootDirectory resolve: anArtifact path. + anArtifact shadowOfTrackedObject squotWrite: anArtifact asTonelWith: self. + (directory parent / '.properties') writeStreamDo: + [:stream | + stream truncate; nextPutAll: self propertiesFileContents]. \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/SquotTonelSerializer.class/instance/writeMCSnapshot.forPackageNamed.from..st b/src/SquotTonel-Tests.package/SquotTonelSerializer.class/instance/writeMCSnapshot.forPackageNamed.from..st new file mode 100644 index 000000000..12b06d73d --- /dev/null +++ b/src/SquotTonel-Tests.package/SquotTonelSerializer.class/instance/writeMCSnapshot.forPackageNamed.from..st @@ -0,0 +1,5 @@ +serializing +writeMCSnapshot: aMonticelloSnapshot forPackageNamed: aString from: anArtifact + (TonelWriterForFileSystem on: directory parent "the writer creates the package directory") + packageName: aString; + writeSnapshot: aMonticelloSnapshot. \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/SquotTonelSerializer.class/instance/writeMCSnapshot.forPackageNamed.packageProperties.from..st b/src/SquotTonel-Tests.package/SquotTonelSerializer.class/instance/writeMCSnapshot.forPackageNamed.packageProperties.from..st new file mode 100644 index 000000000..82c8135d7 --- /dev/null +++ b/src/SquotTonel-Tests.package/SquotTonelSerializer.class/instance/writeMCSnapshot.forPackageNamed.packageProperties.from..st @@ -0,0 +1,9 @@ +serializing +writeMCSnapshot: aMonticelloSnapshot forPackageNamed: aString packageProperties: aDictionary from: anArtifact + directory ensureDirectory / 'package.st' writeStreamDo: + [:file | "Write package properties in advance, to the TonelWriter will pick up some settings." + file nextPutAll: 'Package '. + STON put: aDictionary onStream: file. + file cr. + self flag: #duplication. "TonelWriter>>writePackage:"]. + self writeMCSnapshot: aMonticelloSnapshot forPackageNamed: aString from: anArtifact. \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/SquotTonelSerializer.class/methodProperties.json b/src/SquotTonel-Tests.package/SquotTonelSerializer.class/methodProperties.json new file mode 100644 index 000000000..775245e57 --- /dev/null +++ b/src/SquotTonel-Tests.package/SquotTonelSerializer.class/methodProperties.json @@ -0,0 +1,10 @@ +{ + "class" : { + "rewritePath:for:" : "jr 3/17/2019 00:15", + "userFriendlyTitle" : "jr 3/16/2019 15:52" }, + "instance" : { + "propertiesFileContents" : "jr 9/3/2020 22:47", + "version" : "jr 2/16/2019 16:30", + "write:" : "jr 12/4/2020 20:25", + "writeMCSnapshot:forPackageNamed:from:" : "jr 3/16/2019 23:35", + "writeMCSnapshot:forPackageNamed:packageProperties:from:" : "jr 12/4/2020 20:28" } } diff --git a/src/SquotTonel-Tests.package/SquotTonelSerializer.class/properties.json b/src/SquotTonel-Tests.package/SquotTonelSerializer.class/properties.json new file mode 100644 index 000000000..2684c19d4 --- /dev/null +++ b/src/SquotTonel-Tests.package/SquotTonelSerializer.class/properties.json @@ -0,0 +1,14 @@ +{ + "category" : "SquotTonel-Core", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + "directory" ], + "name" : "SquotTonelSerializer", + "pools" : [ + ], + "super" : "SquotSerializer", + "type" : "normal" } diff --git a/src/SquotTonel-Tests.package/SquotTonelSerializerTest.class/instance/testRewriteCypressPath.st b/src/SquotTonel-Tests.package/SquotTonelSerializerTest.class/instance/testRewriteCypressPath.st deleted file mode 100644 index 0efd5f10e..000000000 --- a/src/SquotTonel-Tests.package/SquotTonelSerializerTest.class/instance/testRewriteCypressPath.st +++ /dev/null @@ -1,8 +0,0 @@ -tests -testRewriteCypressPath - | path serializerClass | - serializerClass := SquotTonelSerializer. - path := serializerClass rewritePath: 'src/test/Test.package' for: - (SquotShadowGraph withSingleShadow: - (PackageInfo new squotShadowFactory forPackageNamed: 'Test' withSnapshot: nil)). - self assert: 'src/test/Test' equals: path. \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/SquotTonelSerializerTest.class/instance/testRewriteEmptyPathAddsPackageDirectory.st b/src/SquotTonel-Tests.package/SquotTonelSerializerTest.class/instance/testRewriteEmptyPathAddsPackageDirectory.st deleted file mode 100644 index c68088bae..000000000 --- a/src/SquotTonel-Tests.package/SquotTonelSerializerTest.class/instance/testRewriteEmptyPathAddsPackageDirectory.st +++ /dev/null @@ -1,8 +0,0 @@ -tests -testRewriteEmptyPathAddsPackageDirectory - | path serializerClass | - serializerClass := SquotTonelSerializer. - path := serializerClass rewritePath: '' for: - (SquotShadowGraph withSingleShadow: - (PackageInfo new squotShadowFactory forPackageNamed: 'Test' withSnapshot: nil)). - self assert: 'Test' equals: path. \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/SquotTonelSerializerTest.class/instance/testRewritePathAddsPackageDirectory.st b/src/SquotTonel-Tests.package/SquotTonelSerializerTest.class/instance/testRewritePathAddsPackageDirectory.st deleted file mode 100644 index 26c9603b1..000000000 --- a/src/SquotTonel-Tests.package/SquotTonelSerializerTest.class/instance/testRewritePathAddsPackageDirectory.st +++ /dev/null @@ -1,8 +0,0 @@ -tests -testRewritePathAddsPackageDirectory - | path serializerClass | - serializerClass := SquotTonelSerializer. - path := serializerClass rewritePath: 'src/tests' for: - (SquotShadowGraph withSingleShadow: - (PackageInfo new squotShadowFactory forPackageNamed: 'Test' withSnapshot: nil)). - self assert: 'src/tests/Test' equals: path. \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/SquotTonelSerializerTest.class/instance/testRewritePathWithPackageAlreadyIncluded.st b/src/SquotTonel-Tests.package/SquotTonelSerializerTest.class/instance/testRewritePathWithPackageAlreadyIncluded.st deleted file mode 100644 index 0593214c4..000000000 --- a/src/SquotTonel-Tests.package/SquotTonelSerializerTest.class/instance/testRewritePathWithPackageAlreadyIncluded.st +++ /dev/null @@ -1,8 +0,0 @@ -tests -testRewritePathWithPackageAlreadyIncluded - | path serializerClass | - serializerClass := SquotTonelSerializer. - path := serializerClass rewritePath: 'src/test/Test' for: - (SquotShadowGraph withSingleShadow: - (PackageInfo new squotShadowFactory forPackageNamed: 'Test' withSnapshot: nil)). - self assert: 'src/test/Test' equals: path. \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/SquotTonelSerializerTest.class/instance/testWritesPropertiesFile.st b/src/SquotTonel-Tests.package/SquotTonelSerializerTest.class/instance/testWritesPropertiesFile.st deleted file mode 100644 index 5a9581778..000000000 --- a/src/SquotTonel-Tests.package/SquotTonelSerializerTest.class/instance/testWritesPropertiesFile.st +++ /dev/null @@ -1,12 +0,0 @@ -tests -testWritesPropertiesFile - | directory serializer artifact | - directory := FileSystem memory root. - serializer := SquotTonelSerializer writingBelow: directory. - artifact := (MCSnapshot fromDefinitions: {MCOrganizationDefinition categories: #('Empty')}) - asSquotArtifactForPackage: (PackageInfo new packageName: 'Empty'). - serializer write: artifact. - self assert: (directory / '.properties') exists. - directory / '.properties' readStreamDo: - [:stream | - (STON fromStream: stream) = (Dictionary new at: #format put: #tonel; yourself)]. \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/SquotTonelSerializerTest.class/methodProperties.json b/src/SquotTonel-Tests.package/SquotTonelSerializerTest.class/methodProperties.json deleted file mode 100644 index 257b46f75..000000000 --- a/src/SquotTonel-Tests.package/SquotTonelSerializerTest.class/methodProperties.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "testRewriteCypressPath" : "jr 3/17/2019 00:09", - "testRewriteEmptyPathAddsPackageDirectory" : "jr 3/12/2019 22:09", - "testRewritePathAddsPackageDirectory" : "jr 3/12/2019 22:09", - "testRewritePathWithPackageAlreadyIncluded" : "jr 3/12/2019 22:09", - "testWritesPropertiesFile" : "jr 9/3/2020 22:10" } } diff --git a/src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/README.md b/src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/instance/delete.st b/src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/instance/delete.st deleted file mode 100644 index 010afc6ba..000000000 --- a/src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/instance/delete.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -delete - tempChangesFile ifNotNil: - [self directory deleteFileNamed: tempChangesFile localName]. \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/instance/directory.st b/src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/instance/directory.st deleted file mode 100644 index d71df2eaf..000000000 --- a/src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/instance/directory.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -directory - "Where we want to place the temporary changes file" - ^FileDirectory default \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/instance/genericChangesName.st b/src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/instance/genericChangesName.st deleted file mode 100644 index 04faa7449..000000000 --- a/src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/instance/genericChangesName.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -genericChangesName - ^self prefixChangesName, self randomString, '.changes' \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/instance/prefixChangesName.st b/src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/instance/prefixChangesName.st deleted file mode 100644 index b76f9db2a..000000000 --- a/src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/instance/prefixChangesName.st +++ /dev/null @@ -1,3 +0,0 @@ -private -prefixChangesName - ^self prefixGeneral \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/instance/prefixGeneral.st b/src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/instance/prefixGeneral.st deleted file mode 100644 index 0a6a2b547..000000000 --- a/src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/instance/prefixGeneral.st +++ /dev/null @@ -1,3 +0,0 @@ -private -prefixGeneral - ^self class name select: [:each | each isUppercase] \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/instance/randomString.st b/src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/instance/randomString.st deleted file mode 100644 index 2068ac5ca..000000000 --- a/src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/instance/randomString.st +++ /dev/null @@ -1,3 +0,0 @@ -private -randomString - ^Character alphabet shuffled \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/instance/tempChangesName.st b/src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/instance/tempChangesName.st deleted file mode 100644 index b47e4792c..000000000 --- a/src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/instance/tempChangesName.st +++ /dev/null @@ -1,3 +0,0 @@ -private -tempChangesName - ^tempChangesName ifNil: [tempChangesName := self genericChangesName] \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/instance/useStandardChangesFile.st b/src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/instance/useStandardChangesFile.st deleted file mode 100644 index aa705dc38..000000000 --- a/src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/instance/useStandardChangesFile.st +++ /dev/null @@ -1,5 +0,0 @@ -accessing -useStandardChangesFile - Smalltalk - closeSourceFiles; - openSourceFiles \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/instance/useTemporaryChangesFile.st b/src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/instance/useTemporaryChangesFile.st deleted file mode 100644 index 1365cd448..000000000 --- a/src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/instance/useTemporaryChangesFile.st +++ /dev/null @@ -1,5 +0,0 @@ -accessing -useTemporaryChangesFile - Smalltalk closeSourceFiles. - tempChangesFile := self directory forceNewFileNamed: self tempChangesName. - SourceFiles at: 2 put: tempChangesFile \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/methodProperties.json b/src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/methodProperties.json deleted file mode 100644 index b13095e8c..000000000 --- a/src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/methodProperties.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "delete" : "jr 12/4/2020 23:54", - "directory" : "laza 9/28/2011 07:22", - "genericChangesName" : "laza 11/21/2011 15:43", - "prefixChangesName" : "laza 11/21/2011 15:43", - "prefixGeneral" : "laza 11/2/2011 12:30", - "randomString" : "laza 11/1/2011 18:58", - "tempChangesName" : "laza 11/21/2011 15:44", - "useStandardChangesFile" : "laza 11/1/2011 21:26", - "useTemporaryChangesFile" : "laza 11/2/2011 10:17" } } diff --git a/src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/properties.json b/src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/properties.json deleted file mode 100644 index 92601df2f..000000000 --- a/src/SquotTonel-Tests.package/TemporarySystemChangeFile.class/properties.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "category" : "SquotTonel-Tests", - "classinstvars" : [ - ], - "classvars" : [ - ], - "commentStamp" : "", - "instvars" : [ - "tempChangesFile", - "tempChangesName" ], - "name" : "TemporarySystemChangeFile", - "pools" : [ - ], - "super" : "Object", - "type" : "normal" } diff --git a/src/SquotTonel-Tests.package/TonelReader.extension/instance/currentPackageProperties.st b/src/SquotTonel-Tests.package/TonelReader.extension/instance/currentPackageProperties.st new file mode 100644 index 000000000..24488faaa --- /dev/null +++ b/src/SquotTonel-Tests.package/TonelReader.extension/instance/currentPackageProperties.st @@ -0,0 +1,9 @@ +*SquotTonel-Core +currentPackageProperties + ^ (self packageDirectory notNil and: [self fileUtils filePathExists: 'package.st' relativeTo: self packageDirectory]) + ifTrue: [ + (self packageDirectory / 'package.st') readStreamDo: [:stream | + ((stream upTo: Character space) = 'Package') + ifTrue: [STON fromStream: stream] + ifFalse: [Dictionary new]]] + ifFalse: [Dictionary new] \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/TonelReader.extension/methodProperties.json b/src/SquotTonel-Tests.package/TonelReader.extension/methodProperties.json new file mode 100644 index 000000000..b2836d9a7 --- /dev/null +++ b/src/SquotTonel-Tests.package/TonelReader.extension/methodProperties.json @@ -0,0 +1,5 @@ +{ + "class" : { + }, + "instance" : { + "currentPackageProperties" : "jr 12/5/2020 00:18" } } diff --git a/src/SquotTonel-Tests.package/TonelReader.extension/properties.json b/src/SquotTonel-Tests.package/TonelReader.extension/properties.json new file mode 100644 index 000000000..5b633f5ab --- /dev/null +++ b/src/SquotTonel-Tests.package/TonelReader.extension/properties.json @@ -0,0 +1,2 @@ +{ + "name" : "TonelReader" } diff --git a/src/SquotTonel-Tests.package/SquotTonelReadWriteTest.class/README.md b/src/SquotTonel-Tests.package/TonelReaderForFileSystem.class/README.md similarity index 100% rename from src/SquotTonel-Tests.package/SquotTonelReadWriteTest.class/README.md rename to src/SquotTonel-Tests.package/TonelReaderForFileSystem.class/README.md diff --git a/src/SquotTonel-Tests.package/TonelReaderForFileSystem.class/instance/fileUtils.st b/src/SquotTonel-Tests.package/TonelReaderForFileSystem.class/instance/fileUtils.st new file mode 100644 index 000000000..b8c10ba1a --- /dev/null +++ b/src/SquotTonel-Tests.package/TonelReaderForFileSystem.class/instance/fileUtils.st @@ -0,0 +1,3 @@ +accessing +fileUtils + ^ TonelFileSystemUtils \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/TonelReaderForFileSystem.class/methodProperties.json b/src/SquotTonel-Tests.package/TonelReaderForFileSystem.class/methodProperties.json new file mode 100644 index 000000000..7f70b98c0 --- /dev/null +++ b/src/SquotTonel-Tests.package/TonelReaderForFileSystem.class/methodProperties.json @@ -0,0 +1,5 @@ +{ + "class" : { + }, + "instance" : { + "fileUtils" : "jr 2/16/2019 17:24" } } diff --git a/src/SquotTonel-Tests.package/SquotTonelDeserializerTest.class/properties.json b/src/SquotTonel-Tests.package/TonelReaderForFileSystem.class/properties.json similarity index 58% rename from src/SquotTonel-Tests.package/SquotTonelDeserializerTest.class/properties.json rename to src/SquotTonel-Tests.package/TonelReaderForFileSystem.class/properties.json index 759bc3994..7762e3050 100644 --- a/src/SquotTonel-Tests.package/SquotTonelDeserializerTest.class/properties.json +++ b/src/SquotTonel-Tests.package/TonelReaderForFileSystem.class/properties.json @@ -1,5 +1,5 @@ { - "category" : "SquotTonel-Tests", + "category" : "SquotTonel-Core", "classinstvars" : [ ], "classvars" : [ @@ -7,8 +7,8 @@ "commentStamp" : "", "instvars" : [ ], - "name" : "SquotTonelDeserializerTest", + "name" : "TonelReaderForFileSystem", "pools" : [ ], - "super" : "TestCase", + "super" : "TonelReader", "type" : "normal" } diff --git a/src/SquotTonel-Tests.package/SquotTonelSerializerTest.class/README.md b/src/SquotTonel-Tests.package/TonelWriterForFileSystem.class/README.md similarity index 100% rename from src/SquotTonel-Tests.package/SquotTonelSerializerTest.class/README.md rename to src/SquotTonel-Tests.package/TonelWriterForFileSystem.class/README.md diff --git a/src/SquotTonel-Tests.package/TonelWriterForFileSystem.class/instance/fileUtils.st b/src/SquotTonel-Tests.package/TonelWriterForFileSystem.class/instance/fileUtils.st new file mode 100644 index 000000000..b8c10ba1a --- /dev/null +++ b/src/SquotTonel-Tests.package/TonelWriterForFileSystem.class/instance/fileUtils.st @@ -0,0 +1,3 @@ +accessing +fileUtils + ^ TonelFileSystemUtils \ No newline at end of file diff --git a/src/SquotTonel-Tests.package/TonelWriterForFileSystem.class/methodProperties.json b/src/SquotTonel-Tests.package/TonelWriterForFileSystem.class/methodProperties.json new file mode 100644 index 000000000..f24c85347 --- /dev/null +++ b/src/SquotTonel-Tests.package/TonelWriterForFileSystem.class/methodProperties.json @@ -0,0 +1,5 @@ +{ + "class" : { + }, + "instance" : { + "fileUtils" : "jr 2/16/2019 17:23" } } diff --git a/src/SquotTonel-Tests.package/SquotTonelPackageLocatorTest.class/properties.json b/src/SquotTonel-Tests.package/TonelWriterForFileSystem.class/properties.json similarity index 54% rename from src/SquotTonel-Tests.package/SquotTonelPackageLocatorTest.class/properties.json rename to src/SquotTonel-Tests.package/TonelWriterForFileSystem.class/properties.json index d79345eb4..1319a8cb5 100644 --- a/src/SquotTonel-Tests.package/SquotTonelPackageLocatorTest.class/properties.json +++ b/src/SquotTonel-Tests.package/TonelWriterForFileSystem.class/properties.json @@ -1,5 +1,5 @@ { - "category" : "SquotTonel-Tests", + "category" : "SquotTonel-Core", "classinstvars" : [ ], "classvars" : [ @@ -7,8 +7,8 @@ "commentStamp" : "", "instvars" : [ ], - "name" : "SquotTonelPackageLocatorTest", + "name" : "TonelWriterForFileSystem", "pools" : [ ], - "super" : "SquotArtifactLocatorTest", + "super" : "TonelWriter", "type" : "normal" } diff --git a/src/SquotTonel-Tests.package/monticello.meta/categories.st b/src/SquotTonel-Tests.package/monticello.meta/categories.st index dc7876dd3..81c3d9808 100644 --- a/src/SquotTonel-Tests.package/monticello.meta/categories.st +++ b/src/SquotTonel-Tests.package/monticello.meta/categories.st @@ -1 +1 @@ -SystemOrganization addCategory: #'SquotTonel-Tests'! +SystemOrganization addCategory: #'SquotTonel-Core'! diff --git a/src/VersionControl.package/.squot-contents b/src/VersionControl.package/.squot-contents index b5d4d4099..4b0df335b 100644 --- a/src/VersionControl.package/.squot-contents +++ b/src/VersionControl.package/.squot-contents @@ -1,6 +1,6 @@ SquotTrackedObjectMetadata { #objectClassName : #PackageInfo, + #slotOverrides : { }, #objectsReplacedByNames : true, - #slotOverrides : IdentityDictionary { }, #serializer : #SquotCypressCodeSerializer } \ No newline at end of file From 6e371901bbb9d8cac5b049ae3eca2bd40ed4e84e Mon Sep 17 00:00:00 2001 From: Eva Krebs Date: Sat, 17 Jul 2021 13:23:09 +0200 Subject: [PATCH 02/19] remove menu elements --- .../instance/buildObjectList..st | 11 ++++++++++ .../instance/commitListMenu..st | 3 +++ .../instance/projectListMenu..st | 3 +++ .../instance/swaMenuCommitListHook..st | 20 ++++++++++++++++++ .../instance/swaMenuProjectListHook..st | 11 ++++++++++ .../swaMenuProjectListWorkingCopyHook..st | 21 +++++++++++++++++++ .../methodProperties.json | 8 ++++++- 7 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 src/Squit.package/SwaSquitBrowser.class/instance/buildObjectList..st create mode 100644 src/Squit.package/SwaSquitBrowser.class/instance/commitListMenu..st create mode 100644 src/Squit.package/SwaSquitBrowser.class/instance/projectListMenu..st create mode 100644 src/Squit.package/SwaSquitBrowser.class/instance/swaMenuCommitListHook..st create mode 100644 src/Squit.package/SwaSquitBrowser.class/instance/swaMenuProjectListHook..st create mode 100644 src/Squit.package/SwaSquitBrowser.class/instance/swaMenuProjectListWorkingCopyHook..st diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/buildObjectList..st b/src/Squit.package/SwaSquitBrowser.class/instance/buildObjectList..st new file mode 100644 index 000000000..1e009ff60 --- /dev/null +++ b/src/Squit.package/SwaSquitBrowser.class/instance/buildObjectList..st @@ -0,0 +1,11 @@ +as yet unclassified +buildObjectList: builder + ^ builder pluggableListSpec new + model: self; + list: #objectList; + getIndex: #objectIndex; + setIndex: #objectIndex:; + dragItem: #dragFromObjectList:; + dropAccept: #wantsObjectListDrop:type:from:; + dropItem: #dropOnObjectList:at:copyIndicated:; + frame: (0.7@0.6 corner: 1@1) \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/commitListMenu..st b/src/Squit.package/SwaSquitBrowser.class/instance/commitListMenu..st new file mode 100644 index 000000000..ed362c78b --- /dev/null +++ b/src/Squit.package/SwaSquitBrowser.class/instance/commitListMenu..st @@ -0,0 +1,3 @@ +as yet unclassified +commitListMenu: aMenu + ^ self menu: aMenu for: #(swaMenuCommitList) \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/projectListMenu..st b/src/Squit.package/SwaSquitBrowser.class/instance/projectListMenu..st new file mode 100644 index 000000000..30358d455 --- /dev/null +++ b/src/Squit.package/SwaSquitBrowser.class/instance/projectListMenu..st @@ -0,0 +1,3 @@ +as yet unclassified +projectListMenu: aMenu + ^ self menu: aMenu for: #(swaMenuProjectList) \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/swaMenuCommitListHook..st b/src/Squit.package/SwaSquitBrowser.class/instance/swaMenuCommitListHook..st new file mode 100644 index 000000000..a216485f4 --- /dev/null +++ b/src/Squit.package/SwaSquitBrowser.class/instance/swaMenuCommitListHook..st @@ -0,0 +1,20 @@ +as yet unclassified +swaMenuCommitListHook: aMenu + + | activeBranchName isMenuOnActiveBranch onlyOnInactiveBranch commands | + self hasProjectSelection ifFalse: [^ aMenu]. + aMenu addTitle: (self commitSelection printStringLimitedTo: 50). + self withUnitOfWork: + [activeBranchName := self projectSelection loadedHistorian shortName. + isMenuOnActiveBranch := selectedHistorian = self projectSelection loadedHistorian. + onlyOnInactiveBranch := selectedHistorian ~= self projectSelection loadedHistorian. + commands := { + {'Checkout objects'. #actionCommitSelectionCheckout. 'Checkout objects from this commit. You will be able to select what will actually be loaded.', String cr, 'NOTE: unless you change the selection, your uncommitted changes will be reverted, so that what is loaded matches the objects in this commit!'}. + {'Merge objects'. #actionCommitMergeIntoMemory. 'Merge objects from this commit with the loaded ones. You may use this to pick objects or changes from this commit without discarding your uncommitted changes.'}. + '-'. + {'Compare with parent commit'. #actionCommitDiffWithParent}. + {'Compare with next selected commit'. #actionCommitDiffWithNextSelected. 'The next commit you select will be the origin of a diff against this commit.'}. + {'Compare with working copy'. #actionCommitDiffWithWorkingCopy}. + }. + self buildMenu: aMenu from: commands]. + ^ aMenu \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/swaMenuProjectListHook..st b/src/Squit.package/SwaSquitBrowser.class/instance/swaMenuProjectListHook..st new file mode 100644 index 000000000..bd2f57c63 --- /dev/null +++ b/src/Squit.package/SwaSquitBrowser.class/instance/swaMenuProjectListHook..st @@ -0,0 +1,11 @@ +as yet unclassified +swaMenuProjectListHook: aMenu + + + | submenu | + self projectSelection + ifNil: [submenu := aMenu] + ifNotNil: [submenu := aMenu class new + defaultTarget: aMenu defaultTarget; + yourself]. + ^ aMenu \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/swaMenuProjectListWorkingCopyHook..st b/src/Squit.package/SwaSquitBrowser.class/instance/swaMenuProjectListWorkingCopyHook..st new file mode 100644 index 000000000..1a165da5a --- /dev/null +++ b/src/Squit.package/SwaSquitBrowser.class/instance/swaMenuProjectListWorkingCopyHook..st @@ -0,0 +1,21 @@ +as yet unclassified +swaMenuProjectListWorkingCopyHook: aMenu + + + self projectSelection ifNil: [^ aMenu]. + aMenu addTitle: 'Working copy of ', self projectSelection name. + aMenu addList: { + {'Rename project'. #actionProjectRename}. + {'Remove project'. #actionProjectRemove}. + }. + aMenu addLine. + aMenu + addList: { + {'Add or remove packages'. #actionAddOrRemoveTrackedPackages. 'Add or remove packages for this project.'} + }. + aMenu addLine. + aMenu addList: { + {'Edit credentials for project'. #actionCredentialsEdit}. + {'Edit project-level git user name/email'. #actionGitUserEdit} + }. + ^ aMenu \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/methodProperties.json b/src/Squit.package/SwaSquitBrowser.class/methodProperties.json index f8a412523..1a5bdfd9a 100644 --- a/src/Squit.package/SwaSquitBrowser.class/methodProperties.json +++ b/src/Squit.package/SwaSquitBrowser.class/methodProperties.json @@ -6,7 +6,13 @@ "buildCloneButton:" : "ek 7/17/2021 11:32", "buildCommitList:" : "ek 7/17/2021 11:11", "buildCommitSearchPanel:" : "ek 7/17/2021 11:09", + "buildObjectList:" : "ek 7/17/2021 13:20", "buildProjectBranchPanel:" : "ek 7/17/2021 11:25", "buildProjectList:" : "ek 7/17/2021 11:30", "clone" : "ek 7/17/2021 11:50", - "offerToAddFirstProject" : "ek 7/17/2021 11:37" } } + "commitListMenu:" : "ek 7/17/2021 13:04", + "offerToAddFirstProject" : "ek 7/17/2021 11:37", + "projectListMenu:" : "ek 7/17/2021 13:11", + "swaMenuCommitListHook:" : "ek 7/17/2021 13:04", + "swaMenuProjectListHook:" : "ek 7/17/2021 13:18", + "swaMenuProjectListWorkingCopyHook:" : "ek 7/17/2021 13:19" } } From 95b7dc22dfd5a2224ec74ec0208e662a336142af Mon Sep 17 00:00:00 2001 From: Tom Beckmann Date: Sat, 17 Jul 2021 15:30:23 +0200 Subject: [PATCH 03/19] add basic custom UI --- src/Squit.package/.squot-contents | 2 +- .../SwaSquitBrowserNew.class/README.md | 0 .../instance/buildCommitList..st | 16 +++++++++++++ .../instance/buildRepositoryButtons..st | 24 +++++++++++++++++++ .../instance/buildRepositoryList..st | 14 +++++++++++ .../instance/buildSyncButton..st | 12 ++++++++++ .../instance/buildWith..st | 11 +++++++++ .../instance/buttonHeight.st | 4 ++++ .../instance/commitList.st | 16 +++++++++++++ .../instance/commitListIndex..st | 5 ++++ .../instance/commitListIndex.st | 4 ++++ .../instance/example.st | 7 ++++++ .../instance/formatDate..st | 12 ++++++++++ .../instance/initialize.st | 6 +++++ .../instance/repositoryList.st | 4 ++++ .../instance/repositoryListIndex..st | 5 ++++ .../instance/repositoryListIndex.st | 4 ++++ .../instance/selectedRepository.st | 4 ++++ .../methodProperties.json | 20 ++++++++++++++++ .../SwaSquitBrowserNew.class/properties.json | 15 ++++++++++++ 20 files changed, 184 insertions(+), 1 deletion(-) create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/README.md create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/instance/buildCommitList..st create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/instance/buildRepositoryButtons..st create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/instance/buildRepositoryList..st create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/instance/buildSyncButton..st create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/instance/buildWith..st create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/instance/buttonHeight.st create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/instance/commitList.st create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/instance/commitListIndex..st create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/instance/commitListIndex.st create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/instance/example.st create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/instance/formatDate..st create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/instance/initialize.st create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/instance/repositoryList.st create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/instance/repositoryListIndex..st create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/instance/repositoryListIndex.st create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/instance/selectedRepository.st create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/methodProperties.json create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/properties.json diff --git a/src/Squit.package/.squot-contents b/src/Squit.package/.squot-contents index 4b0df335b..abe784a58 100644 --- a/src/Squit.package/.squot-contents +++ b/src/Squit.package/.squot-contents @@ -1,6 +1,6 @@ SquotTrackedObjectMetadata { #objectClassName : #PackageInfo, - #slotOverrides : { }, #objectsReplacedByNames : true, + #slotOverrides : { }, #serializer : #SquotCypressCodeSerializer } \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/README.md b/src/Squit.package/SwaSquitBrowserNew.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/buildCommitList..st b/src/Squit.package/SwaSquitBrowserNew.class/instance/buildCommitList..st new file mode 100644 index 000000000..66742ab5b --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/buildCommitList..st @@ -0,0 +1,16 @@ +as yet unclassified +buildCommitList: aBuilder + + ^ aBuilder pluggableMultiColumnListSpec new + model: self; + list: #commitList; + getIndex: #commitListIndex; + hScrollBarPolicy: #whenNeeded; + setIndex: #commitListIndex:; + columnResizings: #(#shrinkWrap #shrinkWrap #shrinkWrap #spaceFill); + itemAlignments: #(#right #left #left #left); + frame: (LayoutFrame new + leftFraction: 0.3 offset: 0; + topFraction: 0 offset: 0; + rightFraction: 1 offset: 0; + bottomFraction: 1 offset: self buttonHeight negated) \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/buildRepositoryButtons..st b/src/Squit.package/SwaSquitBrowserNew.class/instance/buildRepositoryButtons..st new file mode 100644 index 000000000..a391f983b --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/buildRepositoryButtons..st @@ -0,0 +1,24 @@ +as yet unclassified +buildRepositoryButtons: aBuilder + + ^ aBuilder pluggablePanelSpec new + layout: #horizontal; + children: { + aBuilder pluggableButtonSpec new + model: self; + label: 'Load'; + action: #actionLoad. + aBuilder pluggableButtonSpec new + model: self; + label: 'Save'; + action: #actionSave. + aBuilder pluggableButtonSpec new + model: self; + label: 'Save unpushed'; + action: #actionSaveUnpushed; + enabled: false}; + frame: (LayoutFrame new + leftFraction: 0.5 offset: 0; + topFraction: 1 offset: self buttonHeight negated; + rightFraction: 1 offset: 0; + bottomFraction: 1 offset: 0) \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/buildRepositoryList..st b/src/Squit.package/SwaSquitBrowserNew.class/instance/buildRepositoryList..st new file mode 100644 index 000000000..8335c1a2c --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/buildRepositoryList..st @@ -0,0 +1,14 @@ +as yet unclassified +buildRepositoryList: aBuilder + + ^ aBuilder pluggableListSpec new + model: self; + list: #repositoryList; + getIndex: #repositoryListIndex; + setIndex: #repositoryListIndex:; + hScrollBarPolicy: #never; + frame: (LayoutFrame new + leftFraction: 0 offset: 0; + topFraction: 0 offset: 0; + rightFraction: 0.3 offset: 0; + bottomFraction: 1 offset: self buttonHeight negated) \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/buildSyncButton..st b/src/Squit.package/SwaSquitBrowserNew.class/instance/buildSyncButton..st new file mode 100644 index 000000000..6b8a537a7 --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/buildSyncButton..st @@ -0,0 +1,12 @@ +as yet unclassified +buildSyncButton: aBuilder + + ^ aBuilder pluggableButtonSpec new + model: self; + label: 'Add Sync'; + action: #addRepository; + frame: (LayoutFrame new + leftFraction: 0 offset: 0; + topFraction: 1 offset: self buttonHeight negated; + rightFraction: 0.3 offset: 0; + bottomFraction: 1 offset: 0) \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/buildWith..st b/src/Squit.package/SwaSquitBrowserNew.class/instance/buildWith..st new file mode 100644 index 000000000..b685c02fe --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/buildWith..st @@ -0,0 +1,11 @@ +as yet unclassified +buildWith: aBuilder + + ^ aBuilder build: ((self buildWindowWith: aBuilder) + children: { + self buildRepositoryList: aBuilder. + self buildCommitList: aBuilder. + self buildSyncButton: aBuilder. + self buildRepositoryButtons: aBuilder}; + extent: 300 @ 200; + yourself) \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/buttonHeight.st b/src/Squit.package/SwaSquitBrowserNew.class/instance/buttonHeight.st new file mode 100644 index 000000000..c7ee864dd --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/buttonHeight.st @@ -0,0 +1,4 @@ +as yet unclassified +buttonHeight + + ^ TextStyle defaultFont height * 2 \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/commitList.st b/src/Squit.package/SwaSquitBrowserNew.class/instance/commitList.st new file mode 100644 index 000000000..50ea9431e --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/commitList.st @@ -0,0 +1,16 @@ +as yet unclassified +commitList + + | walker count commits | + walker := self selectedRepository loadedHistorian repository historyWalkClass new. + walker nextPut: self selectedRepository loadedHistorian version. + count := 0. + commits := Array streamContents: [:stream | + [walker atEnd or: [count > 30]] whileFalse: [ + stream nextPut: walker next. + count := count + 1]]. + ^ { + [:commit | self formatDate: commit timestamp]. + [:commit | String streamContents: [:s | commit timestamp printHMSOn: s]]. + [:commit | commit metadata at: #author]. + [:commit | commit message]} withIndexCollect: [:columnBlock :columnIndex | commits collect: [:commit | columnBlock value: commit]] \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/commitListIndex..st b/src/Squit.package/SwaSquitBrowserNew.class/instance/commitListIndex..st new file mode 100644 index 000000000..10bf6cdde --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/commitListIndex..st @@ -0,0 +1,5 @@ +as yet unclassified +commitListIndex: aNumber + + commitListIndex := aNumber. + self changed: #commitListIndex \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/commitListIndex.st b/src/Squit.package/SwaSquitBrowserNew.class/instance/commitListIndex.st new file mode 100644 index 000000000..617422d25 --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/commitListIndex.st @@ -0,0 +1,4 @@ +as yet unclassified +commitListIndex + + ^ commitListIndex \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/example.st b/src/Squit.package/SwaSquitBrowserNew.class/instance/example.st new file mode 100644 index 000000000..5c7472f4e --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/example.st @@ -0,0 +1,7 @@ +as yet unclassified +example + + SBMorphExample + setUp: [ToolBuilder open: self class new] + cases: {SBMorphExampleCase name: 'example 1' caseBlock: [:m | m]} + extent: 354 @ 271 \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/formatDate..st b/src/Squit.package/SwaSquitBrowserNew.class/instance/formatDate..st new file mode 100644 index 000000000..d9c4efff5 --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/formatDate..st @@ -0,0 +1,12 @@ +as yet unclassified +formatDate: aDateAndTime + + | YY MM DD hh mm | + YY := aDateAndTime year. + MM := aDateAndTime monthAbbreviation. + DD := aDateAndTime dayOfMonth asString. + hh := aDateAndTime hours. + mm := aDateAndTime minutes asString. + ^ aDateAndTime year = DateAndTime now year + ifTrue: [DD, ' ', MM, ' '] + ifFalse: [DD, ' ', MM, ' ', YY] \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/initialize.st b/src/Squit.package/SwaSquitBrowserNew.class/instance/initialize.st new file mode 100644 index 000000000..b566ceb59 --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/initialize.st @@ -0,0 +1,6 @@ +as yet unclassified +initialize + + super initialize. + repositoryListIndex := 1. + commitListIndex := 1 \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/repositoryList.st b/src/Squit.package/SwaSquitBrowserNew.class/instance/repositoryList.st new file mode 100644 index 000000000..ca2221af4 --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/repositoryList.st @@ -0,0 +1,4 @@ +as yet unclassified +repositoryList + + ^ SquotWorkingCopy registered \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/repositoryListIndex..st b/src/Squit.package/SwaSquitBrowserNew.class/instance/repositoryListIndex..st new file mode 100644 index 000000000..d5b353518 --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/repositoryListIndex..st @@ -0,0 +1,5 @@ +as yet unclassified +repositoryListIndex: aNumber + + repositoryListIndex := aNumber. + self changed: #repositoryListIndex \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/repositoryListIndex.st b/src/Squit.package/SwaSquitBrowserNew.class/instance/repositoryListIndex.st new file mode 100644 index 000000000..350e87ba8 --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/repositoryListIndex.st @@ -0,0 +1,4 @@ +as yet unclassified +repositoryListIndex + + ^ repositoryListIndex \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/selectedRepository.st b/src/Squit.package/SwaSquitBrowserNew.class/instance/selectedRepository.st new file mode 100644 index 000000000..77f0bcf03 --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/selectedRepository.st @@ -0,0 +1,4 @@ +as yet unclassified +selectedRepository + + ^ self repositoryList at: self repositoryListIndex \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/methodProperties.json b/src/Squit.package/SwaSquitBrowserNew.class/methodProperties.json new file mode 100644 index 000000000..c49136ac5 --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/methodProperties.json @@ -0,0 +1,20 @@ +{ + "class" : { + }, + "instance" : { + "buildCommitList:" : "tobe 7/17/2021 15:29", + "buildRepositoryButtons:" : "tobe 7/17/2021 14:57", + "buildRepositoryList:" : "tobe 7/17/2021 15:00", + "buildSyncButton:" : "tobe 7/17/2021 14:48", + "buildWith:" : "tobe 7/17/2021 14:52", + "buttonHeight" : "tobe 7/17/2021 14:49", + "commitList" : "tobe 7/17/2021 15:26", + "commitListIndex" : "tobe 7/17/2021 15:06", + "commitListIndex:" : "tobe 7/17/2021 15:05", + "example" : "tobe 7/17/2021 14:51", + "formatDate:" : "tobe 7/17/2021 15:27", + "initialize" : "tobe 7/17/2021 15:06", + "repositoryList" : "tobe 7/17/2021 14:59", + "repositoryListIndex" : "tobe 7/17/2021 14:58", + "repositoryListIndex:" : "tobe 7/17/2021 15:02", + "selectedRepository" : "tobe 7/17/2021 15:08" } } diff --git a/src/Squit.package/SwaSquitBrowserNew.class/properties.json b/src/Squit.package/SwaSquitBrowserNew.class/properties.json new file mode 100644 index 000000000..adc1b66f1 --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/properties.json @@ -0,0 +1,15 @@ +{ + "category" : "Squit-Hackday", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + "repositoryListIndex", + "commitListIndex" ], + "name" : "SwaSquitBrowserNew", + "pools" : [ + ], + "super" : "Model", + "type" : "normal" } From 00416cc39c5870cfc31de645c4210336c00c6d3d Mon Sep 17 00:00:00 2001 From: Tom Beckmann Date: Sat, 17 Jul 2021 15:56:48 +0200 Subject: [PATCH 04/19] make sure cloning works --- .../SwaSquitBrowserNew.class/instance/addRepository.st | 7 +++++++ .../instance/buildSyncButton..st | 2 +- .../SwaSquitBrowserNew.class/instance/formatDate..st | 2 +- .../SwaSquitBrowserNew.class/instance/refresh.st | 4 ++++ .../instance/repositoryListIndex..st | 3 ++- .../SwaSquitBrowserNew.class/methodProperties.json | 8 +++++--- .../SwaSquitInteractiveClone.class/instance/clone.st | 9 +++++---- .../instance/createRepository.st | 3 ++- .../SwaSquitInteractiveClone.class/methodProperties.json | 4 ++-- 9 files changed, 29 insertions(+), 13 deletions(-) create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/instance/addRepository.st create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/instance/refresh.st diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/addRepository.st b/src/Squit.package/SwaSquitBrowserNew.class/instance/addRepository.st new file mode 100644 index 000000000..28e049eef --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/addRepository.st @@ -0,0 +1,7 @@ +as yet unclassified +addRepository + + | operation | + operation := SwaSquitInteractiveClone new. + [operation clone] on: SquitBadRemote do: [:e | e retry]. + Project current addDeferredUIMessage: [self refresh] \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/buildSyncButton..st b/src/Squit.package/SwaSquitBrowserNew.class/instance/buildSyncButton..st index 6b8a537a7..df39d40d0 100644 --- a/src/Squit.package/SwaSquitBrowserNew.class/instance/buildSyncButton..st +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/buildSyncButton..st @@ -3,7 +3,7 @@ buildSyncButton: aBuilder ^ aBuilder pluggableButtonSpec new model: self; - label: 'Add Sync'; + label: 'Sync New Project'; action: #addRepository; frame: (LayoutFrame new leftFraction: 0 offset: 0; diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/formatDate..st b/src/Squit.package/SwaSquitBrowserNew.class/instance/formatDate..st index d9c4efff5..374e9561d 100644 --- a/src/Squit.package/SwaSquitBrowserNew.class/instance/formatDate..st +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/formatDate..st @@ -8,5 +8,5 @@ formatDate: aDateAndTime hh := aDateAndTime hours. mm := aDateAndTime minutes asString. ^ aDateAndTime year = DateAndTime now year - ifTrue: [DD, ' ', MM, ' '] + ifTrue: [DD, ' ', MM] ifFalse: [DD, ' ', MM, ' ', YY] \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/refresh.st b/src/Squit.package/SwaSquitBrowserNew.class/instance/refresh.st new file mode 100644 index 000000000..ecd57c5d7 --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/refresh.st @@ -0,0 +1,4 @@ +as yet unclassified +refresh + + self changed: #repositoryList \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/repositoryListIndex..st b/src/Squit.package/SwaSquitBrowserNew.class/instance/repositoryListIndex..st index d5b353518..faba132fc 100644 --- a/src/Squit.package/SwaSquitBrowserNew.class/instance/repositoryListIndex..st +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/repositoryListIndex..st @@ -2,4 +2,5 @@ as yet unclassified repositoryListIndex: aNumber repositoryListIndex := aNumber. - self changed: #repositoryListIndex \ No newline at end of file + self changed: #repositoryListIndex. + self changed: #commitList \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/methodProperties.json b/src/Squit.package/SwaSquitBrowserNew.class/methodProperties.json index c49136ac5..b24805e5d 100644 --- a/src/Squit.package/SwaSquitBrowserNew.class/methodProperties.json +++ b/src/Squit.package/SwaSquitBrowserNew.class/methodProperties.json @@ -2,19 +2,21 @@ "class" : { }, "instance" : { + "addRepository" : "tobe 7/17/2021 15:33", "buildCommitList:" : "tobe 7/17/2021 15:29", "buildRepositoryButtons:" : "tobe 7/17/2021 14:57", "buildRepositoryList:" : "tobe 7/17/2021 15:00", - "buildSyncButton:" : "tobe 7/17/2021 14:48", + "buildSyncButton:" : "tobe 7/17/2021 15:31", "buildWith:" : "tobe 7/17/2021 14:52", "buttonHeight" : "tobe 7/17/2021 14:49", "commitList" : "tobe 7/17/2021 15:26", "commitListIndex" : "tobe 7/17/2021 15:06", "commitListIndex:" : "tobe 7/17/2021 15:05", "example" : "tobe 7/17/2021 14:51", - "formatDate:" : "tobe 7/17/2021 15:27", + "formatDate:" : "tobe 7/17/2021 15:37", "initialize" : "tobe 7/17/2021 15:06", + "refresh" : "tobe 7/17/2021 15:49", "repositoryList" : "tobe 7/17/2021 14:59", "repositoryListIndex" : "tobe 7/17/2021 14:58", - "repositoryListIndex:" : "tobe 7/17/2021 15:02", + "repositoryListIndex:" : "tobe 7/17/2021 15:36", "selectedRepository" : "tobe 7/17/2021 15:08" } } diff --git a/src/Squit.package/SwaSquitInteractiveClone.class/instance/clone.st b/src/Squit.package/SwaSquitInteractiveClone.class/instance/clone.st index db15610c9..265a086d8 100644 --- a/src/Squit.package/SwaSquitInteractiveClone.class/instance/clone.st +++ b/src/Squit.package/SwaSquitInteractiveClone.class/instance/clone.st @@ -1,8 +1,9 @@ as yet unclassified clone - self requestProjectName ifNil: [^ nil]. + self requestUrl ifNil: [^ nil]. + name := (remoteUrl splitBy: '/') last copyReplaceAll: '.git' with: ''. + self createRepository ifNil: [^ nil]. - repository withUnitOfWork: - [self fetchAndSetUp ifNil: [^ nil]]. - self registerWorkingCopy ifNil: [^ nil]. \ No newline at end of file + repository withUnitOfWork: [self fetchAndSetUp ifNil: [^ nil]]. + self registerWorkingCopy ifNil: [^ nil] \ No newline at end of file diff --git a/src/Squit.package/SwaSquitInteractiveClone.class/instance/createRepository.st b/src/Squit.package/SwaSquitInteractiveClone.class/instance/createRepository.st index 32de441dc..6196fbdcd 100644 --- a/src/Squit.package/SwaSquitInteractiveClone.class/instance/createRepository.st +++ b/src/Squit.package/SwaSquitInteractiveClone.class/instance/createRepository.st @@ -1,7 +1,8 @@ as yet unclassified createRepository + | repositoryPath | - directory := (FileDirectory default on: 'squot_repos', FileDirectory slash, name) assureExistence. + directory := (FileDirectory default on: 'squot-repositories', FileDirectory slash, name) assureExistence. directory ifNil: [^ nil]. repositoryPath := directory pathName. repository := SquitRepository new initializeInDirectory: (FileSystem disk root resolve: repositoryPath). diff --git a/src/Squit.package/SwaSquitInteractiveClone.class/methodProperties.json b/src/Squit.package/SwaSquitInteractiveClone.class/methodProperties.json index 7da5febdc..c959c16ce 100644 --- a/src/Squit.package/SwaSquitInteractiveClone.class/methodProperties.json +++ b/src/Squit.package/SwaSquitInteractiveClone.class/methodProperties.json @@ -2,7 +2,7 @@ "class" : { }, "instance" : { - "clone" : "ek 7/17/2021 11:59", - "createRepository" : "ek 7/17/2021 12:02", + "clone" : "tobe 7/17/2021 15:34", + "createRepository" : "tobe 7/17/2021 15:35", "registerWorkingCopy" : "ek 7/17/2021 12:01", "requestProjectName" : "ek 7/17/2021 12:00" } } From 771c3a839f7c137cb969cf81fd6d011cf159c4b0 Mon Sep 17 00:00:00 2001 From: Eva Krebs Date: Sun, 18 Jul 2021 10:06:41 +0200 Subject: [PATCH 05/19] add open method to new tool --- src/Squit.package/.squot-contents | 2 +- src/Squit.package/SwaSquitBrowserNew.class/class/open.st | 3 +++ .../SwaSquitBrowserNew.class/methodProperties.json | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/class/open.st diff --git a/src/Squit.package/.squot-contents b/src/Squit.package/.squot-contents index abe784a58..4b0df335b 100644 --- a/src/Squit.package/.squot-contents +++ b/src/Squit.package/.squot-contents @@ -1,6 +1,6 @@ SquotTrackedObjectMetadata { #objectClassName : #PackageInfo, - #objectsReplacedByNames : true, #slotOverrides : { }, + #objectsReplacedByNames : true, #serializer : #SquotCypressCodeSerializer } \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/class/open.st b/src/Squit.package/SwaSquitBrowserNew.class/class/open.st new file mode 100644 index 000000000..32723f503 --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/class/open.st @@ -0,0 +1,3 @@ +as yet unclassified +open + ToolBuilder open: self new \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/methodProperties.json b/src/Squit.package/SwaSquitBrowserNew.class/methodProperties.json index b24805e5d..54d72e591 100644 --- a/src/Squit.package/SwaSquitBrowserNew.class/methodProperties.json +++ b/src/Squit.package/SwaSquitBrowserNew.class/methodProperties.json @@ -1,6 +1,6 @@ { "class" : { - }, + "open" : "ek 7/18/2021 10:05" }, "instance" : { "addRepository" : "tobe 7/17/2021 15:33", "buildCommitList:" : "tobe 7/17/2021 15:29", From a00fdae2719334050d17ae2f7911f1ead75450df Mon Sep 17 00:00:00 2001 From: Christoph Thiede Date: Mon, 30 Aug 2021 17:28:00 +0200 Subject: [PATCH 06/19] Extend swa ui make buttons functional, improve ui, change terminology to git terminology (remove "load" and "save" verbs) Co-authored-by: Tom Beckmann and Eva Krebs --- .../instance/actionCloneAndMerge.st | 11 ++++ .../instance/actionCommitAndPush.st | 4 ++ .../instance/actionCommitAndThenDo..st | 15 +++++ .../instance/actionFetch.st | 6 ++ .../instance/actionFetchAndMerge.st | 6 ++ .../instance/actionMerge.st | 4 ++ .../instance/actionMergeInteractive..st | 7 +++ .../instance/actionPush.st | 13 ++++ .../instance/browseRepository.st | 4 ++ .../instance/buildCommitList..st | 3 +- .../instance/buildRepositoryButtons..st | 13 ++-- .../instance/buildSyncButton..st | 4 +- .../instance/buildWith..st | 1 - .../instance/commitColumns.st | 10 ++++ .../instance/commitList.st | 13 ++-- .../instance/fetch..st | 10 ++++ .../instance/fetchFrom.remoteNames..st | 10 ++++ .../instance/hasSelectedRepository.st | 4 ++ .../instance/refresh.st | 3 +- .../instance/repositoryListIndex..st | 2 +- .../instance/selectRepository..st | 6 ++ .../instance/selectedCommit.st | 5 ++ .../instance/selectedRepository.st | 1 + .../instance/withUnitOfWork..st | 10 ++++ .../methodProperties.json | 60 ++++++++++++------- src/Squit.package/monticello.meta/package | 1 + src/Squit.package/monticello.meta/version | 1 + 27 files changed, 182 insertions(+), 45 deletions(-) create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/instance/actionCloneAndMerge.st create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/instance/actionCommitAndPush.st create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/instance/actionCommitAndThenDo..st create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/instance/actionFetch.st create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/instance/actionFetchAndMerge.st create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/instance/actionMerge.st create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/instance/actionMergeInteractive..st create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/instance/actionPush.st create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/instance/browseRepository.st create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/instance/commitColumns.st create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/instance/fetch..st create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/instance/fetchFrom.remoteNames..st create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/instance/hasSelectedRepository.st create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/instance/selectRepository..st create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/instance/selectedCommit.st create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/instance/withUnitOfWork..st create mode 100644 src/Squit.package/monticello.meta/package create mode 100644 src/Squit.package/monticello.meta/version diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/actionCloneAndMerge.st b/src/Squit.package/SwaSquitBrowserNew.class/instance/actionCloneAndMerge.st new file mode 100644 index 000000000..08f6f3d65 --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/actionCloneAndMerge.st @@ -0,0 +1,11 @@ +as yet unclassified +actionCloneAndMerge + + | operation | + operation := SwaSquitInteractiveClone new. + [operation clone] on: SquitBadRemote do: [:e | e retry]. + self changed: #repositoryList. + self selectRepository: operation repository. + self actionMergeInteractive: false. + Project current addDeferredUIMessage: [self refresh]. + self browseRepository. \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/actionCommitAndPush.st b/src/Squit.package/SwaSquitBrowserNew.class/instance/actionCommitAndPush.st new file mode 100644 index 000000000..1a7145103 --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/actionCommitAndPush.st @@ -0,0 +1,4 @@ +actions +actionCommitAndPush + + self actionCommitAndThenDo: [self actionPush]. \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/actionCommitAndThenDo..st b/src/Squit.package/SwaSquitBrowserNew.class/instance/actionCommitAndThenDo..st new file mode 100644 index 000000000..2b6663807 --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/actionCommitAndThenDo..st @@ -0,0 +1,15 @@ +as yet unclassified +actionCommitAndThenDo: aBlock + + | workingCopy | + self hasSelectedRepository ifFalse: [^ self]. + + workingCopy := self selectedRepository. + self withUnitOfWork: [ + [SquotGUI waitFor: + ((workingCopy newInteractiveSaveOperation + title: 'Select changes and message for the new version'; + applyToWorkingCopy) + then: [:result | self refresh. aBlock value] + ifRejected: [:reason | nil])] + on: BrokenPromise do: [:e | e ifNotError: []]]. \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/actionFetch.st b/src/Squit.package/SwaSquitBrowserNew.class/instance/actionFetch.st new file mode 100644 index 000000000..2899b5b53 --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/actionFetch.st @@ -0,0 +1,6 @@ +actions +actionFetch + + | workingCopy | + workingCopy := self selectedRepository. + self withUnitOfWork: [self fetch: workingCopy]. \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/actionFetchAndMerge.st b/src/Squit.package/SwaSquitBrowserNew.class/instance/actionFetchAndMerge.st new file mode 100644 index 000000000..ea21ba8a8 --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/actionFetchAndMerge.st @@ -0,0 +1,6 @@ +actions +actionFetchAndMerge + + self + actionFetch; + actionMerge. \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/actionMerge.st b/src/Squit.package/SwaSquitBrowserNew.class/instance/actionMerge.st new file mode 100644 index 000000000..28dcf263e --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/actionMerge.st @@ -0,0 +1,4 @@ +actions +actionMerge + + ^ self actionMergeInteractive: true \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/actionMergeInteractive..st b/src/Squit.package/SwaSquitBrowserNew.class/instance/actionMergeInteractive..st new file mode 100644 index 000000000..2d29b1dd4 --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/actionMergeInteractive..st @@ -0,0 +1,7 @@ +actions +actionMergeInteractive: aBoolean + + self withUnitOfWork: [ + self selectedRepository + loadVersion: self selectedCommit + interactive: aBoolean]. \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/actionPush.st b/src/Squit.package/SwaSquitBrowserNew.class/instance/actionPush.st new file mode 100644 index 000000000..e69cc97e9 --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/actionPush.st @@ -0,0 +1,13 @@ +as yet unclassified +actionPush + + self withUnitOfWork: [ + | historian | + historian := self selectedRepository loadedHistorian. + [[(SquitInteractivePushToUpstream historian: historian) push] + on: SquitBadRemote do: + [:e | + Project current addDeferredUIMessage: [self error: 'bad remote: ' , e remote]. + e resume]] + on: SquotCannotExportEmptyHistory do: + [self inform: 'No commits to push on ', historian shortName, ' yet.'].]. \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/browseRepository.st b/src/Squit.package/SwaSquitBrowserNew.class/instance/browseRepository.st new file mode 100644 index 000000000..50fad67a9 --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/browseRepository.st @@ -0,0 +1,4 @@ +as yet unclassified +browseRepository + + ((self selectedRepository ifNil: [^ self]) store artifacts collect: #object) detect: [:artifact | artifact isKindOf: PackageInfo] ifFound: #browse \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/buildCommitList..st b/src/Squit.package/SwaSquitBrowserNew.class/instance/buildCommitList..st index 66742ab5b..0c941df1d 100644 --- a/src/Squit.package/SwaSquitBrowserNew.class/instance/buildCommitList..st +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/buildCommitList..st @@ -3,12 +3,13 @@ buildCommitList: aBuilder ^ aBuilder pluggableMultiColumnListSpec new model: self; - list: #commitList; + list: #commitColumns; getIndex: #commitListIndex; hScrollBarPolicy: #whenNeeded; setIndex: #commitListIndex:; columnResizings: #(#shrinkWrap #shrinkWrap #shrinkWrap #spaceFill); itemAlignments: #(#right #left #left #left); + itemPaddings: {5 @ 0. 5 @ 0. 5 @ 0. 5 @ 0}; frame: (LayoutFrame new leftFraction: 0.3 offset: 0; topFraction: 0 offset: 0; diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/buildRepositoryButtons..st b/src/Squit.package/SwaSquitBrowserNew.class/instance/buildRepositoryButtons..st index a391f983b..c9d9ca7e8 100644 --- a/src/Squit.package/SwaSquitBrowserNew.class/instance/buildRepositoryButtons..st +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/buildRepositoryButtons..st @@ -6,17 +6,12 @@ buildRepositoryButtons: aBuilder children: { aBuilder pluggableButtonSpec new model: self; - label: 'Load'; - action: #actionLoad. + label: 'Fetch & Merge'; + action: #actionFetchAndMerge. aBuilder pluggableButtonSpec new model: self; - label: 'Save'; - action: #actionSave. - aBuilder pluggableButtonSpec new - model: self; - label: 'Save unpushed'; - action: #actionSaveUnpushed; - enabled: false}; + label: 'Commit & Push'; + action: #actionCommitAndPush }; frame: (LayoutFrame new leftFraction: 0.5 offset: 0; topFraction: 1 offset: self buttonHeight negated; diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/buildSyncButton..st b/src/Squit.package/SwaSquitBrowserNew.class/instance/buildSyncButton..st index df39d40d0..9c22c153b 100644 --- a/src/Squit.package/SwaSquitBrowserNew.class/instance/buildSyncButton..st +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/buildSyncButton..st @@ -3,8 +3,8 @@ buildSyncButton: aBuilder ^ aBuilder pluggableButtonSpec new model: self; - label: 'Sync New Project'; - action: #addRepository; + label: 'Clone & Merge'; + action: #actionCloneAndMerge; frame: (LayoutFrame new leftFraction: 0 offset: 0; topFraction: 1 offset: self buttonHeight negated; diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/buildWith..st b/src/Squit.package/SwaSquitBrowserNew.class/instance/buildWith..st index b685c02fe..b1a61f17f 100644 --- a/src/Squit.package/SwaSquitBrowserNew.class/instance/buildWith..st +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/buildWith..st @@ -7,5 +7,4 @@ buildWith: aBuilder self buildCommitList: aBuilder. self buildSyncButton: aBuilder. self buildRepositoryButtons: aBuilder}; - extent: 300 @ 200; yourself) \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/commitColumns.st b/src/Squit.package/SwaSquitBrowserNew.class/instance/commitColumns.st new file mode 100644 index 000000000..8a4371ed3 --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/commitColumns.st @@ -0,0 +1,10 @@ +as yet unclassified +commitColumns + + | commits | + commits := self commitList. + ^ { + [:commit | self formatDate: commit timestamp]. + [:commit | String streamContents: [:s | commit timestamp printHMSOn: s]]. + [:commit | commit metadata at: #author]. + [:commit | commit message]} withIndexCollect: [:columnBlock :columnIndex | commits collect: [:commit | columnBlock value: commit]] \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/commitList.st b/src/Squit.package/SwaSquitBrowserNew.class/instance/commitList.st index 50ea9431e..b640283de 100644 --- a/src/Squit.package/SwaSquitBrowserNew.class/instance/commitList.st +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/commitList.st @@ -1,16 +1,11 @@ as yet unclassified commitList - | walker count commits | - walker := self selectedRepository loadedHistorian repository historyWalkClass new. + | walker count | + walker := (self selectedRepository ifNil: [^ #()]) loadedHistorian repository historyWalkClass new. walker nextPut: self selectedRepository loadedHistorian version. count := 0. - commits := Array streamContents: [:stream | + ^ Array streamContents: [:stream | [walker atEnd or: [count > 30]] whileFalse: [ stream nextPut: walker next. - count := count + 1]]. - ^ { - [:commit | self formatDate: commit timestamp]. - [:commit | String streamContents: [:s | commit timestamp printHMSOn: s]]. - [:commit | commit metadata at: #author]. - [:commit | commit message]} withIndexCollect: [:columnBlock :columnIndex | commits collect: [:commit | columnBlock value: commit]] \ No newline at end of file + count := count + 1]] diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/fetch..st b/src/Squit.package/SwaSquitBrowserNew.class/instance/fetch..st new file mode 100644 index 000000000..1b69c5374 --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/fetch..st @@ -0,0 +1,10 @@ +as yet unclassified +fetch: aWorkingCopy + + | repository gitRepository remoteNames | + repository := aWorkingCopy repository. + gitRepository := repository fsgitRepository. + remoteNames := gitRepository remoteNames. + remoteNames ifNil: [^ self]. + remoteNames ifEmpty: [self inform: 'Nothing selected.'. ^ self]. + self fetchFrom: repository remoteNames: remoteNames. \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/fetchFrom.remoteNames..st b/src/Squit.package/SwaSquitBrowserNew.class/instance/fetchFrom.remoteNames..st new file mode 100644 index 000000000..0ca7ef344 --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/fetchFrom.remoteNames..st @@ -0,0 +1,10 @@ +as yet unclassified +fetchFrom: aRepository remoteNames: aCollection + + [(SquitInteractiveFetch repository: aRepository remoteNames: aCollection) + fetch] + on: SquitBadRemote do: + [:e | + Project current addDeferredUIMessage: [self error: 'bad remote: ' , e remote]. + e resume]. + self refresh. \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/hasSelectedRepository.st b/src/Squit.package/SwaSquitBrowserNew.class/instance/hasSelectedRepository.st new file mode 100644 index 000000000..99baacef8 --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/hasSelectedRepository.st @@ -0,0 +1,4 @@ +testing +hasSelectedRepository + + ^ self selectedRepository notNil \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/refresh.st b/src/Squit.package/SwaSquitBrowserNew.class/instance/refresh.st index ecd57c5d7..d0a5f4332 100644 --- a/src/Squit.package/SwaSquitBrowserNew.class/instance/refresh.st +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/refresh.st @@ -1,4 +1,5 @@ as yet unclassified refresh - self changed: #repositoryList \ No newline at end of file + self changed: #repositoryList. + self changed: #commitColumns. diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/repositoryListIndex..st b/src/Squit.package/SwaSquitBrowserNew.class/instance/repositoryListIndex..st index faba132fc..b93da2155 100644 --- a/src/Squit.package/SwaSquitBrowserNew.class/instance/repositoryListIndex..st +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/repositoryListIndex..st @@ -3,4 +3,4 @@ repositoryListIndex: aNumber repositoryListIndex := aNumber. self changed: #repositoryListIndex. - self changed: #commitList \ No newline at end of file + self changed: #commitColumns. diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/selectRepository..st b/src/Squit.package/SwaSquitBrowserNew.class/instance/selectRepository..st new file mode 100644 index 000000000..1b43cc4c9 --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/selectRepository..st @@ -0,0 +1,6 @@ +as yet unclassified +selectRepository: repository + + self repositoryListIndex: (repository + ifNotNil: [self repositoryList findFirst: [:ea | ea repository = repository]] + ifNil: [0]). \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/selectedCommit.st b/src/Squit.package/SwaSquitBrowserNew.class/instance/selectedCommit.st new file mode 100644 index 000000000..759d87d5d --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/selectedCommit.st @@ -0,0 +1,5 @@ +as yet unclassified +selectedCommit + + self commitListIndex = 0 ifTrue: [^ nil]. + ^ self commitList at: self commitListIndex \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/selectedRepository.st b/src/Squit.package/SwaSquitBrowserNew.class/instance/selectedRepository.st index 77f0bcf03..1aa9ad6cc 100644 --- a/src/Squit.package/SwaSquitBrowserNew.class/instance/selectedRepository.st +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/selectedRepository.st @@ -1,4 +1,5 @@ as yet unclassified selectedRepository + self repositoryListIndex = 0 ifTrue: [^ nil]. ^ self repositoryList at: self repositoryListIndex \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/withUnitOfWork..st b/src/Squit.package/SwaSquitBrowserNew.class/instance/withUnitOfWork..st new file mode 100644 index 000000000..b15def3e9 --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/withUnitOfWork..st @@ -0,0 +1,10 @@ +as yet unclassified +withUnitOfWork: aBlock + + | unitOfWork | + self hasSelectedRepository ifFalse: [^ aBlock value]. + + unitOfWork := self selectedRepository repository unitOfWork. + unitOfWork start. + ^ [unitOfWork activateDuring: aBlock] + ensure: [unitOfWork finish] \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/methodProperties.json b/src/Squit.package/SwaSquitBrowserNew.class/methodProperties.json index 54d72e591..a2d7078db 100644 --- a/src/Squit.package/SwaSquitBrowserNew.class/methodProperties.json +++ b/src/Squit.package/SwaSquitBrowserNew.class/methodProperties.json @@ -1,22 +1,40 @@ { - "class" : { - "open" : "ek 7/18/2021 10:05" }, - "instance" : { - "addRepository" : "tobe 7/17/2021 15:33", - "buildCommitList:" : "tobe 7/17/2021 15:29", - "buildRepositoryButtons:" : "tobe 7/17/2021 14:57", - "buildRepositoryList:" : "tobe 7/17/2021 15:00", - "buildSyncButton:" : "tobe 7/17/2021 15:31", - "buildWith:" : "tobe 7/17/2021 14:52", - "buttonHeight" : "tobe 7/17/2021 14:49", - "commitList" : "tobe 7/17/2021 15:26", - "commitListIndex" : "tobe 7/17/2021 15:06", - "commitListIndex:" : "tobe 7/17/2021 15:05", - "example" : "tobe 7/17/2021 14:51", - "formatDate:" : "tobe 7/17/2021 15:37", - "initialize" : "tobe 7/17/2021 15:06", - "refresh" : "tobe 7/17/2021 15:49", - "repositoryList" : "tobe 7/17/2021 14:59", - "repositoryListIndex" : "tobe 7/17/2021 14:58", - "repositoryListIndex:" : "tobe 7/17/2021 15:36", - "selectedRepository" : "tobe 7/17/2021 15:08" } } + "class": { + "open": "ek 7/18/2021 10:05" + }, + "instance": { + "actionCloneAndMerge": "ct 8/30/2021 16:10", + "actionCommitAndPush": "ct 8/30/2021 16:55", + "actionCommitAndThenDo:": "ct 8/30/2021 16:53", + "actionFetch": "ct 8/30/2021 15:50", + "actionFetchAndMerge": "ct 8/30/2021 15:45", + "actionMerge": "ct 8/30/2021 15:45", + "actionMergeInteractive:": "ct 8/30/2021 15:43", + "actionPush": "ct 8/30/2021 17:02", + "browseRepository": "ct 8/30/2021 16:16", + "buildCommitList:": "ct 8/30/2021 17:06", + "buildRepositoryButtons:": "ct 8/30/2021 15:47", + "buildRepositoryList:": "tobe 7/17/2021 15:00", + "buildSyncButton:": "ct 8/30/2021 15:49", + "buildWith:": "ct 8/30/2021 17:04", + "buttonHeight": "tobe 7/17/2021 14:49", + "commitColumns": "ct 8/30/2021 15:27", + "commitList": "ct 8/30/2021 16:01", + "commitListIndex": "tobe 7/17/2021 15:06", + "commitListIndex:": "tobe 7/17/2021 15:05", + "example": "tobe 7/17/2021 14:51", + "fetch:": "ct 8/30/2021 15:52", + "fetchFrom:remoteNames:": "ct 8/30/2021 15:54", + "formatDate:": "tobe 7/17/2021 15:37", + "hasSelectedRepository": "ct 8/30/2021 15:36", + "initialize": "tobe 7/17/2021 15:06", + "refresh": "ct 8/30/2021 16:53", + "repositoryList": "tobe 7/17/2021 14:59", + "repositoryListIndex": "tobe 7/17/2021 14:58", + "repositoryListIndex:": "ct 8/30/2021 15:49", + "selectRepository:": "ct 8/30/2021 16:07", + "selectedCommit": "ct 8/30/2021 15:39", + "selectedRepository": "ct 8/30/2021 15:18", + "withUnitOfWork:": "ct 8/30/2021 15:36" + } +} \ No newline at end of file diff --git a/src/Squit.package/monticello.meta/package b/src/Squit.package/monticello.meta/package new file mode 100644 index 000000000..60638520d --- /dev/null +++ b/src/Squit.package/monticello.meta/package @@ -0,0 +1 @@ +(name 'Squit') \ No newline at end of file diff --git a/src/Squit.package/monticello.meta/version b/src/Squit.package/monticello.meta/version new file mode 100644 index 000000000..77ef3ed91 --- /dev/null +++ b/src/Squit.package/monticello.meta/version @@ -0,0 +1 @@ +(name 'Squit-ct.5' message 'empty log message' id 'f05de4c6-5f71-6f4c-9080-f5fd744b072c' date '30 August 2021' time '5:20:35.40661 pm' author 'ct' ancestors ((name 'Squit-ct.4' message 'empty log message' id '555ffaf2-7cbe-e747-9fd1-fc706de0aa88' date '30 August 2021' time '5:19:42.73361 pm' author 'ct' ancestors ((name 'Squit-cypress.1' message 'fabricated from a Cypress format repository' id '4a5f3775-51a1-2145-beb7-ebcdb560f31a' date '30 August 2021' time '3:16:59.539657 pm' author '' ancestors () stepChildren ())) stepChildren ())) stepChildren ()) \ No newline at end of file From 401925b221be4784a98baed580369b9788931f62 Mon Sep 17 00:00:00 2001 From: ekrebs5 Date: Wed, 13 Oct 2021 16:50:48 +0200 Subject: [PATCH 07/19] add credentials Morph, minor fixes --- .gitignore | 1 + src/Squit.package/.squot-contents | 6 -- .../README.md | 0 .../class/requestCredentials.st | 4 + .../instance/accept.st | 6 ++ .../instance/addTextPanesAndDescriptions.st | 33 ++++++++ .../instance/configurePaneMorph.st | 9 ++ .../instance/createPasswordTextPaneFor..st | 4 + .../instance/createTextPaneFor..st | 25 ++++++ .../instance/createTextPanes.st | 7 ++ .../instance/displayName..st | 4 + .../instance/displayName.st | 4 + .../instance/email..st | 4 + .../instance/email.st | 4 + .../instance/initialize.st | 15 ++++ .../instance/initializeTextPanes.st | 6 ++ .../instance/password..st | 4 + .../instance/password.st | 4 + .../instance/result.st | 10 +++ .../instance/textPanesAccept.st | 8 ++ .../instance/username..st | 4 + .../instance/username.st | 4 + .../methodProperties.json | 22 +++++ .../properties.json | 22 +++++ .../instance/buildObjectList..st | 2 +- .../instance/commitListMenu..st | 2 +- .../instance/projectListMenu..st | 2 +- .../instance/swaMenuCommitListHook..st | 2 +- .../instance/swaMenuProjectListHook..st | 2 +- .../swaMenuProjectListWorkingCopyHook..st | 2 +- .../actionAddOrRemoveTrackedPackages.st | 4 + .../instance/actionCloneAndMerge.st | 3 +- .../instance/actionCommitAndThenDo..st | 2 +- .../instance/actionCommitSelectionCheckout.st | 5 ++ .../instance/actionCredentialsEdit.st | 20 +++++ .../instance/actionPush.st | 2 +- .../instance/actionRepositoryRemove.st | 12 +++ .../instance/addRepository.st | 2 +- .../instance/browseRepository.st | 2 +- .../instance/buildCommitList..st | 3 +- .../instance/buildRepositoryButtons..st | 2 +- .../instance/buildRepositoryList..st | 3 +- .../instance/buildSyncButton..st | 2 +- .../instance/buildWith..st | 2 +- .../instance/buttonHeight.st | 2 +- .../instance/commitColumns.st | 2 +- .../instance/commitList.st | 2 +- .../instance/commitListIndex..st | 2 +- .../instance/commitListIndex.st | 2 +- .../instance/commitListMenu..st | 4 + .../instance/example.st | 7 -- .../instance/fetch..st | 2 +- .../instance/fetchFrom.remoteNames..st | 2 +- .../instance/formatDate..st | 2 +- .../instance/hasRepositories.st | 4 + .../instance/initialize.st | 8 +- .../instance/menuCommitListHook..st | 10 +++ .../instance/menuRepositoryListHook..st | 12 +++ .../instance/refresh.st | 2 +- .../instance/repositoryList.st | 2 +- .../instance/repositoryListIndex..st | 2 +- .../instance/repositoryListIndex.st | 2 +- .../instance/repositoryListMenu..st | 4 + .../instance/selectRepository..st | 2 +- .../instance/selectedCommit.st | 2 +- .../instance/selectedRepository.st | 2 +- .../instance/withUnitOfWork..st | 2 +- .../methodProperties.json | 84 ++++++++++--------- .../instance/clone.st | 2 +- .../instance/createRepository.st | 2 +- .../instance/registerWorkingCopy.st | 2 +- ...oreCredentialsFor.remoteUrl.ifCanceled..st | 17 ++++ .../instance/requestProjectName.st | 6 -- .../methodProperties.json | 2 +- src/Squit.package/monticello.meta/version | 2 +- 75 files changed, 386 insertions(+), 98 deletions(-) create mode 100644 .gitignore delete mode 100644 src/Squit.package/.squot-contents create mode 100644 src/Squit.package/SquitCredentialsFillInMorph.class/README.md create mode 100644 src/Squit.package/SquitCredentialsFillInMorph.class/class/requestCredentials.st create mode 100644 src/Squit.package/SquitCredentialsFillInMorph.class/instance/accept.st create mode 100644 src/Squit.package/SquitCredentialsFillInMorph.class/instance/addTextPanesAndDescriptions.st create mode 100644 src/Squit.package/SquitCredentialsFillInMorph.class/instance/configurePaneMorph.st create mode 100644 src/Squit.package/SquitCredentialsFillInMorph.class/instance/createPasswordTextPaneFor..st create mode 100644 src/Squit.package/SquitCredentialsFillInMorph.class/instance/createTextPaneFor..st create mode 100644 src/Squit.package/SquitCredentialsFillInMorph.class/instance/createTextPanes.st create mode 100644 src/Squit.package/SquitCredentialsFillInMorph.class/instance/displayName..st create mode 100644 src/Squit.package/SquitCredentialsFillInMorph.class/instance/displayName.st create mode 100644 src/Squit.package/SquitCredentialsFillInMorph.class/instance/email..st create mode 100644 src/Squit.package/SquitCredentialsFillInMorph.class/instance/email.st create mode 100644 src/Squit.package/SquitCredentialsFillInMorph.class/instance/initialize.st create mode 100644 src/Squit.package/SquitCredentialsFillInMorph.class/instance/initializeTextPanes.st create mode 100644 src/Squit.package/SquitCredentialsFillInMorph.class/instance/password..st create mode 100644 src/Squit.package/SquitCredentialsFillInMorph.class/instance/password.st create mode 100644 src/Squit.package/SquitCredentialsFillInMorph.class/instance/result.st create mode 100644 src/Squit.package/SquitCredentialsFillInMorph.class/instance/textPanesAccept.st create mode 100644 src/Squit.package/SquitCredentialsFillInMorph.class/instance/username..st create mode 100644 src/Squit.package/SquitCredentialsFillInMorph.class/instance/username.st create mode 100644 src/Squit.package/SquitCredentialsFillInMorph.class/methodProperties.json create mode 100644 src/Squit.package/SquitCredentialsFillInMorph.class/properties.json create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/instance/actionAddOrRemoveTrackedPackages.st create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/instance/actionCommitSelectionCheckout.st create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/instance/actionCredentialsEdit.st create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/instance/actionRepositoryRemove.st create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/instance/commitListMenu..st delete mode 100644 src/Squit.package/SwaSquitBrowserNew.class/instance/example.st create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/instance/hasRepositories.st create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/instance/menuCommitListHook..st create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/instance/menuRepositoryListHook..st create mode 100644 src/Squit.package/SwaSquitBrowserNew.class/instance/repositoryListMenu..st create mode 100644 src/Squit.package/SwaSquitInteractiveClone.class/instance/requestAndStoreCredentialsFor.remoteUrl.ifCanceled..st delete mode 100644 src/Squit.package/SwaSquitInteractiveClone.class/instance/requestProjectName.st diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..db51ca154 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.filetree diff --git a/src/Squit.package/.squot-contents b/src/Squit.package/.squot-contents deleted file mode 100644 index 4b0df335b..000000000 --- a/src/Squit.package/.squot-contents +++ /dev/null @@ -1,6 +0,0 @@ -SquotTrackedObjectMetadata { - #objectClassName : #PackageInfo, - #slotOverrides : { }, - #objectsReplacedByNames : true, - #serializer : #SquotCypressCodeSerializer -} \ No newline at end of file diff --git a/src/Squit.package/SquitCredentialsFillInMorph.class/README.md b/src/Squit.package/SquitCredentialsFillInMorph.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/src/Squit.package/SquitCredentialsFillInMorph.class/class/requestCredentials.st b/src/Squit.package/SquitCredentialsFillInMorph.class/class/requestCredentials.st new file mode 100644 index 000000000..b11bb5c06 --- /dev/null +++ b/src/Squit.package/SquitCredentialsFillInMorph.class/class/requestCredentials.st @@ -0,0 +1,4 @@ +instance creation +requestCredentials + + ^ self new getUserResponse \ No newline at end of file diff --git a/src/Squit.package/SquitCredentialsFillInMorph.class/instance/accept.st b/src/Squit.package/SquitCredentialsFillInMorph.class/instance/accept.st new file mode 100644 index 000000000..f3c082279 --- /dev/null +++ b/src/Squit.package/SquitCredentialsFillInMorph.class/instance/accept.st @@ -0,0 +1,6 @@ +as yet unclassified +accept + + self + textPanesAccept; + closeDialog: self result. \ No newline at end of file diff --git a/src/Squit.package/SquitCredentialsFillInMorph.class/instance/addTextPanesAndDescriptions.st b/src/Squit.package/SquitCredentialsFillInMorph.class/instance/addTextPanesAndDescriptions.st new file mode 100644 index 000000000..49c40849b --- /dev/null +++ b/src/Squit.package/SquitCredentialsFillInMorph.class/instance/addTextPanesAndDescriptions.st @@ -0,0 +1,33 @@ +initialization +addTextPanesAndDescriptions + + | otherMessageMorph | + + column := AlignmentMorph newColumn + hResizing: #spaceFill; + vResizing: #spaceFill; + cellGap: 4; + color: Color transparent. + self paneMorph addMorph: column. + + self message: 'GitHub username (authentication)'. + + column addMorphBack: textPaneUsername. + + otherMessageMorph := messageMorph copy. + otherMessageMorph contents: 'GitHub password/token (authentication)'. + column addMorphBack: otherMessageMorph. + + column addMorphBack: textPanePassword. + + otherMessageMorph := messageMorph copy. + otherMessageMorph contents: 'Name (used for commits, e.g. Maria Muster)'. + column addMorphBack: otherMessageMorph. + + column addMorphBack: textPaneDisplayName. + + otherMessageMorph := messageMorph copy. + otherMessageMorph contents: 'Email (used for commits)'. + column addMorphBack: otherMessageMorph. + + column addMorphBack: textPaneEmail. \ No newline at end of file diff --git a/src/Squit.package/SquitCredentialsFillInMorph.class/instance/configurePaneMorph.st b/src/Squit.package/SquitCredentialsFillInMorph.class/instance/configurePaneMorph.st new file mode 100644 index 000000000..cf89355cd --- /dev/null +++ b/src/Squit.package/SquitCredentialsFillInMorph.class/instance/configurePaneMorph.st @@ -0,0 +1,9 @@ +initialization +configurePaneMorph. + + "self paneMorph + wantsPaneSplitters: true; + addCornerGrips. + self paneMorph grips do: [:ea | ea showHandle: true]." + + self paneMorph extent: (275@200). \ No newline at end of file diff --git a/src/Squit.package/SquitCredentialsFillInMorph.class/instance/createPasswordTextPaneFor..st b/src/Squit.package/SquitCredentialsFillInMorph.class/instance/createPasswordTextPaneFor..st new file mode 100644 index 000000000..cc25dd66b --- /dev/null +++ b/src/Squit.package/SquitCredentialsFillInMorph.class/instance/createPasswordTextPaneFor..st @@ -0,0 +1,4 @@ +initialization +createPasswordTextPaneFor: aSymbol + + ^ (self createTextPaneFor: aSymbol) font: (StrikeFont passwordFontSize: 12) \ No newline at end of file diff --git a/src/Squit.package/SquitCredentialsFillInMorph.class/instance/createTextPaneFor..st b/src/Squit.package/SquitCredentialsFillInMorph.class/instance/createTextPaneFor..st new file mode 100644 index 000000000..de70fb9a7 --- /dev/null +++ b/src/Squit.package/SquitCredentialsFillInMorph.class/instance/createTextPaneFor..st @@ -0,0 +1,25 @@ +initialization +createTextPaneFor: aSymbol + + | textPane | + textPane := PluggableTextMorph + on: self + text: aSymbol + accept: (aSymbol, #:) asSymbol + "readSelection: #selectionInterval + menu: #codePaneMenu:shifted:". + textPane + showScrollBarsOnlyWhenNeeded; + wantsFrameAdornments: false; + hasUnacceptedEdits: true; + askBeforeDiscardingEdits: false; + setProperty: #alwaysAccept toValue: true; + acceptOnCR: true; + setNameTo: aSymbol asString; + layoutFrame: (LayoutFrame fractions: (0@0 corner: 1@1)); + hResizing: #spaceFill; + vResizing: #spaceFill; + minimumExtent: 0@2; + updateMinimumExtent; + scrollToTop. + ^ textPane \ No newline at end of file diff --git a/src/Squit.package/SquitCredentialsFillInMorph.class/instance/createTextPanes.st b/src/Squit.package/SquitCredentialsFillInMorph.class/instance/createTextPanes.st new file mode 100644 index 000000000..bab3d9108 --- /dev/null +++ b/src/Squit.package/SquitCredentialsFillInMorph.class/instance/createTextPanes.st @@ -0,0 +1,7 @@ +initialization +createTextPanes + + textPaneUsername := self createTextPaneFor: #username. + textPanePassword := self createPasswordTextPaneFor: #password. + textPaneDisplayName := self createTextPaneFor: #displayName. + textPaneEmail := self createTextPaneFor: #email. \ No newline at end of file diff --git a/src/Squit.package/SquitCredentialsFillInMorph.class/instance/displayName..st b/src/Squit.package/SquitCredentialsFillInMorph.class/instance/displayName..st new file mode 100644 index 000000000..c553c4914 --- /dev/null +++ b/src/Squit.package/SquitCredentialsFillInMorph.class/instance/displayName..st @@ -0,0 +1,4 @@ +accessing +displayName: aString + + displayName := aString. \ No newline at end of file diff --git a/src/Squit.package/SquitCredentialsFillInMorph.class/instance/displayName.st b/src/Squit.package/SquitCredentialsFillInMorph.class/instance/displayName.st new file mode 100644 index 000000000..49e825249 --- /dev/null +++ b/src/Squit.package/SquitCredentialsFillInMorph.class/instance/displayName.st @@ -0,0 +1,4 @@ +accessing +displayName + + ^ displayName \ No newline at end of file diff --git a/src/Squit.package/SquitCredentialsFillInMorph.class/instance/email..st b/src/Squit.package/SquitCredentialsFillInMorph.class/instance/email..st new file mode 100644 index 000000000..b22fc4041 --- /dev/null +++ b/src/Squit.package/SquitCredentialsFillInMorph.class/instance/email..st @@ -0,0 +1,4 @@ +accessing +email: aString + + email := aString. \ No newline at end of file diff --git a/src/Squit.package/SquitCredentialsFillInMorph.class/instance/email.st b/src/Squit.package/SquitCredentialsFillInMorph.class/instance/email.st new file mode 100644 index 000000000..5f31f640b --- /dev/null +++ b/src/Squit.package/SquitCredentialsFillInMorph.class/instance/email.st @@ -0,0 +1,4 @@ +accessing +email + + ^ email \ No newline at end of file diff --git a/src/Squit.package/SquitCredentialsFillInMorph.class/instance/initialize.st b/src/Squit.package/SquitCredentialsFillInMorph.class/instance/initialize.st new file mode 100644 index 000000000..b8f9dd955 --- /dev/null +++ b/src/Squit.package/SquitCredentialsFillInMorph.class/instance/initialize.st @@ -0,0 +1,15 @@ +initialization +initialize + + super initialize. + + self title: 'GitHub credentials requested' translated. + self initializeTextPanes. + + self createAcceptButton + action: [self accept]. + self createCancelButton + action: [self closeDialog: nil]. + + self preferredPosition: ActiveHand cursorPoint. + self setDefaultParameters. \ No newline at end of file diff --git a/src/Squit.package/SquitCredentialsFillInMorph.class/instance/initializeTextPanes.st b/src/Squit.package/SquitCredentialsFillInMorph.class/instance/initializeTextPanes.st new file mode 100644 index 000000000..990eb205c --- /dev/null +++ b/src/Squit.package/SquitCredentialsFillInMorph.class/instance/initializeTextPanes.st @@ -0,0 +1,6 @@ +initialization +initializeTextPanes + + self createTextPanes. + self addTextPanesAndDescriptions. + self configurePaneMorph. \ No newline at end of file diff --git a/src/Squit.package/SquitCredentialsFillInMorph.class/instance/password..st b/src/Squit.package/SquitCredentialsFillInMorph.class/instance/password..st new file mode 100644 index 000000000..4be77ff5d --- /dev/null +++ b/src/Squit.package/SquitCredentialsFillInMorph.class/instance/password..st @@ -0,0 +1,4 @@ +accessing +password: aString + + password := aString. \ No newline at end of file diff --git a/src/Squit.package/SquitCredentialsFillInMorph.class/instance/password.st b/src/Squit.package/SquitCredentialsFillInMorph.class/instance/password.st new file mode 100644 index 000000000..8cd21fde1 --- /dev/null +++ b/src/Squit.package/SquitCredentialsFillInMorph.class/instance/password.st @@ -0,0 +1,4 @@ +accessing +password + + ^ password \ No newline at end of file diff --git a/src/Squit.package/SquitCredentialsFillInMorph.class/instance/result.st b/src/Squit.package/SquitCredentialsFillInMorph.class/instance/result.st new file mode 100644 index 000000000..7d9bfe9bb --- /dev/null +++ b/src/Squit.package/SquitCredentialsFillInMorph.class/instance/result.st @@ -0,0 +1,10 @@ +as yet unclassified +result + + ^ Dictionary new + at: #username put: self username asString; + at: #password put: self password asString; + at: #displayName put: self displayName asString; + at: #email put: self email asString; + yourself + \ No newline at end of file diff --git a/src/Squit.package/SquitCredentialsFillInMorph.class/instance/textPanesAccept.st b/src/Squit.package/SquitCredentialsFillInMorph.class/instance/textPanesAccept.st new file mode 100644 index 000000000..8087a71cc --- /dev/null +++ b/src/Squit.package/SquitCredentialsFillInMorph.class/instance/textPanesAccept.st @@ -0,0 +1,8 @@ +as yet unclassified +textPanesAccept + + textPaneUsername accept. + textPanePassword accept. + textPaneDisplayName accept. + textPaneEmail accept. + ^ 'meep' \ No newline at end of file diff --git a/src/Squit.package/SquitCredentialsFillInMorph.class/instance/username..st b/src/Squit.package/SquitCredentialsFillInMorph.class/instance/username..st new file mode 100644 index 000000000..8f1f46025 --- /dev/null +++ b/src/Squit.package/SquitCredentialsFillInMorph.class/instance/username..st @@ -0,0 +1,4 @@ +accessing +username: aString + + username := aString. \ No newline at end of file diff --git a/src/Squit.package/SquitCredentialsFillInMorph.class/instance/username.st b/src/Squit.package/SquitCredentialsFillInMorph.class/instance/username.st new file mode 100644 index 000000000..12b3e01fb --- /dev/null +++ b/src/Squit.package/SquitCredentialsFillInMorph.class/instance/username.st @@ -0,0 +1,4 @@ +accessing +username + + ^ username \ No newline at end of file diff --git a/src/Squit.package/SquitCredentialsFillInMorph.class/methodProperties.json b/src/Squit.package/SquitCredentialsFillInMorph.class/methodProperties.json new file mode 100644 index 000000000..162ae679e --- /dev/null +++ b/src/Squit.package/SquitCredentialsFillInMorph.class/methodProperties.json @@ -0,0 +1,22 @@ +{ + "class" : { + "requestCredentials" : "ek 9/21/2021 16:53" }, + "instance" : { + "accept" : "ek 9/21/2021 18:23", + "addTextPanesAndDescriptions" : "ek 9/21/2021 18:03", + "configurePaneMorph" : "ek 9/21/2021 18:15", + "createPasswordTextPaneFor:" : "ek 9/21/2021 17:27", + "createTextPaneFor:" : "ek 9/21/2021 17:58", + "createTextPanes" : "ek 9/21/2021 17:28", + "displayName" : "ek 9/21/2021 17:31", + "displayName:" : "ek 9/21/2021 17:31", + "email" : "ek 9/21/2021 17:31", + "email:" : "ek 9/21/2021 17:31", + "initialize" : "ek 9/21/2021 18:22", + "initializeTextPanes" : "ek 9/21/2021 17:26", + "password" : "ek 9/21/2021 17:30", + "password:" : "ek 9/21/2021 17:30", + "result" : "ek 9/21/2021 18:26", + "textPanesAccept" : "ek 9/21/2021 18:14", + "username" : "ek 9/21/2021 17:29", + "username:" : "ek 9/21/2021 17:30" } } diff --git a/src/Squit.package/SquitCredentialsFillInMorph.class/properties.json b/src/Squit.package/SquitCredentialsFillInMorph.class/properties.json new file mode 100644 index 000000000..c46c1131f --- /dev/null +++ b/src/Squit.package/SquitCredentialsFillInMorph.class/properties.json @@ -0,0 +1,22 @@ +{ + "category" : "Squit-Hackday", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + "username", + "password", + "displayName", + "email", + "textPaneUsername", + "textPanePassword", + "textPaneDisplayName", + "textPaneEmail", + "column" ], + "name" : "SquitCredentialsFillInMorph", + "pools" : [ + ], + "super" : "DialogWindow", + "type" : "normal" } diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/buildObjectList..st b/src/Squit.package/SwaSquitBrowser.class/instance/buildObjectList..st index 1e009ff60..c365b42ac 100644 --- a/src/Squit.package/SwaSquitBrowser.class/instance/buildObjectList..st +++ b/src/Squit.package/SwaSquitBrowser.class/instance/buildObjectList..st @@ -1,4 +1,4 @@ -as yet unclassified +toolbuilder buildObjectList: builder ^ builder pluggableListSpec new model: self; diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/commitListMenu..st b/src/Squit.package/SwaSquitBrowser.class/instance/commitListMenu..st index ed362c78b..6b6d93edf 100644 --- a/src/Squit.package/SwaSquitBrowser.class/instance/commitListMenu..st +++ b/src/Squit.package/SwaSquitBrowser.class/instance/commitListMenu..st @@ -1,3 +1,3 @@ -as yet unclassified +ui menu commitListMenu: aMenu ^ self menu: aMenu for: #(swaMenuCommitList) \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/projectListMenu..st b/src/Squit.package/SwaSquitBrowser.class/instance/projectListMenu..st index 30358d455..b4d4dd105 100644 --- a/src/Squit.package/SwaSquitBrowser.class/instance/projectListMenu..st +++ b/src/Squit.package/SwaSquitBrowser.class/instance/projectListMenu..st @@ -1,3 +1,3 @@ -as yet unclassified +ui menu projectListMenu: aMenu ^ self menu: aMenu for: #(swaMenuProjectList) \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/swaMenuCommitListHook..st b/src/Squit.package/SwaSquitBrowser.class/instance/swaMenuCommitListHook..st index a216485f4..da1a015cb 100644 --- a/src/Squit.package/SwaSquitBrowser.class/instance/swaMenuCommitListHook..st +++ b/src/Squit.package/SwaSquitBrowser.class/instance/swaMenuCommitListHook..st @@ -1,4 +1,4 @@ -as yet unclassified +ui menu swaMenuCommitListHook: aMenu | activeBranchName isMenuOnActiveBranch onlyOnInactiveBranch commands | diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/swaMenuProjectListHook..st b/src/Squit.package/SwaSquitBrowser.class/instance/swaMenuProjectListHook..st index bd2f57c63..d6094b88b 100644 --- a/src/Squit.package/SwaSquitBrowser.class/instance/swaMenuProjectListHook..st +++ b/src/Squit.package/SwaSquitBrowser.class/instance/swaMenuProjectListHook..st @@ -1,4 +1,4 @@ -as yet unclassified +ui menu swaMenuProjectListHook: aMenu diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/swaMenuProjectListWorkingCopyHook..st b/src/Squit.package/SwaSquitBrowser.class/instance/swaMenuProjectListWorkingCopyHook..st index 1a165da5a..1103f3712 100644 --- a/src/Squit.package/SwaSquitBrowser.class/instance/swaMenuProjectListWorkingCopyHook..st +++ b/src/Squit.package/SwaSquitBrowser.class/instance/swaMenuProjectListWorkingCopyHook..st @@ -1,4 +1,4 @@ -as yet unclassified +ui menu swaMenuProjectListWorkingCopyHook: aMenu diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/actionAddOrRemoveTrackedPackages.st b/src/Squit.package/SwaSquitBrowserNew.class/instance/actionAddOrRemoveTrackedPackages.st new file mode 100644 index 000000000..237e48308 --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/actionAddOrRemoveTrackedPackages.st @@ -0,0 +1,4 @@ +actions +actionAddOrRemoveTrackedPackages + + ^ self withUnitOfWork: [SquitPackageChooser chooseFor: self selectedRepository] \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/actionCloneAndMerge.st b/src/Squit.package/SwaSquitBrowserNew.class/instance/actionCloneAndMerge.st index 08f6f3d65..06460f7c7 100644 --- a/src/Squit.package/SwaSquitBrowserNew.class/instance/actionCloneAndMerge.st +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/actionCloneAndMerge.st @@ -1,7 +1,8 @@ -as yet unclassified +actions actionCloneAndMerge | operation | + operation := SwaSquitInteractiveClone new. [operation clone] on: SquitBadRemote do: [:e | e retry]. self changed: #repositoryList. diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/actionCommitAndThenDo..st b/src/Squit.package/SwaSquitBrowserNew.class/instance/actionCommitAndThenDo..st index 2b6663807..ac5c67bc8 100644 --- a/src/Squit.package/SwaSquitBrowserNew.class/instance/actionCommitAndThenDo..st +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/actionCommitAndThenDo..st @@ -1,4 +1,4 @@ -as yet unclassified +actions actionCommitAndThenDo: aBlock | workingCopy | diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/actionCommitSelectionCheckout.st b/src/Squit.package/SwaSquitBrowserNew.class/instance/actionCommitSelectionCheckout.st new file mode 100644 index 000000000..07d0af0a7 --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/actionCommitSelectionCheckout.st @@ -0,0 +1,5 @@ +actions +actionCommitSelectionCheckout + + self withUnitOfWork: + [self selectedRepository loadVersionInteractively: self selectedCommit ifCanceled: [^ self]]. \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/actionCredentialsEdit.st b/src/Squit.package/SwaSquitBrowserNew.class/instance/actionCredentialsEdit.st new file mode 100644 index 000000000..96e071948 --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/actionCredentialsEdit.st @@ -0,0 +1,20 @@ +actions +actionCredentialsEdit + + | credentials repository gitRepository remoteUrl | + + repository := self selectedRepository repository. + gitRepository := repository git. + remoteUrl := (repository remoteNames collect: + [:each | (gitRepository remoteUrl: each)] + thenSelect: [:each | each beginsWith: 'http']) first. + credentials := SquitCredentialsFillInMorph requestCredentials + ifNil: [^ nil]. + + repository + addCredentialsFor: remoteUrl + user: (credentials at: #username) + password: (credentials at: #password). + + gitRepository configAt: 'user.name' put: (credentials at: #displayName). + gitRepository configAt: 'user.email' put: (credentials at: #email). \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/actionPush.st b/src/Squit.package/SwaSquitBrowserNew.class/instance/actionPush.st index e69cc97e9..71cf2aa5f 100644 --- a/src/Squit.package/SwaSquitBrowserNew.class/instance/actionPush.st +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/actionPush.st @@ -1,4 +1,4 @@ -as yet unclassified +actions actionPush self withUnitOfWork: [ diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/actionRepositoryRemove.st b/src/Squit.package/SwaSquitBrowserNew.class/instance/actionRepositoryRemove.st new file mode 100644 index 000000000..34eff66b4 --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/actionRepositoryRemove.st @@ -0,0 +1,12 @@ +actions +actionRepositoryRemove + + | repository | + repository := self selectedRepository ifNil: [^ self]. + (self confirm: 'Really delete project ', repository name, '?') + ifFalse: [^ self]. + repository unregister. + self repositoryListIndex: (self repositoryListIndex min: self projectList size). + self hasRepositories ifFalse: [self refresh]. + + \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/addRepository.st b/src/Squit.package/SwaSquitBrowserNew.class/instance/addRepository.st index 28e049eef..9823fc5c8 100644 --- a/src/Squit.package/SwaSquitBrowserNew.class/instance/addRepository.st +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/addRepository.st @@ -1,4 +1,4 @@ -as yet unclassified +actions addRepository | operation | diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/browseRepository.st b/src/Squit.package/SwaSquitBrowserNew.class/instance/browseRepository.st index 50fad67a9..28bcc80cc 100644 --- a/src/Squit.package/SwaSquitBrowserNew.class/instance/browseRepository.st +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/browseRepository.st @@ -1,4 +1,4 @@ -as yet unclassified +actions browseRepository ((self selectedRepository ifNil: [^ self]) store artifacts collect: #object) detect: [:artifact | artifact isKindOf: PackageInfo] ifFound: #browse \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/buildCommitList..st b/src/Squit.package/SwaSquitBrowserNew.class/instance/buildCommitList..st index 0c941df1d..c5aff78cc 100644 --- a/src/Squit.package/SwaSquitBrowserNew.class/instance/buildCommitList..st +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/buildCommitList..st @@ -1,4 +1,4 @@ -as yet unclassified +toolbuilder buildCommitList: aBuilder ^ aBuilder pluggableMultiColumnListSpec new @@ -10,6 +10,7 @@ buildCommitList: aBuilder columnResizings: #(#shrinkWrap #shrinkWrap #shrinkWrap #spaceFill); itemAlignments: #(#right #left #left #left); itemPaddings: {5 @ 0. 5 @ 0. 5 @ 0. 5 @ 0}; + menu: #commitListMenu:; frame: (LayoutFrame new leftFraction: 0.3 offset: 0; topFraction: 0 offset: 0; diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/buildRepositoryButtons..st b/src/Squit.package/SwaSquitBrowserNew.class/instance/buildRepositoryButtons..st index c9d9ca7e8..4093a7ca1 100644 --- a/src/Squit.package/SwaSquitBrowserNew.class/instance/buildRepositoryButtons..st +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/buildRepositoryButtons..st @@ -1,4 +1,4 @@ -as yet unclassified +toolbuilder buildRepositoryButtons: aBuilder ^ aBuilder pluggablePanelSpec new diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/buildRepositoryList..st b/src/Squit.package/SwaSquitBrowserNew.class/instance/buildRepositoryList..st index 8335c1a2c..e21ea6343 100644 --- a/src/Squit.package/SwaSquitBrowserNew.class/instance/buildRepositoryList..st +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/buildRepositoryList..st @@ -1,4 +1,4 @@ -as yet unclassified +toolbuilder buildRepositoryList: aBuilder ^ aBuilder pluggableListSpec new @@ -7,6 +7,7 @@ buildRepositoryList: aBuilder getIndex: #repositoryListIndex; setIndex: #repositoryListIndex:; hScrollBarPolicy: #never; + menu: #repositoryListMenu:; frame: (LayoutFrame new leftFraction: 0 offset: 0; topFraction: 0 offset: 0; diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/buildSyncButton..st b/src/Squit.package/SwaSquitBrowserNew.class/instance/buildSyncButton..st index 9c22c153b..14a574542 100644 --- a/src/Squit.package/SwaSquitBrowserNew.class/instance/buildSyncButton..st +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/buildSyncButton..st @@ -1,4 +1,4 @@ -as yet unclassified +toolbuilder buildSyncButton: aBuilder ^ aBuilder pluggableButtonSpec new diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/buildWith..st b/src/Squit.package/SwaSquitBrowserNew.class/instance/buildWith..st index b1a61f17f..bbbac6b53 100644 --- a/src/Squit.package/SwaSquitBrowserNew.class/instance/buildWith..st +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/buildWith..st @@ -1,4 +1,4 @@ -as yet unclassified +toolbuilder buildWith: aBuilder ^ aBuilder build: ((self buildWindowWith: aBuilder) diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/buttonHeight.st b/src/Squit.package/SwaSquitBrowserNew.class/instance/buttonHeight.st index c7ee864dd..bec9a6a6a 100644 --- a/src/Squit.package/SwaSquitBrowserNew.class/instance/buttonHeight.st +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/buttonHeight.st @@ -1,4 +1,4 @@ -as yet unclassified +toolbuilder buttonHeight ^ TextStyle defaultFont height * 2 \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/commitColumns.st b/src/Squit.package/SwaSquitBrowserNew.class/instance/commitColumns.st index 8a4371ed3..9b9149fef 100644 --- a/src/Squit.package/SwaSquitBrowserNew.class/instance/commitColumns.st +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/commitColumns.st @@ -1,4 +1,4 @@ -as yet unclassified +toolbuilder commitColumns | commits | diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/commitList.st b/src/Squit.package/SwaSquitBrowserNew.class/instance/commitList.st index b640283de..395ef7c54 100644 --- a/src/Squit.package/SwaSquitBrowserNew.class/instance/commitList.st +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/commitList.st @@ -1,4 +1,4 @@ -as yet unclassified +toolbuilder commitList | walker count | diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/commitListIndex..st b/src/Squit.package/SwaSquitBrowserNew.class/instance/commitListIndex..st index 10bf6cdde..e2f29c625 100644 --- a/src/Squit.package/SwaSquitBrowserNew.class/instance/commitListIndex..st +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/commitListIndex..st @@ -1,4 +1,4 @@ -as yet unclassified +accessing commitListIndex: aNumber commitListIndex := aNumber. diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/commitListIndex.st b/src/Squit.package/SwaSquitBrowserNew.class/instance/commitListIndex.st index 617422d25..e4215d777 100644 --- a/src/Squit.package/SwaSquitBrowserNew.class/instance/commitListIndex.st +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/commitListIndex.st @@ -1,4 +1,4 @@ -as yet unclassified +accessing commitListIndex ^ commitListIndex \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/commitListMenu..st b/src/Squit.package/SwaSquitBrowserNew.class/instance/commitListMenu..st new file mode 100644 index 000000000..efc45417d --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/commitListMenu..st @@ -0,0 +1,4 @@ +ui menu +commitListMenu: aMenu + + ^ self menu: aMenu for: #(menuCommitList) \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/example.st b/src/Squit.package/SwaSquitBrowserNew.class/instance/example.st deleted file mode 100644 index 5c7472f4e..000000000 --- a/src/Squit.package/SwaSquitBrowserNew.class/instance/example.st +++ /dev/null @@ -1,7 +0,0 @@ -as yet unclassified -example - - SBMorphExample - setUp: [ToolBuilder open: self class new] - cases: {SBMorphExampleCase name: 'example 1' caseBlock: [:m | m]} - extent: 354 @ 271 \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/fetch..st b/src/Squit.package/SwaSquitBrowserNew.class/instance/fetch..st index 1b69c5374..0e9b323eb 100644 --- a/src/Squit.package/SwaSquitBrowserNew.class/instance/fetch..st +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/fetch..st @@ -1,4 +1,4 @@ -as yet unclassified +actions fetch: aWorkingCopy | repository gitRepository remoteNames | diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/fetchFrom.remoteNames..st b/src/Squit.package/SwaSquitBrowserNew.class/instance/fetchFrom.remoteNames..st index 0ca7ef344..165f0ce1e 100644 --- a/src/Squit.package/SwaSquitBrowserNew.class/instance/fetchFrom.remoteNames..st +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/fetchFrom.remoteNames..st @@ -1,4 +1,4 @@ -as yet unclassified +actions fetchFrom: aRepository remoteNames: aCollection [(SquitInteractiveFetch repository: aRepository remoteNames: aCollection) diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/formatDate..st b/src/Squit.package/SwaSquitBrowserNew.class/instance/formatDate..st index 374e9561d..ac19bf1c7 100644 --- a/src/Squit.package/SwaSquitBrowserNew.class/instance/formatDate..st +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/formatDate..st @@ -1,4 +1,4 @@ -as yet unclassified +toolbuilder formatDate: aDateAndTime | YY MM DD hh mm | diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/hasRepositories.st b/src/Squit.package/SwaSquitBrowserNew.class/instance/hasRepositories.st new file mode 100644 index 000000000..04b83a0cb --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/hasRepositories.st @@ -0,0 +1,4 @@ +accessing +hasRepositories + + ^ self repositoryList size > 1 \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/initialize.st b/src/Squit.package/SwaSquitBrowserNew.class/instance/initialize.st index b566ceb59..c3311d34f 100644 --- a/src/Squit.package/SwaSquitBrowserNew.class/instance/initialize.st +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/initialize.st @@ -1,6 +1,8 @@ -as yet unclassified +initialize-release initialize super initialize. - repositoryListIndex := 1. - commitListIndex := 1 \ No newline at end of file + commitListIndex := 1. + self repositoryList + ifEmpty: [repositoryListIndex := 0] + ifNotEmpty: [repositoryListIndex := 1]. \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/menuCommitListHook..st b/src/Squit.package/SwaSquitBrowserNew.class/instance/menuCommitListHook..st new file mode 100644 index 000000000..1d1622cfa --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/menuCommitListHook..st @@ -0,0 +1,10 @@ +ui menu +menuCommitListHook: aMenu + + + self selectedCommit ifNil: [^ aMenu]. + aMenu addList: { + {'Checkout objects'. #actionCommitSelectionCheckout. 'Checkout objects from this commit. You will be able to select what will actually be loaded.', String cr, 'NOTE: unless you change the selection, your uncommitted changes will be reverted, so that what is loaded matches the objects in this commit!'}. + }. + + ^ aMenu \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/menuRepositoryListHook..st b/src/Squit.package/SwaSquitBrowserNew.class/instance/menuRepositoryListHook..st new file mode 100644 index 000000000..5e2abf8a9 --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/menuRepositoryListHook..st @@ -0,0 +1,12 @@ +ui menu +menuRepositoryListHook: aMenu + + + self selectedRepository ifNil: [^ aMenu]. + aMenu addList: { + {'Remove repository'. #actionRepositoryRemove}. + {'Add or remove packages'. #actionAddOrRemoveTrackedPackages. 'Add or remove packages for this repository.'}. + {'Edit credentials for repository'. #actionCredentialsEdit}. + }. + + ^ aMenu \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/refresh.st b/src/Squit.package/SwaSquitBrowserNew.class/instance/refresh.st index d0a5f4332..0782f0a22 100644 --- a/src/Squit.package/SwaSquitBrowserNew.class/instance/refresh.st +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/refresh.st @@ -1,4 +1,4 @@ -as yet unclassified +toolbuilder refresh self changed: #repositoryList. diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/repositoryList.st b/src/Squit.package/SwaSquitBrowserNew.class/instance/repositoryList.st index ca2221af4..214129d63 100644 --- a/src/Squit.package/SwaSquitBrowserNew.class/instance/repositoryList.st +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/repositoryList.st @@ -1,4 +1,4 @@ -as yet unclassified +accessing repositoryList ^ SquotWorkingCopy registered \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/repositoryListIndex..st b/src/Squit.package/SwaSquitBrowserNew.class/instance/repositoryListIndex..st index b93da2155..b913164f4 100644 --- a/src/Squit.package/SwaSquitBrowserNew.class/instance/repositoryListIndex..st +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/repositoryListIndex..st @@ -1,4 +1,4 @@ -as yet unclassified +accessing repositoryListIndex: aNumber repositoryListIndex := aNumber. diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/repositoryListIndex.st b/src/Squit.package/SwaSquitBrowserNew.class/instance/repositoryListIndex.st index 350e87ba8..5b5b68ead 100644 --- a/src/Squit.package/SwaSquitBrowserNew.class/instance/repositoryListIndex.st +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/repositoryListIndex.st @@ -1,4 +1,4 @@ -as yet unclassified +accessing repositoryListIndex ^ repositoryListIndex \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/repositoryListMenu..st b/src/Squit.package/SwaSquitBrowserNew.class/instance/repositoryListMenu..st new file mode 100644 index 000000000..b20ce23c6 --- /dev/null +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/repositoryListMenu..st @@ -0,0 +1,4 @@ +ui menu +repositoryListMenu: aMenu + + ^ self menu: aMenu for: #(menuRepositoryList) \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/selectRepository..st b/src/Squit.package/SwaSquitBrowserNew.class/instance/selectRepository..st index 1b43cc4c9..e85680e9b 100644 --- a/src/Squit.package/SwaSquitBrowserNew.class/instance/selectRepository..st +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/selectRepository..st @@ -1,4 +1,4 @@ -as yet unclassified +accessing selectRepository: repository self repositoryListIndex: (repository diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/selectedCommit.st b/src/Squit.package/SwaSquitBrowserNew.class/instance/selectedCommit.st index 759d87d5d..b02c750d1 100644 --- a/src/Squit.package/SwaSquitBrowserNew.class/instance/selectedCommit.st +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/selectedCommit.st @@ -1,4 +1,4 @@ -as yet unclassified +accessing selectedCommit self commitListIndex = 0 ifTrue: [^ nil]. diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/selectedRepository.st b/src/Squit.package/SwaSquitBrowserNew.class/instance/selectedRepository.st index 1aa9ad6cc..3b9e36322 100644 --- a/src/Squit.package/SwaSquitBrowserNew.class/instance/selectedRepository.st +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/selectedRepository.st @@ -1,4 +1,4 @@ -as yet unclassified +accessing selectedRepository self repositoryListIndex = 0 ifTrue: [^ nil]. diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/withUnitOfWork..st b/src/Squit.package/SwaSquitBrowserNew.class/instance/withUnitOfWork..st index b15def3e9..ec4cebb0e 100644 --- a/src/Squit.package/SwaSquitBrowserNew.class/instance/withUnitOfWork..st +++ b/src/Squit.package/SwaSquitBrowserNew.class/instance/withUnitOfWork..st @@ -1,4 +1,4 @@ -as yet unclassified +actions withUnitOfWork: aBlock | unitOfWork | diff --git a/src/Squit.package/SwaSquitBrowserNew.class/methodProperties.json b/src/Squit.package/SwaSquitBrowserNew.class/methodProperties.json index a2d7078db..ed94eba99 100644 --- a/src/Squit.package/SwaSquitBrowserNew.class/methodProperties.json +++ b/src/Squit.package/SwaSquitBrowserNew.class/methodProperties.json @@ -1,40 +1,46 @@ { - "class": { - "open": "ek 7/18/2021 10:05" - }, - "instance": { - "actionCloneAndMerge": "ct 8/30/2021 16:10", - "actionCommitAndPush": "ct 8/30/2021 16:55", - "actionCommitAndThenDo:": "ct 8/30/2021 16:53", - "actionFetch": "ct 8/30/2021 15:50", - "actionFetchAndMerge": "ct 8/30/2021 15:45", - "actionMerge": "ct 8/30/2021 15:45", - "actionMergeInteractive:": "ct 8/30/2021 15:43", - "actionPush": "ct 8/30/2021 17:02", - "browseRepository": "ct 8/30/2021 16:16", - "buildCommitList:": "ct 8/30/2021 17:06", - "buildRepositoryButtons:": "ct 8/30/2021 15:47", - "buildRepositoryList:": "tobe 7/17/2021 15:00", - "buildSyncButton:": "ct 8/30/2021 15:49", - "buildWith:": "ct 8/30/2021 17:04", - "buttonHeight": "tobe 7/17/2021 14:49", - "commitColumns": "ct 8/30/2021 15:27", - "commitList": "ct 8/30/2021 16:01", - "commitListIndex": "tobe 7/17/2021 15:06", - "commitListIndex:": "tobe 7/17/2021 15:05", - "example": "tobe 7/17/2021 14:51", - "fetch:": "ct 8/30/2021 15:52", - "fetchFrom:remoteNames:": "ct 8/30/2021 15:54", - "formatDate:": "tobe 7/17/2021 15:37", - "hasSelectedRepository": "ct 8/30/2021 15:36", - "initialize": "tobe 7/17/2021 15:06", - "refresh": "ct 8/30/2021 16:53", - "repositoryList": "tobe 7/17/2021 14:59", - "repositoryListIndex": "tobe 7/17/2021 14:58", - "repositoryListIndex:": "ct 8/30/2021 15:49", - "selectRepository:": "ct 8/30/2021 16:07", - "selectedCommit": "ct 8/30/2021 15:39", - "selectedRepository": "ct 8/30/2021 15:18", - "withUnitOfWork:": "ct 8/30/2021 15:36" - } -} \ No newline at end of file + "class" : { + "open" : "ek 7/18/2021 10:05" }, + "instance" : { + "actionAddOrRemoveTrackedPackages" : "ek 9/21/2021 19:24", + "actionCloneAndMerge" : "ek 9/21/2021 18:32", + "actionCommitAndPush" : "ct 8/30/2021 16:55", + "actionCommitAndThenDo:" : "ct 8/30/2021 16:53", + "actionCommitSelectionCheckout" : "ek 9/21/2021 19:34", + "actionCredentialsEdit" : "ek 9/21/2021 19:23", + "actionFetch" : "ct 8/30/2021 15:50", + "actionFetchAndMerge" : "ct 8/30/2021 15:45", + "actionMerge" : "ct 8/30/2021 15:45", + "actionMergeInteractive:" : "ct 8/30/2021 15:43", + "actionPush" : "ct 8/30/2021 17:02", + "actionRepositoryRemove" : "ek 9/21/2021 19:13", + "addRepository" : "ct 8/30/2021 17:20:35", + "browseRepository" : "ct 8/30/2021 16:16", + "buildCommitList:" : "ek 9/21/2021 19:31", + "buildRepositoryButtons:" : "ct 8/30/2021 15:47", + "buildRepositoryList:" : "ek 9/21/2021 19:03", + "buildSyncButton:" : "ct 8/30/2021 15:49", + "buildWith:" : "ct 8/30/2021 17:04", + "buttonHeight" : "tobe 7/17/2021 14:49", + "commitColumns" : "ct 8/30/2021 15:27", + "commitList" : "ct 8/30/2021 16:01", + "commitListIndex" : "tobe 7/17/2021 15:06", + "commitListIndex:" : "tobe 7/17/2021 15:05", + "commitListMenu:" : "ek 9/21/2021 19:31", + "fetch:" : "ct 8/30/2021 15:52", + "fetchFrom:remoteNames:" : "ct 8/30/2021 15:54", + "formatDate:" : "tobe 7/17/2021 15:37", + "hasRepositories" : "ek 9/21/2021 19:13", + "hasSelectedRepository" : "ct 8/30/2021 15:36", + "initialize" : "ek 9/19/2021 18:45", + "menuCommitListHook:" : "ek 9/21/2021 19:34", + "menuRepositoryListHook:" : "ek 9/21/2021 19:10", + "refresh" : "ct 8/30/2021 16:53", + "repositoryList" : "tobe 7/17/2021 14:59", + "repositoryListIndex" : "tobe 7/17/2021 14:58", + "repositoryListIndex:" : "ct 8/30/2021 15:49", + "repositoryListMenu:" : "ek 9/21/2021 19:03", + "selectRepository:" : "ct 8/30/2021 16:07", + "selectedCommit" : "ct 8/30/2021 15:39", + "selectedRepository" : "ct 8/30/2021 15:18", + "withUnitOfWork:" : "ct 8/30/2021 15:36" } } diff --git a/src/Squit.package/SwaSquitInteractiveClone.class/instance/clone.st b/src/Squit.package/SwaSquitInteractiveClone.class/instance/clone.st index 265a086d8..ff8230601 100644 --- a/src/Squit.package/SwaSquitInteractiveClone.class/instance/clone.st +++ b/src/Squit.package/SwaSquitInteractiveClone.class/instance/clone.st @@ -1,4 +1,4 @@ -as yet unclassified +running clone self requestUrl ifNil: [^ nil]. diff --git a/src/Squit.package/SwaSquitInteractiveClone.class/instance/createRepository.st b/src/Squit.package/SwaSquitInteractiveClone.class/instance/createRepository.st index 6196fbdcd..5c0765240 100644 --- a/src/Squit.package/SwaSquitInteractiveClone.class/instance/createRepository.st +++ b/src/Squit.package/SwaSquitInteractiveClone.class/instance/createRepository.st @@ -1,4 +1,4 @@ -as yet unclassified +private createRepository | repositoryPath | diff --git a/src/Squit.package/SwaSquitInteractiveClone.class/instance/registerWorkingCopy.st b/src/Squit.package/SwaSquitInteractiveClone.class/instance/registerWorkingCopy.st index 5c8c60a3f..032a86332 100644 --- a/src/Squit.package/SwaSquitInteractiveClone.class/instance/registerWorkingCopy.st +++ b/src/Squit.package/SwaSquitInteractiveClone.class/instance/registerWorkingCopy.st @@ -1,4 +1,4 @@ -as yet unclassified +running registerWorkingCopy workingCopy := SquotWorkingCopy newOnObjectMemory. diff --git a/src/Squit.package/SwaSquitInteractiveClone.class/instance/requestAndStoreCredentialsFor.remoteUrl.ifCanceled..st b/src/Squit.package/SwaSquitInteractiveClone.class/instance/requestAndStoreCredentialsFor.remoteUrl.ifCanceled..st new file mode 100644 index 000000000..6b3b7284a --- /dev/null +++ b/src/Squit.package/SwaSquitInteractiveClone.class/instance/requestAndStoreCredentialsFor.remoteUrl.ifCanceled..st @@ -0,0 +1,17 @@ +error handling +requestAndStoreCredentialsFor: repository remoteUrl: remoteUrl ifCanceled: cancelBlock + + | credentials gitRepository | + credentials := SquitCredentialsFillInMorph requestCredentials + ifNil: [^ cancelBlock value]. + + repository + addCredentialsFor: remoteUrl + user: (credentials at: #username) + password: (credentials at: #password). + + gitRepository := repository git. + gitRepository configAt: 'user.name' put: (credentials at: #displayName). + gitRepository configAt: 'user.email' put: (credentials at: #email). + + ^ repository credentialsFor: remoteUrl \ No newline at end of file diff --git a/src/Squit.package/SwaSquitInteractiveClone.class/instance/requestProjectName.st b/src/Squit.package/SwaSquitInteractiveClone.class/instance/requestProjectName.st deleted file mode 100644 index 3bdb31795..000000000 --- a/src/Squit.package/SwaSquitInteractiveClone.class/instance/requestProjectName.st +++ /dev/null @@ -1,6 +0,0 @@ -as yet unclassified -requestProjectName - - name := SquotGUI request: 'Project name:'. - name ifEmpty: [name := nil]. - ^ name \ No newline at end of file diff --git a/src/Squit.package/SwaSquitInteractiveClone.class/methodProperties.json b/src/Squit.package/SwaSquitInteractiveClone.class/methodProperties.json index c959c16ce..0dc4f8b51 100644 --- a/src/Squit.package/SwaSquitInteractiveClone.class/methodProperties.json +++ b/src/Squit.package/SwaSquitInteractiveClone.class/methodProperties.json @@ -5,4 +5,4 @@ "clone" : "tobe 7/17/2021 15:34", "createRepository" : "tobe 7/17/2021 15:35", "registerWorkingCopy" : "ek 7/17/2021 12:01", - "requestProjectName" : "ek 7/17/2021 12:00" } } + "requestAndStoreCredentialsFor:remoteUrl:ifCanceled:" : "ek 9/21/2021 18:38" } } diff --git a/src/Squit.package/monticello.meta/version b/src/Squit.package/monticello.meta/version index 77ef3ed91..e105d3745 100644 --- a/src/Squit.package/monticello.meta/version +++ b/src/Squit.package/monticello.meta/version @@ -1 +1 @@ -(name 'Squit-ct.5' message 'empty log message' id 'f05de4c6-5f71-6f4c-9080-f5fd744b072c' date '30 August 2021' time '5:20:35.40661 pm' author 'ct' ancestors ((name 'Squit-ct.4' message 'empty log message' id '555ffaf2-7cbe-e747-9fd1-fc706de0aa88' date '30 August 2021' time '5:19:42.73361 pm' author 'ct' ancestors ((name 'Squit-cypress.1' message 'fabricated from a Cypress format repository' id '4a5f3775-51a1-2145-beb7-ebcdb560f31a' date '30 August 2021' time '3:16:59.539657 pm' author '' ancestors () stepChildren ())) stepChildren ())) stepChildren ()) \ No newline at end of file +(name 'Squit-ek.6' message 'add credentials Morph, minor fixes' id 'ee1af622-08d6-4cc5-a562-987443b92c69' date '13 October 2021' time '4:48:06.072503 pm' author 'ek' ancestors ((name 'Squit-ct.5' message 'empty log message' id 'f05de4c6-5f71-6f4c-9080-f5fd744b072c' date '30 August 2021' time '5:20:35.40661 pm' author 'ct' ancestors ((name 'Squit-ct.4' message 'empty log message' id '555ffaf2-7cbe-e747-9fd1-fc706de0aa88' date '30 August 2021' time '5:19:42.73361 pm' author 'ct' ancestors ((name 'Squit-cypress.1' message 'fabricated from a Cypress format repository' id '4a5f3775-51a1-2145-beb7-ebcdb560f31a' date '30 August 2021' time '3:16:59.539657 pm' author '' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ()) \ No newline at end of file From 67e5b7b88ba7ebcfd42274789cba40ab29417747 Mon Sep 17 00:00:00 2001 From: ekrebs5 Date: Thu, 14 Oct 2021 11:39:19 +0200 Subject: [PATCH 08/19] remove back-up tool --- .../SwaSquitBrowser.class/README.md | 0 .../instance/buildButtonBar..st | 40 ------------------- .../instance/buildCloneButton..st | 23 ----------- .../instance/buildCommitList..st | 24 ----------- .../instance/buildCommitSearchPanel..st | 11 ----- .../instance/buildObjectList..st | 11 ----- .../instance/buildProjectBranchPanel..st | 12 ------ .../instance/buildProjectList..st | 12 ------ .../SwaSquitBrowser.class/instance/clone.st | 8 ---- .../instance/commitListMenu..st | 3 -- .../instance/offerToAddFirstProject.st | 2 - .../instance/projectListMenu..st | 3 -- .../instance/swaMenuCommitListHook..st | 20 ---------- .../instance/swaMenuProjectListHook..st | 11 ----- .../swaMenuProjectListWorkingCopyHook..st | 21 ---------- .../methodProperties.json | 18 --------- .../SwaSquitBrowser.class/properties.json | 14 ------- src/Squit.package/monticello.meta/version | 2 +- 18 files changed, 1 insertion(+), 234 deletions(-) delete mode 100644 src/Squit.package/SwaSquitBrowser.class/README.md delete mode 100644 src/Squit.package/SwaSquitBrowser.class/instance/buildButtonBar..st delete mode 100644 src/Squit.package/SwaSquitBrowser.class/instance/buildCloneButton..st delete mode 100644 src/Squit.package/SwaSquitBrowser.class/instance/buildCommitList..st delete mode 100644 src/Squit.package/SwaSquitBrowser.class/instance/buildCommitSearchPanel..st delete mode 100644 src/Squit.package/SwaSquitBrowser.class/instance/buildObjectList..st delete mode 100644 src/Squit.package/SwaSquitBrowser.class/instance/buildProjectBranchPanel..st delete mode 100644 src/Squit.package/SwaSquitBrowser.class/instance/buildProjectList..st delete mode 100644 src/Squit.package/SwaSquitBrowser.class/instance/clone.st delete mode 100644 src/Squit.package/SwaSquitBrowser.class/instance/commitListMenu..st delete mode 100644 src/Squit.package/SwaSquitBrowser.class/instance/offerToAddFirstProject.st delete mode 100644 src/Squit.package/SwaSquitBrowser.class/instance/projectListMenu..st delete mode 100644 src/Squit.package/SwaSquitBrowser.class/instance/swaMenuCommitListHook..st delete mode 100644 src/Squit.package/SwaSquitBrowser.class/instance/swaMenuProjectListHook..st delete mode 100644 src/Squit.package/SwaSquitBrowser.class/instance/swaMenuProjectListWorkingCopyHook..st delete mode 100644 src/Squit.package/SwaSquitBrowser.class/methodProperties.json delete mode 100644 src/Squit.package/SwaSquitBrowser.class/properties.json diff --git a/src/Squit.package/SwaSquitBrowser.class/README.md b/src/Squit.package/SwaSquitBrowser.class/README.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/buildButtonBar..st b/src/Squit.package/SwaSquitBrowser.class/instance/buildButtonBar..st deleted file mode 100644 index ab990b7bb..000000000 --- a/src/Squit.package/SwaSquitBrowser.class/instance/buildButtonBar..st +++ /dev/null @@ -1,40 +0,0 @@ -toolbuilder -buildButtonBar: builder - | buttonBar commitButton pullButton pushButton | - buttonBar := builder pluggablePanelSpec new - layout: #horizontal; - "spacing: -1;" - children: OrderedCollection new; - frame: (LayoutFrame new leftFraction: 0 offset: 0; - topFraction: 0.6 offset: -25; - rightFraction: 1 offset: 0; - bottomFraction: 0.6 offset: 0) - yourself. - - commitButton := builder pluggableActionButtonSpec new. - commitButton - model: self; - label: 'Commit'; - enabled: #hasProjectSelection; - action: #actionCommit; - help: 'Commit your current changes.'. - - pullButton := builder pluggableActionButtonSpec new. - pullButton - model: self; - label: 'Pull'; - enabled: #hasBranchSelection; - action: #actionPull; - help: 'Pull commits into the active branch from its tracked remote branch.'. - - pushButton := builder pluggableActionButtonSpec new. - pushButton - model: self; - label: 'Push'; - enabled: #hasBranchSelection; - action: #actionPush; - help: 'Push commits to a remote.'. - - buttonBar children addAll: { - commitButton. pushButton. pullButton}. - ^ buttonBar \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/buildCloneButton..st b/src/Squit.package/SwaSquitBrowser.class/instance/buildCloneButton..st deleted file mode 100644 index 6a2cf85af..000000000 --- a/src/Squit.package/SwaSquitBrowser.class/instance/buildCloneButton..st +++ /dev/null @@ -1,23 +0,0 @@ -toolbuilder -buildCloneButton: builder - - | buttonBar cloneButton | - buttonBar := builder pluggablePanelSpec new - layout: #horizontal; - "spacing: -1;" - children: OrderedCollection new; - frame: (LayoutFrame new leftFraction: 0 offset: 0; - topFraction: 0 offset: 0; - rightFraction: 1 offset: 0; - bottomFraction: 0.1 offset: 0) - yourself. - - cloneButton := builder pluggableActionButtonSpec new. - cloneButton - model: self; - label: 'Clone'; - action: #actionProjectClone; - help: 'Clone a new project.'. - - buttonBar children addAll: {cloneButton}. - ^ buttonBar \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/buildCommitList..st b/src/Squit.package/SwaSquitBrowser.class/instance/buildCommitList..st deleted file mode 100644 index d62bf296f..000000000 --- a/src/Squit.package/SwaSquitBrowser.class/instance/buildCommitList..st +++ /dev/null @@ -1,24 +0,0 @@ -toolbuilder -buildCommitList: builder - ^ builder pluggableTreeSpec new - model: self; - hScrollBarPolicy: #whenNeeded; - roots: #commitList; - nodeClass: SquitVersionWrapper; - getSelected: #commitSelection; - setSelected: #commitSelection:; - menu: #commitListMenu:; - dragItem: #dragFromCommitList:; - dropAccept: #wantsCommitListDrop:type:from:; - dropItem: #dropOnCommitList:on:copyIndicated:; - keyPress: #commitListKey:from:; - columns: { - [:listMorph | (listMorph filteredItems collect: [:item | - item preferredWidthOfColumn: 1]) max]. - [:listMorph | (listMorph filteredItems collect: [:item | - item preferredWidthOfColumn: 2]) max]. - nil "take all the space"}; - frame: (LayoutFrame new leftFraction: 0 offset: 0; - topFraction: 0 offset: 0; - rightFraction: 1 offset: 0; - bottomFraction: 1 offset: 0) \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/buildCommitSearchPanel..st b/src/Squit.package/SwaSquitBrowser.class/instance/buildCommitSearchPanel..st deleted file mode 100644 index 020c53b5e..000000000 --- a/src/Squit.package/SwaSquitBrowser.class/instance/buildCommitSearchPanel..st +++ /dev/null @@ -1,11 +0,0 @@ -toolbuilder -buildCommitSearchPanel: builder - ^ builder pluggablePanelSpec new - wantsResizeHandles: true; - model: self; - children: {self buildCommitList: builder". - self buildSearchPanel: builder"}; - frame: (LayoutFrame new leftFraction: 0.2 offset: 0; - topFraction: 0 offset: 0; - rightFraction: 1 offset: 0; - bottomFraction: 0.6 offset: -25) \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/buildObjectList..st b/src/Squit.package/SwaSquitBrowser.class/instance/buildObjectList..st deleted file mode 100644 index c365b42ac..000000000 --- a/src/Squit.package/SwaSquitBrowser.class/instance/buildObjectList..st +++ /dev/null @@ -1,11 +0,0 @@ -toolbuilder -buildObjectList: builder - ^ builder pluggableListSpec new - model: self; - list: #objectList; - getIndex: #objectIndex; - setIndex: #objectIndex:; - dragItem: #dragFromObjectList:; - dropAccept: #wantsObjectListDrop:type:from:; - dropItem: #dropOnObjectList:at:copyIndicated:; - frame: (0.7@0.6 corner: 1@1) \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/buildProjectBranchPanel..st b/src/Squit.package/SwaSquitBrowser.class/instance/buildProjectBranchPanel..st deleted file mode 100644 index 3d18905a4..000000000 --- a/src/Squit.package/SwaSquitBrowser.class/instance/buildProjectBranchPanel..st +++ /dev/null @@ -1,12 +0,0 @@ -toolbuilder -buildProjectBranchPanel: builder - ^ builder pluggablePanelSpec new - wantsResizeHandles: true; - model: self; - children: {self buildProjectList: builder. - self buildCloneButton: builder". - self buildBranchList: builder"}; - frame: (LayoutFrame new leftFraction: 0 offset: 0; - topFraction: 0 offset: 0; - rightFraction: 0.2 offset: 0; - bottomFraction: 0.6 offset: -25) \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/buildProjectList..st b/src/Squit.package/SwaSquitBrowser.class/instance/buildProjectList..st deleted file mode 100644 index 6275537bb..000000000 --- a/src/Squit.package/SwaSquitBrowser.class/instance/buildProjectList..st +++ /dev/null @@ -1,12 +0,0 @@ -toolbuilder -buildProjectList: builder - ^ builder pluggableListSpec new - model: self; - list: #projectList; - getIndex: #projectIndex; - setIndex: #projectIndex:; - dragItem: #dragFromProjectList:; - dropAccept: #wantsProjectListDrop:type:from:; - dropItem: #dropOnProjectList:at:copyIndicated:; - menu: #projectListMenu:; - frame: (0@0.1 corner: 1@1) \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/clone.st b/src/Squit.package/SwaSquitBrowser.class/instance/clone.st deleted file mode 100644 index cef50c04d..000000000 --- a/src/Squit.package/SwaSquitBrowser.class/instance/clone.st +++ /dev/null @@ -1,8 +0,0 @@ -actions on working copies -clone - | operation | - operation := SwaSquitInteractiveClone new. - [operation clone] - on: SquitBadRemote do: - [:e | e retry]. - Project current addDeferredUIMessage: [self refresh]. \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/commitListMenu..st b/src/Squit.package/SwaSquitBrowser.class/instance/commitListMenu..st deleted file mode 100644 index 6b6d93edf..000000000 --- a/src/Squit.package/SwaSquitBrowser.class/instance/commitListMenu..st +++ /dev/null @@ -1,3 +0,0 @@ -ui menu -commitListMenu: aMenu - ^ self menu: aMenu for: #(swaMenuCommitList) \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/offerToAddFirstProject.st b/src/Squit.package/SwaSquitBrowser.class/instance/offerToAddFirstProject.st deleted file mode 100644 index e5ab48939..000000000 --- a/src/Squit.package/SwaSquitBrowser.class/instance/offerToAddFirstProject.st +++ /dev/null @@ -1,2 +0,0 @@ -actions -offerToAddFirstProject \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/projectListMenu..st b/src/Squit.package/SwaSquitBrowser.class/instance/projectListMenu..st deleted file mode 100644 index b4d4dd105..000000000 --- a/src/Squit.package/SwaSquitBrowser.class/instance/projectListMenu..st +++ /dev/null @@ -1,3 +0,0 @@ -ui menu -projectListMenu: aMenu - ^ self menu: aMenu for: #(swaMenuProjectList) \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/swaMenuCommitListHook..st b/src/Squit.package/SwaSquitBrowser.class/instance/swaMenuCommitListHook..st deleted file mode 100644 index da1a015cb..000000000 --- a/src/Squit.package/SwaSquitBrowser.class/instance/swaMenuCommitListHook..st +++ /dev/null @@ -1,20 +0,0 @@ -ui menu -swaMenuCommitListHook: aMenu - - | activeBranchName isMenuOnActiveBranch onlyOnInactiveBranch commands | - self hasProjectSelection ifFalse: [^ aMenu]. - aMenu addTitle: (self commitSelection printStringLimitedTo: 50). - self withUnitOfWork: - [activeBranchName := self projectSelection loadedHistorian shortName. - isMenuOnActiveBranch := selectedHistorian = self projectSelection loadedHistorian. - onlyOnInactiveBranch := selectedHistorian ~= self projectSelection loadedHistorian. - commands := { - {'Checkout objects'. #actionCommitSelectionCheckout. 'Checkout objects from this commit. You will be able to select what will actually be loaded.', String cr, 'NOTE: unless you change the selection, your uncommitted changes will be reverted, so that what is loaded matches the objects in this commit!'}. - {'Merge objects'. #actionCommitMergeIntoMemory. 'Merge objects from this commit with the loaded ones. You may use this to pick objects or changes from this commit without discarding your uncommitted changes.'}. - '-'. - {'Compare with parent commit'. #actionCommitDiffWithParent}. - {'Compare with next selected commit'. #actionCommitDiffWithNextSelected. 'The next commit you select will be the origin of a diff against this commit.'}. - {'Compare with working copy'. #actionCommitDiffWithWorkingCopy}. - }. - self buildMenu: aMenu from: commands]. - ^ aMenu \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/swaMenuProjectListHook..st b/src/Squit.package/SwaSquitBrowser.class/instance/swaMenuProjectListHook..st deleted file mode 100644 index d6094b88b..000000000 --- a/src/Squit.package/SwaSquitBrowser.class/instance/swaMenuProjectListHook..st +++ /dev/null @@ -1,11 +0,0 @@ -ui menu -swaMenuProjectListHook: aMenu - - - | submenu | - self projectSelection - ifNil: [submenu := aMenu] - ifNotNil: [submenu := aMenu class new - defaultTarget: aMenu defaultTarget; - yourself]. - ^ aMenu \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/swaMenuProjectListWorkingCopyHook..st b/src/Squit.package/SwaSquitBrowser.class/instance/swaMenuProjectListWorkingCopyHook..st deleted file mode 100644 index 1103f3712..000000000 --- a/src/Squit.package/SwaSquitBrowser.class/instance/swaMenuProjectListWorkingCopyHook..st +++ /dev/null @@ -1,21 +0,0 @@ -ui menu -swaMenuProjectListWorkingCopyHook: aMenu - - - self projectSelection ifNil: [^ aMenu]. - aMenu addTitle: 'Working copy of ', self projectSelection name. - aMenu addList: { - {'Rename project'. #actionProjectRename}. - {'Remove project'. #actionProjectRemove}. - }. - aMenu addLine. - aMenu - addList: { - {'Add or remove packages'. #actionAddOrRemoveTrackedPackages. 'Add or remove packages for this project.'} - }. - aMenu addLine. - aMenu addList: { - {'Edit credentials for project'. #actionCredentialsEdit}. - {'Edit project-level git user name/email'. #actionGitUserEdit} - }. - ^ aMenu \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/methodProperties.json b/src/Squit.package/SwaSquitBrowser.class/methodProperties.json deleted file mode 100644 index 1a5bdfd9a..000000000 --- a/src/Squit.package/SwaSquitBrowser.class/methodProperties.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "buildButtonBar:" : "ek 7/17/2021 12:07", - "buildCloneButton:" : "ek 7/17/2021 11:32", - "buildCommitList:" : "ek 7/17/2021 11:11", - "buildCommitSearchPanel:" : "ek 7/17/2021 11:09", - "buildObjectList:" : "ek 7/17/2021 13:20", - "buildProjectBranchPanel:" : "ek 7/17/2021 11:25", - "buildProjectList:" : "ek 7/17/2021 11:30", - "clone" : "ek 7/17/2021 11:50", - "commitListMenu:" : "ek 7/17/2021 13:04", - "offerToAddFirstProject" : "ek 7/17/2021 11:37", - "projectListMenu:" : "ek 7/17/2021 13:11", - "swaMenuCommitListHook:" : "ek 7/17/2021 13:04", - "swaMenuProjectListHook:" : "ek 7/17/2021 13:18", - "swaMenuProjectListWorkingCopyHook:" : "ek 7/17/2021 13:19" } } diff --git a/src/Squit.package/SwaSquitBrowser.class/properties.json b/src/Squit.package/SwaSquitBrowser.class/properties.json deleted file mode 100644 index 818d785b6..000000000 --- a/src/Squit.package/SwaSquitBrowser.class/properties.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "category" : "Squit-Hackday", - "classinstvars" : [ - ], - "classvars" : [ - ], - "commentStamp" : "", - "instvars" : [ - ], - "name" : "SwaSquitBrowser", - "pools" : [ - ], - "super" : "SquitBrowser", - "type" : "normal" } diff --git a/src/Squit.package/monticello.meta/version b/src/Squit.package/monticello.meta/version index e105d3745..eafb7c0cd 100644 --- a/src/Squit.package/monticello.meta/version +++ b/src/Squit.package/monticello.meta/version @@ -1 +1 @@ -(name 'Squit-ek.6' message 'add credentials Morph, minor fixes' id 'ee1af622-08d6-4cc5-a562-987443b92c69' date '13 October 2021' time '4:48:06.072503 pm' author 'ek' ancestors ((name 'Squit-ct.5' message 'empty log message' id 'f05de4c6-5f71-6f4c-9080-f5fd744b072c' date '30 August 2021' time '5:20:35.40661 pm' author 'ct' ancestors ((name 'Squit-ct.4' message 'empty log message' id '555ffaf2-7cbe-e747-9fd1-fc706de0aa88' date '30 August 2021' time '5:19:42.73361 pm' author 'ct' ancestors ((name 'Squit-cypress.1' message 'fabricated from a Cypress format repository' id '4a5f3775-51a1-2145-beb7-ebcdb560f31a' date '30 August 2021' time '3:16:59.539657 pm' author '' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ()) \ No newline at end of file +(name 'Squit-ek.7' message 'remove back-up tool' id '94063854-60c8-4d76-bcc2-09a36d965af9' date '14 October 2021' time '11:38:49.527581 am' author 'ek' ancestors ((name 'Squit-ek.6' message 'add credentials Morph, minor fixes' id 'ee1af622-08d6-4cc5-a562-987443b92c69' date '13 October 2021' time '4:48:06.072503 pm' author 'ek' ancestors ((name 'Squit-ct.5' message 'empty log message' id 'f05de4c6-5f71-6f4c-9080-f5fd744b072c' date '30 August 2021' time '5:20:35.40661 pm' author 'ct' ancestors ((name 'Squit-ct.4' message 'empty log message' id '555ffaf2-7cbe-e747-9fd1-fc706de0aa88' date '30 August 2021' time '5:19:42.73361 pm' author 'ct' ancestors ((name 'Squit-cypress.1' message 'fabricated from a Cypress format repository' id '4a5f3775-51a1-2145-beb7-ebcdb560f31a' date '30 August 2021' time '3:16:59.539657 pm' author '' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ()) \ No newline at end of file From 2aed6a28af7b215d6f1003b9b7a216c618ebf397 Mon Sep 17 00:00:00 2001 From: ekrebs5 Date: Thu, 14 Oct 2021 11:41:19 +0200 Subject: [PATCH 09/19] renaming --- .../SquitCredentialsFillInMorph.class/properties.json | 2 +- .../README.md | 0 .../class/open.st | 0 .../instance/actionAddOrRemoveTrackedPackages.st | 0 .../instance/actionCloneAndMerge.st | 0 .../instance/actionCommitAndPush.st | 0 .../instance/actionCommitAndThenDo..st | 0 .../instance/actionCommitSelectionCheckout.st | 0 .../instance/actionCredentialsEdit.st | 0 .../instance/actionFetch.st | 0 .../instance/actionFetchAndMerge.st | 0 .../instance/actionMerge.st | 0 .../instance/actionMergeInteractive..st | 0 .../instance/actionPush.st | 0 .../instance/actionRepositoryRemove.st | 0 .../instance/addRepository.st | 0 .../instance/browseRepository.st | 0 .../instance/buildCommitList..st | 0 .../instance/buildRepositoryButtons..st | 0 .../instance/buildRepositoryList..st | 0 .../instance/buildSyncButton..st | 0 .../instance/buildWith..st | 0 .../instance/buttonHeight.st | 0 .../instance/commitColumns.st | 0 .../instance/commitList.st | 0 .../instance/commitListIndex..st | 0 .../instance/commitListIndex.st | 0 .../instance/commitListMenu..st | 0 .../instance/fetch..st | 0 .../instance/fetchFrom.remoteNames..st | 0 .../instance/formatDate..st | 0 .../instance/hasRepositories.st | 0 .../instance/hasSelectedRepository.st | 0 .../instance/initialize.st | 0 .../instance/menuCommitListHook..st | 0 .../instance/menuRepositoryListHook..st | 0 .../instance/refresh.st | 0 .../instance/repositoryList.st | 0 .../instance/repositoryListIndex..st | 0 .../instance/repositoryListIndex.st | 0 .../instance/repositoryListMenu..st | 0 .../instance/selectRepository..st | 0 .../instance/selectedCommit.st | 0 .../instance/selectedRepository.st | 0 .../instance/withUnitOfWork..st | 0 .../methodProperties.json | 0 .../properties.json | 4 ++-- .../SwaSquitInteractiveClone.class/properties.json | 2 +- src/Squit.package/monticello.meta/categories.st | 2 +- src/Squit.package/monticello.meta/version | 2 +- 50 files changed, 6 insertions(+), 6 deletions(-) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/README.md (100%) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/class/open.st (100%) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/instance/actionAddOrRemoveTrackedPackages.st (100%) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/instance/actionCloneAndMerge.st (100%) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/instance/actionCommitAndPush.st (100%) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/instance/actionCommitAndThenDo..st (100%) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/instance/actionCommitSelectionCheckout.st (100%) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/instance/actionCredentialsEdit.st (100%) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/instance/actionFetch.st (100%) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/instance/actionFetchAndMerge.st (100%) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/instance/actionMerge.st (100%) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/instance/actionMergeInteractive..st (100%) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/instance/actionPush.st (100%) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/instance/actionRepositoryRemove.st (100%) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/instance/addRepository.st (100%) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/instance/browseRepository.st (100%) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/instance/buildCommitList..st (100%) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/instance/buildRepositoryButtons..st (100%) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/instance/buildRepositoryList..st (100%) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/instance/buildSyncButton..st (100%) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/instance/buildWith..st (100%) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/instance/buttonHeight.st (100%) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/instance/commitColumns.st (100%) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/instance/commitList.st (100%) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/instance/commitListIndex..st (100%) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/instance/commitListIndex.st (100%) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/instance/commitListMenu..st (100%) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/instance/fetch..st (100%) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/instance/fetchFrom.remoteNames..st (100%) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/instance/formatDate..st (100%) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/instance/hasRepositories.st (100%) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/instance/hasSelectedRepository.st (100%) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/instance/initialize.st (100%) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/instance/menuCommitListHook..st (100%) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/instance/menuRepositoryListHook..st (100%) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/instance/refresh.st (100%) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/instance/repositoryList.st (100%) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/instance/repositoryListIndex..st (100%) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/instance/repositoryListIndex.st (100%) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/instance/repositoryListMenu..st (100%) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/instance/selectRepository..st (100%) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/instance/selectedCommit.st (100%) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/instance/selectedRepository.st (100%) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/instance/withUnitOfWork..st (100%) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/methodProperties.json (100%) rename src/Squit.package/{SwaSquitBrowserNew.class => SwaSquitBrowser.class}/properties.json (75%) diff --git a/src/Squit.package/SquitCredentialsFillInMorph.class/properties.json b/src/Squit.package/SquitCredentialsFillInMorph.class/properties.json index c46c1131f..393be48c0 100644 --- a/src/Squit.package/SquitCredentialsFillInMorph.class/properties.json +++ b/src/Squit.package/SquitCredentialsFillInMorph.class/properties.json @@ -1,5 +1,5 @@ { - "category" : "Squit-Hackday", + "category" : "Squit-Lecture", "classinstvars" : [ ], "classvars" : [ diff --git a/src/Squit.package/SwaSquitBrowserNew.class/README.md b/src/Squit.package/SwaSquitBrowser.class/README.md similarity index 100% rename from src/Squit.package/SwaSquitBrowserNew.class/README.md rename to src/Squit.package/SwaSquitBrowser.class/README.md diff --git a/src/Squit.package/SwaSquitBrowserNew.class/class/open.st b/src/Squit.package/SwaSquitBrowser.class/class/open.st similarity index 100% rename from src/Squit.package/SwaSquitBrowserNew.class/class/open.st rename to src/Squit.package/SwaSquitBrowser.class/class/open.st diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/actionAddOrRemoveTrackedPackages.st b/src/Squit.package/SwaSquitBrowser.class/instance/actionAddOrRemoveTrackedPackages.st similarity index 100% rename from src/Squit.package/SwaSquitBrowserNew.class/instance/actionAddOrRemoveTrackedPackages.st rename to src/Squit.package/SwaSquitBrowser.class/instance/actionAddOrRemoveTrackedPackages.st diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/actionCloneAndMerge.st b/src/Squit.package/SwaSquitBrowser.class/instance/actionCloneAndMerge.st similarity index 100% rename from src/Squit.package/SwaSquitBrowserNew.class/instance/actionCloneAndMerge.st rename to src/Squit.package/SwaSquitBrowser.class/instance/actionCloneAndMerge.st diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/actionCommitAndPush.st b/src/Squit.package/SwaSquitBrowser.class/instance/actionCommitAndPush.st similarity index 100% rename from src/Squit.package/SwaSquitBrowserNew.class/instance/actionCommitAndPush.st rename to src/Squit.package/SwaSquitBrowser.class/instance/actionCommitAndPush.st diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/actionCommitAndThenDo..st b/src/Squit.package/SwaSquitBrowser.class/instance/actionCommitAndThenDo..st similarity index 100% rename from src/Squit.package/SwaSquitBrowserNew.class/instance/actionCommitAndThenDo..st rename to src/Squit.package/SwaSquitBrowser.class/instance/actionCommitAndThenDo..st diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/actionCommitSelectionCheckout.st b/src/Squit.package/SwaSquitBrowser.class/instance/actionCommitSelectionCheckout.st similarity index 100% rename from src/Squit.package/SwaSquitBrowserNew.class/instance/actionCommitSelectionCheckout.st rename to src/Squit.package/SwaSquitBrowser.class/instance/actionCommitSelectionCheckout.st diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/actionCredentialsEdit.st b/src/Squit.package/SwaSquitBrowser.class/instance/actionCredentialsEdit.st similarity index 100% rename from src/Squit.package/SwaSquitBrowserNew.class/instance/actionCredentialsEdit.st rename to src/Squit.package/SwaSquitBrowser.class/instance/actionCredentialsEdit.st diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/actionFetch.st b/src/Squit.package/SwaSquitBrowser.class/instance/actionFetch.st similarity index 100% rename from src/Squit.package/SwaSquitBrowserNew.class/instance/actionFetch.st rename to src/Squit.package/SwaSquitBrowser.class/instance/actionFetch.st diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/actionFetchAndMerge.st b/src/Squit.package/SwaSquitBrowser.class/instance/actionFetchAndMerge.st similarity index 100% rename from src/Squit.package/SwaSquitBrowserNew.class/instance/actionFetchAndMerge.st rename to src/Squit.package/SwaSquitBrowser.class/instance/actionFetchAndMerge.st diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/actionMerge.st b/src/Squit.package/SwaSquitBrowser.class/instance/actionMerge.st similarity index 100% rename from src/Squit.package/SwaSquitBrowserNew.class/instance/actionMerge.st rename to src/Squit.package/SwaSquitBrowser.class/instance/actionMerge.st diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/actionMergeInteractive..st b/src/Squit.package/SwaSquitBrowser.class/instance/actionMergeInteractive..st similarity index 100% rename from src/Squit.package/SwaSquitBrowserNew.class/instance/actionMergeInteractive..st rename to src/Squit.package/SwaSquitBrowser.class/instance/actionMergeInteractive..st diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/actionPush.st b/src/Squit.package/SwaSquitBrowser.class/instance/actionPush.st similarity index 100% rename from src/Squit.package/SwaSquitBrowserNew.class/instance/actionPush.st rename to src/Squit.package/SwaSquitBrowser.class/instance/actionPush.st diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/actionRepositoryRemove.st b/src/Squit.package/SwaSquitBrowser.class/instance/actionRepositoryRemove.st similarity index 100% rename from src/Squit.package/SwaSquitBrowserNew.class/instance/actionRepositoryRemove.st rename to src/Squit.package/SwaSquitBrowser.class/instance/actionRepositoryRemove.st diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/addRepository.st b/src/Squit.package/SwaSquitBrowser.class/instance/addRepository.st similarity index 100% rename from src/Squit.package/SwaSquitBrowserNew.class/instance/addRepository.st rename to src/Squit.package/SwaSquitBrowser.class/instance/addRepository.st diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/browseRepository.st b/src/Squit.package/SwaSquitBrowser.class/instance/browseRepository.st similarity index 100% rename from src/Squit.package/SwaSquitBrowserNew.class/instance/browseRepository.st rename to src/Squit.package/SwaSquitBrowser.class/instance/browseRepository.st diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/buildCommitList..st b/src/Squit.package/SwaSquitBrowser.class/instance/buildCommitList..st similarity index 100% rename from src/Squit.package/SwaSquitBrowserNew.class/instance/buildCommitList..st rename to src/Squit.package/SwaSquitBrowser.class/instance/buildCommitList..st diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/buildRepositoryButtons..st b/src/Squit.package/SwaSquitBrowser.class/instance/buildRepositoryButtons..st similarity index 100% rename from src/Squit.package/SwaSquitBrowserNew.class/instance/buildRepositoryButtons..st rename to src/Squit.package/SwaSquitBrowser.class/instance/buildRepositoryButtons..st diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/buildRepositoryList..st b/src/Squit.package/SwaSquitBrowser.class/instance/buildRepositoryList..st similarity index 100% rename from src/Squit.package/SwaSquitBrowserNew.class/instance/buildRepositoryList..st rename to src/Squit.package/SwaSquitBrowser.class/instance/buildRepositoryList..st diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/buildSyncButton..st b/src/Squit.package/SwaSquitBrowser.class/instance/buildSyncButton..st similarity index 100% rename from src/Squit.package/SwaSquitBrowserNew.class/instance/buildSyncButton..st rename to src/Squit.package/SwaSquitBrowser.class/instance/buildSyncButton..st diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/buildWith..st b/src/Squit.package/SwaSquitBrowser.class/instance/buildWith..st similarity index 100% rename from src/Squit.package/SwaSquitBrowserNew.class/instance/buildWith..st rename to src/Squit.package/SwaSquitBrowser.class/instance/buildWith..st diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/buttonHeight.st b/src/Squit.package/SwaSquitBrowser.class/instance/buttonHeight.st similarity index 100% rename from src/Squit.package/SwaSquitBrowserNew.class/instance/buttonHeight.st rename to src/Squit.package/SwaSquitBrowser.class/instance/buttonHeight.st diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/commitColumns.st b/src/Squit.package/SwaSquitBrowser.class/instance/commitColumns.st similarity index 100% rename from src/Squit.package/SwaSquitBrowserNew.class/instance/commitColumns.st rename to src/Squit.package/SwaSquitBrowser.class/instance/commitColumns.st diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/commitList.st b/src/Squit.package/SwaSquitBrowser.class/instance/commitList.st similarity index 100% rename from src/Squit.package/SwaSquitBrowserNew.class/instance/commitList.st rename to src/Squit.package/SwaSquitBrowser.class/instance/commitList.st diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/commitListIndex..st b/src/Squit.package/SwaSquitBrowser.class/instance/commitListIndex..st similarity index 100% rename from src/Squit.package/SwaSquitBrowserNew.class/instance/commitListIndex..st rename to src/Squit.package/SwaSquitBrowser.class/instance/commitListIndex..st diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/commitListIndex.st b/src/Squit.package/SwaSquitBrowser.class/instance/commitListIndex.st similarity index 100% rename from src/Squit.package/SwaSquitBrowserNew.class/instance/commitListIndex.st rename to src/Squit.package/SwaSquitBrowser.class/instance/commitListIndex.st diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/commitListMenu..st b/src/Squit.package/SwaSquitBrowser.class/instance/commitListMenu..st similarity index 100% rename from src/Squit.package/SwaSquitBrowserNew.class/instance/commitListMenu..st rename to src/Squit.package/SwaSquitBrowser.class/instance/commitListMenu..st diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/fetch..st b/src/Squit.package/SwaSquitBrowser.class/instance/fetch..st similarity index 100% rename from src/Squit.package/SwaSquitBrowserNew.class/instance/fetch..st rename to src/Squit.package/SwaSquitBrowser.class/instance/fetch..st diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/fetchFrom.remoteNames..st b/src/Squit.package/SwaSquitBrowser.class/instance/fetchFrom.remoteNames..st similarity index 100% rename from src/Squit.package/SwaSquitBrowserNew.class/instance/fetchFrom.remoteNames..st rename to src/Squit.package/SwaSquitBrowser.class/instance/fetchFrom.remoteNames..st diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/formatDate..st b/src/Squit.package/SwaSquitBrowser.class/instance/formatDate..st similarity index 100% rename from src/Squit.package/SwaSquitBrowserNew.class/instance/formatDate..st rename to src/Squit.package/SwaSquitBrowser.class/instance/formatDate..st diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/hasRepositories.st b/src/Squit.package/SwaSquitBrowser.class/instance/hasRepositories.st similarity index 100% rename from src/Squit.package/SwaSquitBrowserNew.class/instance/hasRepositories.st rename to src/Squit.package/SwaSquitBrowser.class/instance/hasRepositories.st diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/hasSelectedRepository.st b/src/Squit.package/SwaSquitBrowser.class/instance/hasSelectedRepository.st similarity index 100% rename from src/Squit.package/SwaSquitBrowserNew.class/instance/hasSelectedRepository.st rename to src/Squit.package/SwaSquitBrowser.class/instance/hasSelectedRepository.st diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/initialize.st b/src/Squit.package/SwaSquitBrowser.class/instance/initialize.st similarity index 100% rename from src/Squit.package/SwaSquitBrowserNew.class/instance/initialize.st rename to src/Squit.package/SwaSquitBrowser.class/instance/initialize.st diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/menuCommitListHook..st b/src/Squit.package/SwaSquitBrowser.class/instance/menuCommitListHook..st similarity index 100% rename from src/Squit.package/SwaSquitBrowserNew.class/instance/menuCommitListHook..st rename to src/Squit.package/SwaSquitBrowser.class/instance/menuCommitListHook..st diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/menuRepositoryListHook..st b/src/Squit.package/SwaSquitBrowser.class/instance/menuRepositoryListHook..st similarity index 100% rename from src/Squit.package/SwaSquitBrowserNew.class/instance/menuRepositoryListHook..st rename to src/Squit.package/SwaSquitBrowser.class/instance/menuRepositoryListHook..st diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/refresh.st b/src/Squit.package/SwaSquitBrowser.class/instance/refresh.st similarity index 100% rename from src/Squit.package/SwaSquitBrowserNew.class/instance/refresh.st rename to src/Squit.package/SwaSquitBrowser.class/instance/refresh.st diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/repositoryList.st b/src/Squit.package/SwaSquitBrowser.class/instance/repositoryList.st similarity index 100% rename from src/Squit.package/SwaSquitBrowserNew.class/instance/repositoryList.st rename to src/Squit.package/SwaSquitBrowser.class/instance/repositoryList.st diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/repositoryListIndex..st b/src/Squit.package/SwaSquitBrowser.class/instance/repositoryListIndex..st similarity index 100% rename from src/Squit.package/SwaSquitBrowserNew.class/instance/repositoryListIndex..st rename to src/Squit.package/SwaSquitBrowser.class/instance/repositoryListIndex..st diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/repositoryListIndex.st b/src/Squit.package/SwaSquitBrowser.class/instance/repositoryListIndex.st similarity index 100% rename from src/Squit.package/SwaSquitBrowserNew.class/instance/repositoryListIndex.st rename to src/Squit.package/SwaSquitBrowser.class/instance/repositoryListIndex.st diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/repositoryListMenu..st b/src/Squit.package/SwaSquitBrowser.class/instance/repositoryListMenu..st similarity index 100% rename from src/Squit.package/SwaSquitBrowserNew.class/instance/repositoryListMenu..st rename to src/Squit.package/SwaSquitBrowser.class/instance/repositoryListMenu..st diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/selectRepository..st b/src/Squit.package/SwaSquitBrowser.class/instance/selectRepository..st similarity index 100% rename from src/Squit.package/SwaSquitBrowserNew.class/instance/selectRepository..st rename to src/Squit.package/SwaSquitBrowser.class/instance/selectRepository..st diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/selectedCommit.st b/src/Squit.package/SwaSquitBrowser.class/instance/selectedCommit.st similarity index 100% rename from src/Squit.package/SwaSquitBrowserNew.class/instance/selectedCommit.st rename to src/Squit.package/SwaSquitBrowser.class/instance/selectedCommit.st diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/selectedRepository.st b/src/Squit.package/SwaSquitBrowser.class/instance/selectedRepository.st similarity index 100% rename from src/Squit.package/SwaSquitBrowserNew.class/instance/selectedRepository.st rename to src/Squit.package/SwaSquitBrowser.class/instance/selectedRepository.st diff --git a/src/Squit.package/SwaSquitBrowserNew.class/instance/withUnitOfWork..st b/src/Squit.package/SwaSquitBrowser.class/instance/withUnitOfWork..st similarity index 100% rename from src/Squit.package/SwaSquitBrowserNew.class/instance/withUnitOfWork..st rename to src/Squit.package/SwaSquitBrowser.class/instance/withUnitOfWork..st diff --git a/src/Squit.package/SwaSquitBrowserNew.class/methodProperties.json b/src/Squit.package/SwaSquitBrowser.class/methodProperties.json similarity index 100% rename from src/Squit.package/SwaSquitBrowserNew.class/methodProperties.json rename to src/Squit.package/SwaSquitBrowser.class/methodProperties.json diff --git a/src/Squit.package/SwaSquitBrowserNew.class/properties.json b/src/Squit.package/SwaSquitBrowser.class/properties.json similarity index 75% rename from src/Squit.package/SwaSquitBrowserNew.class/properties.json rename to src/Squit.package/SwaSquitBrowser.class/properties.json index adc1b66f1..2fc357566 100644 --- a/src/Squit.package/SwaSquitBrowserNew.class/properties.json +++ b/src/Squit.package/SwaSquitBrowser.class/properties.json @@ -1,5 +1,5 @@ { - "category" : "Squit-Hackday", + "category" : "Squit-Lecture", "classinstvars" : [ ], "classvars" : [ @@ -8,7 +8,7 @@ "instvars" : [ "repositoryListIndex", "commitListIndex" ], - "name" : "SwaSquitBrowserNew", + "name" : "SwaSquitBrowser", "pools" : [ ], "super" : "Model", diff --git a/src/Squit.package/SwaSquitInteractiveClone.class/properties.json b/src/Squit.package/SwaSquitInteractiveClone.class/properties.json index 854bea78f..2d113fdb8 100644 --- a/src/Squit.package/SwaSquitInteractiveClone.class/properties.json +++ b/src/Squit.package/SwaSquitInteractiveClone.class/properties.json @@ -1,5 +1,5 @@ { - "category" : "Squit-Hackday", + "category" : "Squit-Lecture", "classinstvars" : [ ], "classvars" : [ diff --git a/src/Squit.package/monticello.meta/categories.st b/src/Squit.package/monticello.meta/categories.st index 2a548f81e..82cc92096 100644 --- a/src/Squit.package/monticello.meta/categories.st +++ b/src/Squit.package/monticello.meta/categories.st @@ -3,5 +3,5 @@ SystemOrganization addCategory: #'Squit-Exceptions'! SystemOrganization addCategory: #'Squit-UI'! SystemOrganization addCategory: #'Squit-UI-Support'! SystemOrganization addCategory: #'Squit-Tests'! -SystemOrganization addCategory: #'Squit-Hackday'! +SystemOrganization addCategory: #'Squit-Lecture'! SystemOrganization addCategory: #'Squit-Tests-UI'! diff --git a/src/Squit.package/monticello.meta/version b/src/Squit.package/monticello.meta/version index eafb7c0cd..6bec3a8d9 100644 --- a/src/Squit.package/monticello.meta/version +++ b/src/Squit.package/monticello.meta/version @@ -1 +1 @@ -(name 'Squit-ek.7' message 'remove back-up tool' id '94063854-60c8-4d76-bcc2-09a36d965af9' date '14 October 2021' time '11:38:49.527581 am' author 'ek' ancestors ((name 'Squit-ek.6' message 'add credentials Morph, minor fixes' id 'ee1af622-08d6-4cc5-a562-987443b92c69' date '13 October 2021' time '4:48:06.072503 pm' author 'ek' ancestors ((name 'Squit-ct.5' message 'empty log message' id 'f05de4c6-5f71-6f4c-9080-f5fd744b072c' date '30 August 2021' time '5:20:35.40661 pm' author 'ct' ancestors ((name 'Squit-ct.4' message 'empty log message' id '555ffaf2-7cbe-e747-9fd1-fc706de0aa88' date '30 August 2021' time '5:19:42.73361 pm' author 'ct' ancestors ((name 'Squit-cypress.1' message 'fabricated from a Cypress format repository' id '4a5f3775-51a1-2145-beb7-ebcdb560f31a' date '30 August 2021' time '3:16:59.539657 pm' author '' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ()) \ No newline at end of file +(name 'Squit-ek.8' message 'renaming' id '57b59ac5-ca24-4ee8-af6f-0057d1fbd0a2' date '14 October 2021' time '11:40:48.185265 am' author 'ek' ancestors ((name 'Squit-ek.7' message 'remove back-up tool' id '94063854-60c8-4d76-bcc2-09a36d965af9' date '14 October 2021' time '11:38:49.527581 am' author 'ek' ancestors ((name 'Squit-ek.6' message 'add credentials Morph, minor fixes' id 'ee1af622-08d6-4cc5-a562-987443b92c69' date '13 October 2021' time '4:48:06.072503 pm' author 'ek' ancestors ((name 'Squit-ct.5' message 'empty log message' id 'f05de4c6-5f71-6f4c-9080-f5fd744b072c' date '30 August 2021' time '5:20:35.40661 pm' author 'ct' ancestors ((name 'Squit-ct.4' message 'empty log message' id '555ffaf2-7cbe-e747-9fd1-fc706de0aa88' date '30 August 2021' time '5:19:42.73361 pm' author 'ct' ancestors ((name 'Squit-cypress.1' message 'fabricated from a Cypress format repository' id '4a5f3775-51a1-2145-beb7-ebcdb560f31a' date '30 August 2021' time '3:16:59.539657 pm' author '' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ()) \ No newline at end of file From 516a2ca87532b28b4473e57520728f25196b2ea5 Mon Sep 17 00:00:00 2001 From: ekrebs5 Date: Thu, 14 Oct 2021 13:36:49 +0200 Subject: [PATCH 10/19] Tool only handles exactly one repository --- .../README.md | 1 + .../properties.json | 2 +- .../SwaSquitBrowser.class/README.md | 1 + .../instance/actionCloneAndMerge.st | 3 ++- .../instance/actionCommitDiffWithParent.st | 9 +++++++ .../instance/actionCredentialsEdit.st | 4 ++-- .../instance/actionRepositoryButtonClicked.st | 6 +++++ .../instance/buildCommitList..st | 4 ++-- .../instance/buildRepositoryButton..st | 12 ++++++++++ .../instance/buildRepositoryButtons..st | 4 ++-- .../instance/buildRepositoryLabel..st | 13 ++++++++++ .../instance/buildRepositoryList..st | 15 ------------ .../instance/buildSyncButton..st | 12 ---------- .../instance/buildWith..st | 4 ++-- .../instance/menuCommitListHook..st | 1 + .../instance/menuRepositoryListHook..st | 12 ---------- .../SwaSquitBrowser.class/instance/refresh.st | 3 ++- .../instance/repositoryButtonText.st | 6 +++++ .../instance/repositoryListMenu..st | 4 ---- .../instance/repositoryText.st | 6 +++++ .../methodProperties.json | 24 ++++++++++--------- .../SwaSquitBrowser.class/properties.json | 2 +- .../SwaSquitInteractiveClone.class/README.md | 1 + .../properties.json | 2 +- src/Squit.package/monticello.meta/version | 2 +- 25 files changed, 85 insertions(+), 68 deletions(-) create mode 100644 src/Squit.package/SwaSquitBrowser.class/instance/actionCommitDiffWithParent.st create mode 100644 src/Squit.package/SwaSquitBrowser.class/instance/actionRepositoryButtonClicked.st create mode 100644 src/Squit.package/SwaSquitBrowser.class/instance/buildRepositoryButton..st create mode 100644 src/Squit.package/SwaSquitBrowser.class/instance/buildRepositoryLabel..st delete mode 100644 src/Squit.package/SwaSquitBrowser.class/instance/buildRepositoryList..st delete mode 100644 src/Squit.package/SwaSquitBrowser.class/instance/buildSyncButton..st delete mode 100644 src/Squit.package/SwaSquitBrowser.class/instance/menuRepositoryListHook..st create mode 100644 src/Squit.package/SwaSquitBrowser.class/instance/repositoryButtonText.st delete mode 100644 src/Squit.package/SwaSquitBrowser.class/instance/repositoryListMenu..st create mode 100644 src/Squit.package/SwaSquitBrowser.class/instance/repositoryText.st diff --git a/src/Squit.package/SquitCredentialsFillInMorph.class/README.md b/src/Squit.package/SquitCredentialsFillInMorph.class/README.md index e69de29bb..fcc761570 100644 --- a/src/Squit.package/SquitCredentialsFillInMorph.class/README.md +++ b/src/Squit.package/SquitCredentialsFillInMorph.class/README.md @@ -0,0 +1 @@ +I provide an UI to edit all relevant credential fields at once. \ No newline at end of file diff --git a/src/Squit.package/SquitCredentialsFillInMorph.class/properties.json b/src/Squit.package/SquitCredentialsFillInMorph.class/properties.json index 393be48c0..bf5c7dba8 100644 --- a/src/Squit.package/SquitCredentialsFillInMorph.class/properties.json +++ b/src/Squit.package/SquitCredentialsFillInMorph.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "ek 10/14/2021 13:27", "instvars" : [ "username", "password", diff --git a/src/Squit.package/SwaSquitBrowser.class/README.md b/src/Squit.package/SwaSquitBrowser.class/README.md index e69de29bb..0e0882ea9 100644 --- a/src/Squit.package/SwaSquitBrowser.class/README.md +++ b/src/Squit.package/SwaSquitBrowser.class/README.md @@ -0,0 +1 @@ +I provide a UI to browse and manipulate exactly one Git repository and its history. I am intended to be a simpler version of the SquitBrowser that can be used in the SWA lecture. \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/actionCloneAndMerge.st b/src/Squit.package/SwaSquitBrowser.class/instance/actionCloneAndMerge.st index 06460f7c7..c4cd68ea4 100644 --- a/src/Squit.package/SwaSquitBrowser.class/instance/actionCloneAndMerge.st +++ b/src/Squit.package/SwaSquitBrowser.class/instance/actionCloneAndMerge.st @@ -9,4 +9,5 @@ actionCloneAndMerge self selectRepository: operation repository. self actionMergeInteractive: false. Project current addDeferredUIMessage: [self refresh]. - self browseRepository. \ No newline at end of file + self browseRepository. + self refresh. \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/actionCommitDiffWithParent.st b/src/Squit.package/SwaSquitBrowser.class/instance/actionCommitDiffWithParent.st new file mode 100644 index 000000000..713416537 --- /dev/null +++ b/src/Squit.package/SwaSquitBrowser.class/instance/actionCommitDiffWithParent.st @@ -0,0 +1,9 @@ +actions +actionCommitDiffWithParent + + self withUnitOfWork: + [(SquotDiffExplorer + from: (self selectedCommit parents at: 1 ifAbsent: [SquotSnapshot empty]) + to: self selectedCommit) + workingCopy: self selectedRepository; + openLabel: 'Comparing versions']. \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/actionCredentialsEdit.st b/src/Squit.package/SwaSquitBrowser.class/instance/actionCredentialsEdit.st index 96e071948..79fddbc82 100644 --- a/src/Squit.package/SwaSquitBrowser.class/instance/actionCredentialsEdit.st +++ b/src/Squit.package/SwaSquitBrowser.class/instance/actionCredentialsEdit.st @@ -8,8 +8,8 @@ actionCredentialsEdit remoteUrl := (repository remoteNames collect: [:each | (gitRepository remoteUrl: each)] thenSelect: [:each | each beginsWith: 'http']) first. - credentials := SquitCredentialsFillInMorph requestCredentials - ifNil: [^ nil]. + credentials := SquitCredentialsFillInMorph requestCredentials. + credentials ifNil: [^ nil]. repository addCredentialsFor: remoteUrl diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/actionRepositoryButtonClicked.st b/src/Squit.package/SwaSquitBrowser.class/instance/actionRepositoryButtonClicked.st new file mode 100644 index 000000000..cabfb3059 --- /dev/null +++ b/src/Squit.package/SwaSquitBrowser.class/instance/actionRepositoryButtonClicked.st @@ -0,0 +1,6 @@ +actions +actionRepositoryButtonClicked + + self selectedRepository + ifNotNil: [self actionCredentialsEdit] + ifNil: [self actionCloneAndMerge] \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/buildCommitList..st b/src/Squit.package/SwaSquitBrowser.class/instance/buildCommitList..st index c5aff78cc..c59b20cf4 100644 --- a/src/Squit.package/SwaSquitBrowser.class/instance/buildCommitList..st +++ b/src/Squit.package/SwaSquitBrowser.class/instance/buildCommitList..st @@ -12,7 +12,7 @@ buildCommitList: aBuilder itemPaddings: {5 @ 0. 5 @ 0. 5 @ 0. 5 @ 0}; menu: #commitListMenu:; frame: (LayoutFrame new - leftFraction: 0.3 offset: 0; - topFraction: 0 offset: 0; + leftFraction: 0 offset: 0; + topFraction: 0 offset: self buttonHeight; rightFraction: 1 offset: 0; bottomFraction: 1 offset: self buttonHeight negated) \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/buildRepositoryButton..st b/src/Squit.package/SwaSquitBrowser.class/instance/buildRepositoryButton..st new file mode 100644 index 000000000..68913fd5f --- /dev/null +++ b/src/Squit.package/SwaSquitBrowser.class/instance/buildRepositoryButton..st @@ -0,0 +1,12 @@ +toolbuilder +buildRepositoryButton: aBuilder + + ^ aBuilder pluggableButtonSpec new + model: self; + label: #repositoryButtonText; + action: #actionRepositoryButtonClicked; + frame: (LayoutFrame new + leftFraction: 0.8 offset: 0; + topFraction: 0 offset: 0; + rightFraction: 1 offset: 0; + bottomFraction: 0 offset: self buttonHeight) \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/buildRepositoryButtons..st b/src/Squit.package/SwaSquitBrowser.class/instance/buildRepositoryButtons..st index 4093a7ca1..aed6d202a 100644 --- a/src/Squit.package/SwaSquitBrowser.class/instance/buildRepositoryButtons..st +++ b/src/Squit.package/SwaSquitBrowser.class/instance/buildRepositoryButtons..st @@ -6,14 +6,14 @@ buildRepositoryButtons: aBuilder children: { aBuilder pluggableButtonSpec new model: self; - label: 'Fetch & Merge'; + label: 'Pull (Fetch & Merge)'; action: #actionFetchAndMerge. aBuilder pluggableButtonSpec new model: self; label: 'Commit & Push'; action: #actionCommitAndPush }; frame: (LayoutFrame new - leftFraction: 0.5 offset: 0; + leftFraction: 0 offset: 0; topFraction: 1 offset: self buttonHeight negated; rightFraction: 1 offset: 0; bottomFraction: 1 offset: 0) \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/buildRepositoryLabel..st b/src/Squit.package/SwaSquitBrowser.class/instance/buildRepositoryLabel..st new file mode 100644 index 000000000..4d87efba2 --- /dev/null +++ b/src/Squit.package/SwaSquitBrowser.class/instance/buildRepositoryLabel..st @@ -0,0 +1,13 @@ +toolbuilder +buildRepositoryLabel: aBuilder + + ^ aBuilder pluggableTextSpec new + model: self; + getText: #repositoryText; + readOnly: true; + indicateUnacceptedChanges: false; + frame: (LayoutFrame new + leftFraction: 0 offset: 0; + topFraction: 0 offset: 0; + rightFraction: 0.8 offset: 0; + bottomFraction: 0 offset: self buttonHeight) \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/buildRepositoryList..st b/src/Squit.package/SwaSquitBrowser.class/instance/buildRepositoryList..st deleted file mode 100644 index e21ea6343..000000000 --- a/src/Squit.package/SwaSquitBrowser.class/instance/buildRepositoryList..st +++ /dev/null @@ -1,15 +0,0 @@ -toolbuilder -buildRepositoryList: aBuilder - - ^ aBuilder pluggableListSpec new - model: self; - list: #repositoryList; - getIndex: #repositoryListIndex; - setIndex: #repositoryListIndex:; - hScrollBarPolicy: #never; - menu: #repositoryListMenu:; - frame: (LayoutFrame new - leftFraction: 0 offset: 0; - topFraction: 0 offset: 0; - rightFraction: 0.3 offset: 0; - bottomFraction: 1 offset: self buttonHeight negated) \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/buildSyncButton..st b/src/Squit.package/SwaSquitBrowser.class/instance/buildSyncButton..st deleted file mode 100644 index 14a574542..000000000 --- a/src/Squit.package/SwaSquitBrowser.class/instance/buildSyncButton..st +++ /dev/null @@ -1,12 +0,0 @@ -toolbuilder -buildSyncButton: aBuilder - - ^ aBuilder pluggableButtonSpec new - model: self; - label: 'Clone & Merge'; - action: #actionCloneAndMerge; - frame: (LayoutFrame new - leftFraction: 0 offset: 0; - topFraction: 1 offset: self buttonHeight negated; - rightFraction: 0.3 offset: 0; - bottomFraction: 1 offset: 0) \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/buildWith..st b/src/Squit.package/SwaSquitBrowser.class/instance/buildWith..st index bbbac6b53..822d6026c 100644 --- a/src/Squit.package/SwaSquitBrowser.class/instance/buildWith..st +++ b/src/Squit.package/SwaSquitBrowser.class/instance/buildWith..st @@ -3,8 +3,8 @@ buildWith: aBuilder ^ aBuilder build: ((self buildWindowWith: aBuilder) children: { - self buildRepositoryList: aBuilder. + self buildRepositoryLabel: aBuilder. self buildCommitList: aBuilder. - self buildSyncButton: aBuilder. + self buildRepositoryButton: aBuilder. self buildRepositoryButtons: aBuilder}; yourself) \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/menuCommitListHook..st b/src/Squit.package/SwaSquitBrowser.class/instance/menuCommitListHook..st index 1d1622cfa..7bbb2596a 100644 --- a/src/Squit.package/SwaSquitBrowser.class/instance/menuCommitListHook..st +++ b/src/Squit.package/SwaSquitBrowser.class/instance/menuCommitListHook..st @@ -5,6 +5,7 @@ menuCommitListHook: aMenu self selectedCommit ifNil: [^ aMenu]. aMenu addList: { {'Checkout objects'. #actionCommitSelectionCheckout. 'Checkout objects from this commit. You will be able to select what will actually be loaded.', String cr, 'NOTE: unless you change the selection, your uncommitted changes will be reverted, so that what is loaded matches the objects in this commit!'}. + {'Compare with parent commit'. #actionCommitDiffWithParent. 'Compare selected commit with parent commit.'}. }. ^ aMenu \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/menuRepositoryListHook..st b/src/Squit.package/SwaSquitBrowser.class/instance/menuRepositoryListHook..st deleted file mode 100644 index 5e2abf8a9..000000000 --- a/src/Squit.package/SwaSquitBrowser.class/instance/menuRepositoryListHook..st +++ /dev/null @@ -1,12 +0,0 @@ -ui menu -menuRepositoryListHook: aMenu - - - self selectedRepository ifNil: [^ aMenu]. - aMenu addList: { - {'Remove repository'. #actionRepositoryRemove}. - {'Add or remove packages'. #actionAddOrRemoveTrackedPackages. 'Add or remove packages for this repository.'}. - {'Edit credentials for repository'. #actionCredentialsEdit}. - }. - - ^ aMenu \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/refresh.st b/src/Squit.package/SwaSquitBrowser.class/instance/refresh.st index 0782f0a22..d8bed1578 100644 --- a/src/Squit.package/SwaSquitBrowser.class/instance/refresh.st +++ b/src/Squit.package/SwaSquitBrowser.class/instance/refresh.st @@ -1,5 +1,6 @@ toolbuilder refresh - self changed: #repositoryList. self changed: #commitColumns. + self changed: #repositoryButtonText. + self changed: #repositoryText \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/repositoryButtonText.st b/src/Squit.package/SwaSquitBrowser.class/instance/repositoryButtonText.st new file mode 100644 index 000000000..998669505 --- /dev/null +++ b/src/Squit.package/SwaSquitBrowser.class/instance/repositoryButtonText.st @@ -0,0 +1,6 @@ +toolbuilder +repositoryButtonText + + ^ self selectedRepository + ifNotNil: ['Edit Credentials'] + ifNil: ['Clone & Merge'] \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/repositoryListMenu..st b/src/Squit.package/SwaSquitBrowser.class/instance/repositoryListMenu..st deleted file mode 100644 index b20ce23c6..000000000 --- a/src/Squit.package/SwaSquitBrowser.class/instance/repositoryListMenu..st +++ /dev/null @@ -1,4 +0,0 @@ -ui menu -repositoryListMenu: aMenu - - ^ self menu: aMenu for: #(menuRepositoryList) \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/repositoryText.st b/src/Squit.package/SwaSquitBrowser.class/instance/repositoryText.st new file mode 100644 index 000000000..6147e397d --- /dev/null +++ b/src/Squit.package/SwaSquitBrowser.class/instance/repositoryText.st @@ -0,0 +1,6 @@ +toolbuilder +repositoryText + + ^ self selectedRepository + ifNotNilDo: [:repository | repository asString] + ifNil: ['No repository selected/cloned'] \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/methodProperties.json b/src/Squit.package/SwaSquitBrowser.class/methodProperties.json index ed94eba99..2ebda0b5e 100644 --- a/src/Squit.package/SwaSquitBrowser.class/methodProperties.json +++ b/src/Squit.package/SwaSquitBrowser.class/methodProperties.json @@ -3,24 +3,26 @@ "open" : "ek 7/18/2021 10:05" }, "instance" : { "actionAddOrRemoveTrackedPackages" : "ek 9/21/2021 19:24", - "actionCloneAndMerge" : "ek 9/21/2021 18:32", + "actionCloneAndMerge" : "ek 10/14/2021 13:20", "actionCommitAndPush" : "ct 8/30/2021 16:55", "actionCommitAndThenDo:" : "ct 8/30/2021 16:53", + "actionCommitDiffWithParent" : "ek 10/14/2021 13:12", "actionCommitSelectionCheckout" : "ek 9/21/2021 19:34", - "actionCredentialsEdit" : "ek 9/21/2021 19:23", + "actionCredentialsEdit" : "ek 10/14/2021 13:18", "actionFetch" : "ct 8/30/2021 15:50", "actionFetchAndMerge" : "ct 8/30/2021 15:45", "actionMerge" : "ct 8/30/2021 15:45", "actionMergeInteractive:" : "ct 8/30/2021 15:43", "actionPush" : "ct 8/30/2021 17:02", + "actionRepositoryButtonClicked" : "ek 10/14/2021 13:06", "actionRepositoryRemove" : "ek 9/21/2021 19:13", "addRepository" : "ct 8/30/2021 17:20:35", "browseRepository" : "ct 8/30/2021 16:16", - "buildCommitList:" : "ek 9/21/2021 19:31", - "buildRepositoryButtons:" : "ct 8/30/2021 15:47", - "buildRepositoryList:" : "ek 9/21/2021 19:03", - "buildSyncButton:" : "ct 8/30/2021 15:49", - "buildWith:" : "ct 8/30/2021 17:04", + "buildCommitList:" : "ek 10/14/2021 12:47", + "buildRepositoryButton:" : "ek 10/14/2021 13:06", + "buildRepositoryButtons:" : "ek 10/14/2021 11:55", + "buildRepositoryLabel:" : "ek 10/14/2021 13:25", + "buildWith:" : "ek 10/14/2021 13:24", "buttonHeight" : "tobe 7/17/2021 14:49", "commitColumns" : "ct 8/30/2021 15:27", "commitList" : "ct 8/30/2021 16:01", @@ -33,13 +35,13 @@ "hasRepositories" : "ek 9/21/2021 19:13", "hasSelectedRepository" : "ct 8/30/2021 15:36", "initialize" : "ek 9/19/2021 18:45", - "menuCommitListHook:" : "ek 9/21/2021 19:34", - "menuRepositoryListHook:" : "ek 9/21/2021 19:10", - "refresh" : "ct 8/30/2021 16:53", + "menuCommitListHook:" : "ek 10/14/2021 13:11", + "refresh" : "ek 10/14/2021 13:23", + "repositoryButtonText" : "ek 10/14/2021 13:04", "repositoryList" : "tobe 7/17/2021 14:59", "repositoryListIndex" : "tobe 7/17/2021 14:58", "repositoryListIndex:" : "ct 8/30/2021 15:49", - "repositoryListMenu:" : "ek 9/21/2021 19:03", + "repositoryText" : "ek 10/14/2021 13:02", "selectRepository:" : "ct 8/30/2021 16:07", "selectedCommit" : "ct 8/30/2021 15:39", "selectedRepository" : "ct 8/30/2021 15:18", diff --git a/src/Squit.package/SwaSquitBrowser.class/properties.json b/src/Squit.package/SwaSquitBrowser.class/properties.json index 2fc357566..65d6a6b47 100644 --- a/src/Squit.package/SwaSquitBrowser.class/properties.json +++ b/src/Squit.package/SwaSquitBrowser.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "ek 10/14/2021 13:27", "instvars" : [ "repositoryListIndex", "commitListIndex" ], diff --git a/src/Squit.package/SwaSquitInteractiveClone.class/README.md b/src/Squit.package/SwaSquitInteractiveClone.class/README.md index e69de29bb..fc9a48aab 100644 --- a/src/Squit.package/SwaSquitInteractiveClone.class/README.md +++ b/src/Squit.package/SwaSquitInteractiveClone.class/README.md @@ -0,0 +1 @@ +I am a streamlined version of SquitInteractiveClone. I only need a repository URL, I create folders and names automatically. \ No newline at end of file diff --git a/src/Squit.package/SwaSquitInteractiveClone.class/properties.json b/src/Squit.package/SwaSquitInteractiveClone.class/properties.json index 2d113fdb8..2336529c8 100644 --- a/src/Squit.package/SwaSquitInteractiveClone.class/properties.json +++ b/src/Squit.package/SwaSquitInteractiveClone.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "ek 10/14/2021 13:28", "instvars" : [ "name" ], "name" : "SwaSquitInteractiveClone", diff --git a/src/Squit.package/monticello.meta/version b/src/Squit.package/monticello.meta/version index 6bec3a8d9..ecbfaafe5 100644 --- a/src/Squit.package/monticello.meta/version +++ b/src/Squit.package/monticello.meta/version @@ -1 +1 @@ -(name 'Squit-ek.8' message 'renaming' id '57b59ac5-ca24-4ee8-af6f-0057d1fbd0a2' date '14 October 2021' time '11:40:48.185265 am' author 'ek' ancestors ((name 'Squit-ek.7' message 'remove back-up tool' id '94063854-60c8-4d76-bcc2-09a36d965af9' date '14 October 2021' time '11:38:49.527581 am' author 'ek' ancestors ((name 'Squit-ek.6' message 'add credentials Morph, minor fixes' id 'ee1af622-08d6-4cc5-a562-987443b92c69' date '13 October 2021' time '4:48:06.072503 pm' author 'ek' ancestors ((name 'Squit-ct.5' message 'empty log message' id 'f05de4c6-5f71-6f4c-9080-f5fd744b072c' date '30 August 2021' time '5:20:35.40661 pm' author 'ct' ancestors ((name 'Squit-ct.4' message 'empty log message' id '555ffaf2-7cbe-e747-9fd1-fc706de0aa88' date '30 August 2021' time '5:19:42.73361 pm' author 'ct' ancestors ((name 'Squit-cypress.1' message 'fabricated from a Cypress format repository' id '4a5f3775-51a1-2145-beb7-ebcdb560f31a' date '30 August 2021' time '3:16:59.539657 pm' author '' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ()) \ No newline at end of file +(name 'Squit-ek.9' message 'Tool handles only exactly one repository' id 'd87a7aa7-ff7b-4555-953b-5f4f5606211d' date '14 October 2021' time '1:36:06.083263 pm' author 'ek' ancestors ((name 'Squit-ek.8' message 'renaming' id '57b59ac5-ca24-4ee8-af6f-0057d1fbd0a2' date '14 October 2021' time '11:40:48.185265 am' author 'ek' ancestors ((name 'Squit-ek.7' message 'remove back-up tool' id '94063854-60c8-4d76-bcc2-09a36d965af9' date '14 October 2021' time '11:38:49.527581 am' author 'ek' ancestors ((name 'Squit-ek.6' message 'add credentials Morph, minor fixes' id 'ee1af622-08d6-4cc5-a562-987443b92c69' date '13 October 2021' time '4:48:06.072503 pm' author 'ek' ancestors ((name 'Squit-ct.5' message 'empty log message' id 'f05de4c6-5f71-6f4c-9080-f5fd744b072c' date '30 August 2021' time '5:20:35.40661 pm' author 'ct' ancestors ((name 'Squit-ct.4' message 'empty log message' id '555ffaf2-7cbe-e747-9fd1-fc706de0aa88' date '30 August 2021' time '5:19:42.73361 pm' author 'ct' ancestors ((name 'Squit-cypress.1' message 'fabricated from a Cypress format repository' id '4a5f3775-51a1-2145-beb7-ebcdb560f31a' date '30 August 2021' time '3:16:59.539657 pm' author '' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ()) \ No newline at end of file From e76ced9f2d63bb855c966f246e0fc01df610a139 Mon Sep 17 00:00:00 2001 From: ekrebs5 Date: Tue, 26 Oct 2021 20:52:19 +0200 Subject: [PATCH 11/19] add second registration method --- .../SquitBrowser.class/class/registerInWorldMenu.st | 3 ++- .../SquitBrowser.class/methodProperties.json | 2 +- .../SwaSquitBrowser.class/class/initialize.st | 4 ++++ src/Squit.package/SwaSquitBrowser.class/class/open.st | 2 +- .../SwaSquitBrowser.class/class/registerInWorldMenu.st | 9 +++++++++ .../class/unregisterFromWorldMenu.st | 5 +++++ .../SwaSquitBrowser.class/methodProperties.json | 5 ++++- src/Squit.package/monticello.meta/version | 2 +- 8 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 src/Squit.package/SwaSquitBrowser.class/class/initialize.st create mode 100644 src/Squit.package/SwaSquitBrowser.class/class/registerInWorldMenu.st create mode 100644 src/Squit.package/SwaSquitBrowser.class/class/unregisterFromWorldMenu.st diff --git a/src/Squit.package/SquitBrowser.class/class/registerInWorldMenu.st b/src/Squit.package/SquitBrowser.class/class/registerInWorldMenu.st index 5e41f8169..e0aab7cee 100644 --- a/src/Squit.package/SquitBrowser.class/class/registerInWorldMenu.st +++ b/src/Squit.package/SquitBrowser.class/class/registerInWorldMenu.st @@ -1,8 +1,9 @@ world menu registerInWorldMenu + "self registerInWorldMenu" (self environment valueOf: #TheWorldMenu) ifNotNil: [:worldMenu | worldMenu registerOpenCommand: (Array - with: 'Git Browser' + with: 'Squit' with: (Array with: self with: #open))]. \ No newline at end of file diff --git a/src/Squit.package/SquitBrowser.class/methodProperties.json b/src/Squit.package/SquitBrowser.class/methodProperties.json index 4660b3b02..c75e5358b 100644 --- a/src/Squit.package/SquitBrowser.class/methodProperties.json +++ b/src/Squit.package/SquitBrowser.class/methodProperties.json @@ -4,7 +4,7 @@ "initialize" : "jr 4/18/2018 21:28", "initializeSelfUpdate" : "jr 4/18/2018 21:27", "open" : "fn 4/11/2017 09:09", - "registerInWorldMenu" : "jr 4/15/2017 13:34", + "registerInWorldMenu" : "ek 10/26/2021 20:45", "selfUpdate" : "jr 3/7/2020 00:09", "selfUpdateBranch" : "jr 4/21/2018 22:22", "selfUpdateBranch:" : "jr 4/18/2018 22:37", diff --git a/src/Squit.package/SwaSquitBrowser.class/class/initialize.st b/src/Squit.package/SwaSquitBrowser.class/class/initialize.st new file mode 100644 index 000000000..ed3d3574d --- /dev/null +++ b/src/Squit.package/SwaSquitBrowser.class/class/initialize.st @@ -0,0 +1,4 @@ +class initialization +initialize + + self registerInWorldMenu. \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/class/open.st b/src/Squit.package/SwaSquitBrowser.class/class/open.st index 32723f503..a212f01d9 100644 --- a/src/Squit.package/SwaSquitBrowser.class/class/open.st +++ b/src/Squit.package/SwaSquitBrowser.class/class/open.st @@ -1,3 +1,3 @@ -as yet unclassified +instance creation open ToolBuilder open: self new \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/class/registerInWorldMenu.st b/src/Squit.package/SwaSquitBrowser.class/class/registerInWorldMenu.st new file mode 100644 index 000000000..7ebb67fa6 --- /dev/null +++ b/src/Squit.package/SwaSquitBrowser.class/class/registerInWorldMenu.st @@ -0,0 +1,9 @@ +world menu +registerInWorldMenu + "self registerInWorldMenu" + (self environment valueOf: #TheWorldMenu) ifNotNil: [:worldMenu | + worldMenu registerOpenCommand: (Array + with: 'SWA Git Browser' + with: (Array + with: self + with: #open))]. \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/class/unregisterFromWorldMenu.st b/src/Squit.package/SwaSquitBrowser.class/class/unregisterFromWorldMenu.st new file mode 100644 index 000000000..0b43f7315 --- /dev/null +++ b/src/Squit.package/SwaSquitBrowser.class/class/unregisterFromWorldMenu.st @@ -0,0 +1,5 @@ +world menu +unregisterFromWorldMenu + "self unregisterFromWorldMenu" + (self environment valueOf: #TheWorldMenu) ifNotNil: + [:worldMenu | worldMenu unregisterOpenCommandWithReceiver: self]. \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/methodProperties.json b/src/Squit.package/SwaSquitBrowser.class/methodProperties.json index 2ebda0b5e..7aa7ca526 100644 --- a/src/Squit.package/SwaSquitBrowser.class/methodProperties.json +++ b/src/Squit.package/SwaSquitBrowser.class/methodProperties.json @@ -1,6 +1,9 @@ { "class" : { - "open" : "ek 7/18/2021 10:05" }, + "initialize" : "ek 10/14/2021 13:40", + "open" : "ek 7/18/2021 10:05", + "registerInWorldMenu" : "ek 10/26/2021 20:49", + "unregisterFromWorldMenu" : "ek 10/14/2021 13:43" }, "instance" : { "actionAddOrRemoveTrackedPackages" : "ek 9/21/2021 19:24", "actionCloneAndMerge" : "ek 10/14/2021 13:20", diff --git a/src/Squit.package/monticello.meta/version b/src/Squit.package/monticello.meta/version index ecbfaafe5..3385ea9e3 100644 --- a/src/Squit.package/monticello.meta/version +++ b/src/Squit.package/monticello.meta/version @@ -1 +1 @@ -(name 'Squit-ek.9' message 'Tool handles only exactly one repository' id 'd87a7aa7-ff7b-4555-953b-5f4f5606211d' date '14 October 2021' time '1:36:06.083263 pm' author 'ek' ancestors ((name 'Squit-ek.8' message 'renaming' id '57b59ac5-ca24-4ee8-af6f-0057d1fbd0a2' date '14 October 2021' time '11:40:48.185265 am' author 'ek' ancestors ((name 'Squit-ek.7' message 'remove back-up tool' id '94063854-60c8-4d76-bcc2-09a36d965af9' date '14 October 2021' time '11:38:49.527581 am' author 'ek' ancestors ((name 'Squit-ek.6' message 'add credentials Morph, minor fixes' id 'ee1af622-08d6-4cc5-a562-987443b92c69' date '13 October 2021' time '4:48:06.072503 pm' author 'ek' ancestors ((name 'Squit-ct.5' message 'empty log message' id 'f05de4c6-5f71-6f4c-9080-f5fd744b072c' date '30 August 2021' time '5:20:35.40661 pm' author 'ct' ancestors ((name 'Squit-ct.4' message 'empty log message' id '555ffaf2-7cbe-e747-9fd1-fc706de0aa88' date '30 August 2021' time '5:19:42.73361 pm' author 'ct' ancestors ((name 'Squit-cypress.1' message 'fabricated from a Cypress format repository' id '4a5f3775-51a1-2145-beb7-ebcdb560f31a' date '30 August 2021' time '3:16:59.539657 pm' author '' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ()) \ No newline at end of file +(name 'Squit-ek.10' message 'add second registration method' id '64325ee2-e821-4ce2-8e94-d1afbb360686' date '26 October 2021' time '8:51:31.569315 pm' author 'ek' ancestors ((name 'Squit-ek.9' message 'Tool handles only exactly one repository' id 'd87a7aa7-ff7b-4555-953b-5f4f5606211d' date '14 October 2021' time '1:36:06.083263 pm' author 'ek' ancestors ((name 'Squit-ek.8' message 'renaming' id '57b59ac5-ca24-4ee8-af6f-0057d1fbd0a2' date '14 October 2021' time '11:40:48.185265 am' author 'ek' ancestors ((name 'Squit-ek.7' message 'remove back-up tool' id '94063854-60c8-4d76-bcc2-09a36d965af9' date '14 October 2021' time '11:38:49.527581 am' author 'ek' ancestors ((name 'Squit-ek.6' message 'add credentials Morph, minor fixes' id 'ee1af622-08d6-4cc5-a562-987443b92c69' date '13 October 2021' time '4:48:06.072503 pm' author 'ek' ancestors ((name 'Squit-ct.5' message 'empty log message' id 'f05de4c6-5f71-6f4c-9080-f5fd744b072c' date '30 August 2021' time '5:20:35.40661 pm' author 'ct' ancestors ((name 'Squit-ct.4' message 'empty log message' id '555ffaf2-7cbe-e747-9fd1-fc706de0aa88' date '30 August 2021' time '5:19:42.73361 pm' author 'ct' ancestors ((name 'Squit-cypress.1' message 'fabricated from a Cypress format repository' id '4a5f3775-51a1-2145-beb7-ebcdb560f31a' date '30 August 2021' time '3:16:59.539657 pm' author '' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ()) \ No newline at end of file From d56c34f6242184639b78ed0286e33fac058eb15e Mon Sep 17 00:00:00 2001 From: Eva Date: Sun, 31 Oct 2021 22:50:52 +0100 Subject: [PATCH 12/19] hotfix for swa --- .../instance/actionCredentialsEdit.st | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/actionCredentialsEdit.st b/src/Squit.package/SwaSquitBrowser.class/instance/actionCredentialsEdit.st index 79fddbc82..8262f6e21 100644 --- a/src/Squit.package/SwaSquitBrowser.class/instance/actionCredentialsEdit.st +++ b/src/Squit.package/SwaSquitBrowser.class/instance/actionCredentialsEdit.st @@ -1,7 +1,7 @@ actions actionCredentialsEdit - | credentials repository gitRepository remoteUrl | + | credentials repository gitRepository remoteUrl displayName email | repository := self selectedRepository repository. gitRepository := repository git. @@ -16,5 +16,9 @@ actionCredentialsEdit user: (credentials at: #username) password: (credentials at: #password). - gitRepository configAt: 'user.name' put: (credentials at: #displayName). - gitRepository configAt: 'user.email' put: (credentials at: #email). \ No newline at end of file + displayName := credentials at: #displayName. + email := credentials at: #email. + displayName ifNotNil: [GitStamp defaultName: displayName]. + email ifNotNil: [GitStamp defaultEmail: email]. + gitRepository configAt: 'user.name' put: displayName. + gitRepository configAt: 'user.email' put: email. From b2189cd01c84c6738a734a51d565ee73cc2292a6 Mon Sep 17 00:00:00 2001 From: Eva Date: Sun, 31 Oct 2021 22:51:37 +0100 Subject: [PATCH 13/19] hotfix for swa --- ...stAndStoreCredentialsFor.remoteUrl.ifCanceled..st | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Squit.package/SwaSquitInteractiveClone.class/instance/requestAndStoreCredentialsFor.remoteUrl.ifCanceled..st b/src/Squit.package/SwaSquitInteractiveClone.class/instance/requestAndStoreCredentialsFor.remoteUrl.ifCanceled..st index 6b3b7284a..a88663d5d 100644 --- a/src/Squit.package/SwaSquitInteractiveClone.class/instance/requestAndStoreCredentialsFor.remoteUrl.ifCanceled..st +++ b/src/Squit.package/SwaSquitInteractiveClone.class/instance/requestAndStoreCredentialsFor.remoteUrl.ifCanceled..st @@ -1,7 +1,7 @@ error handling requestAndStoreCredentialsFor: repository remoteUrl: remoteUrl ifCanceled: cancelBlock - | credentials gitRepository | + | credentials gitRepository displayName email | credentials := SquitCredentialsFillInMorph requestCredentials ifNil: [^ cancelBlock value]. @@ -11,7 +11,11 @@ requestAndStoreCredentialsFor: repository remoteUrl: remoteUrl ifCanceled: cance password: (credentials at: #password). gitRepository := repository git. - gitRepository configAt: 'user.name' put: (credentials at: #displayName). - gitRepository configAt: 'user.email' put: (credentials at: #email). + displayName := credentials at: #displayName. + email := credentials at: #email. + displayName ifNotNil: [GitStamp defaultName: displayName]. + email ifNotNil: [GitStamp defaultEmail: email]. + gitRepository configAt: 'user.name' put: displayName. + gitRepository configAt: 'user.email' put: email. - ^ repository credentialsFor: remoteUrl \ No newline at end of file + ^ repository credentialsFor: remoteUrl From 6639a185d8b1c462e4ff9f62745d8bd77343f9c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marius=20D=C3=B6rbandt?= Date: Fri, 9 Sep 2022 13:31:28 +0200 Subject: [PATCH 14/19] Add SwaSquitBrowser>>actionPull using SquitInteractivePullFromUpstream --- .../instance/actionPull.st | 18 ++++++++++++++++++ .../methodProperties.json | 1 + 2 files changed, 19 insertions(+) create mode 100644 src/Squit.package/SwaSquitBrowser.class/instance/actionPull.st diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/actionPull.st b/src/Squit.package/SwaSquitBrowser.class/instance/actionPull.st new file mode 100644 index 000000000..6a45862bb --- /dev/null +++ b/src/Squit.package/SwaSquitBrowser.class/instance/actionPull.st @@ -0,0 +1,18 @@ +actions +actionPull + + [(SquitInteractivePullFromUpstream workingCopy: self selectedRepository) + pull] + on: SquitUpstreamUndefined do: + [:e | + self inform: + 'You can''t pull as this repository has no remote repository configured (e. g. on GitHub). ', + 'Please set one using the advanced Git Browser, then pull again.'. + ^ self] + on: SquitBadRemote do: + [:e | + self inform: + 'Something went wrong while pulling from the remote repository. ', + 'Please try fixing the issue with the advanced Git Browser or seek help from slack.'. + ^ self]. + ^ Project current addDeferredUIMessage: [self refresh] \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/methodProperties.json b/src/Squit.package/SwaSquitBrowser.class/methodProperties.json index 7aa7ca526..381742b44 100644 --- a/src/Squit.package/SwaSquitBrowser.class/methodProperties.json +++ b/src/Squit.package/SwaSquitBrowser.class/methodProperties.json @@ -16,6 +16,7 @@ "actionFetchAndMerge" : "ct 8/30/2021 15:45", "actionMerge" : "ct 8/30/2021 15:45", "actionMergeInteractive:" : "ct 8/30/2021 15:43", + "actionPull" : "mad 9/9/2022 13:12", "actionPush" : "ct 8/30/2021 17:02", "actionRepositoryButtonClicked" : "ek 10/14/2021 13:06", "actionRepositoryRemove" : "ek 9/21/2021 19:13", From 4c39841eb909639dc3f5e452bc22892abf853294 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marius=20D=C3=B6rbandt?= Date: Fri, 9 Sep 2022 13:31:47 +0200 Subject: [PATCH 15/19] Use actionPull instead of actionFetchAndMerge --- .../SwaSquitBrowser.class/instance/buildRepositoryButtons..st | 2 +- src/Squit.package/SwaSquitBrowser.class/methodProperties.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/buildRepositoryButtons..st b/src/Squit.package/SwaSquitBrowser.class/instance/buildRepositoryButtons..st index aed6d202a..dc1232b1b 100644 --- a/src/Squit.package/SwaSquitBrowser.class/instance/buildRepositoryButtons..st +++ b/src/Squit.package/SwaSquitBrowser.class/instance/buildRepositoryButtons..st @@ -7,7 +7,7 @@ buildRepositoryButtons: aBuilder aBuilder pluggableButtonSpec new model: self; label: 'Pull (Fetch & Merge)'; - action: #actionFetchAndMerge. + action: #actionPull. aBuilder pluggableButtonSpec new model: self; label: 'Commit & Push'; diff --git a/src/Squit.package/SwaSquitBrowser.class/methodProperties.json b/src/Squit.package/SwaSquitBrowser.class/methodProperties.json index 381742b44..fb430e0df 100644 --- a/src/Squit.package/SwaSquitBrowser.class/methodProperties.json +++ b/src/Squit.package/SwaSquitBrowser.class/methodProperties.json @@ -24,7 +24,7 @@ "browseRepository" : "ct 8/30/2021 16:16", "buildCommitList:" : "ek 10/14/2021 12:47", "buildRepositoryButton:" : "ek 10/14/2021 13:06", - "buildRepositoryButtons:" : "ek 10/14/2021 11:55", + "buildRepositoryButtons:" : "mad 9/7/2022 19:15", "buildRepositoryLabel:" : "ek 10/14/2021 13:25", "buildWith:" : "ek 10/14/2021 13:24", "buttonHeight" : "tobe 7/17/2021 14:49", From f54c0ea958405ea85795388022f9745a4e575e84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marius=20D=C3=B6rbandt?= Date: Fri, 9 Sep 2022 13:33:02 +0200 Subject: [PATCH 16/19] Bump Monticello version --- src/Squit.package/monticello.meta/version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Squit.package/monticello.meta/version b/src/Squit.package/monticello.meta/version index 3385ea9e3..6f9751c67 100644 --- a/src/Squit.package/monticello.meta/version +++ b/src/Squit.package/monticello.meta/version @@ -1 +1 @@ -(name 'Squit-ek.10' message 'add second registration method' id '64325ee2-e821-4ce2-8e94-d1afbb360686' date '26 October 2021' time '8:51:31.569315 pm' author 'ek' ancestors ((name 'Squit-ek.9' message 'Tool handles only exactly one repository' id 'd87a7aa7-ff7b-4555-953b-5f4f5606211d' date '14 October 2021' time '1:36:06.083263 pm' author 'ek' ancestors ((name 'Squit-ek.8' message 'renaming' id '57b59ac5-ca24-4ee8-af6f-0057d1fbd0a2' date '14 October 2021' time '11:40:48.185265 am' author 'ek' ancestors ((name 'Squit-ek.7' message 'remove back-up tool' id '94063854-60c8-4d76-bcc2-09a36d965af9' date '14 October 2021' time '11:38:49.527581 am' author 'ek' ancestors ((name 'Squit-ek.6' message 'add credentials Morph, minor fixes' id 'ee1af622-08d6-4cc5-a562-987443b92c69' date '13 October 2021' time '4:48:06.072503 pm' author 'ek' ancestors ((name 'Squit-ct.5' message 'empty log message' id 'f05de4c6-5f71-6f4c-9080-f5fd744b072c' date '30 August 2021' time '5:20:35.40661 pm' author 'ct' ancestors ((name 'Squit-ct.4' message 'empty log message' id '555ffaf2-7cbe-e747-9fd1-fc706de0aa88' date '30 August 2021' time '5:19:42.73361 pm' author 'ct' ancestors ((name 'Squit-cypress.1' message 'fabricated from a Cypress format repository' id '4a5f3775-51a1-2145-beb7-ebcdb560f31a' date '30 August 2021' time '3:16:59.539657 pm' author '' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ()) \ No newline at end of file +(name 'Squit-mad.13' message 'Add SwaSquitBrowser>>actionPull using SquitInteractivePullFromUpstream' id '3284d489-b024-4119-bab8-addfc18cbce6' date '9 September 2022' time '1:28:37.17515 pm' author 'mad' ancestors ((name 'Squit-mad.11' message 'Add SwaSquitBrowser>>actionPull using SquitInteractivePullFromUpstream' id 'afe96613-c13e-46a1-b2dd-0eac5eb43724' date '9 September 2022' time '1:15:12.737264 pm' author 'mad' ancestors ((name 'Squit-ek.10' message 'add second registration method' id '64325ee2-e821-4ce2-8e94-d1afbb360686' date '26 October 2021' time '8:51:31.569315 pm' author 'ek' ancestors ((name 'Squit-ek.9' message 'Tool handles only exactly one repository' id 'd87a7aa7-ff7b-4555-953b-5f4f5606211d' date '14 October 2021' time '1:36:06.083263 pm' author 'ek' ancestors ((name 'Squit-ek.8' message 'renaming' id '57b59ac5-ca24-4ee8-af6f-0057d1fbd0a2' date '14 October 2021' time '11:40:48.185265 am' author 'ek' ancestors ((name 'Squit-ek.7' message 'remove back-up tool' id '94063854-60c8-4d76-bcc2-09a36d965af9' date '14 October 2021' time '11:38:49.527581 am' author 'ek' ancestors ((name 'Squit-ek.6' message 'add credentials Morph, minor fixes' id 'ee1af622-08d6-4cc5-a562-987443b92c69' date '13 October 2021' time '4:48:06.072503 pm' author 'ek' ancestors ((name 'Squit-ct.5' message 'empty log message' id 'f05de4c6-5f71-6f4c-9080-f5fd744b072c' date '30 August 2021' time '5:20:35.40661 pm' author 'ct' ancestors ((name 'Squit-ct.4' message 'empty log message' id '555ffaf2-7cbe-e747-9fd1-fc706de0aa88' date '30 August 2021' time '5:19:42.73361 pm' author 'ct' ancestors ((name 'Squit-cypress.1' message 'fabricated from a Cypress format repository' id '4a5f3775-51a1-2145-beb7-ebcdb560f31a' date '30 August 2021' time '3:16:59.539657 pm' author '' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ()) \ No newline at end of file From eeb0f199ce267a2b1dc27af2cd1dd334a54d0fd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marius=20D=C3=B6rbandt?= Date: Fri, 9 Sep 2022 13:38:50 +0200 Subject: [PATCH 17/19] Remove unused methods --- .../SwaSquitBrowser.class/instance/actionFetch.st | 6 ------ .../SwaSquitBrowser.class/instance/actionFetchAndMerge.st | 6 ------ .../SwaSquitBrowser.class/instance/actionMerge.st | 4 ---- .../SwaSquitBrowser.class/methodProperties.json | 3 --- 4 files changed, 19 deletions(-) delete mode 100644 src/Squit.package/SwaSquitBrowser.class/instance/actionFetch.st delete mode 100644 src/Squit.package/SwaSquitBrowser.class/instance/actionFetchAndMerge.st delete mode 100644 src/Squit.package/SwaSquitBrowser.class/instance/actionMerge.st diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/actionFetch.st b/src/Squit.package/SwaSquitBrowser.class/instance/actionFetch.st deleted file mode 100644 index 2899b5b53..000000000 --- a/src/Squit.package/SwaSquitBrowser.class/instance/actionFetch.st +++ /dev/null @@ -1,6 +0,0 @@ -actions -actionFetch - - | workingCopy | - workingCopy := self selectedRepository. - self withUnitOfWork: [self fetch: workingCopy]. \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/actionFetchAndMerge.st b/src/Squit.package/SwaSquitBrowser.class/instance/actionFetchAndMerge.st deleted file mode 100644 index ea21ba8a8..000000000 --- a/src/Squit.package/SwaSquitBrowser.class/instance/actionFetchAndMerge.st +++ /dev/null @@ -1,6 +0,0 @@ -actions -actionFetchAndMerge - - self - actionFetch; - actionMerge. \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/instance/actionMerge.st b/src/Squit.package/SwaSquitBrowser.class/instance/actionMerge.st deleted file mode 100644 index 28dcf263e..000000000 --- a/src/Squit.package/SwaSquitBrowser.class/instance/actionMerge.st +++ /dev/null @@ -1,4 +0,0 @@ -actions -actionMerge - - ^ self actionMergeInteractive: true \ No newline at end of file diff --git a/src/Squit.package/SwaSquitBrowser.class/methodProperties.json b/src/Squit.package/SwaSquitBrowser.class/methodProperties.json index fb430e0df..0cff0c6e3 100644 --- a/src/Squit.package/SwaSquitBrowser.class/methodProperties.json +++ b/src/Squit.package/SwaSquitBrowser.class/methodProperties.json @@ -12,9 +12,6 @@ "actionCommitDiffWithParent" : "ek 10/14/2021 13:12", "actionCommitSelectionCheckout" : "ek 9/21/2021 19:34", "actionCredentialsEdit" : "ek 10/14/2021 13:18", - "actionFetch" : "ct 8/30/2021 15:50", - "actionFetchAndMerge" : "ct 8/30/2021 15:45", - "actionMerge" : "ct 8/30/2021 15:45", "actionMergeInteractive:" : "ct 8/30/2021 15:43", "actionPull" : "mad 9/9/2022 13:12", "actionPush" : "ct 8/30/2021 17:02", From 6c528fba73dffc066847b1daa3213fadcf0e4502 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marius=20D=C3=B6rbandt?= Date: Fri, 9 Sep 2022 14:31:08 +0200 Subject: [PATCH 18/19] Fix SquitCredentialsFillInMorph sizing --- .../instance/addTextPanesAndDescriptions.st | 4 ++-- .../instance/configurePaneMorph.st | 9 +++------ .../methodProperties.json | 4 ++-- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/Squit.package/SquitCredentialsFillInMorph.class/instance/addTextPanesAndDescriptions.st b/src/Squit.package/SquitCredentialsFillInMorph.class/instance/addTextPanesAndDescriptions.st index 49c40849b..2c78aee52 100644 --- a/src/Squit.package/SquitCredentialsFillInMorph.class/instance/addTextPanesAndDescriptions.st +++ b/src/Squit.package/SquitCredentialsFillInMorph.class/instance/addTextPanesAndDescriptions.st @@ -4,8 +4,8 @@ addTextPanesAndDescriptions | otherMessageMorph | column := AlignmentMorph newColumn - hResizing: #spaceFill; - vResizing: #spaceFill; + hResizing: #shrinkWrap; + vResizing: #shrinkWrap; cellGap: 4; color: Color transparent. self paneMorph addMorph: column. diff --git a/src/Squit.package/SquitCredentialsFillInMorph.class/instance/configurePaneMorph.st b/src/Squit.package/SquitCredentialsFillInMorph.class/instance/configurePaneMorph.st index cf89355cd..fe580373e 100644 --- a/src/Squit.package/SquitCredentialsFillInMorph.class/instance/configurePaneMorph.st +++ b/src/Squit.package/SquitCredentialsFillInMorph.class/instance/configurePaneMorph.st @@ -1,9 +1,6 @@ initialization configurePaneMorph. - "self paneMorph - wantsPaneSplitters: true; - addCornerGrips. - self paneMorph grips do: [:ea | ea showHandle: true]." - - self paneMorph extent: (275@200). \ No newline at end of file + self paneMorph + hResizing: #shrinkWrap; + vResizing: #shrinkWrap. \ No newline at end of file diff --git a/src/Squit.package/SquitCredentialsFillInMorph.class/methodProperties.json b/src/Squit.package/SquitCredentialsFillInMorph.class/methodProperties.json index 162ae679e..07a396292 100644 --- a/src/Squit.package/SquitCredentialsFillInMorph.class/methodProperties.json +++ b/src/Squit.package/SquitCredentialsFillInMorph.class/methodProperties.json @@ -3,8 +3,8 @@ "requestCredentials" : "ek 9/21/2021 16:53" }, "instance" : { "accept" : "ek 9/21/2021 18:23", - "addTextPanesAndDescriptions" : "ek 9/21/2021 18:03", - "configurePaneMorph" : "ek 9/21/2021 18:15", + "addTextPanesAndDescriptions" : "mad 9/9/2022 14:06", + "configurePaneMorph" : "mad 9/9/2022 14:06", "createPasswordTextPaneFor:" : "ek 9/21/2021 17:27", "createTextPaneFor:" : "ek 9/21/2021 17:58", "createTextPanes" : "ek 9/21/2021 17:28", From 23b3025ed2f611cf17c52e681b7c28cc9fe7e49f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marius=20D=C3=B6rbandt?= Date: Fri, 9 Sep 2022 14:31:40 +0200 Subject: [PATCH 19/19] Bump Monticello version --- src/Squit.package/monticello.meta/version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Squit.package/monticello.meta/version b/src/Squit.package/monticello.meta/version index 6f9751c67..c63c324bb 100644 --- a/src/Squit.package/monticello.meta/version +++ b/src/Squit.package/monticello.meta/version @@ -1 +1 @@ -(name 'Squit-mad.13' message 'Add SwaSquitBrowser>>actionPull using SquitInteractivePullFromUpstream' id '3284d489-b024-4119-bab8-addfc18cbce6' date '9 September 2022' time '1:28:37.17515 pm' author 'mad' ancestors ((name 'Squit-mad.11' message 'Add SwaSquitBrowser>>actionPull using SquitInteractivePullFromUpstream' id 'afe96613-c13e-46a1-b2dd-0eac5eb43724' date '9 September 2022' time '1:15:12.737264 pm' author 'mad' ancestors ((name 'Squit-ek.10' message 'add second registration method' id '64325ee2-e821-4ce2-8e94-d1afbb360686' date '26 October 2021' time '8:51:31.569315 pm' author 'ek' ancestors ((name 'Squit-ek.9' message 'Tool handles only exactly one repository' id 'd87a7aa7-ff7b-4555-953b-5f4f5606211d' date '14 October 2021' time '1:36:06.083263 pm' author 'ek' ancestors ((name 'Squit-ek.8' message 'renaming' id '57b59ac5-ca24-4ee8-af6f-0057d1fbd0a2' date '14 October 2021' time '11:40:48.185265 am' author 'ek' ancestors ((name 'Squit-ek.7' message 'remove back-up tool' id '94063854-60c8-4d76-bcc2-09a36d965af9' date '14 October 2021' time '11:38:49.527581 am' author 'ek' ancestors ((name 'Squit-ek.6' message 'add credentials Morph, minor fixes' id 'ee1af622-08d6-4cc5-a562-987443b92c69' date '13 October 2021' time '4:48:06.072503 pm' author 'ek' ancestors ((name 'Squit-ct.5' message 'empty log message' id 'f05de4c6-5f71-6f4c-9080-f5fd744b072c' date '30 August 2021' time '5:20:35.40661 pm' author 'ct' ancestors ((name 'Squit-ct.4' message 'empty log message' id '555ffaf2-7cbe-e747-9fd1-fc706de0aa88' date '30 August 2021' time '5:19:42.73361 pm' author 'ct' ancestors ((name 'Squit-cypress.1' message 'fabricated from a Cypress format repository' id '4a5f3775-51a1-2145-beb7-ebcdb560f31a' date '30 August 2021' time '3:16:59.539657 pm' author '' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ()) \ No newline at end of file +(name 'Squit-mad.15' message 'Fix SquitCredentialsFillInMorph sizing' id '3e484930-f622-4dec-bc6e-c8411f9978cc' date '9 September 2022' time '2:30:42.655016 pm' author 'mad' ancestors ((name 'Squit-mad.14' message 'Remove unused methods' id '84b87d9b-be06-45ce-90e0-6a3777390d34' date '9 September 2022' time '1:38:14.434284 pm' author 'mad' ancestors ((name 'Squit-mad.13' message 'Add SwaSquitBrowser>>actionPull using SquitInteractivePullFromUpstream' id '3284d489-b024-4119-bab8-addfc18cbce6' date '9 September 2022' time '1:28:37.17515 pm' author 'mad' ancestors ((name 'Squit-mad.11' message 'Add SwaSquitBrowser>>actionPull using SquitInteractivePullFromUpstream' id 'afe96613-c13e-46a1-b2dd-0eac5eb43724' date '9 September 2022' time '1:15:12.737264 pm' author 'mad' ancestors ((name 'Squit-ek.10' message 'add second registration method' id '64325ee2-e821-4ce2-8e94-d1afbb360686' date '26 October 2021' time '8:51:31.569315 pm' author 'ek' ancestors ((name 'Squit-ek.9' message 'Tool handles only exactly one repository' id 'd87a7aa7-ff7b-4555-953b-5f4f5606211d' date '14 October 2021' time '1:36:06.083263 pm' author 'ek' ancestors ((name 'Squit-ek.8' message 'renaming' id '57b59ac5-ca24-4ee8-af6f-0057d1fbd0a2' date '14 October 2021' time '11:40:48.185265 am' author 'ek' ancestors ((name 'Squit-ek.7' message 'remove back-up tool' id '94063854-60c8-4d76-bcc2-09a36d965af9' date '14 October 2021' time '11:38:49.527581 am' author 'ek' ancestors ((name 'Squit-ek.6' message 'add credentials Morph, minor fixes' id 'ee1af622-08d6-4cc5-a562-987443b92c69' date '13 October 2021' time '4:48:06.072503 pm' author 'ek' ancestors ((name 'Squit-ct.5' message 'empty log message' id 'f05de4c6-5f71-6f4c-9080-f5fd744b072c' date '30 August 2021' time '5:20:35.40661 pm' author 'ct' ancestors ((name 'Squit-ct.4' message 'empty log message' id '555ffaf2-7cbe-e747-9fd1-fc706de0aa88' date '30 August 2021' time '5:19:42.73361 pm' author 'ct' ancestors ((name 'Squit-cypress.1' message 'fabricated from a Cypress format repository' id '4a5f3775-51a1-2145-beb7-ebcdb560f31a' date '30 August 2021' time '3:16:59.539657 pm' author '' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ()) \ No newline at end of file