Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[WIP] Add --notes flag (rebased) #405

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[WIP] Add --notes flag (rebased) #405

wants to merge 3 commits into from

Conversation

aero31aero
Copy link

@aero31aero aero31aero commented Feb 11, 2021 •
edited
Loading

This is a rebased version of #383 that then goes on to implement some half-complete features after the last rebase.

Ugh, I really wish you hadn't rebased initially @joelostblom; I think I'm redoing some of what you did here.

Edit: renaming this to WIP because the straight up squashing didn't work here either and a lot of previous commits got squashed.... somehow.

@aero31aero aero31aero changed the title Add --notes flag (rebased) [WIP] Add --notes flag (rebased) Feb 11, 2021
@joelostblom
Copy link
Contributor

Sorry but I don't understand your comment. The original PR (#337) was out of sync with the master branch. You can't merge PRs that are out of sync with the branch you're merging them into, and often the best solution is to rebase. But you don't need to use my rebase if you think something was messed up there, you can start from #337 directly. I'm happy for this functionality to be added in any PR but glancing at your changes here, I don't understand why you have e.g. removed the addition of support for Python 3.8 and 3.9 from master and modified an additional 15 files compared to #383 .

@aero31aero
Copy link
Author

Hey, sorry I'm still trying to fight with git here. I just checked the history and it looks like the complications started before your last rebase, maybe due to merge commits? In fact, I see you merged master into the PR branch to sync them instead of rebase.

I'm somewhat more familiar with another style of updating PRs where we avoid merge commits in the PR branch, thus there's a linear history on top of the last commit from master. I'm sorry if I'm not able to understand the commit structure in this project and wrongly mentioned you here.

@aero31aero @prat0088 @joelostblom
Add 'notes' field to frames.
6d9c1e4 
This is a large commit that adds the following:

1. Syntax: `watson stop --notes "some additional information"`.
2. Print only non-empty notes in log.
3. Always pass id to `new_frame` so that the length of array with/without
   notes doesn't cause ambiguity.
4. Print a warning message and the existing note if overwriting a note.
5. Print notes in report.

Primary work here was done by the following people:

Co-authored-by: Tristan Pratt <prat0088@gmail.com>
Co-authored-by: Joel Ostblom <joelostblom@users.noreply.github.com>
@joelostblom
Copy link
Contributor

No worries and thanks for clarifying!

@jmaupetit
Copy link
Contributor

@aero31aero As you may have noticed, we now use a linear history and avoid merge commits. 😉

@aero31aero
Copy link
Author

Glad to know that. :D

BTW I just rebased this PR to latest master and I'm now fixing the tests. Is there any merge blocker here I should know of?

tommoyer added a commit to tommoyer/Watson that referenced this pull request Mar 9, 2023
@tommoyer @prat0088 @joelostblom
This commit ports jazzband#405 to df4b720
fa06572 
This is a large commit that adds the following:

1. Syntax: `watson stop --notes "some additional information"`.
2. Print only non-empty notes in log.
3. Always pass id to `new_frame` so that the length of array with/without
   notes doesn't cause ambiguity.
4. Print a warning message and the existing note if overwriting a note.
5. Print notes in report.
6. Print notes in `watson log`
7. Fixed tests

Primary work here was done by the following people:

Co-authored-by: Tristan Pratt <prat0088@gmail.com>
Co-authored-by: Joel Ostblom <joelostblom@users.noreply.github.com>
tommoyer added a commit to tommoyer/Watson that referenced this pull request Mar 9, 2023
@tommoyer @prat0088 @joelostblom
This commit ports jazzband#405 to df4b720
846ae5d 
This is a large commit that adds the following:

1. Syntax: `watson stop --notes "some additional information"`.
2. Print only non-empty notes in log.
3. Always pass id to `new_frame` so that the length of array with/without
   notes doesn't cause ambiguity.
4. Print a warning message and the existing note if overwriting a note.
5. Print notes in report.
6. Print notes in `watson log`
7. Fixed tests

Primary work here was done by the following people:

Co-authored-by: Tristan Pratt <prat0088@gmail.com>
Co-authored-by: Joel Ostblom <joelostblom@users.noreply.github.com>
tommoyer added a commit to tommoyer/Watson that referenced this pull request Mar 9, 2023
@tommoyer @prat0088 @joelostblom
This commit ports jazzband#405 to df4b720
72077f7 
This is a large commit that adds the following:

1. Syntax: `watson stop --notes "some additional information"`.
2. Print only non-empty notes in log.
3. Always pass id to `new_frame` so that the length of array with/without
   notes doesn't cause ambiguity.
4. Print a warning message and the existing note if overwriting a note.
5. Print notes in report.
6. Print notes in `watson log`
7. Fixed tests

Primary work here was done by the following people:

Co-authored-by: Tristan Pratt <prat0088@gmail.com>
Co-authored-by: Joel Ostblom <joelostblom@users.noreply.github.com>
tommoyer added a commit to tommoyer/Watson that referenced this pull request Mar 9, 2023
@tommoyer @prat0088 @joelostblom
This commit ports jazzband#405 to df4b720
104374d 
This is a large commit that adds the following:

1. Syntax: `watson stop --notes "some additional information"`.
2. Print only non-empty notes in log.
3. Always pass id to `new_frame` so that the length of array with/without
   notes doesn't cause ambiguity.
4. Print a warning message and the existing note if overwriting a note.
5. Print notes in report.
6. Print notes in `watson log`
7. Fixed tests

Primary work here was done by the following people:

Co-authored-by: Tristan Pratt <prat0088@gmail.com>
Co-authored-by: Joel Ostblom <joelostblom@users.noreply.github.com>
tommoyer added a commit to tommoyer/Watson that referenced this pull request Mar 29, 2023
@tommoyer @prat0088 @joelostblom
This commit ports jazzband#405 to df4b720
0fbbcc8 
This is a large commit that adds the following:

1. Syntax: `watson stop --notes "some additional information"`.
2. Print only non-empty notes in log.
3. Always pass id to `new_frame` so that the length of array with/without
   notes doesn't cause ambiguity.
4. Print a warning message and the existing note if overwriting a note.
5. Print notes in report.
6. Print notes in `watson log`
7. Fixed tests

Primary work here was done by the following people:

Co-authored-by: Tristan Pratt <prat0088@gmail.com>
Co-authored-by: Joel Ostblom <joelostblom@users.noreply.github.com>
tommoyer added a commit to tommoyer/Watson that referenced this pull request Mar 29, 2023
@tommoyer @prat0088 @joelostblom
This commit ports jazzband#405 to df4b720
2c922b3 
This is a large commit that adds the following:

1. Syntax: `watson stop --notes "some additional information"`.
2. Print only non-empty notes in log.
3. Always pass id to `new_frame` so that the length of array with/without
   notes doesn't cause ambiguity.
4. Print a warning message and the existing note if overwriting a note.
5. Print notes in report.
6. Print notes in `watson log`
7. Fixed tests
8. Add notes with the add command

Primary work here was done by the following people:

Co-authored-by: Tristan Pratt <prat0088@gmail.com>
Co-authored-by: Joel Ostblom <joelostblom@users.noreply.github.com>
Co-authored-by: Tom Moyer <tommoyer@gmail.com>
tommoyer added a commit to tommoyer/Watson that referenced this pull request Apr 13, 2023
@tommoyer @prat0088 @joelostblom
This commit ports jazzband#405 to df4b720
f8d9710 
This is a large commit that adds the following:

1. Syntax: `watson stop --notes "some additional information"`.
2. Print only non-empty notes in log.
3. Always pass id to `new_frame` so that the length of array with/without
   notes doesn't cause ambiguity.
4. Print a warning message and the existing note if overwriting a note.
5. Print notes in report.
6. Print notes in `watson log`
7. Fixed tests
8. Add notes with the add command
9. Tweaked Makefile to work with newer Ubuntu versions (python vs
   python3)

Primary work here was done by the following people:

Co-authored-by: Tristan Pratt <prat0088@gmail.com>
Co-authored-by: Joel Ostblom <joelostblom@users.noreply.github.com>
Co-authored-by: Tom Moyer <tommoyer@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@aero31aero @joelostblom @jmaupetit