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.

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

Ticket Reference handling #1048 #1055

Merged
merged 2 commits into from
Jun 18, 2016
Merged

Ticket Reference handling #1048 #1055

merged 2 commits into from
Jun 18, 2016

Conversation

paulsputer
Copy link
Collaborator

  • Supports referencing:
    • from other tickets via comments
    • from commits on other branches

@paulsputer
Copy link
Collaborator Author

Example showing reference by commit 8E5DA2 and ticket/2

ticketreferences

@paulsputer
Copy link
Collaborator Author

@gitblit could you cast an eye over this and share your thoughts?

@gitblit
Copy link
Collaborator

gitblit commented Apr 14, 2016

I will cast my eye. Trying to make time.

@gitblit
Copy link
Collaborator

gitblit commented Apr 20, 2016

Thoughts...

  1. We need to unit test the new features of TicketModel and ITicketService.
  2. I think the use of lozenges for commit links and ticket links overloads their appearance value. I would advocate it would be better to use a plain, fixed-width font link for commit shas and a plain link for the ticket reference.

@paulsputer
Copy link
Collaborator Author

paulsputer commented Apr 23, 2016

Thanks James, (1) will do, (2) very true, I tried to use the lowest level lozenge but still looks a bit too much, I'll make those fixes and post back. Are you happy with the temporary TicketLink and persisted Reference structures? I'm not sure if there's any cleaner alternative.

+ Supports referencing:
  + Tickets from other tickets via comments
  + Tickets from commits on any branch
+ Common TicketLink class used for both commits and tickets
  + TicketLink is temporary and persisted to ticket as a Reference
+ Support deletion of ticket references
  + Rebasing patchsets/branches will generate new references
  + Deleting old patchsets/branches will remove the relevant references
+ Substantial testing of use cases
  + With and without patchsets, deleting, amending
  + BranchTicketService used during testing to allow end-to-end ref testing
+ Relocated common git helper functions to JGitUtils
@paulsputer
Copy link
Collaborator Author

ok @gitblit can you take another look at this and see if there's anything else we need to address on referencing in this PR? It's getting a bit larger than I was anticipating, then again half of it is testing the different use cases.

@paulsputer
Copy link
Collaborator Author

Here's the updated UI
gitblitrefui2

+ Multiple commits in a single push
@paulsputer paulsputer merged commit c585040 into master Jun 18, 2016
@gitblit gitblit deleted the 1048-TicketReferences branch August 1, 2016 12:06
@flaix flaix modified the milestone: 1.8.0 Mar 18, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants