Mercurial > hg4j
comparison src/org/tmatesoft/hg/core/HgChangesetTreeHandler.java @ 507:a6435c1a42d0
Test for HgChangesetTreeHandler - make sure nothing is broken prior to adding --follow support
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
|---|---|
| date | Wed, 12 Dec 2012 14:17:12 +0100 |
| parents | 31a89587eb04 |
| children | e6c8b9b654b2 |
comparison
equal
deleted
inserted
replaced
| 506:27398bbfd543 | 507:a6435c1a42d0 |
|---|---|
| 45 * @return revision of the revlog being iterated. | 45 * @return revision of the revlog being iterated. |
| 46 */ | 46 */ |
| 47 public Nodeid fileRevision(); | 47 public Nodeid fileRevision(); |
| 48 | 48 |
| 49 /** | 49 /** |
| 50 * @return changeset associated with the current revision | 50 * @return changeset associated with the current file revision |
| 51 */ | 51 */ |
| 52 public HgChangeset changeset(); | 52 public HgChangeset changeset(); |
| 53 | 53 |
| 54 /** | 54 /** |
| 55 * Lightweight alternative to {@link #changeset()}, identifies changeset in which current file node has been modified | 55 * Lightweight alternative to {@link #changeset()}, identifies changeset in which current file node has been modified |
| 56 * @return changeset {@link Nodeid revision} | 56 * @return changeset {@link Nodeid revision} |
| 57 */ | 57 */ |
| 58 public Nodeid changesetRevision(); | 58 public Nodeid changesetRevision(); |
| 59 | 59 |
| 60 /** | 60 /** |
| 61 * Node, these are not necessarily in direct relation to parents of changeset from {@link #changeset()} | 61 * Identifies parent changes, changesets where file/revlog in question was modified prior to change being visited. |
| 62 * | |
| 63 * Note, these are not necessarily in direct relation to parents of changeset from {@link #changeset()} | |
| 64 * | |
| 65 * Imagine next history (grows from bottom to top): | |
| 66 * <pre> | |
| 67 * o A o | |
| 68 * | \ | | |
| 69 * o B \/ | |
| 70 * | o C | |
| 71 * | / | |
| 72 * o / | |
| 73 * | / | |
| 74 * o D | |
| 75 * </pre> | |
| 76 * | |
| 77 * When we are at {@link TreeElement} for <code>A</code>, <code>B</code> and <code>C</code> are changeset parents, naturally. However | |
| 78 * if the file/revlog we've been walking has not been changed in <code>B</code> and <code>C</code>, but e.g. in <code>D</code> only, | |
| 79 * then this {@link #parents()} call would return pair with single element only, pointing to <code>D</code> | |
| 80 * | |
| 62 * @return changesets that correspond to parents of the current file node, either pair element may be <code>null</code>. | 81 * @return changesets that correspond to parents of the current file node, either pair element may be <code>null</code>. |
| 63 */ | 82 */ |
| 64 public Pair<HgChangeset, HgChangeset> parents(); | 83 public Pair<HgChangeset, HgChangeset> parents(); |
| 65 | 84 |
| 66 /** | 85 /** |
