Mercurial > hg4j

comparison src/org/tmatesoft/hg/core/HgChangeset.java @ 427:31a89587eb04

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
FIXMEs: consistent names, throws for commands and their handlers. Use of checked exceptions in hi-level api
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Thu, 29 Mar 2012 17:14:35 +0200
parents 6437d261048a
children 1fc0da631200
comparison
equal deleted inserted replaced
426:063b0663495a 427:31a89587eb04
19 import java.util.ArrayList; 19 import java.util.ArrayList;
20 import java.util.Collections; 20 import java.util.Collections;
21 import java.util.List; 21 import java.util.List;
22 import java.util.Map; 22 import java.util.Map;
23 23
24 import org.tmatesoft.hg.repo.HgChangelog;
24 import org.tmatesoft.hg.repo.HgChangelog.RawChangeset; 25 import org.tmatesoft.hg.repo.HgChangelog.RawChangeset;
25 import org.tmatesoft.hg.repo.HgChangelog;
26 import org.tmatesoft.hg.repo.HgInvalidStateException; 26 import org.tmatesoft.hg.repo.HgInvalidStateException;
27 import org.tmatesoft.hg.repo.HgInvalidControlFileException;
28 import org.tmatesoft.hg.repo.HgRepository; 27 import org.tmatesoft.hg.repo.HgRepository;
29 import org.tmatesoft.hg.repo.HgRuntimeException; 28 import org.tmatesoft.hg.repo.HgRuntimeException;
30 import org.tmatesoft.hg.repo.HgStatusCollector; 29 import org.tmatesoft.hg.repo.HgStatusCollector;
31 import org.tmatesoft.hg.util.CancelledException; 30 import org.tmatesoft.hg.util.CancelledException;
32 import org.tmatesoft.hg.util.Path; 31 import org.tmatesoft.hg.util.Path;
199 initFileChanges(); 198 initFileChanges();
200 } 199 }
201 return deletedFiles; 200 return deletedFiles;
202 } 201 }
203 202
204 public boolean isMerge() throws HgInvalidControlFileException { 203 public boolean isMerge() throws HgRuntimeException {
205 // p1 == -1 and p2 != -1 is legitimate case 204 // p1 == -1 and p2 != -1 is legitimate case
206 return !(getFirstParentRevision().isNull() || getSecondParentRevision().isNull()); 205 return !(getFirstParentRevision().isNull() || getSecondParentRevision().isNull());
207 } 206 }
208 207
209 /** 208 /**