Skip to content
This repository has been archived by the owner on Dec 15, 2022. It is now read-only.

Re-introduce commit message template #1756

Merged
merged 46 commits into from
Nov 7, 2018
Merged

Re-introduce commit message template #1756

merged 46 commits into from
Nov 7, 2018

Commits on Oct 23, 2018

  1. Revert "Merge pull request #1754 from atom/revert-1713-feature/commit… 

    …-template"

This reverts commit c96687a, reversing
changes made to 4bc7fde.
    @kuychaco
    kuychaco committed Oct 23, 2018
    Configuration menu
    Copy the full SHA
    f5ccd16 View commit details
    Browse the repository at this point in the history

  2. 🎨 getCommitMessageFromTemplate tests. Return null if config not set 

    Co-Authored-By: Tilde Ann Thurium <annthurium@github.com>
    @kuychaco
    kuychaco and Tilde Ann Thurium committed Oct 23, 2018
    Configuration menu
    Copy the full SHA
    0a24012 View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2018

  1. Restore state from last commit only if undo is successful 

    Repro steps: 

open repo with merge conflict
click undo
see error (cannot do a soft reset in the middle of a merge)

expected: no change to commit message box
actual: commit message from last commit appears in box
    @kuychaco
    kuychaco committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    49a1d31 View commit details
    Browse the repository at this point in the history

  2. Pass events to observeFilesystemChange in order to use action property

    @kuychaco
    kuychaco committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    3ebda2f View commit details
    Browse the repository at this point in the history

  3. Update commit message after file system change for MERGE_HEAD or config

    @kuychaco
    kuychaco committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    b6ef6d2 View commit details
    Browse the repository at this point in the history

  4. 👕

    @kuychaco
    kuychaco committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    d895691 View commit details
    Browse the repository at this point in the history

  5. Load initial commit message based on template or merge state

    @kuychaco
    kuychaco committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    bcbbff8 View commit details
    Browse the repository at this point in the history

  6. 🎨 variable message -> template

    @kuychaco
    kuychaco committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    b8e55ab View commit details
    Browse the repository at this point in the history

  7. Don't set merge message in controller, now handled in repository

    @kuychaco
    kuychaco committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    ca10d13 View commit details
    Browse the repository at this point in the history

  8. Fix repo test now that we are passing events and not paths

    @kuychaco
    kuychaco committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    99fe542 View commit details
    Browse the repository at this point in the history

  9. WIP tests for CommitController

    @kuychaco
    kuychaco committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    40b015e View commit details
    Browse the repository at this point in the history

  10. Suppress repo update when typing commit message 

    See #1464 (for performance)
    @kuychaco
    kuychaco committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    ade7de8 View commit details
    Browse the repository at this point in the history

  11. Don't trim commit message template 

    It's best to assume that template users craft their template exactly as they want it. For example, I have two empty lines at the beginning of mine so that I can quickly type my message.
    @kuychaco
    kuychaco committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    7c18ddb View commit details
    Browse the repository at this point in the history

  12. 🎨 rename getCommitMessageFromTemplate to getCommitMessageTemplate

    @kuychaco
    kuychaco committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    7a73138 View commit details
    Browse the repository at this point in the history

  13. Enable commit button only if message contains non-comment lines

    @kuychaco
    kuychaco committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    b16525c View commit details
    Browse the repository at this point in the history

  14. Set cursor to beginning of commit message template 

    We don't want it to be at the end
    @kuychaco
    kuychaco committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    b3cc2c3 View commit details
    Browse the repository at this point in the history

  15. Reset commit message after a successful abort triggered through the UI 

    According to @smashwilson
> it may be worth triggering some of that behavior manually if a user aborts (or, eventually, initiates) a merge through our UI. in terms of reliability - on all three platforms there is some risk of dropped events that increases with the number of events that arrive in quick succession (like if a ton of files are created at once). merges in huge repositories _might_ trigger this but it shouldn't be common.

Co-Authored-By: Ash Wilson <smashwilson@gmail.com>
    @kuychaco @smashwilson
    kuychaco and smashwilson committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    5a7b2d4 View commit details
    Browse the repository at this point in the history

  16. Add repository tests for commit message updating due to file system e… 

    …vents
    @kuychaco
    kuychaco committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    b3588ef View commit details
    Browse the repository at this point in the history

  17. Trim message before checking if clean

    @kuychaco
    kuychaco committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    4a1525b View commit details
    Browse the repository at this point in the history

  18. 🔥 merge message tests in CommitController (now handled in repo)

    @kuychaco
    kuychaco committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    2c2857e View commit details
    Browse the repository at this point in the history

  19. Fix WorkdirContext test

    @kuychaco
    kuychaco committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    f780ad1 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2018

  1. Fix CommitController tests 

    Co-Authored-By: Matt <mattmattmatt@users.noreply.github.com>
    @kuychaco @mattmattmatt
    kuychaco and mattmattmatt committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    5ee83db View commit details
    Browse the repository at this point in the history

  2. 🔥 commit-template test fixture

    @kuychaco
    kuychaco committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    6e45f0c View commit details
    Browse the repository at this point in the history

  3. Clean up cloneRepository 

    We don't want to be setting up a commit template for every single test that runs. We do it locally for the tests that need it
    @kuychaco
    kuychaco committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    56d9f5e View commit details
    Browse the repository at this point in the history

  4. 🔥 comment 

    Co-Authored-By: Matt <mattmattmatt@users.noreply.github.com>
    @kuychaco @mattmattmatt
    kuychaco and mattmattmatt committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    d145084 View commit details
    Browse the repository at this point in the history

  5. Fix and clean up GitStrategies tests

    @kuychaco
    kuychaco committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    8a40a74 View commit details
    Browse the repository at this point in the history

  6. add comment explaining regex 

    Co-Authored-By: Katrina Uychaco <katrina@github.com>
    @kuychaco
    Tilde Ann Thurium and kuychaco committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    63ffa69 View commit details
    Browse the repository at this point in the history

  7. cleanup some dead code 

    Co-Authored-By: Katrina Uychaco <katrina@github.com>
    @kuychaco
    Tilde Ann Thurium and kuychaco committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    c15f1d0 View commit details
    Browse the repository at this point in the history

  8. add comment about isValidMessage regex 

    Co-Authored-By: Katrina Uychaco <katrina@github.com>
    @kuychaco
    Tilde Ann Thurium and kuychaco committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    fd1d1cf View commit details
    Browse the repository at this point in the history

  9. 🔥 unused dependencies. 

    Co-Authored-By: Katrina Uychaco <katrina@github.com>
    @kuychaco
    Tilde Ann Thurium and kuychaco committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    3d94405 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2018

  1. Merge branch 'master' into pr-1756/atom/ku-tt-commit-msg-template 

    Co-Authored-By: Katrina Uychaco <katrina@github.com>
    @kuychaco
    Tilde Ann Thurium and kuychaco committed Oct 26, 2018
    Configuration menu
    Copy the full SHA
    acf502c View commit details
    Browse the repository at this point in the history

  2. test merged changes + cleanup 

    Co-Authored-By: Katrina Uychaco <katrina@github.com>
    @kuychaco
    Tilde Ann Thurium and kuychaco committed Oct 26, 2018
    Configuration menu
    Copy the full SHA
    9b606ba View commit details
    Browse the repository at this point in the history

  3. fix issue with setting cursor buffer position 

    This only works for commit message templates where every line starts 
with a #.  We explored using isCommitMessageClean to try and handle 
commit message templates that have uncommented lines.  We're not calling 
didUpdate every time the commit message is updated, so it's out of sync, 
and we decided it was getting too edge casey out there.

Co-Authored-By: Katrina Uychaco <katrina@github.com>
    @kuychaco
    Tilde Ann Thurium and kuychaco committed Oct 26, 2018
    Configuration menu
    Copy the full SHA
    6379f30 View commit details
    Browse the repository at this point in the history

  4. Retry flakey file patch test

    @kuychaco
    kuychaco committed Oct 26, 2018
    Configuration menu
    Copy the full SHA
    d331372 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2018

  1. extract regex and give it a better name 

    Co-Authored-By: Katrina Uychaco <katrina@github.com>
    @kuychaco
    Tilde Ann Thurium and kuychaco committed Oct 29, 2018
    Configuration menu
    Copy the full SHA
    13e7342 View commit details
    Browse the repository at this point in the history

  2. rename getCommitMessageTemplate to fetchCommitMessageTemplate 

    Co-Authored-By: Katrina Uychaco <katrina@github.com>
    @kuychaco
    Tilde Ann Thurium and kuychaco committed Oct 29, 2018
    Configuration menu
    Copy the full SHA
    218f193 View commit details
    Browse the repository at this point in the history

  3. extract filePathEndsWith into helper function

    Tilde Ann Thurium committed Oct 29, 2018
    Configuration menu
    Copy the full SHA
    e2cc423 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2018

  1. Extract wireUpObserver and expectEvents to test helpers file 

    Co-Authored-By: Tilde Ann Thurium <annthurium@github.com>
    @kuychaco
    kuychaco and Tilde Ann Thurium committed Oct 30, 2018
    Configuration menu
    Copy the full SHA
    b3c9ec7 View commit details
    Browse the repository at this point in the history

  2. Access local config in spec mode 

    Tests were failing because my global config was being used to look up the commit template
    @kuychaco
    kuychaco committed Oct 30, 2018
    Configuration menu
    Copy the full SHA
    37fbb44 View commit details
    Browse the repository at this point in the history

  3. Don't break snapshotting by accessing atom in global scope 

    Co-Authored-By: Ash Wilson <smashwilson@gmail.com>
    @kuychaco @smashwilson
    kuychaco and smashwilson committed Oct 30, 2018
    Configuration menu
    Copy the full SHA
    6299ae2 View commit details
    Browse the repository at this point in the history

  4. Test flakes

    @kuychaco
    kuychaco committed Oct 30, 2018
    Configuration menu
    Copy the full SHA
    8aaf2ac View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/master' into ku-tt-commit-msg-te… 

    …mplate
    @kuychaco
    kuychaco committed Oct 30, 2018
    Configuration menu
    Copy the full SHA
    e8e39db View commit details
    Browse the repository at this point in the history

  6. Retry file-patch test flakes

    @kuychaco
    kuychaco committed Oct 30, 2018
    Configuration menu
    Copy the full SHA
    3e1cb40 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2018

  1. handle case where template is unset

    Tilde Ann Thurium committed Nov 6, 2018
    Configuration menu
    Copy the full SHA
    a87b3a4 View commit details
    Browse the repository at this point in the history

  2. add unit test for unsetting commit template

    Tilde Ann Thurium committed Nov 6, 2018
    Configuration menu
    Copy the full SHA
    6f88f76 View commit details
    Browse the repository at this point in the history

  3. address code review feedback.

    Tilde Ann Thurium committed Nov 6, 2018
    Configuration menu
    Copy the full SHA
    4e400bd View commit details
    Browse the repository at this point in the history