From 3d6a552eb890c09099665da593f870e5bca1087f Mon Sep 17 00:00:00 2001 From: johnmanjiro13 Date: Thu, 6 Aug 2020 21:49:14 +0900 Subject: [PATCH 1/2] add --show-current option --- go/cmd/dolt/commands/branch.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/go/cmd/dolt/commands/branch.go b/go/cmd/dolt/commands/branch.go index dd8e2dffe3..54068103d0 100644 --- a/go/cmd/dolt/commands/branch.go +++ b/go/cmd/dolt/commands/branch.go @@ -68,6 +68,7 @@ const ( verboseFlag = "verbose" allFlag = "all" remoteFlag = "remote" + showCurrentFlag = "show-current" ) type BranchCmd struct{} @@ -100,6 +101,7 @@ func (cmd BranchCmd) createArgParser() *argparser.ArgParser { ap.SupportsFlag(verboseFlag, "v", "When in list mode, show the hash and commit subject line for each head") ap.SupportsFlag(allFlag, "a", "When in list mode, shows remote tracked branches") ap.SupportsFlag(remoteFlag, "r", "When in list mode, show only remote tracked branches. When with -d, delete a remote tracking branch.") + ap.SupportsFlag(showCurrentFlag, "", "Print the name of the current branch") return ap } @@ -125,6 +127,8 @@ func (cmd BranchCmd) Exec(ctx context.Context, commandStr string, args []string, return deleteForceBranches(ctx, dEnv, apr, usage) case apr.Contains(listFlag): return printBranches(ctx, dEnv, apr, usage) + case apr.Contains(showCurrentFlag): + return printCurrentBranch(ctx, dEnv) case apr.NArg() > 0: return createBranch(ctx, dEnv, apr, usage) default: @@ -202,6 +206,11 @@ func printBranches(ctx context.Context, dEnv *env.DoltEnv, apr *argparser.ArgPar return 0 } +func printCurrentBranch(ctx context.Context, dEnv *env.DoltEnv) int { + cli.Println(dEnv.RepoState.CWBHeadRef().GetPath()) + return 0 +} + func moveBranch(ctx context.Context, dEnv *env.DoltEnv, apr *argparser.ArgParseResults, usage cli.UsagePrinter) int { if apr.NArg() != 2 { usage() From 4b8778d0b0915abf12c8e8a1f400f665ee4fde43 Mon Sep 17 00:00:00 2001 From: johnmanjiro13 Date: Thu, 6 Aug 2020 22:12:08 +0900 Subject: [PATCH 2/2] remove ctx --- go/cmd/dolt/commands/branch.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/go/cmd/dolt/commands/branch.go b/go/cmd/dolt/commands/branch.go index 54068103d0..bfe0fd5cc9 100644 --- a/go/cmd/dolt/commands/branch.go +++ b/go/cmd/dolt/commands/branch.go @@ -128,7 +128,7 @@ func (cmd BranchCmd) Exec(ctx context.Context, commandStr string, args []string, case apr.Contains(listFlag): return printBranches(ctx, dEnv, apr, usage) case apr.Contains(showCurrentFlag): - return printCurrentBranch(ctx, dEnv) + return printCurrentBranch(dEnv) case apr.NArg() > 0: return createBranch(ctx, dEnv, apr, usage) default: @@ -206,7 +206,7 @@ func printBranches(ctx context.Context, dEnv *env.DoltEnv, apr *argparser.ArgPar return 0 } -func printCurrentBranch(ctx context.Context, dEnv *env.DoltEnv) int { +func printCurrentBranch(dEnv *env.DoltEnv) int { cli.Println(dEnv.RepoState.CWBHeadRef().GetPath()) return 0 }