Updates

Author: Robert Holt

tools/GitHubTools.psm1

@@ -439,10 +439,16 @@ function Get-GitCommit
         $organization = $originDetails.Organization
         $repository = $originDetails.Repository
 
+        Wait-Debugger
+
         Write-Verbose "Getting local git commit data"
 
+        $null = Exec { git fetch --all }
+
+        $lastCommonCommit = Exec { git merge-base $SinceRef $UntilRef }
+
         $format = '%H||%P||%aN||%aE||%s'
-        $commits = Exec { git --no-pager log "$SinceRef..$UntilRef" --format=$format }
+        $commits = Exec { git --no-pager log "$lastCommonCommit..$UntilRef" --format=$format }
 
         $irmParams = if ($GitHubToken)
         {

tools/changelog/updateChangelog.ps1

@@ -243,23 +243,7 @@ $psesChangelogSection = Get-GitCommit @psesGetCommitParams |
 
 Write-Host "PSES CHANGELOG:`n`n$psesChangelogSection`n`n"
 
-$cloneLocation = Join-Path ([System.IO.Path]::GetTempPath()) "${psesRepoName}_changelogupdate"
-
-$cloneParams = @{
-    OriginRemote = "https://github.com/$FromFork/$psesRepoName"
-    Destination = $cloneLocation
-    CheckoutBranch = $branchName
-    CloneBranch = $PsesBaseBranch
-    Clobber = $true
-    Remotes = @{ 'upstream' = "https://github.com/$TargetFork/$vscodeRepoName" }
-}
-Copy-GitRepository @cloneParams -Verbose:$VerbosePreference
-
-UpdateChangelogFile -NewSection $psesChangelogSection -Path "$cloneLocation/$ChangelogName"
-
-Submit-GitChanges -RepositoryLocation $cloneLocation -File $GalleryFileName -Branch $branchName -Message "Update CHANGELOG for $ReleaseName" -Verbose:$VerbosePreference
-
-#endregion
+#endregion PSES Changelog
 
 #region vscode-PowerShell Changelog
 $psesChangelogPostamble = $psesChangelogSection -split "`n"
@@ -273,7 +257,6 @@ $psExtGetCommitParams = @{
     RepositoryPath = $PSExtensionRepositoryPath
     Verbose = $VerbosePreference
 }
-
 $psextChangelogSection = Get-GitCommit @psExtGetCommitParams |
     Get-ChangeInfoFromCommit -GitHubToken $GitHubToken -Verbose:$VerbosePreference |
     Skip-IgnoredChange @ignore -Verbose:$VerbosePreference |
@@ -282,28 +265,29 @@ $psextChangelogSection = Get-GitCommit @psExtGetCommitParams |
 
 Write-Host "vscode-PowerShell CHANGELOG:`n`n$psextChangelogSection`n`n"
 
-$cloneLocation = Join-Path ([System.IO.Path]::GetTempPath()) "${vscodeRepoName}_changelogupdate"
+#endregion vscode-PowerShell Changelog
+
+#region PRs
+
+return
+
+# PSES PR
+$cloneLocation = Join-Path ([System.IO.Path]::GetTempPath()) "${psesRepoName}_changelogupdate"
 
 $cloneParams = @{
-    OriginRemote = "https://github.com/$FromFork/$vscodeRepoName"
+    OriginRemote = "https://github.com/$FromFork/$psesRepoName"
     Destination = $cloneLocation
     CheckoutBranch = $branchName
-    CloneBranch = $PSExtensionBaseBranch
+    CloneBranch = $PsesBaseBranch
     Clobber = $true
     Remotes = @{ 'upstream' = "https://github.com/$TargetFork/$vscodeRepoName" }
-    PullUpstream = $true
 }
 Copy-GitRepository @cloneParams -Verbose:$VerbosePreference
 
-UpdateChangelogFile -NewSection $psextChangelogSection -Path "$cloneLocation/$ChangelogName"
-
-Submit-GitChanges -RepositoryLocation $cloneLocation -File $GalleryFileName -Branch $branchName -Message "Update CHANGELOG for $ReleaseName" -Verbose:$VerbosePreference
-
-#endregion vscode-PowerShell Changelog
+UpdateChangelogFile -NewSection $psesChangelogSection -Path "$cloneLocation/$ChangelogName"
 
-#region PRs
+Submit-GitChanges -RepositoryLocation $cloneLocation -File $GalleryFileName -Branch $branchName -Message "Update CHANGELOG for $PsesReleaseName" -Verbose:$VerbosePreference
 
-# PSES PR
 $prParams = @{
     Organization = $TargetFork
     Repository = $psesRepoName
@@ -316,6 +300,23 @@ $prParams = @{
 New-GitHubPR @prParams -Verbose:$VerbosePreference
 
 # vscode-PowerShell PR
+$cloneLocation = Join-Path ([System.IO.Path]::GetTempPath()) "${vscodeRepoName}_changelogupdate"
+
+$cloneParams = @{
+    OriginRemote = "https://github.com/$FromFork/$vscodeRepoName"
+    Destination = $cloneLocation
+    CheckoutBranch = $branchName
+    CloneBranch = $PSExtensionBaseBranch
+    Clobber = $true
+    Remotes = @{ 'upstream' = "https://github.com/$TargetFork/$vscodeRepoName" }
+    PullUpstream = $true
+}
+Copy-GitRepository @cloneParams -Verbose:$VerbosePreference
+
+UpdateChangelogFile -NewSection $psextChangelogSection -Path "$cloneLocation/$ChangelogName"
+
+Submit-GitChanges -RepositoryLocation $cloneLocation -File $GalleryFileName -Branch $branchName -Message "Update CHANGELOG for $PSExtensionReleaseName" -Verbose:$VerbosePreference
+
 $prParams = @{
     Organization = $TargetFork
     Repository = $vscodeRepoName