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

Jump to bottom

Fixes #2259 #2909

Merged
merged 3 commits into from
Sep 1, 2021
Merged

Fixes #2259 #2909

merged 3 commits into from
Sep 1, 2021

Conversation

burkeholland
Copy link
Collaborator

Check to see if new branch name per config is different from what is in state. If so, and branch has been deleted, update branch name to new config calculated value.

@burkeholland burkeholland mentioned this pull request Aug 13, 2021
Closed
@burkeholland burkeholland changed the title Fixes 2259 Fixes #2259 Aug 13, 2021
alexr00
alexr00 requested changes Aug 16, 2021
View reviewed changes
Copy link
Member

@alexr00 alexr00 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just one change needed I think! I still think we should also offer to "move to"/"rename" the old branch if it exists, but that can be a separate PR since this is a good change regardless.

src/issues/currentIssue.ts
if (!branchExists) {
this._branchName = branchNameConfig;
}
}
if (!this._branchName) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We also need to do this if if this._branchName changed in the previous block since it includes branch name validation.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@burkeholland this is the only change I see that is needed before merging!

Copy link
Collaborator Author

@burkeholland burkeholland Aug 27, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry - I'm not following the logic here. Are you referring to the branchNameConfig section? I don't know why we need to check for the branch existing there since all that does is compose the branch name from the config.

Copy link
Member

@alexr00 alexr00 Aug 30, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was thinking something like this, since we still needed to validate the branch name:

https://github.com/burkeholland/vscode-pull-request-github/blob/a53fbfcfb2c93ae1e129f3c4d24d66194d7a8879/src/issues/currentIssue.ts#L231-L235

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have pushed that change though, so I will merge this PR for the September milestone after we release.

@alexr00 alexr00 self-assigned this Aug 24, 2021
alexr00
alexr00 approved these changes Aug 30, 2021
View reviewed changes
Copy link
Member

@alexr00 alexr00 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I pushed the change, it all looks good. Thank you!

@alexr00 alexr00 added this to the September 2021 milestone Aug 30, 2021
@alexr00 alexr00 merged commit 1c12ac0 into microsoft:main Sep 1, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alexr00 alexr00 alexr00 approved these changes

Assignees

@alexr00 alexr00

Labels
None yet
Projects
None yet
Milestone
September 2021
Development

Successfully merging this pull request may close these issues.
2 participants
@burkeholland @alexr00