選択できるのは25トピックまでです。 トピックは、先頭が英数字で、英数字とダッシュ('-')を使用した35文字以内のものにしてください。

AWTPlotRenderer.java 6.4KB

Rewrite reference handling to be abstract and accurate This commit actually does three major changes to the way references are handled within JGit. Unfortunately they were easier to do as a single massive commit than to break them up into smaller units. Disambiguate symbolic references: --------------------------------- Reporting a symbolic reference such as HEAD as though it were any other normal reference like refs/heads/master causes subtle programming errors. We have been bitten by this error on several occasions, as have some downstream applications written by myself. Instead of reporting HEAD as a reference whose name differs from its "original name", report it as an actual SymbolicRef object that the application can test the type and examine the target of. With this change, Ref is now an abstract type with different subclasses for the different types. In the classical example of "HEAD" being a symbolic reference to branch "refs/heads/master", the Repository.getAllRefs() method will now return: Map<String, Ref> all = repository.getAllRefs(); SymbolicRef HEAD = (SymbolicRef) all.get("HEAD"); ObjectIdRef master = (ObjectIdRef) all.get("refs/heads/master"); assertSame(master, HEAD.getTarget()); assertSame(master.getObjectId(), HEAD.getObjectId()); assertEquals("HEAD", HEAD.getName()); assertEquals("refs/heads/master", master.getName()); A nice side-effect of this change is the storage type of the symbolic reference is no longer ambiguous with the storge type of the underlying reference it targets. In the above example, if master was only available in the packed-refs file, then the following is also true: assertSame(Ref.Storage.LOOSE, HEAD.getStorage()); assertSame(Ref.Storage.PACKED, master.getStorage()); (Prior to this change we returned the ambiguous storage of LOOSE_PACKED for HEAD, which was confusing since it wasn't actually true on disk). Another nice side-effect of this change is all intermediate symbolic references are preserved, and are therefore visible to the application when they walk the target chain. We can now correctly inspect chains of symbolic references. As a result of this change the Ref.getOrigName() method has been removed from the API. Applications should identify a symbolic reference by testing for isSymbolic() and not by using an arcane string comparsion between properties. Abstract the RefDatabase storage: --------------------------------- RefDatabase is now abstract, similar to ObjectDatabase, and a new concrete implementation called RefDirectory is used for the traditional on-disk storage layout. In the future we plan to support additional implementations, such as a pure in-memory RefDatabase for unit testing purposes. Optimize RefDirectory: ---------------------- The implementation of the in-memory reference cache, reading, and update routines has been completely rewritten. Much of the code was heavily borrowed or cribbed from the prior implementation, so copyright notices have been left intact as much as possible. The RefDirectory cache no longer confuses symbolic references with normal references. This permits the cache to resolve the value of a symbolic reference as late as possible, ensuring it is always current, without needing to maintain reverse pointers. The cache is now 2 sorted RefLists, rather than 3 HashMaps. Using sorted lists allows the implementation to reduce the in-memory footprint when storing many refs. Using specialized types for the elements allows the code to avoid additional map lookups for auxiliary stat information. To improve scan time during getRefs(), the lists are returned via a copy-on-write contract. Most callers of getRefs() do not modify the returned collections, so the copy-on-write semantics improves access on repositories with a large number of packed references. Iterator traversals of the returned Map<String,Ref> are performed using a simple merge-join of the two cache lists, ensuring we can perform the entire traversal in linear time as a function of the number of references: O(PackedRefs + LooseRefs). Scans of the loose reference space to update the cache run in O(LooseRefs log LooseRefs) time, as the directory contents are sorted before being merged against the in-memory cache. Since the majority of stable references are kept packed, there typically are only a handful of reference names to be sorted, so the sorting cost should not be very high. Locking is reduced during getRefs() by taking advantage of the copy-on-write semantics of the improved cache data structure. This permits concurrent readers to pull back references without blocking each other. If there is contention updating the cache during a scan, one or more updates are simply skipped and will get picked up again in a future scan. Writing to the $GIT_DIR/packed-refs during reference delete is now fully atomic. The file is locked, reparsed fresh, and written back out if a change is necessary. This avoids all race conditions with concurrent external updates of the packed-refs file. The RefLogWriter class has been fully folded into RefDirectory and is therefore deleted. Maintaining the reference's log is the responsiblity of the database implementation, and not all implementations will use java.io for access. Future work still remains to be done to abstract the ReflogReader class away from local disk IO. Change-Id: I26b9287c45a4b2d2be35ba2849daa316f5eec85d Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
14年前
Rewrite reference handling to be abstract and accurate This commit actually does three major changes to the way references are handled within JGit. Unfortunately they were easier to do as a single massive commit than to break them up into smaller units. Disambiguate symbolic references: --------------------------------- Reporting a symbolic reference such as HEAD as though it were any other normal reference like refs/heads/master causes subtle programming errors. We have been bitten by this error on several occasions, as have some downstream applications written by myself. Instead of reporting HEAD as a reference whose name differs from its "original name", report it as an actual SymbolicRef object that the application can test the type and examine the target of. With this change, Ref is now an abstract type with different subclasses for the different types. In the classical example of "HEAD" being a symbolic reference to branch "refs/heads/master", the Repository.getAllRefs() method will now return: Map<String, Ref> all = repository.getAllRefs(); SymbolicRef HEAD = (SymbolicRef) all.get("HEAD"); ObjectIdRef master = (ObjectIdRef) all.get("refs/heads/master"); assertSame(master, HEAD.getTarget()); assertSame(master.getObjectId(), HEAD.getObjectId()); assertEquals("HEAD", HEAD.getName()); assertEquals("refs/heads/master", master.getName()); A nice side-effect of this change is the storage type of the symbolic reference is no longer ambiguous with the storge type of the underlying reference it targets. In the above example, if master was only available in the packed-refs file, then the following is also true: assertSame(Ref.Storage.LOOSE, HEAD.getStorage()); assertSame(Ref.Storage.PACKED, master.getStorage()); (Prior to this change we returned the ambiguous storage of LOOSE_PACKED for HEAD, which was confusing since it wasn't actually true on disk). Another nice side-effect of this change is all intermediate symbolic references are preserved, and are therefore visible to the application when they walk the target chain. We can now correctly inspect chains of symbolic references. As a result of this change the Ref.getOrigName() method has been removed from the API. Applications should identify a symbolic reference by testing for isSymbolic() and not by using an arcane string comparsion between properties. Abstract the RefDatabase storage: --------------------------------- RefDatabase is now abstract, similar to ObjectDatabase, and a new concrete implementation called RefDirectory is used for the traditional on-disk storage layout. In the future we plan to support additional implementations, such as a pure in-memory RefDatabase for unit testing purposes. Optimize RefDirectory: ---------------------- The implementation of the in-memory reference cache, reading, and update routines has been completely rewritten. Much of the code was heavily borrowed or cribbed from the prior implementation, so copyright notices have been left intact as much as possible. The RefDirectory cache no longer confuses symbolic references with normal references. This permits the cache to resolve the value of a symbolic reference as late as possible, ensuring it is always current, without needing to maintain reverse pointers. The cache is now 2 sorted RefLists, rather than 3 HashMaps. Using sorted lists allows the implementation to reduce the in-memory footprint when storing many refs. Using specialized types for the elements allows the code to avoid additional map lookups for auxiliary stat information. To improve scan time during getRefs(), the lists are returned via a copy-on-write contract. Most callers of getRefs() do not modify the returned collections, so the copy-on-write semantics improves access on repositories with a large number of packed references. Iterator traversals of the returned Map<String,Ref> are performed using a simple merge-join of the two cache lists, ensuring we can perform the entire traversal in linear time as a function of the number of references: O(PackedRefs + LooseRefs). Scans of the loose reference space to update the cache run in O(LooseRefs log LooseRefs) time, as the directory contents are sorted before being merged against the in-memory cache. Since the majority of stable references are kept packed, there typically are only a handful of reference names to be sorted, so the sorting cost should not be very high. Locking is reduced during getRefs() by taking advantage of the copy-on-write semantics of the improved cache data structure. This permits concurrent readers to pull back references without blocking each other. If there is contention updating the cache during a scan, one or more updates are simply skipped and will get picked up again in a future scan. Writing to the $GIT_DIR/packed-refs during reference delete is now fully atomic. The file is locked, reparsed fresh, and written back out if a change is necessary. This avoids all race conditions with concurrent external updates of the packed-refs file. The RefLogWriter class has been fully folded into RefDirectory and is therefore deleted. Maintaining the reference's log is the responsiblity of the database implementation, and not all implementations will use java.io for access. Future work still remains to be done to abstract the ReflogReader class away from local disk IO. Change-Id: I26b9287c45a4b2d2be35ba2849daa316f5eec85d Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
14年前
123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194
  1. /*
  2. * Copyright (C) 2010, Google Inc.
  3. * Copyright (C) 2008, Robin Rosenberg <robin.rosenberg@dewire.com>
  4. * Copyright (C) 2008, Shawn O. Pearce <spearce@spearce.org>
  5. * and other copyright owners as documented in the project's IP log.
  6. *
  7. * This program and the accompanying materials are made available
  8. * under the terms of the Eclipse Distribution License v1.0 which
  9. * accompanies this distribution, is reproduced below, and is
  10. * available at http://www.eclipse.org/org/documents/edl-v10.php
  11. *
  12. * All rights reserved.
  13. *
  14. * Redistribution and use in source and binary forms, with or
  15. * without modification, are permitted provided that the following
  16. * conditions are met:
  17. *
  18. * - Redistributions of source code must retain the above copyright
  19. * notice, this list of conditions and the following disclaimer.
  20. *
  21. * - Redistributions in binary form must reproduce the above
  22. * copyright notice, this list of conditions and the following
  23. * disclaimer in the documentation and/or other materials provided
  24. * with the distribution.
  25. *
  26. * - Neither the name of the Eclipse Foundation, Inc. nor the
  27. * names of its contributors may be used to endorse or promote
  28. * products derived from this software without specific prior
  29. * written permission.
  30. *
  31. * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
  32. * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
  33. * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  34. * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  35. * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
  36. * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  37. * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  38. * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  39. * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
  40. * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  41. * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  42. * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  43. * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  44. */
  45. package org.eclipse.jgit.awtui;
  46. import java.awt.Color;
  47. import java.awt.Graphics;
  48. import java.awt.Graphics2D;
  49. import java.awt.Polygon;
  50. import java.io.Serializable;
  51. import org.eclipse.jgit.awtui.CommitGraphPane.GraphCellRender;
  52. import org.eclipse.jgit.awtui.SwingCommitList.SwingLane;
  53. import org.eclipse.jgit.lib.Constants;
  54. import org.eclipse.jgit.lib.Ref;
  55. import org.eclipse.jgit.revplot.AbstractPlotRenderer;
  56. import org.eclipse.jgit.revplot.PlotCommit;
  57. final class AWTPlotRenderer extends AbstractPlotRenderer<SwingLane, Color>
  58. implements Serializable {
  59. private static final long serialVersionUID = 1L;
  60. final GraphCellRender cell;
  61. transient Graphics2D g;
  62. AWTPlotRenderer(final GraphCellRender c) {
  63. cell = c;
  64. }
  65. void paint(final Graphics in, final PlotCommit<SwingLane> commit) {
  66. g = (Graphics2D) in.create();
  67. try {
  68. final int h = cell.getHeight();
  69. g.setColor(cell.getBackground());
  70. g.fillRect(0, 0, cell.getWidth(), h);
  71. if (commit != null)
  72. paintCommit(commit, h);
  73. } finally {
  74. g.dispose();
  75. g = null;
  76. }
  77. }
  78. @Override
  79. protected void drawLine(final Color color, int x1, int y1, int x2,
  80. int y2, int width) {
  81. if (y1 == y2) {
  82. x1 -= width / 2;
  83. x2 -= width / 2;
  84. } else if (x1 == x2) {
  85. y1 -= width / 2;
  86. y2 -= width / 2;
  87. }
  88. g.setColor(color);
  89. g.setStroke(CommitGraphPane.stroke(width));
  90. g.drawLine(x1, y1, x2, y2);
  91. }
  92. @Override
  93. protected void drawCommitDot(final int x, final int y, final int w,
  94. final int h) {
  95. g.setColor(Color.blue);
  96. g.setStroke(CommitGraphPane.strokeCache[1]);
  97. g.fillOval(x, y, w, h);
  98. g.setColor(Color.black);
  99. g.drawOval(x, y, w, h);
  100. }
  101. @Override
  102. protected void drawBoundaryDot(final int x, final int y, final int w,
  103. final int h) {
  104. g.setColor(cell.getBackground());
  105. g.setStroke(CommitGraphPane.strokeCache[1]);
  106. g.fillOval(x, y, w, h);
  107. g.setColor(Color.black);
  108. g.drawOval(x, y, w, h);
  109. }
  110. @Override
  111. protected void drawText(final String msg, final int x, final int y) {
  112. final int texth = g.getFontMetrics().getHeight();
  113. final int y0 = (y - texth) / 2 + (cell.getHeight() - texth) / 2;
  114. g.setColor(cell.getForeground());
  115. g.drawString(msg, x, y0 + texth - g.getFontMetrics().getDescent());
  116. }
  117. @Override
  118. protected Color laneColor(final SwingLane myLane) {
  119. return myLane != null ? myLane.color : Color.black;
  120. }
  121. void paintTriangleDown(final int cx, final int y, final int h) {
  122. final int tipX = cx;
  123. final int tipY = y + h;
  124. final int baseX1 = cx - 10 / 2;
  125. final int baseX2 = tipX + 10 / 2;
  126. final int baseY = y;
  127. final Polygon triangle = new Polygon();
  128. triangle.addPoint(tipX, tipY);
  129. triangle.addPoint(baseX1, baseY);
  130. triangle.addPoint(baseX2, baseY);
  131. g.fillPolygon(triangle);
  132. g.drawPolygon(triangle);
  133. }
  134. @Override
  135. protected int drawLabel(int x, int y, Ref ref) {
  136. String txt;
  137. String name = ref.getName();
  138. if (name.startsWith(Constants.R_HEADS)) {
  139. g.setBackground(Color.GREEN);
  140. txt = name.substring(Constants.R_HEADS.length());
  141. } else if (name.startsWith(Constants.R_REMOTES)){
  142. g.setBackground(Color.LIGHT_GRAY);
  143. txt = name.substring(Constants.R_REMOTES.length());
  144. } else if (name.startsWith(Constants.R_TAGS)){
  145. g.setBackground(Color.YELLOW);
  146. txt = name.substring(Constants.R_TAGS.length());
  147. } else {
  148. // Whatever this would be
  149. g.setBackground(Color.WHITE);
  150. if (name.startsWith(Constants.R_REFS))
  151. txt = name.substring(Constants.R_REFS.length());
  152. else
  153. txt = name; // HEAD and such
  154. }
  155. if (ref.getPeeledObjectId() != null) {
  156. float[] colorComponents = g.getBackground().getRGBColorComponents(null);
  157. colorComponents[0] *= 0.9f;
  158. colorComponents[1] *= 0.9f;
  159. colorComponents[2] *= 0.9f;
  160. g.setBackground(new Color(colorComponents[0],colorComponents[1],colorComponents[2]));
  161. }
  162. if (txt.length() > 12)
  163. txt = txt.substring(0,11) + "\u2026"; // ellipsis "…" (in UTF-8) //$NON-NLS-1$
  164. final int texth = g.getFontMetrics().getHeight();
  165. int textw = g.getFontMetrics().stringWidth(txt);
  166. g.setColor(g.getBackground());
  167. int arcHeight = texth/4;
  168. int y0 = y - texth/2 + (cell.getHeight() - texth)/2;
  169. g.fillRoundRect(x , y0, textw + arcHeight*2, texth -1, arcHeight, arcHeight);
  170. g.setColor(g.getColor().darker());
  171. g.drawRoundRect(x, y0, textw + arcHeight*2, texth -1 , arcHeight, arcHeight);
  172. g.setColor(Color.BLACK);
  173. g.drawString(txt, x + arcHeight, y0 + texth - g.getFontMetrics().getDescent());
  174. return arcHeight * 3 + textw;
  175. }
  176. }