Supports local issue association with branches#3871
Merged
ramin-t merged 1 commit intofeature/home-remodelingfrom Dec 17, 2024
Merged
Supports local issue association with branches#3871ramin-t merged 1 commit intofeature/home-remodelingfrom
ramin-t merged 1 commit intofeature/home-remodelingfrom
Conversation
eamodio
requested changes
Dec 17, 2024
Member
eamodio
left a comment
There was a problem hiding this comment.
Minor changes, but good after those are fixed up.
Though this should target the feature\home-remodeling branch rather than main
src/commands/git/branch.ts
Outdated
| suggestNameOnly?: boolean; | ||
| suggestRepoOnly?: boolean; | ||
| confirmOptions?: CreateFlags[]; | ||
| withIssue?: IssueShape; |
Member
There was a problem hiding this comment.
Suggested change
| withIssue?: IssueShape; | |
| associateWithIssue?: IssueShape; |
Comment on lines
+439
to
+442
| const branch = await state.repo.git.getBranch(state.name); | ||
| // TODO: These descriptors are hacked in. Use an integration function to get the right resource for the issue. | ||
| const resource = issue.repository | ||
| ? { | ||
| key: `${issue.repository.owner}/${issue.repository.repo}`, | ||
| owner: issue.repository.owner, | ||
| name: issue.repository.repo, | ||
| } | ||
| : issue.project | ||
| ? { key: issue.project.resourceId, id: issue.project.resourceId, name: issue.project.resourceId } | ||
| : undefined; | ||
| if (branch != null && resource != null) { | ||
| await addAssociatedIssueToBranch(this.container, branch, { ...issue, type: 'issue' }, resource); | ||
| } | ||
| } |
Member
There was a problem hiding this comment.
Might suggest just wrapping this completely in a function that can be reused elsewhere
src/git/models/branch.utils.ts
Outdated
| return { value: undefined, paused: false }; | ||
| } | ||
|
|
||
| if (options?.cancellation?.isCancellationRequested) return { value: undefined, paused: false }; |
Member
There was a problem hiding this comment.
Don't need this line because there is no await so this can't change here
Comment on lines
+208
to
+255
| return pauseOnCancelOrTimeout( | ||
| (async () => { | ||
| const output = []; | ||
| for (const issueDecoded of associatedIssues) { | ||
| try { | ||
| const issue = await getIssueFromGitConfigEntityIdentifier(container, issueDecoded); | ||
| if (issue != null) { | ||
| output.push(issue); | ||
| } | ||
| } catch (ex) { | ||
| Logger.error(ex, 'getAssociatedIssuesForBranch'); | ||
| } | ||
| } | ||
| return output; | ||
| })(), | ||
| options?.cancellation, | ||
| options?.timeout, | ||
| ); | ||
| } |
Member
There was a problem hiding this comment.
This will happen serially which is fine at this point, but we probably want to make this parallel for the future
src/git/models/branch.utils.ts
Outdated
| const associatedIssues: GitConfigEntityIdentifier[] = associatedIssuesEncoded | ||
| ? (JSON.parse(associatedIssuesEncoded) as GitConfigEntityIdentifier[]) | ||
| : []; | ||
| if (options?.cancellation?.isCancellationRequested || associatedIssues.some(i => i.entityId === issue.nodeId)) { |
Member
There was a problem hiding this comment.
Don't need options?.cancellation?.isCancellationRequested ||
src/git/models/branch.utils.ts
Outdated
| let associatedIssues: GitConfigEntityIdentifier[] = associatedIssuesEncoded | ||
| ? (JSON.parse(associatedIssuesEncoded) as GitConfigEntityIdentifier[]) | ||
| : []; | ||
| if (options?.cancellation?.isCancellationRequested) return; |
Comment on lines
+143
to
+144
| 'searchId' in entity && | ||
| entity.searchId != null |
Member
There was a problem hiding this comment.
Needs to be updated to check for the metadata
Comment on lines
+151
to
+167
| if (!isGitConfigEntityIdentifier(decoded)) { | ||
| throw new Error('Invalid issue or pull request'); | ||
| } |
Member
There was a problem hiding this comment.
Not sure we should throw here -- could debugger; but at runtime I think we just want to move on right?
| decoded.provider === EntityIdentifierProviderType.Jira && | ||
| (decoded.resourceId == null || decoded.projectId == null) | ||
| ) { | ||
| throw new Error('Invalid Jira issue'); |
0eeb7a1 to
fa4bfe2
Compare
fa4bfe2 to
c72febb
Compare
eamodio
approved these changes
Dec 17, 2024
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #3870
In this PR:
In the next PR: