Mercurial > jhg
comparison src/org/tmatesoft/hg/core/HgChangeset.java @ 380:9517df1ef7ec
Comments/javadoc
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
|---|---|
| date | Thu, 09 Feb 2012 18:57:14 +0100 |
| parents | 189dc6dc1c3e |
| children | 2747b0723867 d0e5dc3cae6e |
comparison
equal
deleted
inserted
replaced
| 379:fa2be7a05af6 | 380:9517df1ef7ec |
|---|---|
| 142 return !(getFirstParentRevision().isNull() || getSecondParentRevision().isNull()); | 142 return !(getFirstParentRevision().isNull() || getSecondParentRevision().isNull()); |
| 143 } | 143 } |
| 144 | 144 |
| 145 /** | 145 /** |
| 146 * @return never <code>null</code> | 146 * @return never <code>null</code> |
| 147 * @throws HgInvalidControlFileException FIXME | 147 * @throws HgInvalidControlFileException if access to revlog index/data entry failed |
| 148 */ | 148 */ |
| 149 public Nodeid getFirstParentRevision() throws HgInvalidControlFileException { | 149 public Nodeid getFirstParentRevision() throws HgInvalidControlFileException { |
| 150 if (parentHelper != null) { | 150 if (parentHelper != null) { |
| 151 return parentHelper.safeFirstParent(nodeid); | 151 return parentHelper.safeFirstParent(nodeid); |
| 152 } | 152 } |
| 159 return Nodeid.fromBinary(parent1, 0); | 159 return Nodeid.fromBinary(parent1, 0); |
| 160 } | 160 } |
| 161 | 161 |
| 162 /** | 162 /** |
| 163 * @return never <code>null</code> | 163 * @return never <code>null</code> |
| 164 * @throws HgInvalidControlFileException FIXME | 164 * @throws HgInvalidControlFileException if access to revlog index/data entry failed |
| 165 */ | 165 */ |
| 166 public Nodeid getSecondParentRevision() throws HgInvalidControlFileException { | 166 public Nodeid getSecondParentRevision() throws HgInvalidControlFileException { |
| 167 if (parentHelper != null) { | 167 if (parentHelper != null) { |
| 168 return parentHelper.safeSecondParent(nodeid); | 168 return parentHelper.safeSecondParent(nodeid); |
| 169 } | 169 } |
