-
Notifications
You must be signed in to change notification settings - Fork 15
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add commit message merge functionality [Wrong branch] #192
Conversation
v3.0.2 -- Fix minor bug and change output file for showcase
Version 3.1.1 Merged-by: Claus Hunsen <[email protected]>
Version v3.1.2 Merged-by: Claus Hunsen <[email protected]>
Version v3.2 Merged-by: Claus Hunsen <[email protected]>
v3.3 Merged-by: Claus Hunsen <[email protected]>
v3.4 Merged-by: Thomas Bock <[email protected]>
Version 3.5 Reviewed-by: Claus Hunsen <[email protected]>
Version 3.6 Merged-by: Thomas Bock <[email protected]>
Version 3.7 Merged-by: Thomas Bock <[email protected]>
In order to test new functionality (i.e. the read.commit.messages function) new files containing test commit data were needed. Add two files containing messages corresponding to the test commit data that already exists. See se-sic#180 Signed-off-by: Niklas Schneider <[email protected]>
Add the read.commit.messages and create.empty.commits.list functions to util-read.R as well as a unit test to test the new functions. This allows to read 'commitMessages.list' files and return the commit data separated into message title and body. See se-sic#180 Signed-off-by: Niklas Schneider <[email protected]>
…reaks Discussion has shown that codeface separates lines with five spaces, not four. So the two test files have been modified to account for that fact. See discussion in se-sic#180 Signed-off-by: Niklas Schneider <[email protected]>
Change the line breaks in the expected output to \n's. See se-sic#180 Signed-off-by: Niklas Schneider <[email protected]>
Replace five spaces with \n, remove any white space at the beginning and the end of a commit message. See se-sic#180 Signed-off-by: Niklas Schneider <[email protected]>
… merge messages into data Get the commit messsage data using the new read function and merge either nothing, the title or message and title into the commit.data of the proj.conf instance. See se-sic#180 Signed-off-by: Niklas Schneider <[email protected]>
Add the new attribute "commit.messages" to the project configuration class with options "none", "title" and "message" to make it possible to specify what exactly of the commit message data is to be merged to the commit data. See se-sic#180 Signed-off-by: Niklas Schneider <[email protected]>
Signed-off-by: Niklas Schneider <[email protected]>
…tles Add two tests for testing the merge functionality for both full commit messages and titles only. Fix bug that merges message body instead of title when selecting option "title" See se-sic#180 Signed-off-by: Niklas Schneider <[email protected]>
Signed-off-by: Niklas Schneider <[email protected]>
Signed-off-by: Niklas Schneider <[email protected]>
Signed-off-by: Niklas Schneider <[email protected]>
Thanks for all the work and also for creating this pull request @nlschn. I did not yet have a look at your implementations, but I just had a look at the list of commits displayed in this pull request—and it seems that your changes are based on the wrong branch ( But before going into the details of that, one more comment on the merge conflict displayed here: GitHub still says that there is a conflict in And now back to the PR's branch: To base your changes onto the current Let me add one comment for @clhunsen: GitHub's dashboard looks weird to me. In today's activity feed, I can see a comment from you on this PR mentioning a log message, but this comment is not displayed in this PR—even clicking on the comment in my activity feed just brings me to the initial comment of this PR. Do you know what has happened to your comment? |
I did not want to resolve the conflict with this conflict button, because I didn't know if I this generated commit can be signed off. Thanks for your suggestions, I will try them out. |
Prerequisites
dev
.Description
In order to address issue #180 this PR adds functionality to read and process commit message data in "commitMessages.list" files. The first non-white-space line of the message is considered the title, the rest the body of the commit message.
This functionality can be found in "util-read.R"
The ability to merge the commit messages to the commit data is implemented in "set.commits" in "util-data.R" and a new attribute "commit.messages" has been added to "proj.conf" to control what data shall be merged.
For each new functionality tests are provided.
Changelog
commit.messages
inproj.conf
:none
is the default value and does not change the previous behavior ofproj.data$set.commits
.title
merges the commit message titles (i.e. the first non white space line of a commit message) to the commit data. This gives the data frame an additional columntitle
.messages
merges both titles and message bodies to the commit data frame. This adds two new columnstitle
andmessage.body
.