Merge pull request #1754 from atom/revert-1713-feature/commit-template

Revert "Feature: Add commit template support"

Author: kuychaco

lib/get-repo-pipeline-manager.js

@@ -210,8 +210,7 @@ export default function({confirm, notificationManager, workspace}) {
   commitPipeline.addMiddleware('failed-to-commit-error', async (next, repository) => {
     try {
       const result = await next();
-      const message = await repository.getCommitMessageFromTemplate();
-      repository.setCommitMessage(message || '');
+      repository.setCommitMessage('');
       destroyFilePatchPaneItems({onlyStaged: true}, workspace);
       return result;
     } catch (error) {

lib/git-shell-out-strategy.js

@@ -415,33 +415,6 @@ export default class GitShellOutStrategy {
     return this.exec(args, {writeOperation: true});
   }
 
-  async getCommitMessageFromTemplate() {
-    let templatePath = await this.getConfig('commit.template');
-    if (!templatePath) {
-      return '';
-    }
-
-    /**
-     * Get absolute path from git path
-     * https://git-scm.com/docs/git-config#git-config-pathname
-     */
-    const homeDir = os.homedir();
-    const regex = new RegExp('^~([^/]*)/');
-    templatePath = templatePath.trim().replace(regex, (_, user) => {
-      return `${user ? path.join(path.dirname(homeDir), user) : homeDir}/`;
-    });
-
-    if (!path.isAbsolute(templatePath)) {
-      templatePath = path.join(this.workingDir, templatePath);
-    }
-
-    if (!await fileExists(templatePath)) {
-      return '';
-    }
-    const message = await fs.readFile(templatePath, {encoding: 'utf8'});
-    return message.trim();
-  }
-
   unstageFiles(paths, commit = 'HEAD') {
     if (paths.length === 0) { return Promise.resolve(null); }
     const args = ['reset', commit, '--'].concat(paths.map(toGitPathSep));

lib/models/repository-states/present.js

@@ -41,7 +41,6 @@ export default class Present extends State {
     this.operationStates = new OperationStates({didUpdate: this.didUpdate.bind(this)});
 
     this.commitMessage = '';
-    this.setCommitMessageFromTemplate();
 
     if (history) {
       this.discardHistory.updateHistory(history);
@@ -56,19 +55,6 @@ export default class Present extends State {
     return this.commitMessage;
   }
 
-  async setCommitMessageFromTemplate() {
-    const message = await this.getCommitMessageFromTemplate();
-    if (!message) {
-      return;
-    }
-    this.setCommitMessage(message);
-    this.didUpdate();
-  }
-
-  async getCommitMessageFromTemplate() {
-    return await this.git().getCommitMessageFromTemplate();
-  }
-
   getOperationStates() {
     return this.operationStates;
   }

lib/models/repository-states/state.js

@@ -373,10 +373,6 @@ export default class State {
     return '';
   }
 
-  getCommitMessageFromTemplate() {
-    return unsupportedOperationPromise(this, 'getCommitMessageFromTemplate');
-  }
-
   // Cache
 
   getCache() {

lib/models/repository.js

@@ -358,7 +358,6 @@ const delegates = [
 
   'setCommitMessage',
   'getCommitMessage',
-  'getCommitMessageFromTemplate',
   'getCache',
 ];
 

test/controllers/commit-controller.test.js

@@ -60,9 +60,6 @@ describe('CommitController', function() {
     const repository1 = await buildRepository(workdirPath1);
     const workdirPath2 = await cloneRepository('three-files');
     const repository2 = await buildRepository(workdirPath2);
-    const workdirPath3 = await cloneRepository('commit-template');
-    const repository3 = await buildRepository(workdirPath3);
-    const templateCommitMessage = await repository3.git.getCommitMessageFromTemplate();
 
     app = React.cloneElement(app, {repository: repository1});
     const wrapper = shallow(app, {disableLifecycleMethods: true});
@@ -77,23 +74,8 @@ describe('CommitController', function() {
 
     wrapper.setProps({repository: repository1});
     assert.equal(wrapper.instance().getCommitMessage(), 'message 1');
-    wrapper.setProps({repository: repository3});
-    await assert.async.strictEqual(wrapper.instance().getCommitMessage(), templateCommitMessage);
   });
 
-
-  describe('when commit.template config is set', function() {
-    it('populates the commit message with the template', async function() {
-      const workdirPath = await cloneRepository('commit-template');
-      const repository = await buildRepository(workdirPath);
-      const templateCommitMessage = await repository.git.getCommitMessageFromTemplate();
-      app = React.cloneElement(app, {repository});
-      const wrapper = shallow(app, {disableLifecycleMethods: true});
-      await assert.async.strictEqual(wrapper.instance().getCommitMessage(), templateCommitMessage);
-    });
-  });
-
-
   describe('the passed commit message', function() {
     let repository;
 
@@ -158,21 +140,6 @@ describe('CommitController', function() {
       assert.strictEqual(repository.getCommitMessage(), '');
     });
 
-    it('reload the commit messages from commit template', async function() {
-      const repoPath = await cloneRepository('commit-template');
-      const repo = await buildRepositoryWithPipeline(repoPath, {confirm, notificationManager, workspace});
-      const templateCommitMessage = await repo.git.getCommitMessageFromTemplate();
-      const commitStub = sinon.stub().callsFake((...args) => repo.commit(...args));
-      const app2 = React.cloneElement(app, {repository: repo, commit: commitStub});
-
-      await fs.writeFile(path.join(repoPath, 'a.txt'), 'some changes', {encoding: 'utf8'});
-      await repo.git.exec(['add', '.']);
-
-      const wrapper = shallow(app2, {disableLifecycleMethods: true});
-      await wrapper.instance().commit('some message');
-      assert.strictEqual(repo.getCommitMessage(), templateCommitMessage);
-    });
-
     it('sets the verbatim flag when committing from the mini editor', async function() {
       await fs.writeFile(path.join(workdirPath, 'a.txt'), 'some changes', {encoding: 'utf8'});
       await repository.git.exec(['add', '.']);