From e747c3fa70aa5a19ad65f839aba8591d8515708d Mon Sep 17 00:00:00 2001 From: adriano-repetti Date: Wed, 13 Nov 2019 11:09:42 +0000 Subject: [PATCH 1/2] Implemented Hg.createBranch --- packages/hg/src/common/hg.ts | 4 +--- packages/hg/src/node/hg-impl.ts | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/hg/src/common/hg.ts b/packages/hg/src/common/hg.ts index b878533ec5d8a..a5083fa2f3e1f 100644 --- a/packages/hg/src/common/hg.ts +++ b/packages/hg/src/common/hg.ts @@ -631,10 +631,8 @@ export interface Hg extends Disposable { * * @param the repository where the branch modification has to be performed. * @param branchName The desired name of the new branch. - * @param branchStartPoint The new branch head will point to this commit. It may be given as a branch name, a commit-id, or a tag. - * If this parameter is omitted, the current `HEAD` will be used instead. */ - createBranch(repository: Repository, branchName: string, branchStartPoint?: string): Promise + createBranch(repository: Repository, branchName: string): Promise /** * Switches branches or restores working tree files. diff --git a/packages/hg/src/node/hg-impl.ts b/packages/hg/src/node/hg-impl.ts index c95a6502941ba..0807a5566972b 100644 --- a/packages/hg/src/node/hg-impl.ts +++ b/packages/hg/src/node/hg-impl.ts @@ -270,8 +270,8 @@ export class HgImpl implements Hg { } - async createBranch(repository: Repository, branchName: string, branchStartPoint?: string): Promise { - throw Error('not implemented yet'); + async createBranch(repository: Repository, branchName: string): Promise { + await this.runCommand(repository, ['branch', branchName]); } async checkout(repository: Repository, options: Hg.Options.Checkout.CheckoutBranch | Hg.Options.Checkout.WorkingTreeFile): Promise { From 09d609991aa8d7738c3d1830682b57230fa190ca Mon Sep 17 00:00:00 2001 From: adriano-repetti Date: Wed, 13 Nov 2019 11:10:27 +0000 Subject: [PATCH 2/2] No need for `hg checkout` after `hg branch` --- packages/hg/src/browser/hg-quick-open-service.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/hg/src/browser/hg-quick-open-service.ts b/packages/hg/src/browser/hg-quick-open-service.ts index 29aec7a8465a0..6a1131b7b90c1 100644 --- a/packages/hg/src/browser/hg-quick-open-service.ts +++ b/packages/hg/src/browser/hg-quick-open-service.ts @@ -269,7 +269,6 @@ export class HgQuickOpenService { async () => { try { await hgQuickOpenService.hg.createBranch(repository, lookFor); - await hgQuickOpenService.hg.checkout(repository, { branch: lookFor }); } catch (error) { hgQuickOpenService.hgErrorHandler.handleError(error); }