github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-26 15:28:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

And test it with editor:checkout-head-revision

Browse Source
This commit is contained in:
Wliu
2017-11-17 23:32:53 +01:00
parent c61eb62b06
commit 47963ef2e5
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/workspace.js
View File

@@ -1990,25 +1990,22 @@ module.exports = class Workspace extends Model {
checkoutHeadRevision (editor) {
if (editor.getPath()) {
const checkoutHead = () => {
return this.project.repositoryForDirectory(new Directory(editor.getDirectoryPath()))
.then(repository => repository && repository.checkoutHeadForEditor(editor))
const checkoutHead = async () => {
const repository = await this.project.repositoryForDirectory(new Directory(editor.getDirectoryPath()))
if (repository) repository.checkoutHeadForEditor(editor)
}
if (this.config.get('editor.confirmCheckoutHeadRevision')) {
this.applicationDelegate.confirm({
message: 'Confirm Checkout HEAD Revision',
detailedMessage: `Are you sure you want to discard all changes to "${editor.getFileName()}" since the last Git commit?`,
buttons: {
OK: checkoutHead,
Cancel: null
}
buttons: ['OK', 'Cancel']
}, response => {
if (response === 0) checkoutHead()
})
} else {
return checkoutHead()
checkoutHead()
}
} else {
return Promise.resolve(false)
}
}
}