Ticket #6725 (closed: fixed)
git macro fixes
Reported by: | Martyn Gigg | Owned by: | Martyn Gigg |
---|---|---|---|
Priority: | major | Milestone: | Release 2.5 |
Component: | Mantid | Keywords: | |
Cc: | Blocked By: | ||
Blocking: | #6708 | Tester: | Owen Arnold |
Description (last modified by Martyn Gigg) (diff)
A couple of issues arose on Friday testing:
- git test pass needs to handle if the remote has been updated
- git test start needs to handle merge conflicts properly, it currently just hard resets and the macro becomes useless.
Change History
comment:5 Changed 8 years ago by Martyn Gigg
Some other minor issues arose:
- The (y/n) question needs to check whether the user entered y or n and keep asking.
- The error message on merge conflicts with git test start needs to say run git merge --abort if they want to abort rather than git test fail
comment:6 Changed 8 years ago by Martyn Gigg
Be more verbose when not publishing on "git test pass". Refs #6725
This should avoid the problem of just pressing return by accident and allow the macro to be rerun.
Changeset: 1dec034a440973c373cd7cb88f7c0c948dcfaecb
comment:7 Changed 8 years ago by Martyn Gigg
Only allow y/n answers to "git test pass". Refs #6725
Changeset: e9cd89afab0e6a25005d55c9055adac3c4b592dd
comment:8 Changed 8 years ago by Martyn Gigg
Fix function name in git-checkbuild. Refs #6725
Changeset: e36fc7ceb0d40e221a5a44eb646abd0d72cb7906
comment:9 Changed 8 years ago by Martyn Gigg
Better abstraction for "git test pass steps" Refs #6725
Changeset: 1620e4bf3408fa7796fbcc3c045b11ac4839df65
comment:10 Changed 8 years ago by Martyn Gigg
Remove git-config key when starting from develop. Refs #6725
Changeset: 086be61ffbb726247d8711fcdcd37461c8ade0b9
comment:11 Changed 8 years ago by Martyn Gigg
Allow git-test to recover after merge. Refs #6725
Changeset: 380207c9fa28778e26751ca668ab25bb016cf667
comment:12 Changed 8 years ago by Martyn Gigg
Wrap file argument in git-test in quotes. Refs #6725
Changeset: 05c23eb9880f56f4fb6697ee860383bc833ff6f5
comment:13 Changed 8 years ago by Martyn Gigg
- Status changed from accepted to verify
- Resolution set to fixed
Tester:
Branchname: feature/6725_macro_fixes
I HIGHLY recommend testing these fixes on a separate sandbox repository that you can create under your account on github.
The main thing to check is that git test pass can now push to the remote even if the remote has been updated since testing started. The macro also now does not reset the master branch if a merge conflict arises. It describes what to do to the user and then leaves the branch as it currently is.
comment:15 Changed 8 years ago by Owen Arnold
- Status changed from verify to verifying
- Tester set to Owen Arnold
comment:16 Changed 8 years ago by Owen Arnold
Handles the merge conflict properly with master. Gives a good set of information as to what to do next.
comment:17 Changed 8 years ago by Owen Arnold
If you encounter a merge conflict on testing, and then abort the merge, and then run git test fail, you get the following message:
"The name of the test branch has not been recorded in the config. Was the testing started with 'git test start'?"
Is this desired?
comment:18 Changed 8 years ago by Owen Arnold
- Status changed from verifying to closed
Otherwise, this works as advertised.
comment:19 Changed 8 years ago by Martyn Gigg
In reply to comment:17, yes that's how it should behave I think. An aborted merge takes you right back to current origin/master so you can start testing fresh.
comment:20 Changed 8 years ago by Martyn Gigg
Be more verbose when not publishing on "git test pass". Refs #6725
This should avoid the problem of just pressing return by accident and allow the macro to be rerun.
Changeset: 1dec034a440973c373cd7cb88f7c0c948dcfaecb
comment:21 Changed 8 years ago by Martyn Gigg
Only allow y/n answers to "git test pass". Refs #6725
Changeset: e9cd89afab0e6a25005d55c9055adac3c4b592dd
comment:22 Changed 8 years ago by Martyn Gigg
Fix function name in git-checkbuild. Refs #6725
Changeset: e36fc7ceb0d40e221a5a44eb646abd0d72cb7906
comment:23 Changed 8 years ago by Martyn Gigg
Better abstraction for "git test pass steps" Refs #6725
Changeset: 1620e4bf3408fa7796fbcc3c045b11ac4839df65
comment:24 Changed 8 years ago by Martyn Gigg
Remove git-config key when starting from develop. Refs #6725
Changeset: 086be61ffbb726247d8711fcdcd37461c8ade0b9
comment:25 Changed 8 years ago by Martyn Gigg
Allow git-test to recover after merge. Refs #6725
Changeset: 380207c9fa28778e26751ca668ab25bb016cf667
comment:26 Changed 8 years ago by Martyn Gigg
Wrap file argument in git-test in quotes. Refs #6725
Changeset: 05c23eb9880f56f4fb6697ee860383bc833ff6f5
comment:27 Changed 8 years ago by Martyn Gigg
Be more verbose when not publishing on "git test pass". Refs #6725
This should avoid the problem of just pressing return by accident and allow the macro to be rerun.
Changeset: 1dec034a440973c373cd7cb88f7c0c948dcfaecb
comment:28 Changed 8 years ago by Martyn Gigg
Only allow y/n answers to "git test pass". Refs #6725
Changeset: e9cd89afab0e6a25005d55c9055adac3c4b592dd
comment:29 Changed 8 years ago by Martyn Gigg
Fix function name in git-checkbuild. Refs #6725
Changeset: e36fc7ceb0d40e221a5a44eb646abd0d72cb7906
comment:30 Changed 8 years ago by Martyn Gigg
Better abstraction for "git test pass steps" Refs #6725
Changeset: 1620e4bf3408fa7796fbcc3c045b11ac4839df65
comment:31 Changed 8 years ago by Martyn Gigg
Remove git-config key when starting from develop. Refs #6725
Changeset: 086be61ffbb726247d8711fcdcd37461c8ade0b9
comment:32 Changed 8 years ago by Martyn Gigg
Allow git-test to recover after merge. Refs #6725
Changeset: 380207c9fa28778e26751ca668ab25bb016cf667
comment:33 Changed 8 years ago by Martyn Gigg
Wrap file argument in git-test in quotes. Refs #6725
Changeset: 05c23eb9880f56f4fb6697ee860383bc833ff6f5
comment:34 Changed 8 years ago by Martyn Gigg
Be more verbose when not publishing on "git test pass". Refs #6725
This should avoid the problem of just pressing return by accident and allow the macro to be rerun.
Changeset: 1dec034a440973c373cd7cb88f7c0c948dcfaecb
comment:35 Changed 8 years ago by Martyn Gigg
Only allow y/n answers to "git test pass". Refs #6725
Changeset: e9cd89afab0e6a25005d55c9055adac3c4b592dd
comment:36 Changed 8 years ago by Martyn Gigg
Fix function name in git-checkbuild. Refs #6725
Changeset: e36fc7ceb0d40e221a5a44eb646abd0d72cb7906
comment:37 Changed 8 years ago by Martyn Gigg
Better abstraction for "git test pass steps" Refs #6725
Changeset: 1620e4bf3408fa7796fbcc3c045b11ac4839df65
comment:38 Changed 8 years ago by Martyn Gigg
Remove git-config key when starting from develop. Refs #6725
Changeset: 086be61ffbb726247d8711fcdcd37461c8ade0b9
comment:39 Changed 8 years ago by Martyn Gigg
Allow git-test to recover after merge. Refs #6725
Changeset: 380207c9fa28778e26751ca668ab25bb016cf667
comment:40 Changed 8 years ago by Martyn Gigg
Wrap file argument in git-test in quotes. Refs #6725
Changeset: 05c23eb9880f56f4fb6697ee860383bc833ff6f5
comment:41 Changed 7 years ago by Martyn Gigg
Be more verbose when not publishing on "git test pass". Refs #6725
This should avoid the problem of just pressing return by accident and allow the macro to be rerun.
Changeset: 1dec034a440973c373cd7cb88f7c0c948dcfaecb
comment:42 Changed 7 years ago by Martyn Gigg
Only allow y/n answers to "git test pass". Refs #6725
Changeset: e9cd89afab0e6a25005d55c9055adac3c4b592dd
comment:43 Changed 7 years ago by Martyn Gigg
Fix function name in git-checkbuild. Refs #6725
Changeset: e36fc7ceb0d40e221a5a44eb646abd0d72cb7906
comment:44 Changed 7 years ago by Martyn Gigg
Better abstraction for "git test pass steps" Refs #6725
Changeset: 1620e4bf3408fa7796fbcc3c045b11ac4839df65
comment:45 Changed 7 years ago by Martyn Gigg
Remove git-config key when starting from develop. Refs #6725
Changeset: 086be61ffbb726247d8711fcdcd37461c8ade0b9
comment:46 Changed 7 years ago by Martyn Gigg
Allow git-test to recover after merge. Refs #6725
Changeset: 380207c9fa28778e26751ca668ab25bb016cf667
comment:47 Changed 7 years ago by Martyn Gigg
Wrap file argument in git-test in quotes. Refs #6725
Changeset: 05c23eb9880f56f4fb6697ee860383bc833ff6f5
comment:48 Changed 7 years ago by Martyn Gigg
Be more verbose when not publishing on "git test pass". Refs #6725
This should avoid the problem of just pressing return by accident and allow the macro to be rerun.
Changeset: 1dec034a440973c373cd7cb88f7c0c948dcfaecb
comment:49 Changed 7 years ago by Martyn Gigg
Only allow y/n answers to "git test pass". Refs #6725
Changeset: e9cd89afab0e6a25005d55c9055adac3c4b592dd
comment:50 Changed 7 years ago by Martyn Gigg
Fix function name in git-checkbuild. Refs #6725
Changeset: e36fc7ceb0d40e221a5a44eb646abd0d72cb7906
comment:51 Changed 7 years ago by Martyn Gigg
Better abstraction for "git test pass steps" Refs #6725
Changeset: 1620e4bf3408fa7796fbcc3c045b11ac4839df65
comment:52 Changed 7 years ago by Martyn Gigg
Remove git-config key when starting from develop. Refs #6725
Changeset: 086be61ffbb726247d8711fcdcd37461c8ade0b9
comment:53 Changed 7 years ago by Martyn Gigg
Allow git-test to recover after merge. Refs #6725
Changeset: 380207c9fa28778e26751ca668ab25bb016cf667
comment:54 Changed 7 years ago by Martyn Gigg
Wrap file argument in git-test in quotes. Refs #6725
Changeset: 05c23eb9880f56f4fb6697ee860383bc833ff6f5
comment:55 Changed 5 years ago by Stuart Campbell
This ticket has been transferred to github issue 7571