New actions for GitCommitBear #2927

akshatkarani · 2019-06-19T12:48:01Z

This adds two new actions for GitCommitBear:

AddNewlineAction: This adds a newline between shortlog and body of the commit message.
EditCommitMessageAction: Open an editor in which user can edit the commit message

This also modifies CommitBear.py to pass these actions when Result is yielded.

Temp changes for travis commit is temporary commit because this PR depends on coala/coala#6029

akshatkarani · 2019-06-19T17:27:47Z

bears/actions/AddNewlineAction.py

+        Add (N)ewline
+        """
+        new_commit_message = '{}\n\n{}'.format(self.shortlog, self.body)
+        command = 'git commit --amend -m "{}"'.format(new_commit_message)


@abhishalya I think git commit --amend also adds the staged changes. This is not good. Any alternatives?

I guess git rebase would do then.

Have a look at this. Even rebase is not ideal if someone is using your commits.

ping @Vamshi99 @kriti21

Yeah, but here we are expecting the user to change the commit message. If the commit is not pushed doing rebase is just fine.

Maybe we can warn that history will be rewritten action is applied.

Yeah, a warning message would be good 👍

I guess git rebase would do then.

git rebase doesn't run when there are unstaged or uncommitted changes.

git commit --amend -o will do the job.

bears/vcs/CommitBear.py

bears/vcs/actions/AddNewlineAction.py

akshatkarani · 2019-06-30T12:20:33Z

EditCommitMessageAction and AddNewlineAction in action

akshatkarani · 2019-07-05T16:21:35Z

bears/vcs/actions/AddNewlineAction.py

+                      original_file_dict,
+                      file_diff_dict,
+                      applied_actions=()):
+        new_message, _ = run_shell_command('git log -1 --pretty=%B')


User can first apply EditCommitMessageAction and change the commit message, so to check if AddNewlineAction is applicable or not, commit message is extracted first.

akshatkarani · 2019-07-21T11:42:37Z

Travis is failing because it depends on coala/coala#6029

abhishalya · 2019-07-21T12:59:42Z

Yeah, please add the coala requirement as your branch.

abhishalya · 2019-07-21T13:06:04Z

Yeah, please add the coala requirement as your branch.

Btw this is only temporary, to check if the changes work fine.

akshatkarani · 2019-07-21T15:27:04Z

Yeah, please add the coala requirement as your branch.

I made these changes, am I doing something wrong because the first travis job is failing because of some weird reason but it was passing before.

abhishalya · 2019-07-21T15:40:00Z

You can ignore the first job of Sentinel since it fails for moban. But, the rest should pass... Looks like a breaking test.

abhishalya · 2019-07-21T15:44:17Z

Btw, I think the rest of the jobs would stop if Sentinel fails (which it would eventually since the first one would fail due to moban) so instead of restarting those you can also make relevant changes to travis.

akshatkarani · 2019-07-21T15:45:54Z

Look at the error of the second build. This is because the changes in coala/coala#6029 are not there yet.

abhishalya · 2019-07-21T15:49:51Z

coala is being installed correctly there from your branch, let me try this out locally

abhishalya · 2019-07-21T16:11:45Z

@akshatkarani This seems to be the problem...

akshatkarani · 2019-07-22T07:24:01Z

Removed the first sentinel build, now only one build is failing and the error is the same.

akshatkarani · 2019-07-22T11:52:10Z

Okay build is passing with these temporary changes.

abhishalya · 2019-07-22T13:00:52Z

Nice, (since other mentors aren't active) give me some time to check this (and the core changes) in more detail.

abhishalya · 2019-08-11T15:06:29Z

Ping @Makman2

Makman2 · 2019-08-13T14:22:14Z

What about the temp-commit? ;)
I would expect in the commit for AddNewlineAction to just do stuff with this action only, not mixing with EditCommitMessageAction. Please properly separate into the commits 👍

akshatkarani · 2019-08-13T14:36:13Z

What about the temp-commit? ;)

This PR depends on coala/coala#6029, so for builds to pass this commit has been added. Once that PR is merged it can be removed.

I would expect in the commit for AddNewlineAction to just do stuff with this action only, not mixing with EditCommitMessageAction. Please properly separate into the commits +1

Yes, I will.

akshatkarani · 2019-08-14T06:24:45Z

@Makman2 I have separated the commits properly.
Also some comments you made on commits have been lost because I amended them, link to it

abhishalya · 2019-08-25T12:57:02Z

Temp commit not required now, also needs rebase.

akshatkarani · 2019-08-25T14:04:31Z

Temp commit not required now

This PR still depends on coala/coala#6029 😕

abhishalya · 2019-09-04T08:32:17Z

#2855 seems related to moban sync. Also, the commit should be a part of separate PR.

akshatkarani · 2019-09-07T11:02:38Z

#2855 seems related to moban sync.

Looks pretty old, idk what the rest of changes are for.

Also, the commit should be a part of separate PR.

Okay, #2957

This adds a new action for GitCommitBear. When applied it opens up a editor for user to edit commit message of the HEAD commit. This also makes changes is CommitBear.py to pass EditCommitMessageAction when Result is yielded.

This adds a new action which adds a newline between shortlog and body of commit message when applied. This also make changes in CommitBear.py to pass AddNewlineAction when Result is yielded.

abhishalya · 2021-03-26T17:13:55Z

Don't want to merge this until we have a green build here. coala-bears is already a bit messed up to add more changes. Will keep this back in my head though.

akshatkarani changed the title ~~AddNewlineAction.py: A new action for GitCommitBear~~ AddNewlineAction: A new action for GitCommitBear Jun 19, 2019

akshatkarani commented Jun 19, 2019

View reviewed changes

abhishalya requested changes Jun 20, 2019

View reviewed changes

bears/vcs/CommitBear.py Outdated Show resolved Hide resolved

bears/vcs/CommitBear.py Outdated Show resolved Hide resolved

bears/vcs/CommitBear.py Outdated Show resolved Hide resolved

akshatkarani force-pushed the add-newline-action branch 2 times, most recently from 775f5d0 to 31fff83 Compare June 20, 2019 15:06

akshatkarani commented Jun 20, 2019

View reviewed changes

bears/vcs/actions/AddNewlineAction.py Outdated Show resolved Hide resolved

akshatkarani force-pushed the add-newline-action branch 3 times, most recently from 8ecf188 to b17afae Compare June 25, 2019 14:26

akshatkarani mentioned this pull request Jun 25, 2019

cEP-0030: Next Generation Action System coala/cEPs#182

Merged

akshatkarani changed the title ~~AddNewlineAction: A new action for GitCommitBear~~ New actions for GitCommitBear Jun 25, 2019

akshatkarani force-pushed the add-newline-action branch 3 times, most recently from 51e9f5e to bd53589 Compare June 29, 2019 11:24

akshatkarani commented Jul 5, 2019

View reviewed changes

akshatkarani force-pushed the add-newline-action branch from bd53589 to 00a3374 Compare July 8, 2019 06:46

akshatkarani force-pushed the add-newline-action branch from 00a3374 to 26fad10 Compare July 21, 2019 10:57

akshatkarani force-pushed the add-newline-action branch from 26fad10 to 629bc53 Compare July 21, 2019 11:48

akshatkarani force-pushed the add-newline-action branch 2 times, most recently from f567bff to b15ec55 Compare July 21, 2019 16:35

jayvdb added the process/pending review label Jul 22, 2019

akshatkarani force-pushed the add-newline-action branch from b15ec55 to 4c5c866 Compare July 22, 2019 09:30

akshatkarani force-pushed the add-newline-action branch from 4c5c866 to 27b2e32 Compare August 7, 2019 09:29

akshatkarani force-pushed the add-newline-action branch 3 times, most recently from 8b28fcc to 675cc1e Compare August 13, 2019 15:25

akshatkarani force-pushed the add-newline-action branch from 675cc1e to 5b1a03c Compare August 25, 2019 14:05

akshatkarani force-pushed the add-newline-action branch 3 times, most recently from 24f27bc to d9a5df2 Compare September 4, 2019 07:01

akshatkarani force-pushed the add-newline-action branch from d9a5df2 to bc41a68 Compare September 7, 2019 09:23

akshatkarani force-pushed the add-newline-action branch from bc41a68 to 892e753 Compare September 8, 2019 05:06

akshatkarani added 2 commits March 26, 2021 19:55

EditCommitMessageAction: New action

b5d46ec

This adds a new action for GitCommitBear. When applied it opens up a editor for user to edit commit message of the HEAD commit. This also makes changes is CommitBear.py to pass EditCommitMessageAction when Result is yielded.

AddNewlineAction: New action for GitCommitBear

7ffaabe

This adds a new action which adds a newline between shortlog and body of commit message when applied. This also make changes in CommitBear.py to pass AddNewlineAction when Result is yielded.

akshatkarani force-pushed the add-newline-action branch from 892e753 to 7ffaabe Compare March 26, 2021 14:25

akshatkarani requested a review from abhishalya March 26, 2021 16:27

abhishalya added status/blocked and removed process/pending review labels Mar 26, 2021

New actions for GitCommitBear #2927

Are you sure you want to change the base?

New actions for GitCommitBear #2927

Uh oh!

Conversation

akshatkarani commented Jun 19, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

akshatkarani Jun 19, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

abhishalya Jun 20, 2019

Choose a reason for hiding this comment

Uh oh!

akshatkarani Jun 20, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

akshatkarani Jun 20, 2019

Choose a reason for hiding this comment

Uh oh!

abhishalya Jun 20, 2019

Choose a reason for hiding this comment

Uh oh!

akshatkarani Jun 20, 2019

Choose a reason for hiding this comment

Uh oh!

abhishalya Jun 20, 2019

Choose a reason for hiding this comment

Uh oh!

akshatkarani Jun 22, 2019

Choose a reason for hiding this comment

Uh oh!

akshatkarani Jun 22, 2019

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

akshatkarani commented Jun 30, 2019

Uh oh!

akshatkarani Jul 5, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

akshatkarani commented Jul 21, 2019

Uh oh!

abhishalya commented Jul 21, 2019

Uh oh!

abhishalya commented Jul 21, 2019

Uh oh!

akshatkarani commented Jul 21, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

abhishalya commented Jul 21, 2019

Uh oh!

abhishalya commented Jul 21, 2019

Uh oh!

akshatkarani commented Jul 21, 2019

Uh oh!

abhishalya commented Jul 21, 2019

Uh oh!

abhishalya commented Jul 21, 2019

Uh oh!

akshatkarani commented Jul 22, 2019

Uh oh!

akshatkarani commented Jul 22, 2019

Uh oh!

abhishalya commented Jul 22, 2019

Uh oh!

abhishalya commented Aug 11, 2019

Uh oh!

Makman2 commented Aug 13, 2019

Uh oh!

akshatkarani commented Aug 13, 2019

Uh oh!

akshatkarani commented Aug 14, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

akshatkarani commented Jun 19, 2019 •

edited

Loading

akshatkarani Jun 19, 2019 •

edited

Loading

akshatkarani Jun 20, 2019 •

edited

Loading

akshatkarani Jul 5, 2019 •

edited

Loading

akshatkarani commented Jul 21, 2019 •

edited

Loading

akshatkarani commented Aug 14, 2019 •

edited

Loading