frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add delete local branch option

Browse Source
This commit is contained in:
Nick O'Leary
2017-12-08 16:31:42 +00:00
parent d007623347
commit 27f1d3b704
6 changed files with 226 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
red/runtime/storage/localfilesystem/projects/git/index.js
View File

@@ -55,10 +55,9 @@ function runGitCommand(args,cwd,env) {
err.code = "git_local_overwrite";
} else if (/CONFLICT/.test(err.stdout)) {
err.code = "git_pull_merge_conflict";
} else if (/not fully merged/.test(stderr)) {
err.code = "git_delete_branch_unmerged";
}
return reject(err);
}
resolve(stdout);
@@ -276,8 +275,7 @@ function getBranches(cwd, remote) {
if (remote) {
args.push('-r');
}
//TODO: parse out ahead/behind status (currently m[5] vvv )
var branchRE = /^([ \*] )(\S+) +(\S+)(?: \[(\S+?)(?:: (.*))?\])? (.*)$/;
var branchRE = /^([ \*] )(\S+) +(\S+)(?: \[(\S+?)(?:: (?:ahead (\d+)(?:, )?)?(?:behind (\d+))?)?\])? (.*)$/;
return runGitCommand(args,cwd).then(function(output) {
var branches = [];
var lines = output.split("\n");
@@ -288,10 +286,13 @@ function getBranches(cwd, remote) {
branch = {
name: m[2],
remote: m[4],
status: m[5],
status: {
ahead: m[5]||0,
behind: m[6]||0,
},
commit: {
sha: m[3],
subject: m[6]
subject: m[7]
}
}
if (m[1] === '* ') {
@@ -516,6 +517,19 @@ module.exports = {
args.push(branchName);
return runGitCommand(args,cwd);
},
deleteBranch: function(cwd, branchName, isRemote, force) {
if (isRemote) {
throw new Error("Deleting remote branches not supported");
}
var args = ['branch'];
if (force) {
args.push('-D');
} else {
args.push('-d');
}
args.push(branchName);
return runGitCommand(args, cwd);
},
getBranchStatus: getBranchStatus,
addRemote: addRemote,
removeRemote: removeRemote