Undo incorrect renames

Author: mdekrey

utils/query-state/Get-BranchSyncState.mocks.psm1

@@ -12,7 +12,7 @@ function Initialize-RemoteBranchSyncState([String] $branchName, [AllowEmptyStrin
     if ($null -eq $remote) { throw 'Do not initialize remote state if remote is not set' }
     $remoteBranch = "$remote/$branchName"
 
-    Invoke-MockGit "for-each-ref --format=%(if:equals=$remoteBranch)%(dependency:short)%(then)%(dependency:trackshort)%(else)%(end) refs/heads --omit-empty" $state
+    Invoke-MockGit "for-each-ref --format=%(if:equals=$remoteBranch)%(upstream:short)%(then)%(upstream:trackshort)%(else)%(end) refs/heads --omit-empty" $state
 }
 
 function Initialize-RemoteBranchBehind([String] $branchName) {

utils/query-state/Get-BranchSyncState.psm1

@@ -8,7 +8,7 @@ function Get-BranchSyncState(
     if ($config.remote -ne $nil) {
         # Will give empty string for not tracked, `<` for behind, `>` for commits that aren't pushed, `=` for same, and `<>` for both remote and local have extra commits
         $syncState = Invoke-ProcessLogs "get sync state for $($config.remote)/$branchName" {
-            git for-each-ref "--format=%(if:equals=$($config.remote)/$branchName)%(dependency:short)%(then)%(dependency:trackshort)%(else)%(end)" refs/heads --omit-empty
+            git for-each-ref "--format=%(if:equals=$($config.remote)/$branchName)%(upstream:short)%(then)%(upstream:trackshort)%(else)%(end)" refs/heads --omit-empty
         } -allowSuccessOutput
 
         return $syncState

utils/query-state/Get-LocalBranchForRemote.mocks.psm1

@@ -9,7 +9,7 @@ function Initialize-GetLocalBranchForRemote([string] $remoteBranch, [string][All
     $remote = $(Get-Configuration).remote
     if ($null -eq $remote) { return }
 
-    Invoke-MockGit "for-each-ref --format=%(if:equals=$remote/$remoteBranch)%(dependency:short)%(then)%(refname:short)%(else)%(end) refs/heads --omit-empty" -MockWith $localBranch
+    Invoke-MockGit "for-each-ref --format=%(if:equals=$remote/$remoteBranch)%(upstream:short)%(then)%(refname:short)%(else)%(end) refs/heads --omit-empty" -MockWith $localBranch
 }
 
 Export-ModuleMember -Function Initialize-GetLocalBranchForRemote

utils/query-state/Get-LocalBranchForRemote.psm1

@@ -8,7 +8,7 @@ function Get-LocalBranchForRemote(
     if ($config.remote -ne $nil) {
         # Gets the local version of the remote tracking branch:
         $localBranch = Invoke-ProcessLogs "get local branch for $($config.remote)/$branchName" {
-            git for-each-ref "--format=%(if:equals=$($config.remote)/$branchName)%(dependency:short)%(then)%(refname:short)%(else)%(end)" refs/heads --omit-empty
+            git for-each-ref "--format=%(if:equals=$($config.remote)/$branchName)%(upstream:short)%(then)%(refname:short)%(else)%(end)" refs/heads --omit-empty
         } -allowSuccessOutput
 
         return $localBranch