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

Add "Ignore Date" and "Committer Date Is Author Date" options to rebase dialog #8289

Merged
merged 1 commit into from Jul 17, 2020
Merged

Add "Ignore Date" and "Committer Date Is Author Date" options to rebase dialog #8289

merged 1 commit into from Jul 17, 2020

Conversation

gtisdelle
Copy link
Contributor

@gtisdelle gtisdelle commented Jul 3, 2020 •
edited

Fixes #7708

Proposed changes

  • Add "Ignore Date" option to rebase dialog

  • Add tooltip for "Ignore Date"

  • Add "Committer Date is Author Date" option to rebase dialog (Suggested by @pmiossec here)

  • Add tooltip for "Committer Date is Author Date"

Screenshots

Before

before

After

after

Test methodology

  • Regression testing using the test suites provided
  • Added test cases to test suite
  • System testing on the rebase dialog

Test environment(s)

  • Git 2.27.0.windows.1
  • Microsoft Windows NT 10.0.18363.0
  • .NET Framework 4.8.4180.0
  • DPI 192dpi (200% scaling)

✒️ I contribute this code under The Developer Certificate of Origin.

@ghost ghost assigned gtisdelle Jul 3, 2020
@mstv
Copy link
Member

mstv commented Jul 3, 2020

Run build.cmd -loc, please. Then commit the updated English.xlf.

mstv
mstv reviewed Jul 3, 2020
View reviewed changes
Copy link
Member

@mstv mstv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to the prefiltering me.

GitCommands/Git/GitCommandHelpers.cs Outdated Show resolved Hide resolved
GitUI/UserControls/RevisionGrid/RevisionGridControl.cs Outdated Show resolved Hide resolved
@pmiossec
Copy link
Member

pmiossec commented Jul 3, 2020

2 quick things:

  1. It seems there are too many changes in FormRebase.Designer.cs. Please launch visual studio in no scale (start VS with /noscale parameter) mode before opening the designer and commit the changes.

Add "Committer Date is Author Date" option to rebase dialog (Suggested by @pmiossec here)

  1. You announce that but I don't see it in the changes. Is it because that's a work in progress that it is not in the PR and you will add it later? Or there is a commit missing?

@codecov
Copy link

codecov bot commented Jul 4, 2020 •
edited

Codecov Report

Merging #8289 into master will increase coverage by 0.00%.
The diff coverage is 78.44%.

@@           Coverage Diff            @@
##           master    #8289    +/-   ##
========================================
  Coverage   52.78%   52.78%            
========================================
  Files         857      866     +9     
  Lines       62339    62691   +352     
  Branches    11202    11300    +98     
========================================
+ Hits        32907    33093   +186     
- Misses      26827    26977   +150     
- Partials     2605     2621    +16
Flag Coverage Δ
#production 40.79% <87.17%> (+0.02%) ⬆️
#tests 94.21% <76.53%> (-0.25%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

@gtisdelle
Copy link
Contributor Author

2 quick things:

1. It seems there are too many changes in `FormRebase.Designer.cs`. Please launch visual studio in no scale (start VS with ` /noscale` parameter) mode before opening the designer and commit the changes.

Add "Committer Date is Author Date" option to rebase dialog (Suggested by @pmiossec here)

2. You announce that but I don't see it in the changes. Is it because that's a work in progress that it is not in the PR and you will add it later? Or there is a commit missing?

  1. Maybe some of those changes have to do with the fact that I changed the default size of the form? I made sure to restart VS in non-scaling mode before opening the designer. I also just opened it with that parameter, and there was nothing to commit.

  2. You're right that was a bit confusing. I updated the PR to better show that adding "Commit Date is Author Date" is a future task.

@gtisdelle
Copy link
Contributor Author

Run build.cmd -loc, please. Then commit the updated English.xlf.

✔️ Done

RussKie
RussKie requested changes Jul 4, 2020
View reviewed changes
Copy link
Member

@RussKie RussKie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reset the designer and re-apply changes in 100% scaling

GitCommands/Git/GitCommandHelpers.cs Outdated Show resolved Hide resolved
@ghost ghost added the 📭 needs: author feedback More info/confirmation awaited from OP; issues typically get closed after 30 days of inactivity label Jul 4, 2020
@ghost ghost removed the 📭 needs: author feedback More info/confirmation awaited from OP; issues typically get closed after 30 days of inactivity label Jul 4, 2020
@gtisdelle
Copy link
Contributor Author

I will checkout the master branch's FormRebase.Designer.cs and redo the changes to that file in the designer while making sure to launch Visual Studio with the /noscale parameter within the next few days. Hopefully that will solve it. Thanks for that advice, @pmiossec and @RussKie!

@gtisdelle gtisdelle requested a review from RussKie July 6, 2020 19:26
@gtisdelle gtisdelle force-pushed the feature/rebase-ignore-date branch 2 times, most recently from a6634db to e033ce0 Compare July 10, 2020 21:02
@gtisdelle gtisdelle changed the title WIP: Add "Ignore Date" and "Committer Date Is Author Date" options to rebase dialog Add "Ignore Date" and "Committer Date Is Author Date" options to rebase dialog Jul 10, 2020
@gtisdelle gtisdelle requested a review from RussKie July 10, 2020 21:23
mstv
mstv reviewed Jul 11, 2020
View reviewed changes
Copy link
Member

@mstv mstv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, though not sure regarding ArgumentBuilder (@RussKie?), nitpicks

GitUI/CommandsDialogs/FormRebase.Designer.cs Outdated Show resolved Hide resolved
GitUI/CommandsDialogs/FormRebase.Designer.cs Outdated Show resolved Hide resolved
RussKie
RussKie requested changes Jul 12, 2020
View reviewed changes
Copy link
Member

@RussKie RussKie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good

GitUI/CommandsDialogs/FormRebase.Designer.cs Outdated Show resolved Hide resolved
GitUI/CommandsDialogs/FormRebase.Designer.cs Outdated Show resolved Hide resolved
GitUI/CommandsDialogs/FormRebase.Designer.cs Outdated Show resolved Hide resolved
GitUI/CommandsDialogs/FormRebase.cs Show resolved Hide resolved
@ghost ghost added the 📭 needs: author feedback More info/confirmation awaited from OP; issues typically get closed after 30 days of inactivity label Jul 12, 2020
@gtisdelle
Copy link
Contributor Author

gtisdelle commented Jul 12, 2020 •
edited

It looks like I will be creating the unit test for the FormRebase class. That means that things like the Interactive Rebase and Autosquash toggle are not tested currently. Should I test them too, or would that be outside the scope of this PR?

@ghost ghost removed the 📭 needs: author feedback More info/confirmation awaited from OP; issues typically get closed after 30 days of inactivity label Jul 12, 2020
@pmiossec
Copy link
Member

pmiossec commented Jul 12, 2020 via email

@gtisdelle gtisdelle requested a review from RussKie July 13, 2020 01:43
RussKie
RussKie reviewed Jul 15, 2020
View reviewed changes
Copy link
Member

@RussKie RussKie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚀

GitUI/CommandsDialogs/FormRebase.Designer.cs Outdated Show resolved Hide resolved
GitUI/CommandsDialogs/FormRebase.cs Outdated Show resolved Hide resolved
IntegrationTests/UI.IntegrationTests/CommandsDialogs/FormRebaseTests.cs Outdated Show resolved Hide resolved
@RussKie RussKie added the 📭 needs: author feedback More info/confirmation awaited from OP; issues typically get closed after 30 days of inactivity label Jul 15, 2020
@ghost ghost removed the 📭 needs: author feedback More info/confirmation awaited from OP; issues typically get closed after 30 days of inactivity label Jul 15, 2020
@RussKie
Copy link
Member

RussKie commented Jul 16, 2020 via email •
edited by ghost

@gtisdelle gtisdelle requested a review from RussKie July 17, 2020 01:48
RussKie
RussKie approved these changes Jul 17, 2020
View reviewed changes
Copy link
Member

@RussKie RussKie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you

@RussKie
Copy link
Member

RussKie commented Jul 17, 2020

Please squash and it is ready to go

Add Date options to rebase dialog
eabe7df 
- Add "Ignore Date"
- Add "Committer Date Is Author Date"
@gtisdelle
Copy link
Contributor Author

All the changes have been squashed into one functional commit. Thank you for all your help!

@mstv mstv merged commit 4c7e620 into gitextensions:master Jul 17, 2020
@ghost ghost added this to the 4.0 milestone Jul 17, 2020
@gtisdelle gtisdelle deleted the feature/rebase-ignore-date branch July 17, 2020 21:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mstv mstv mstv left review comments

@RussKie RussKie RussKie approved these changes

Assignees

@gtisdelle gtisdelle

Labels
None yet
Projects
None yet
Milestone
3.5
Development

Successfully merging this pull request may close these issues.

new UI option for Rebase window - "ignore-date"
4 participants
@gtisdelle @mstv @pmiossec @RussKie