Skip to content

add --apply to cherry-pick the result rather than logging it #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

add --apply to cherry-pick the result rather than logging it #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions branch-diff.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,30 @@ function diffCollected (options, branchCommits, callback) {
}


function applyCommits (list, bail) {
const cp = require('child_process')

let i = list.length
while (i--) {
const commit = list[i]
const out = cp.spawnSync('git', ['cherry-pick', commit.sha])

if (out.status === 0) {
continue
}

const cleanup = cp.spawnSync('git', ['cherry-pick', '--abort'])
if (cleanup.status !== 0) {
console.error('Error resetting git, bailing.')
return
}

console.log(`${bail ? 'Bailing' : 'Skipping'}: Could not apply ${commit.sha.slice(0, 7)}... ${commit.summary}`)
if (bail) return
}
}


function printCommits (list, simple) {
list = list.map((commit) => commitToOutput(commit, simple, ghId))

Expand Down Expand Up @@ -134,6 +158,7 @@ if (require.main === module) {
, endRef = argv['end-ref']
, excludeLabels = []
, options
, bail = argv.bail

if (argv['patch-only'])
excludeLabels = [ 'semver-minor', 'semver-major' ]
Expand All @@ -149,6 +174,11 @@ if (require.main === module) {
if (err)
throw err

if (argv.apply) {
applyCommits(list, bail)
return
}

printCommits(list, simple)
})
}