Branch checkout after cloning #460

Pythonen · 2022-04-15T10:13:04Z

Description

Added branch checkout modal which shows after cloning from the welcome view

Related Issue

Checklist

I read and understood the contributing guide as well as the code of conduct
My changes generate no new warnings
My code builds and runs on my machine
I documented my code
Review requested

Screenshots

Basics of cloning repository implemented. Pressing clone on welcome view now opens simple window with url input with clone and close buttons For now it clones the repositories in to your home dir. Error handling for now is nada and should be implemented in later commits

Now you can select the folder to which you want to clone the repository. This defaults to home folder. Also added check that the repository isn't empty when trying to clone.

Now after we press `clone` button, we firstly clone the specified repository to given folder. After cloning, we open folder picker for the user to pick folder to open the editor in. However this could be better if we straight up open the editor in the cloned folder, rather than giving user an option to choose the folder in between.

Added error handling for git related errors e.g. when trying to clone non existent repository

Changed GitClone to be module as discussed in CodeEditApp#232 (comment)

Switched the git clone view folder picking to use NSSavePanel instead of NSOpenPanel. NSSavePanel gives us kind of the same flow as Xcode has, as it's also using NSSavePanel to prompt the target folder for cloning. The view now consist of two separate modals that pop open, and it may seem cumbersome, but it now has kind of the same functionality as Xcode.

Also fix current implementation to use the new ShellClient

Repositioning buttons, input and text. Also added app icon to the view

Changed git clone view to be sheet instead of normal window. This is better for UX as you can't click anywhere else than the clone view until you either cancel or clone the repository

Naive Xcode-like check for the url implemented. For now if the url does not start with certain string, the clone button is disabled, just like in Xcode. Also added check for when user decides to press cancel on folder selection CodeEditApp#232 (comment)

If you have 'valid' git url in your clipboard when opening the clone view, it now automatically pastes it to the textfield

Fixed indentation in WelcomeView and moved the logic of cloning repository into it's own private function

Added modal to checkout to other branches after cloning the repository

Pythonen · 2022-04-15T10:14:03Z

Had to move some variables from GitCloneView to WelcomeView to share them with the modal.
E.g.

    @State var showCheckoutBranch = false
    @State private var repoPath = "~/"

Is this big no no as the number of WelcomeView 's state vars increases?

Angelk90 · 2022-04-15T11:07:52Z

@Pythonen : I tested it, some considerations:

I tried with a repository that has several branches, at the moment it only shows me one branch, the first one.
Test with: Repository

When I clone a report, the window where it asks me where to save in which path, remains open all the time, with the mouse waiting as seen in the video.
The behavior that I expect to close, I think this thing has to be discussed with @MarcoCarnevali.

Registrazione.schermo.2022-04-15.alle.13.00.28.mov

What happens if I press the Cancel button?
If the repository I cloned to only one branch it makes sense to show the checkout?

austincondiff · 2022-04-16T14:44:41Z

How are you seeing this dialog. I wasn't seeing it in my tests.

Angelk90 · 2022-04-16T14:59:33Z

@austincondiff : Can you make the video of when you try to clone a report?

Senza.nome.mov

austincondiff · 2022-04-16T15:36:54Z

Disregard my comment. I stand corrected. This dialogue is not shown if there is only a single branch available. Just make sure that is the case with yours.

nanashili · 2022-04-16T15:42:43Z

@Pythonen how you planning to handle private repos?

austincondiff · 2022-04-16T15:55:00Z

Resolve conflicts and we can merge if there are no other outstanding items.

Pythonen · 2022-04-16T16:02:35Z

Resolve conflicts and we can merge if there are no other outstanding items.

Sure, just have to change the functionality to make sure it won't ask for checkout if there's only one branch present

@Pythonen how you planning to handle private repos?

For now just relying on the GitClient's functionalities, as it just uses shell

esthicodes

is it important to do branch checkout after cloning

CodeEditModules/Modules/GitClone/src/CheckoutBranchModal.swift

nanashili

@austincondiff All looks good to me.

nanashili · 2022-04-18T16:52:17Z

@Pythonen is this still a WIP?

Pythonen · 2022-04-18T17:02:00Z

@Pythonen is this still a WIP?

If you don't see it as a mandatory to convert it to Observable, then no. 👍

austincondiff · 2022-04-18T17:05:12Z

If it is not WIP, remove WIP from the title so reviewers know to review it. 🙂

austincondiff

LGTM ✅

austincondiff · 2022-04-18T19:06:01Z

@allcontributors add @Pythonen for code

allcontributors · 2022-04-18T19:06:10Z

@austincondiff

I've put up a pull request to add @Pythonen! 🎉

Pythonen added 25 commits March 23, 2022 14:08

Git Clone: Select target folder and clone the repository

97c1fee

Now you can select the folder to which you want to clone the repository. This defaults to home folder. Also added check that the repository isn't empty when trying to clone.

Git Clone: Add error handling

d8735bc

Added error handling for git related errors e.g. when trying to clone non existent repository

Git Clone: Implementation as a module

4a201b7

Changed GitClone to be module as discussed in CodeEditApp#232 (comment)

Git Clone: Uncomment dependency from Package.swift

3aed56c

Merge branch 'main' into git-clone

715d465

Git Clone: Remove .git only if the url has it.

5e0b088

Merge branch 'main' into git-clone

14f4a78

Also fix current implementation to use the new ShellClient

Git Clone: Reposition UI

fe462ea

Repositioning buttons, input and text. Also added app icon to the view

Git Clone: Change clone view to be sheet

e94ceec

Changed git clone view to be sheet instead of normal window. This is better for UX as you can't click anywhere else than the clone view until you either cancel or clone the repository

Merge branch 'main' into git-clone

015eafe

Merge branch 'main' into git-clone

5cfdd7a

Git Clone: Add automatic pasting

8fea833

If you have 'valid' git url in your clipboard when opening the clone view, it now automatically pastes it to the textfield

Merge branch 'main' into git-clone

65eef65

GitClone: Fix some force unwrappings and make vars private

07661da

Merge branch 'main' into git-clone

10653c1

GitClone: Make shellClient constant

7db99f1

GitClone: Fix indentation and make logic private func

5774bbb

Fixed indentation in WelcomeView and moved the logic of cloning repository into it's own private function

Merge branch 'main' into git-clone

781e45b

GitClone: Add CheckoutBranchModal

02369ca

Added modal to checkout to other branches after cloning the repository

GitClone: Make checkout button defaultAction

4af1524

Merge branch 'main' into git-clone

e5fa03b

Pythonen marked this pull request as ready for review April 15, 2022 10:18

Pythonen changed the title ~~Git clone~~ Branch checkout after cloning Apr 15, 2022

lukepistrol requested a review from MarcoCarnevali April 15, 2022 11:02

lukepistrol marked this pull request as draft April 16, 2022 18:14

lukepistrol added the WIP This is work-in-progress label Apr 16, 2022

lukepistrol changed the title ~~Branch checkout after cloning~~ [WIP] Branch checkout after cloning Apr 16, 2022

Pythonen added 2 commits April 17, 2022 11:48

GitClone: Open checkout branch modal only if there's multiple branches

217a2b7

Merge branch 'main' into git-clone

1b5be61

Pythonen marked this pull request as ready for review April 17, 2022 18:02

austincondiff requested review from lukepistrol and nanashili April 18, 2022 02:10

esthicodes reviewed Apr 18, 2022

View reviewed changes

Merge branch 'main' into git-clone

13ac174

nanashili suggested changes Apr 18, 2022

View reviewed changes

CodeEditModules/Modules/GitClone/src/CheckoutBranchModal.swift Outdated Show resolved Hide resolved

CodeEditModules/Modules/GitClone/src/CheckoutBranchModal.swift Outdated Show resolved Hide resolved

Pythonen added 2 commits April 18, 2022 19:35

GitClone: Refactor extension to separate file.

45010c6

Merge branch 'main' into git-clone

e1f4746

nanashili approved these changes Apr 18, 2022

View reviewed changes

Pythonen changed the title ~~[WIP] Branch checkout after cloning~~ Branch checkout after cloning Apr 18, 2022

austincondiff self-requested a review April 18, 2022 17:12

austincondiff approved these changes Apr 18, 2022

View reviewed changes

austincondiff merged commit 8d6f31e into CodeEditApp:main Apr 18, 2022

allcontributors bot mentioned this pull request Apr 18, 2022

docs: add Pythonen as a contributor for code #476

Merged

Uh oh!

Branch checkout after cloning #460

Branch checkout after cloning #460

Uh oh!

Conversation

Pythonen commented Apr 15, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Related Issue

Checklist

Screenshots

Uh oh!

Pythonen commented Apr 15, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Angelk90 commented Apr 15, 2022

Uh oh!

austincondiff commented Apr 16, 2022

Uh oh!

Angelk90 commented Apr 16, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

austincondiff commented Apr 16, 2022

Uh oh!

nanashili commented Apr 16, 2022

Uh oh!

austincondiff commented Apr 16, 2022

Uh oh!

Pythonen commented Apr 16, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

esthicodes left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

nanashili left a comment

Choose a reason for hiding this comment

Uh oh!

nanashili commented Apr 18, 2022

Uh oh!

Pythonen commented Apr 18, 2022

Uh oh!

austincondiff commented Apr 18, 2022

Uh oh!

austincondiff left a comment

Choose a reason for hiding this comment

Uh oh!

austincondiff commented Apr 18, 2022

Uh oh!

allcontributors bot commented Apr 18, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Pythonen commented Apr 15, 2022 •

edited

Loading

Pythonen commented Apr 15, 2022 •

edited

Loading

Angelk90 commented Apr 16, 2022 •

edited

Loading

Pythonen commented Apr 16, 2022 •

edited

Loading