You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

MarkdownUtils.java 4.7KB

Ticket tracker with patchset contributions A basic issue tracker styled as a hybrid of GitHub and BitBucket issues. You may attach commits to an existing ticket or you can push a single commit to create a *proposal* ticket. Tickets keep track of patchsets (one or more commits) and allow patchset rewriting (rebase, amend, squash) by detecing the non-fast-forward update and assigning a new patchset number to the new commits. Ticket tracker -------------- The ticket tracker stores tickets as an append-only journal of changes. The journals are deserialized and a ticket is built by applying the journal entries. Tickets are indexed using Apache Lucene and all queries and searches are executed against this Lucene index. There is one trade-off to this persistence design: user attributions are non-relational. What does that mean? Each journal entry stores the username of the author. If the username changes in the user service, the journal entry will not reflect that change because the values are hard-coded. Here are a few reasons/justifications for this design choice: 1. commit identifications (author, committer, tagger) are non-relational 2. maintains the KISS principle 3. your favorite text editor can still be your administration tool Persistence Choices ------------------- **FileTicketService**: stores journals on the filesystem **BranchTicketService**: stores journals on an orphan branch **RedisTicketService**: stores journals in a Redis key-value datastore It should be relatively straight-forward to develop other backends (MongoDB, etc) as long as the journal design is preserved. Pushing Commits --------------- Each push to a ticket is identified as a patchset revision. A patchset revision may add commits to the patchset (fast-forward) OR a patchset revision may rewrite history (rebase, squash, rebase+squash, or amend). Patchset authors should not be afraid to polish, revise, and rewrite their code before merging into the proposed branch. Gitblit will create one ref for each patchset. These refs are updated for fast-forward pushes or created for rewrites. They are formatted as `refs/tickets/{shard}/{id}/{patchset}`. The *shard* is the last two digits of the id. If the id < 10, prefix a 0. The *shard* is always two digits long. The shard's purpose is to ensure Gitblit doesn't exceed any filesystem directory limits for file creation. **Creating a Proposal Ticket** You may create a new change proposal ticket just by pushing a **single commit** to `refs/for/{branch}` where branch is the proposed integration branch OR `refs/for/new` or `refs/for/default` which both will use the default repository branch. git push origin HEAD:refs/for/new **Updating a Patchset** The safe way to update an existing patchset is to push to the patchset ref. git push origin HEAD:refs/heads/ticket/{id} This ensures you do not accidentally create a new patchset in the event that the patchset was updated after you last pulled. The not-so-safe way to update an existing patchset is to push using the magic ref. git push origin HEAD:refs/for/{id} This push ref will update an exisitng patchset OR create a new patchset if the update is non-fast-forward. **Rebasing, Squashing, Amending** Gitblit makes rebasing, squashing, and amending patchsets easy. Normally, pushing a non-fast-forward update would require rewind (RW+) repository permissions. Gitblit provides a magic ref which will allow ticket participants to rewrite a ticket patchset as long as the ticket is open. git push origin HEAD:refs/for/{id} Pushing changes to this ref allows the patchset authors to rebase, squash, or amend the patchset commits without requiring client-side use of the *--force* flag on push AND without requiring RW+ permission to the repository. Since each patchset is tracked with a ref it is easy to recover from accidental non-fast-forward updates. Features -------- - Ticket tracker with status changes and responsible assignments - Patchset revision scoring mechanism - Update/Rewrite patchset handling - Close-on-push detection - Server-side Merge button for simple merges - Comments with Markdown syntax support - Rich mail notifications - Voting - Mentions - Watch lists - Querying - Searches - Partial miletones support - Multiple backend options
10 years ago
123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148
  1. /*
  2. * Copyright 2011 gitblit.com.
  3. *
  4. * Licensed under the Apache License, Version 2.0 (the "License");
  5. * you may not use this file except in compliance with the License.
  6. * You may obtain a copy of the License at
  7. *
  8. * http://www.apache.org/licenses/LICENSE-2.0
  9. *
  10. * Unless required by applicable law or agreed to in writing, software
  11. * distributed under the License is distributed on an "AS IS" BASIS,
  12. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  13. * See the License for the specific language governing permissions and
  14. * limitations under the License.
  15. */
  16. package com.gitblit.utils;
  17. import static org.pegdown.Extensions.ALL;
  18. import static org.pegdown.Extensions.SMARTYPANTS;
  19. import java.io.IOException;
  20. import java.io.Reader;
  21. import java.io.StringWriter;
  22. import java.text.MessageFormat;
  23. import org.apache.commons.io.IOUtils;
  24. import org.pegdown.LinkRenderer;
  25. import org.pegdown.PegDownProcessor;
  26. import com.gitblit.IStoredSettings;
  27. import com.gitblit.Keys;
  28. /**
  29. * Utility methods for transforming raw markdown text to html.
  30. *
  31. * @author James Moger
  32. *
  33. */
  34. public class MarkdownUtils {
  35. /**
  36. * Returns the html version of the plain source text.
  37. *
  38. * @param text
  39. * @return html version of plain text
  40. * @throws java.text.ParseException
  41. */
  42. public static String transformPlainText(String text) {
  43. // url auto-linking
  44. text = text.replaceAll("((http|https)://[0-9A-Za-z-_=\\?\\.\\$#&/]*)", "<a href=\"$1\">$1</a>");
  45. String html = "<pre>" + text + "</pre>";
  46. return html;
  47. }
  48. /**
  49. * Returns the html version of the markdown source text.
  50. *
  51. * @param markdown
  52. * @return html version of markdown text
  53. * @throws java.text.ParseException
  54. */
  55. public static String transformMarkdown(String markdown) {
  56. return transformMarkdown(markdown, null);
  57. }
  58. /**
  59. * Returns the html version of the markdown source text.
  60. *
  61. * @param markdown
  62. * @return html version of markdown text
  63. * @throws java.text.ParseException
  64. */
  65. public static String transformMarkdown(String markdown, LinkRenderer linkRenderer) {
  66. PegDownProcessor pd = new PegDownProcessor(ALL & ~SMARTYPANTS);
  67. String html = pd.markdownToHtml(markdown, linkRenderer == null ? new LinkRenderer() : linkRenderer);
  68. return html;
  69. }
  70. /**
  71. * Returns the html version of the markdown source reader. The reader is
  72. * closed regardless of success or failure.
  73. *
  74. * @param markdownReader
  75. * @return html version of the markdown text
  76. * @throws java.text.ParseException
  77. */
  78. public static String transformMarkdown(Reader markdownReader) throws IOException {
  79. // Read raw markdown content and transform it to html
  80. StringWriter writer = new StringWriter();
  81. try {
  82. IOUtils.copy(markdownReader, writer);
  83. String markdown = writer.toString();
  84. return transformMarkdown(markdown);
  85. } finally {
  86. try {
  87. writer.close();
  88. } catch (IOException e) {
  89. // IGNORE
  90. }
  91. }
  92. }
  93. /**
  94. * Transforms GFM (Github Flavored Markdown) to html.
  95. * Gitblit does not support the complete GFM specification.
  96. *
  97. * @param input
  98. * @param repositoryName
  99. * @return html
  100. */
  101. public static String transformGFM(IStoredSettings settings, String input, String repositoryName) {
  102. String text = input;
  103. // strikethrough
  104. text = text.replaceAll("~~(.*)~~", "<s>$1</s>");
  105. text = text.replaceAll("\\{(?:-){2}(.*)(?:-){2}}", "<s>$1</s>");
  106. // underline
  107. text = text.replaceAll("\\{(?:\\+){2}(.*)(?:\\+){2}}", "<u>$1</u>");
  108. // strikethrough, replacement
  109. text = text.replaceAll("\\{~~(.*)~>(.*)~~}", "<s>$1</s><u>$2</u>");
  110. // highlight
  111. text = text.replaceAll("\\{==(.*)==}", "<span class='highlight'>$1</span>");
  112. String canonicalUrl = settings.getString(Keys.web.canonicalUrl, "https://localhost:8443");
  113. // emphasize and link mentions
  114. String mentionReplacement = String.format(" **<a href=\"%1s/user/$1\">@$1</a>**", canonicalUrl);
  115. text = text.replaceAll("\\s@([A-Za-z0-9-_]+)", mentionReplacement);
  116. // link ticket refs
  117. String ticketReplacement = MessageFormat.format("$1[#$2]({0}/tickets?r={1}&h=$2)$3", canonicalUrl, repositoryName);
  118. text = text.replaceAll("([\\s,]+)#(\\d+)([\\s,:\\.\\n])", ticketReplacement);
  119. // link commit shas
  120. int shaLen = settings.getInteger(Keys.web.shortCommitIdLength, 6);
  121. String commitPattern = MessageFormat.format("\\s([A-Fa-f0-9]'{'{0}'}')([A-Fa-f0-9]'{'{1}'}')", shaLen, 40 - shaLen);
  122. String commitReplacement = String.format(" <a class='commit' href='%1$s/commit?r=%2$s&h=$1$2'>$1</a>", canonicalUrl, repositoryName);
  123. text = text.replaceAll(commitPattern, commitReplacement);
  124. String html = transformMarkdown(text);
  125. return html;
  126. }
  127. }