Swa UI

src/BaselineOfSquot.package/.squot-contents

@@ -1,6 +1,6 @@
 SquotTrackedObjectMetadata {
 	#objectClassName : #PackageInfo,
+	#slotOverrides : { },
 	#objectsReplacedByNames : true,
-	#slotOverrides : IdentityDictionary { },
 	#serializer : #SquotCypressCodeSerializer
 }

src/FileSystem-Git.package/.squot-contents

@@ -1,6 +1,6 @@
 SquotTrackedObjectMetadata {
 	#objectClassName : #PackageInfo,
+	#slotOverrides : { },
 	#objectsReplacedByNames : true,
-	#slotOverrides : IdentityDictionary { },
 	#serializer : #SquotCypressCodeSerializer
 }

src/Squit.package/.squot-contents

@@ -1,6 +1,6 @@
 SquotTrackedObjectMetadata {
 	#objectClassName : #PackageInfo,
+	#slotOverrides : { },
 	#objectsReplacedByNames : true,
-	#slotOverrides : IdentityDictionary { },
 	#serializer : #SquotCypressCodeSerializer
 }

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

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

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)

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)

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: ([email protected] corner: 1@1)

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)

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: ([email protected] corner: 1@1)

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].

src/Squit.package/SwaSquitBrowser.class/instance/commitListMenu..st

@@ -0,0 +1,3 @@
+as yet unclassified
+commitListMenu: aMenu
+	^ self menu: aMenu for: #(swaMenuCommitList)

src/Squit.package/SwaSquitBrowser.class/instance/offerToAddFirstProject.st

@@ -0,0 +1,2 @@
+actions
+offerToAddFirstProject

src/Squit.package/SwaSquitBrowser.class/instance/projectListMenu..st

@@ -0,0 +1,3 @@
+as yet unclassified
+projectListMenu: aMenu
+	^ self menu: aMenu for: #(swaMenuProjectList)

src/Squit.package/SwaSquitBrowser.class/instance/swaMenuCommitListHook..st

@@ -0,0 +1,20 @@
+as yet unclassified
+swaMenuCommitListHook: aMenu
+	<swaMenuCommitList>
+	| 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

src/Squit.package/SwaSquitBrowser.class/instance/swaMenuProjectListHook..st

@@ -0,0 +1,11 @@
+as yet unclassified
+swaMenuProjectListHook: aMenu
+	<swaMenuProjectList>
+	<menuPriority: 100>
+	| submenu |
+	self projectSelection
+		ifNil: [submenu := aMenu]
+		ifNotNil: [submenu := aMenu class new
+					defaultTarget: aMenu defaultTarget;
+					yourself].
+	^ aMenu

src/Squit.package/SwaSquitBrowser.class/instance/swaMenuProjectListWorkingCopyHook..st

@@ -0,0 +1,21 @@
+as yet unclassified
+swaMenuProjectListWorkingCopyHook: aMenu
+	<swaMenuProjectList>
+	<menuPriority: 50>
+	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

src/Squit.package/SwaSquitBrowser.class/methodProperties.json

@@ -0,0 +1,18 @@
+{
+	"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" } }

src/SquotTonel-Tests.package/SquotTonelSerializerTest.class/properties.json → src/Squit.package/SwaSquitBrowser.class/properties.json

@@ -1,14 +1,14 @@
 {
-	"category" : "SquotTonel-Tests",
+	"category" : "Squit-Hackday",
 	"classinstvars" : [
 		 ],
 	"classvars" : [
 		 ],
 	"commentStamp" : "",
 	"instvars" : [
 		 ],
-	"name" : "SquotTonelSerializerTest",
+	"name" : "SwaSquitBrowser",
 	"pools" : [
 		 ],
-	"super" : "TestCase",
+	"super" : "SquitBrowser",
 	"type" : "normal" }

src/Squit.package/SwaSquitBrowserNew.class/class/open.st

@@ -0,0 +1,3 @@
+as yet unclassified
+open
+	ToolBuilder open: self new

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.

src/Squit.package/SwaSquitBrowserNew.class/instance/actionCommitAndPush.st

@@ -0,0 +1,4 @@
+actions
+actionCommitAndPush
+
+	self actionCommitAndThenDo: [self actionPush].

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: []]].

src/Squit.package/SwaSquitBrowserNew.class/instance/actionFetch.st

@@ -0,0 +1,6 @@
+actions
+actionFetch
+
+	| workingCopy |
+	workingCopy := self selectedRepository.
+	self withUnitOfWork: [self fetch: workingCopy].

src/Squit.package/SwaSquitBrowserNew.class/instance/actionFetchAndMerge.st

@@ -0,0 +1,6 @@
+actions
+actionFetchAndMerge
+
+	self
+		actionFetch;
+		actionMerge.

src/Squit.package/SwaSquitBrowserNew.class/instance/actionMerge.st

@@ -0,0 +1,4 @@
+actions
+actionMerge
+
+	^ self actionMergeInteractive: true

src/Squit.package/SwaSquitBrowserNew.class/instance/actionMergeInteractive..st

@@ -0,0 +1,7 @@
+actions
+actionMergeInteractive: aBoolean
+
+	self withUnitOfWork: [
+		self selectedRepository 
+			loadVersion: self selectedCommit
+			interactive: aBoolean].

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.'].].

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]

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