Improvements to git macros

[Martyn Gigg]

Notes from testing ticket #6653 for improvements of the macros

• The log of the diff doesn't work on Windows (git bash or command window). There's an error message in there about an ambiguous redirect. This is a pity as this is the only platform where I can't click on the URL either.
• I'd like git test start to check that the branch has been merged to develop. We'll have to figure out how to handle this if develop has been reset.
• Things error out if a developer does not have a local develop branch. This is not a problem now, but may cause confusion in the future for new clones or developers.

Also add a review command to 'git test' that starts a browser in the github compare view:, i.e. opens something like ​https://github.com/mantidproject/mantid/compare/develop but comparing with the branch being tested.

It will rely on git test start being run first to record the test branch.

[Martyn Gigg]

It would also be nice git test start could just accept a ticket number

[Martyn Gigg]

Allow git-test to find branch via hint not just full name. Refs #6708

Changeset: ec98638917d880c193f03410660742d41e3cd16a

[Martyn Gigg]

Fix git-checkbuild when local copy of develop does not exist

Refs #6708

Changeset: 66d93199d0f965e696b3bf7c1f10b65c024bfc88

[Martyn Gigg]

Fix bug with remote specifier in compare view. Refs #6708

Changeset: e70c983799d79651df3b96079792a680c7446026

[Martyn Gigg]

Add 'git test review' command. Refs #6708

Changeset: b68ea992a90ae5eedd715e4cbc0d788c75507a1b

[Martyn Gigg]

Add 'git publish command' Refs #6708

Changeset: 255ab8a9ef10de56fc4e8575cbc1ddf66813d180

[Martyn Gigg]

git-finish checks merge with remote not local. Refs #6708

This allows "git checkbuild" to be run from a different copy of the repository while still allowing "git finish" to run successfully without having to update the local copy of develop. Helps with reducing number of required builds.

Changeset: 55270fc7a9786cc0876f2300a7fadfe4efc03aa4

[Martyn Gigg]

Allow git-test to find branch via hint not just full name. Refs #6708

Changeset: ec98638917d880c193f03410660742d41e3cd16a

[Martyn Gigg]

Fix git-checkbuild when local copy of develop does not exist

Refs #6708

Changeset: 66d93199d0f965e696b3bf7c1f10b65c024bfc88

[Martyn Gigg]

Fix bug with remote specifier in compare view. Refs #6708

Changeset: e70c983799d79651df3b96079792a680c7446026

[Martyn Gigg]

Add 'git test review' command. Refs #6708

Changeset: b68ea992a90ae5eedd715e4cbc0d788c75507a1b

[Martyn Gigg]

Add 'git publish command' Refs #6708

Changeset: 255ab8a9ef10de56fc4e8575cbc1ddf66813d180

[Martyn Gigg]

git-finish checks merge with remote not local. Refs #6708

This allows "git checkbuild" to be run from a different copy of the repository while still allowing "git finish" to run successfully without having to update the local copy of develop. Helps with reducing number of required builds.

Changeset: 55270fc7a9786cc0876f2300a7fadfe4efc03aa4

[Martyn Gigg]

Add check for merge to origin/develop on 'git test start' Refs #6708

It is strict at the moment and won't let you start if the branch is not in develop.

Changeset: 91c534b51f4d22eb5c7940a62fa6021b54c6f1da

[Martyn Gigg]

Add check for merge to origin/develop on 'git test start' Refs #6708

It is strict at the moment and won't let you start if the branch is not in develop.

Changeset: 91c534b51f4d22eb5c7940a62fa6021b54c6f1da

[Martyn Gigg]

Tester

[Martyn Gigg]

Tester: This is blocked by #6725 and that ticket must be tested & merged first.

Branch: feature/6708_git_macro_improv

In a similar manner to testing #6653 it is STRONGLY advised to test this on a sandbox repository that you can create under your own account on github.

Things to check:

• git test start can now just accept a hint if it is unambiugous, it should raise an error if the hint produces several matches;
• there is a new 'git publish' command that simply pushes the current branch to github, with the exception that if the current branch is master or develop then it aborts
• there is a new 'git test review' command, which only works after testing has started with 'git test start' that opens up github to show the changes made on the branch since it was started
• 'git test start' should throw an error if the branch under test has not been merged to develop. It lists contact information for the develop and asks the tester to check with the develop.

[Owen Arnold]

Every test point in the checklist is working.

[Martyn Gigg]

Allow git-test to find branch via hint not just full name. Refs #6708

Changeset: ec98638917d880c193f03410660742d41e3cd16a

[Martyn Gigg]

Fix git-checkbuild when local copy of develop does not exist

Refs #6708

Changeset: 66d93199d0f965e696b3bf7c1f10b65c024bfc88

[Martyn Gigg]

Fix bug with remote specifier in compare view. Refs #6708

Changeset: e70c983799d79651df3b96079792a680c7446026

[Martyn Gigg]

Add 'git test review' command. Refs #6708

Changeset: b68ea992a90ae5eedd715e4cbc0d788c75507a1b

[Martyn Gigg]

Add 'git publish command' Refs #6708

Changeset: 255ab8a9ef10de56fc4e8575cbc1ddf66813d180

[Martyn Gigg]

git-finish checks merge with remote not local. Refs #6708

This allows "git checkbuild" to be run from a different copy of the repository while still allowing "git finish" to run successfully without having to update the local copy of develop. Helps with reducing number of required builds.

Changeset: 55270fc7a9786cc0876f2300a7fadfe4efc03aa4

[Martyn Gigg]

Add check for merge to origin/develop on 'git test start' Refs #6708

It is strict at the moment and won't let you start if the branch is not in develop.

Changeset: 91c534b51f4d22eb5c7940a62fa6021b54c6f1da

[Martyn Gigg]

Allow git-test to find branch via hint not just full name. Refs #6708

Changeset: ec98638917d880c193f03410660742d41e3cd16a

[Martyn Gigg]

Fix git-checkbuild when local copy of develop does not exist

Refs #6708

Changeset: 66d93199d0f965e696b3bf7c1f10b65c024bfc88

[Martyn Gigg]

Fix bug with remote specifier in compare view. Refs #6708

Changeset: e70c983799d79651df3b96079792a680c7446026

[Martyn Gigg]

Add 'git test review' command. Refs #6708

Changeset: b68ea992a90ae5eedd715e4cbc0d788c75507a1b

[Martyn Gigg]

Add 'git publish command' Refs #6708

Changeset: 255ab8a9ef10de56fc4e8575cbc1ddf66813d180

[Martyn Gigg]

git-finish checks merge with remote not local. Refs #6708

This allows "git checkbuild" to be run from a different copy of the repository while still allowing "git finish" to run successfully without having to update the local copy of develop. Helps with reducing number of required builds.

Changeset: 55270fc7a9786cc0876f2300a7fadfe4efc03aa4

[Martyn Gigg]

Add check for merge to origin/develop on 'git test start' Refs #6708

It is strict at the moment and won't let you start if the branch is not in develop.

Changeset: 91c534b51f4d22eb5c7940a62fa6021b54c6f1da

[Martyn Gigg]

Allow git-test to find branch via hint not just full name. Refs #6708

Changeset: ec98638917d880c193f03410660742d41e3cd16a

[Martyn Gigg]

Fix git-checkbuild when local copy of develop does not exist

Refs #6708

Changeset: 66d93199d0f965e696b3bf7c1f10b65c024bfc88

[Martyn Gigg]

Fix bug with remote specifier in compare view. Refs #6708

Changeset: e70c983799d79651df3b96079792a680c7446026

[Martyn Gigg]

Add 'git test review' command. Refs #6708

Changeset: b68ea992a90ae5eedd715e4cbc0d788c75507a1b

[Martyn Gigg]

Add 'git publish command' Refs #6708

Changeset: 255ab8a9ef10de56fc4e8575cbc1ddf66813d180

[Martyn Gigg]

git-finish checks merge with remote not local. Refs #6708

This allows "git checkbuild" to be run from a different copy of the repository while still allowing "git finish" to run successfully without having to update the local copy of develop. Helps with reducing number of required builds.

Changeset: 55270fc7a9786cc0876f2300a7fadfe4efc03aa4

[Martyn Gigg]

Add check for merge to origin/develop on 'git test start' Refs #6708

It is strict at the moment and won't let you start if the branch is not in develop.

Changeset: 91c534b51f4d22eb5c7940a62fa6021b54c6f1da

[Martyn Gigg]

Allow git-test to find branch via hint not just full name. Refs #6708

Changeset: ec98638917d880c193f03410660742d41e3cd16a

[Martyn Gigg]

Fix git-checkbuild when local copy of develop does not exist

Refs #6708

Changeset: 66d93199d0f965e696b3bf7c1f10b65c024bfc88

[Martyn Gigg]

Fix bug with remote specifier in compare view. Refs #6708

Changeset: e70c983799d79651df3b96079792a680c7446026

[Martyn Gigg]

Add 'git test review' command. Refs #6708

Changeset: b68ea992a90ae5eedd715e4cbc0d788c75507a1b

[Martyn Gigg]

Add 'git publish command' Refs #6708

Changeset: 255ab8a9ef10de56fc4e8575cbc1ddf66813d180

[Martyn Gigg]

git-finish checks merge with remote not local. Refs #6708

This allows "git checkbuild" to be run from a different copy of the repository while still allowing "git finish" to run successfully without having to update the local copy of develop. Helps with reducing number of required builds.

Changeset: 55270fc7a9786cc0876f2300a7fadfe4efc03aa4

[Martyn Gigg]

Add check for merge to origin/develop on 'git test start' Refs #6708

It is strict at the moment and won't let you start if the branch is not in develop.

Changeset: 91c534b51f4d22eb5c7940a62fa6021b54c6f1da

[Martyn Gigg]

Allow git-test to find branch via hint not just full name. Refs #6708

Changeset: ec98638917d880c193f03410660742d41e3cd16a

[Martyn Gigg]

Fix git-checkbuild when local copy of develop does not exist

Refs #6708

Changeset: 66d93199d0f965e696b3bf7c1f10b65c024bfc88

[Martyn Gigg]

Fix bug with remote specifier in compare view. Refs #6708

Changeset: e70c983799d79651df3b96079792a680c7446026

[Martyn Gigg]

Add 'git test review' command. Refs #6708

Changeset: b68ea992a90ae5eedd715e4cbc0d788c75507a1b

[Martyn Gigg]

Add 'git publish command' Refs #6708

Changeset: 255ab8a9ef10de56fc4e8575cbc1ddf66813d180

[Martyn Gigg]

git-finish checks merge with remote not local. Refs #6708

This allows "git checkbuild" to be run from a different copy of the repository while still allowing "git finish" to run successfully without having to update the local copy of develop. Helps with reducing number of required builds.

Changeset: 55270fc7a9786cc0876f2300a7fadfe4efc03aa4

[Martyn Gigg]

Add check for merge to origin/develop on 'git test start' Refs #6708

It is strict at the moment and won't let you start if the branch is not in develop.

Changeset: 91c534b51f4d22eb5c7940a62fa6021b54c6f1da

[Stuart Campbell]

This ticket has been transferred to github issue ​7554