Parcourir la source

Fixes remote branch deep link generation and resolving logic

main
Ramin Tadayon il y a 1 an
Parent
révision
191a17e02b
Aucune clé connue n'a été trouvée dans la base pour cette signature ID de la clé GPG: 5B90E918AEBCE7A7
2 fichiers modifiés avec 14 ajouts et 4 suppressions
  1. +11
    -2
      src/uris/deepLinks/deepLinkService.ts
  2. +3
    -2
      src/webviews/apps/plus/graph/GraphWrapper.tsx

+ 11
- 2
src/uris/deepLinks/deepLinkService.ts Voir le fichier

@ -2,6 +2,7 @@ import { Disposable, env, ProgressLocation, Uri, window, workspace } from 'vscod
import { configuration } from '../../configuration';
import { Commands } from '../../constants';
import type { Container } from '../../container';
import { getBranchNameWithoutRemote } from '../../git/models/branch';
import { GitReference } from '../../git/models/reference';
import type { GitRemote } from '../../git/models/remote';
import { parseGitRemoteUrl } from '../../git/parsers/remoteParser';
@ -134,7 +135,13 @@ export class DeepLinkService implements Disposable {
if (targetType === DeepLinkType.Branch) {
// Form the target branch name using the remote name and branch name
const branchName = `${remote.name}/${targetId}`;
const branch = await repo.getBranch(branchName);
let branch = await repo.getBranch(branchName);
if (branch) {
return branch.sha;
}
// If it doesn't exist on the target remote, it may still exist locally.
branch = await repo.getBranch(targetId);
if (branch) {
return branch.sha;
}
@ -501,7 +508,9 @@ export class DeepLinkService implements Disposable {
switch (refOrRepoPath.refType) {
case 'branch':
targetType = DeepLinkType.Branch;
targetId = refOrRepoPath.name;
targetId = refOrRepoPath.remote
? getBranchNameWithoutRemote(refOrRepoPath.name)
: refOrRepoPath.name;
break;
case 'revision':
targetType = DeepLinkType.Commit;

+ 3
- 2
src/webviews/apps/plus/graph/GraphWrapper.tsx Voir le fichier

@ -529,8 +529,9 @@ export function GraphWrapper({
if (
!graphConfig?.minimap ||
!graphConfig.enabledMinimapMarkerTypes?.includes(GraphMinimapMarkerTypes.Highlights)
)
{return undefined;}
) {
return undefined;
}
const searchResultsByDay = new Map<number, GraphMinimapSearchResultMarker>();

Chargement…
Annuler
Enregistrer