Edit commit message in editor #896

kuychaco · 2017-05-31T14:52:16Z

Fixes #818

TODO:

add commit grammar
activate commit editor if already open
add tests
obscure commit box when editor is open
- per @BinaryMuse suggestion:

If the user has the file expanded, I'd love to gray out the box or display a little overlay with an informational message. If the user clicks it (or the arrow or something) again, it'd find and focus that buffer in the workspace center. Then if the editor is closed, we re-read the text and turn it back on.

add command
add context menu
add button somewhere
check if file is unsaved
handle case where commit box is empty and commit button is disabled
handle splitting commit message file into multiple panes and closing the original
delete file after committing
toggle the expanded editor instead of "revealing" it
prompt to save before destroying editor

kuychaco · 2017-06-01T12:32:07Z

Here's what I've got so far:

Could use some UX help around where to put a button to open the editor, and what to do to obscure the commit box when the editor is open. Right now I just hide the commit box using CSS. @simurai @BinaryMuse mind if I ask for your help implementing these?

…kage

simurai · 2017-06-01T15:25:13Z

Added a subtle "expand" button:

If the user clicks it (or the arrow or something) again, it'd find and focus that buffer in the workspace center. Then if the editor is closed, we re-read the text and turn it back on.

Maybe like this:

Or rather than "find the expanded commit message", it could close it instead and open the small one again? Then it would be more like a toggle:

simurai · 2017-06-02T00:54:13Z

@kuychaco Ok, added the expanded styles. Still needs wiring up:

On github-CommitView-editor replace hidden class with is-expanded
Make the expand button clickable
Optional: Move the text into the <button> element. Currently it's just a pseudo element.

simurai · 2017-06-03T00:45:41Z

Wire up button

Nice!

Do you like the behaviour? I still think it should toggle the expanded editor instead of "revealing" it.

kuychaco · 2017-06-07T17:40:26Z

I still think it should toggle the expanded editor instead of "revealing" it.

Agreed 👍

BinaryMuse

One thought, otherwise 👍 . Like the UX here.

BinaryMuse · 2017-06-07T21:56:08Z

test/controllers/commit-view-controller.test.js

+
+        sinon.spy(controller.refs.commitView, 'update');
+        editor.destroy();
+        await assert.async.isTrue(controller.refs.commitView.update.called);


🤔 I wonder if this line's intention would be more clear as await until(() => controller.refs.commitView.update.called)

BinaryMuse · 2017-06-07T22:02:42Z

test/views/commit-view.test.js

@@ -41,45 +41,53 @@ describe('CommitView', function() {
    });
  });

-  it('displays the remaining characters limit based on which line is being edited', async function() {
+  it.only('displays the remaining characters limit based on which line is being edited', async function() {


Not sure if this is just here for debugging but 🔥

smashwilson · 2017-06-13T14:28:52Z

🎉

atomi · 2017-08-08T17:16:18Z

Can we get a shortcut to git push after committing the git message. Something like ctrl+shift+p?

BinaryMuse · 2017-08-08T17:32:41Z

@atomi There's already a keybind for the Push command; you can see it by looking next to the "GitHub: Push" command in the command palette, and you can always bind your own keybind if you don't like the included one. See http://flight-manual.atom.io/behind-atom/sections/keymaps-in-depth/ for more.

atomi · 2017-08-08T18:28:33Z

@BinaryMuse Thank you for the fast reply! I was thinking more along the lines of a quick push while within the commit input similar to git gui a commit would be ctrl+enter and a push would be something like ctrl+p all within the git commit input.

edit: though i understand ctrl+p and ctrl+shift+p might not make sense here another option is fine with me alt+crtl+p perhaps

kuychaco added the work-in-progress label May 31, 2017

kuychaco added 2 commits June 1, 2017 13:20

Open commit message editor

6044252

Use git commit grammar

adef1e7

kuychaco force-pushed the ku-commit-msg-editor branch from 4c8083c to a8b805d Compare June 1, 2017 11:23

Add context menu item "Edit Commit Message in Editor"

11ee268

kuychaco force-pushed the ku-commit-msg-editor branch 2 times, most recently from de98744 to d79407e Compare June 1, 2017 12:27

Activate commit message editor if already open

50d9ddf

kuychaco force-pushed the ku-commit-msg-editor branch from d79407e to 50d9ddf Compare June 1, 2017 12:27

kuychaco and others added 3 commits June 1, 2017 15:28

Apply git grammar if language-git package is activated after this pac…

7981909

…kage

Add tests

8172e7d

Add expand button

6b7762a

Add expanded styles

bf69ee7

kuychaco and others added 2 commits June 2, 2017 12:37

Merge branch 'master' into ku-commit-msg-editor

86b2f81

Wire up button and @simurai's styles ✨

e84a15c

kuychaco and others added 11 commits June 5, 2017 17:41

Pass down grammar registry as prop

b748ff5

🎨 remove unnecessary flag this.deactivateCommitBox

819184d

🎨 Move commit tests into commit describe block

d66bf93

Fix commit grammar test

91d3a83

🎨 move test

02f33a9

Commit from ATOM_COMMIT_EDITMSG file while commit editor is open

2431240

Delete ATOM_COMMIT_EDITMSG file after committing

43048dd

🎨 CommitViewController tests

e033ec2

Reveal commit box only when last editor is closed

ea32a4e

Ask user to confirm if commit editor has unsaved changes

8706c64

Merge branch 'master' into ku-commit-msg-editor

b5a7cb8

kuychaco and others added 3 commits June 7, 2017 12:26

Fix tests that I broke

2cc163e

Toggle commit editor open and close

358b5f1

Merge branch 'master' into ku-commit-msg-editor

6828bc1

kuychaco requested a review from BinaryMuse June 7, 2017 21:37

kuychaco force-pushed the ku-commit-msg-editor branch from 72b8d1d to 6828bc1 Compare June 7, 2017 22:02

BinaryMuse approved these changes Jun 7, 2017

View reviewed changes

kuychaco and others added 3 commits June 7, 2017 15:51

Use until to make test more readable

dea2e09

🔥 @autoBind that was causing sinon stub to fail

481229d

Merge branch 'master' into ku-commit-msg-editor

ecf4680

kuychaco merged commit 6046c1f into master Jun 13, 2017

kuychaco deleted the ku-commit-msg-editor branch June 13, 2017 00:53

BinaryMuse mentioned this pull request Jul 5, 2017

⬆ [email protected] atom/atom#14959

Merged

BinaryMuse mentioned this pull request Aug 1, 2017

Hotfix from v0.3.3 #1073

Closed

25 tasks

smashwilson removed the work-in-progress label May 1, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Edit commit message in editor #896

Edit commit message in editor #896

Uh oh!

kuychaco commented May 31, 2017 •

edited

Loading

Uh oh!

kuychaco commented Jun 1, 2017

Uh oh!

simurai commented Jun 1, 2017 •

edited

Loading

Uh oh!

simurai commented Jun 2, 2017

Uh oh!

simurai commented Jun 3, 2017

Uh oh!

kuychaco commented Jun 7, 2017

Uh oh!

BinaryMuse left a comment

Uh oh!

BinaryMuse Jun 7, 2017

Uh oh!

BinaryMuse Jun 7, 2017

Uh oh!

smashwilson commented Jun 13, 2017

Uh oh!

atomi commented Aug 8, 2017

Uh oh!

BinaryMuse commented Aug 8, 2017

Uh oh!

atomi commented Aug 8, 2017 •

edited

Loading

Uh oh!

Uh oh!

Edit commit message in editor #896

Edit commit message in editor #896

Uh oh!

Conversation

kuychaco commented May 31, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kuychaco commented Jun 1, 2017

Uh oh!

simurai commented Jun 1, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

simurai commented Jun 2, 2017

Uh oh!

simurai commented Jun 3, 2017

Uh oh!

kuychaco commented Jun 7, 2017

Uh oh!

BinaryMuse left a comment

Choose a reason for hiding this comment

Uh oh!

BinaryMuse Jun 7, 2017

Choose a reason for hiding this comment

Uh oh!

BinaryMuse Jun 7, 2017

Choose a reason for hiding this comment

Uh oh!

smashwilson commented Jun 13, 2017

Uh oh!

atomi commented Aug 8, 2017

Uh oh!

BinaryMuse commented Aug 8, 2017

Uh oh!

atomi commented Aug 8, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

kuychaco commented May 31, 2017 •

edited

Loading

simurai commented Jun 1, 2017 •

edited

Loading

atomi commented Aug 8, 2017 •

edited

Loading