File tree Expand file tree Collapse file tree 1 file changed +25
-5
lines changed Expand file tree Collapse file tree 1 file changed +25
-5
lines changed Original file line number Diff line number Diff line change @@ -364,6 +364,10 @@ async function transferMergeRequests() {
364364 // be empty)
365365 let githubPullRequests = await githubHelper . getAllGithubPullRequests ( ) ;
366366
367+ // get a list of the current issues in the new GitHub repo (likely to be empty)
368+ // Issues are sometimes created from Gitlab merge requests. Avoid creating duplicates.
369+ let githubIssues = await githubHelper . getAllGithubIssues ( ) ;
370+
367371 console . log (
368372 'Transferring ' + mergeRequests . length . toString ( ) + ' merge requests'
369373 ) ;
@@ -380,7 +384,11 @@ async function transferMergeRequests() {
380384 let githubRequest = githubPullRequests . find (
381385 i => i . title . trim ( ) === request . title . trim ( )
382386 ) ;
383- if ( ! githubRequest ) {
387+ let githubIssue = githubIssues . find (
388+ // allow for issues titled "Original Issue Name [merged]"
389+ i => i . title . trim ( ) . includes ( request . title . trim ( ) )
390+ ) ;
391+ if ( ! githubRequest && ! githubIssue ) {
384392 console . log (
385393 'Creating pull request: !' + request . iid + ' - ' + request . title
386394 ) ;
@@ -397,10 +405,22 @@ async function transferMergeRequests() {
397405 console . error ( err ) ;
398406 }
399407 } else {
400- console . log (
401- 'Pull request already exists: ' + request . iid + ' - ' + request . title
402- ) ;
403- githubHelper . updatePullRequestState ( githubRequest , request ) ;
408+ if ( githubRequest ) {
409+ console . log (
410+ 'Gitlab merge request already exists (as github pull request): ' +
411+ request . iid +
412+ ' - ' +
413+ request . title
414+ ) ;
415+ githubHelper . updatePullRequestState ( githubRequest , request ) ;
416+ } else {
417+ console . log (
418+ 'Gitlab merge request already exists (as github issue): ' +
419+ request . iid +
420+ ' - ' +
421+ request . title
422+ ) ;
423+ }
404424 }
405425 }
406426}
You can’t perform that action at this time.
0 commit comments