Fix link between git commit messages and trac (Trac #874)

[ajj]

Git commit messages that refer to a pull request number (usually the merge of the request) get copied to the trac ticket with the same number as the pull request.

This needs some filtering as it will only get worse as our pull request numbers increase.

For now I am manually cleaning up tickets that get crufted.

Migrated from http://trac.sasview.org/ticket/874

{
    "status": "closed",
    "changetime": "2017-04-09T13:15:53",
    "_ts": "2017-04-09 13:15:53.908951+00:00",
    "description": "Git commit messages that refer to a pull request number (usually the merge of the request) get copied to the trac ticket with the same number as the pull request.\n\nThis needs some filtering as it will only get worse as our pull request numbers increase.\n\nFor now I am manually cleaning up tickets that get crufted.",
    "reporter": "ajj",
    "cc": "",
    "resolution": "fixed",
    "workpackage": "SasView Admin",
    "time": "2017-03-08T14:48:26",
    "component": "SasView",
    "summary": "Fix link between git commit messages and trac",
    "priority": "minor",
    "keywords": "",
    "milestone": "Admin Tasks",
    "owner": "ajj",
    "type": "defect"
}

[ajj]

Trac update at 2017/03/08 14:53:11: ajj commented:

From #926

"Putting "Fixes #" in the commit message for a checkin on a branch should not close the associated ticket until that branch is merged into master."

"Is there a way to differentiate between pull requests and trac tickets? Merging a pull request also updates the ticket for that number pull."

[ajj]

Trac update at 2017/03/08 14:57:06: ajj commented:

Issue opened on trac-github:

trac-hacks/trac-github#108

was closed as feature should be implemented in the Trac !CommitTicketUpdater https://trac.edgewall.org/wiki/CommitTicketUpdater

Will investigate possibility of local fix for us and if it works will try getting it adopted upstream.

[ajj]

Trac update at 2017/03/25 20:21:12:

• ajj changed _comment0 from:

Temporary solution ...

Have updated the settings for trac commit ticket updater so that we must use:

To close a ticket:
{{{
closes #ticketno
fixes # ticketno
}}}

To reference a ticket:
{{{
addresses #ticketno
re #ticketno
references #ticketno
refs #ticketno
see #ticketno
}}}

More info on how to use is in the docs: https://trac.edgewall.org/wiki/CommitTicketUpdater#Usage

to:

1490473290354666

• ajj commented:

Temporary solution ...

Have updated the settings for trac commit ticket updater so that we must use:

To close a ticket:

closes #ticketno
fixes #ticketno 

To reference a ticket:

addresses #ticketno
re #ticketno
references #ticketno
refs #ticketno
see #ticketno

More info on how to use is in the docs: https://trac.edgewall.org/wiki/CommitTicketUpdater#Usage

[ajj]

Trac update at 2017/04/09 13:15:53:

• ajj commented:

This is working ok now, so closing ticket.

• ajj changed resolution from "" to "fixed"
• ajj changed status from "new" to "closed"