Skip to content

BREAKING: Convert sync methods to async methods #1348

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

Merged
implausible merged 14 commits into from
Aug 16, 2017
Merged

BREAKING: Convert sync methods to async methods #1348

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
945b09d
Convert git_status_file to an async method
cjhoward92 Aug 2, 2017
54a2786
removed comments
Aug 2, 2017
89c3489
BREAKING: Made Merge.merge async
Aug 8, 2017
9927174
updated rebase.commit to be async
Aug 8, 2017
0f38993
Converted rebase abort to async
mohseenrm Aug 9, 2017
766d3dd
Fixed error in continueRebase
Aug 9, 2017
7e65c09
fixed linter error
Aug 10, 2017
6ded1d2
converted commit amend to async
mohseenrm Aug 10, 2017
63f4db0
Converting git_reflog_write to async
mohseenrm Aug 10, 2017
080e8aa
babel cli fix for travis
mohseenrm Aug 11, 2017
34a9e59
Reverted unnecessary babel changes.
Aug 14, 2017
2e32eeb
Fixed status_file special case
Aug 15, 2017
f39bf86
removed old callback style code
Aug 15, 2017
3b54899
Formatting; removed unnecessary return of 0
Aug 15, 2017
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
8 changes: 6 additions & 2 deletions lib/repository.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,9 +449,13 @@ Repository.prototype.continueRebase = function(
})
.then(function(_rebase) {
rebase = _rebase;
return rebase.commit(null, signature);
return rebase.commit(null, signature)
.catch(function() {
// we are ignoring errors. This is to prevent issues caused by making this async

@rcjsuen rcjsuen Aug 10, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What are these errors that we are supposedly ignoring?

@cjhoward92 cjhoward92 Aug 10, 2017

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All of them. The original synchronous method would ignore the libgit2 result and just return the Oid. We ran into issues with this change when rebasing as the EAPPLIED error is sometimes thrown when a patch is already applied. Because we switched to the asynchronous pattern the code now throws instead of returning a null Oid. This caused rebase operations to halt when trying to continue rebase in some scenarios.

return 0;
});
})
.then(function(oid) {
.then(function() {
return performRebase(
repo,
rebase,
Expand Down