Comparing version 0.0.86 to 0.0.87
@@ -35,2 +35,5 @@ "use strict"; | ||
return __awaiter(this, void 0, void 0, function* () { | ||
if (!/^branch\//.test(refID.ref) && refID.ref !== "HEAD") { | ||
throw new Error(`invalid Zap ref: ${JSON.stringify(refID.ref)} (no 'branch/' prefix)`); | ||
} | ||
if (this.attaching) { | ||
@@ -37,0 +40,0 @@ throw new Error(`Attach workspace called multiple times while in process of attaching.`); |
@@ -35,3 +35,3 @@ "use strict"; | ||
repo: "repo", | ||
ref: "ref", | ||
ref: "branch/b", | ||
state: { gitBase: "c", gitBranch: "d" }, | ||
@@ -45,3 +45,3 @@ }); | ||
repo: "repo", | ||
ref: "ref", | ||
ref: "branch/b", | ||
current: { gitBase: "c", gitBranch: "d", rev: 0 }, | ||
@@ -63,3 +63,3 @@ op: { head: "a" }, | ||
repo: "repo", | ||
ref: "ref", | ||
ref: "branch/b", | ||
state: { gitBase: "c", gitBranch: "d" }, | ||
@@ -69,3 +69,3 @@ }); | ||
return client.start().initialStart.then(() => { | ||
return handler.attachWorkspace({ repo: "repo", ref: "ref" }, workspace, handler_1.MergeStrategy.RemoteClobbersLocal).then(() => { | ||
return handler.attachWorkspace({ repo: "repo", ref: "branch/b" }, workspace, handler_1.MergeStrategy.RemoteClobbersLocal).then(() => { | ||
workspace.mockRecordOp({ head: "a" }); | ||
@@ -81,3 +81,3 @@ return util_1.assertResolved(ok, "server did not receive 'ref/update' from client"); | ||
repo: "repo", | ||
ref: "ref", | ||
ref: "branch/b", | ||
state: { gitBase: "c", gitBranch: "d" }, | ||
@@ -91,3 +91,3 @@ }); | ||
repo: "repo", | ||
ref: "ref", | ||
ref: "branch/b", | ||
state: { gitBase: "c", gitBranch: "d" }, | ||
@@ -97,8 +97,8 @@ }); | ||
let ok = false; | ||
handler.getRepo("repo").getRef("ref").ot.ack = () => { ok = true; }; | ||
handler.getRepo("repo").getRef("branch/b").ot.ack = () => { ok = true; }; | ||
return client.start().initialStart.then(() => __awaiter(this, void 0, void 0, function* () { | ||
yield handler.attachWorkspace({ repo: "repo", ref: "ref" }, workspace, handler_1.MergeStrategy.RemoteClobbersLocal); | ||
yield handler.attachWorkspace({ repo: "repo", ref: "branch/b" }, workspace, handler_1.MergeStrategy.RemoteClobbersLocal); | ||
yield server.sendRequest(protocol_1.RefUpdateDownstreamRequest.type, { | ||
repo: "repo", | ||
ref: "ref", | ||
ref: "branch/b", | ||
current: { gitBase: "c", gitBranch: "d" }, | ||
@@ -105,0 +105,0 @@ ack: true, |
@@ -110,2 +110,5 @@ import { NotificationType, NotificationType0, RequestType, RequestType0 } from "vscode-jsonrpc"; | ||
} | ||
export interface RefInfoParams extends RefIdentifier { | ||
fuzzy?: boolean; | ||
} | ||
export interface RefBaseInfo { | ||
@@ -169,3 +172,3 @@ gitBase: string; | ||
export declare namespace RefInfoRequest { | ||
const type: RequestType<RefIdentifier, RefInfo, void, void>; | ||
const type: RequestType<RefInfoParams, RefInfo, void, void>; | ||
} | ||
@@ -172,0 +175,0 @@ export interface RefUpdateDownstreamParams extends RefIdentifier { |
{ | ||
"name": "libzap", | ||
"version": "0.0.86", | ||
"version": "0.0.87", | ||
"description": "JavaScript library for Zap", | ||
@@ -5,0 +5,0 @@ "license": "none", |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
663403
19537