comparison cmdline/org/tmatesoft/hg/console/ChangesetDumpHandler.java @ 231:1792b37650f2

Introduced access to conflict resolution information (merge state)
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Wed, 01 Jun 2011 05:44:25 +0200
parents 644ee58c9f16
children 9fb50c04f03c
comparison
equal deleted inserted replaced
230:0dd9da7489dc 231:1792b37650f2
20 import java.util.LinkedList; 20 import java.util.LinkedList;
21 import java.util.List; 21 import java.util.List;
22 22
23 import org.tmatesoft.hg.core.HgChangeset; 23 import org.tmatesoft.hg.core.HgChangeset;
24 import org.tmatesoft.hg.core.HgChangesetHandler; 24 import org.tmatesoft.hg.core.HgChangesetHandler;
25 import org.tmatesoft.hg.core.HgFileRevision;
25 import org.tmatesoft.hg.core.Nodeid; 26 import org.tmatesoft.hg.core.Nodeid;
26 import org.tmatesoft.hg.core.HgLogCommand.FileRevision;
27 import org.tmatesoft.hg.repo.HgRepository; 27 import org.tmatesoft.hg.repo.HgRepository;
28 import org.tmatesoft.hg.util.Path; 28 import org.tmatesoft.hg.util.Path;
29 29
30 /** 30 /**
31 * 31 *
120 sb.append('\n'); 120 sb.append('\n');
121 } 121 }
122 if (complete) { 122 if (complete) {
123 if (!cset.getModifiedFiles().isEmpty()) { 123 if (!cset.getModifiedFiles().isEmpty()) {
124 sb.append("files: "); 124 sb.append("files: ");
125 for (FileRevision s : cset.getModifiedFiles()) { 125 for (HgFileRevision s : cset.getModifiedFiles()) {
126 sb.append(' '); 126 sb.append(' ');
127 sb.append(s.getPath()); 127 sb.append(s.getPath());
128 } 128 }
129 sb.append('\n'); 129 sb.append('\n');
130 } 130 }
131 if (!cset.getAddedFiles().isEmpty()) { 131 if (!cset.getAddedFiles().isEmpty()) {
132 sb.append("files+: "); 132 sb.append("files+: ");
133 for (FileRevision s : cset.getAddedFiles()) { 133 for (HgFileRevision s : cset.getAddedFiles()) {
134 sb.append(' '); 134 sb.append(' ');
135 sb.append(s.getPath()); 135 sb.append(s.getPath());
136 } 136 }
137 sb.append('\n'); 137 sb.append('\n');
138 } 138 }