History

Add JJ VCS driver support

- Detect and route jj repositories alongside git - Thread VCS kind through status and UI labels - Add jj driver contract coverage and shared freshness helper

Julius Marminge committed 6 months ago

Commit c31beca1 parent 128b43230 files · +838 −44Browse files

Showing the changes to packages/shared (2 of 30 files). Show all

Unified · Split

2 files
  1. packages/shared/src/git.test.ts +2 −0
  2. packages/shared/src/git.ts +2 −0
packages/shared/src/git.test.ts+2−0
@@ -81,6 +81,7 @@ describe("applyGitStatusStreamEvent", () => { · 80 unmodified lines
81 };81 };
82 82
83 expect(applyGitStatusStreamEvent(null, { _tag: "remoteUpdated", remote })).toEqual({83 expect(applyGitStatusStreamEvent(null, { _tag: "remoteUpdated", remote })).toEqual({
84 kind: "unknown",
84 isRepo: true,85 isRepo: true,
85 hasPrimaryRemote: false,86 hasPrimaryRemote: false,
86 isDefaultRef: false,87 isDefaultRef: false,
@@ -96,6 +97,7 @@ describe("applyGitStatusStreamEvent", () => { · 9 unmodified lines
96 97
97 it("preserves local-only fields when applying a remote update", () => {98 it("preserves local-only fields when applying a remote update", () => {
98 const current: VcsStatusResult = {99 const current: VcsStatusResult = {
100 kind: "git",
99 isRepo: true,101 isRepo: true,
100 sourceControlProvider: {102 sourceControlProvider: {
101 kind: "github",103 kind: "github",
packages/shared/src/git.ts+2−0
@@ -226,6 +226,7 @@ function toRemoteStatusPart(status: VcsStatusResult): VcsStatusRemoteResult { · 225 unmodified lines
226 226
227function toLocalStatusPart(status: VcsStatusResult): VcsStatusLocalResult {227function toLocalStatusPart(status: VcsStatusResult): VcsStatusLocalResult {
228 return {228 return {
229 kind: status.kind,
229 isRepo: status.isRepo,230 isRepo: status.isRepo,
230 ...(status.sourceControlProvider231 ...(status.sourceControlProvider
231 ? { sourceControlProvider: status.sourceControlProvider }232 ? { sourceControlProvider: status.sourceControlProvider }
@@ -251,6 +252,7 @@ export function applyGitStatusStreamEvent( · 19 unmodified lines
251 if (current === null) {252 if (current === null) {
252 return mergeGitStatusParts(253 return mergeGitStatusParts(
253 {254 {
255 kind: "unknown",
254 isRepo: true,256 isRepo: true,
255 hasPrimaryRemote: false,257 hasPrimaryRemote: false,
256 isDefaultRef: false,258 isDefaultRef: false,