Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes # 1861 on Pharo : location not a git repo when Importing existing clone #1862

Merged
merged 3 commits into from
Dec 4, 2024
Merged

Fixes # 1861 on Pharo : location not a git repo when Importing existing clone #1862

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d5a2c1
Fixes the issue 1861 on Pharo
AlexisCnockaert Nov 25, 2024
571ccc5
Fixes #1861 Simplified new code
AlexisCnockaert Nov 26, 2024
9d6e77d
Merge branch 'Pharo13' into ExistingClone1861
jecisc Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions Iceberg-TipUI/IceTipLocalRepositoryPanel.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,5 @@ IceTipLocalRepositoryPanel >> validate [
self
assert: self location exists
description: 'Project location must exist!'.
self
assert: (IceRepositoryCreator isGitRoot: self location)
description: 'Project location does not seems to be a valid git repository.'

]
18 changes: 12 additions & 6 deletions Iceberg-TipUI/IceTipOptionDialogPresenter.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,18 @@ Class {
{ #category : 'actions' }
IceTipOptionDialogPresenter >> accept [

[
self doAccept.
self closeWindow ]
on: IceError , IceWarning
do: [ :e |
e acceptError: (IceTipInteractiveErrorVisitor newContext: self) ]
[
(self selectedType class = IceTipLocalRepositoryPanel and: [
(IceRepositoryCreator isGitRoot: self selectedType location) not ])
ifTrue: [
self inform: ('"{1}" git repository not found' format:
{ self selectedType location fullName }) ]
ifFalse: [
self doAccept.
self closeWindow ] ]
on: IceError , IceWarning
do: [ :e |
e acceptError: (IceTipInteractiveErrorVisitor newContext: self) ]
]

{ #category : 'accessing' }
Expand Down
Loading