search

codefori / git-client-ibmi

IBM i git client for VS Code.
MIT License
12 stars 5 forks source link

Branching #2

Closed RobBoeckermann closed 3 years ago

RobBoeckermann commented 3 years ago

Added "Branches" view.

Branches view displays all remote and local branches. The title has buttons for creating a new branch and refreshing the branches view. Right clicking branches allows for checking out the branch, deleting the branch, and merging the branch into the current branch. These actions are also accessible for manual entry with F1.

Known issues: -Unable to delete a branch if it has not been fully merged. The uppercase "-D" flag must be used to do so, but I felt it best to leave the lowercase "-d" flag for now to prevent accidental deletion of a branch. -Open files are not refreshed after checking out a different branch. The open files will still display the state of the previous branch and must be closed and re-opened to display their state on the current branch.

worksofliam commented 3 years ago

Will be reviewing this evening.

worksofliam commented 3 years ago

@RobBoeckermann This is great! What an awesome PR. Thanks for your great work here.

I've tested on some repos I have on my IBM i and it works fab.

Regarding this:

Unable to delete a branch if it has not been fully merged. The uppercase "-D" flag must be used to do so, but I felt it best to leave the lowercase "-d" flag for now to prevent accidental deletion of a branch.

I agree with you, but it might be worth doing something with the showWarningMessage API in VS Code. For example, you could do something like this:

let result = await vscode.window.showWarningMessage(`Are you sure you want to delete branch ${x}?`, `Yes`, `Cancel`);

if (result === `Yes`) {
  // delete branch here
}

Which could then force delete it.

I am happy with the changes. If you'd like to add this last bit, go ahead. Otherwise, let me know and I will get it merged and released over the weekend.

RobBoeckermann commented 3 years ago

@worksofliam Great idea. Thanks! I have implemented the warning and tested it. It's ready to be merged.

worksofliam commented 3 years ago

@RobBoeckermann Awesome!

I'm going to give it a try in the morning and I'll get it merged and released.

worksofliam commented 3 years ago

@RobBoeckermann Great work friend.

I will merge and make a new release.