Mercurial > jhg

comparison src/org/tmatesoft/hg/core/HgRevertCommand.java @ 705:b4242b7e7dfe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge command: implement conflict resolution alternatives
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Thu, 15 Aug 2013 18:43:50 +0200
parents 65c01508f002
children
comparison
equal deleted inserted replaced
704:7743a9c10bfa 705:b4242b7e7dfe
19 import java.io.File; 19 import java.io.File;
20 import java.util.Arrays; 20 import java.util.Arrays;
21 import java.util.LinkedHashSet; 21 import java.util.LinkedHashSet;
22 import java.util.Set; 22 import java.util.Set;
23 23
24 import org.tmatesoft.hg.internal.COWTransaction;
25 import org.tmatesoft.hg.internal.CsetParamKeeper; 24 import org.tmatesoft.hg.internal.CsetParamKeeper;
26 import org.tmatesoft.hg.internal.DirstateBuilder; 25 import org.tmatesoft.hg.internal.DirstateBuilder;
27 import org.tmatesoft.hg.internal.DirstateReader; 26 import org.tmatesoft.hg.internal.DirstateReader;
28 import org.tmatesoft.hg.internal.Internals; 27 import org.tmatesoft.hg.internal.Internals;
29 import org.tmatesoft.hg.internal.Transaction; 28 import org.tmatesoft.hg.internal.Transaction;
158 repo.getManifest().walkFileRevisions(file, insp, csetRevision); 157 repo.getManifest().walkFileRevisions(file, insp, csetRevision);
159 worker.checkFailed(); 158 worker.checkFailed();
160 progress.worked(1); 159 progress.worked(1);
161 cancellation.checkCancelled(); 160 cancellation.checkCancelled();
162 } 161 }
163 Transaction.Factory trFactory = new COWTransaction.Factory(); 162 Transaction.Factory trFactory = implRepo.getTransactionFactory();
164 Transaction tr = trFactory.create(repo); 163 Transaction tr = trFactory.create(repo);
165 try { 164 try {
166 // TODO same code in HgAddRemoveCommand and similar in HgCommitCommand 165 // TODO same code in HgAddRemoveCommand and similar in HgCommitCommand
167 dirstateBuilder.serialize(tr); 166 dirstateBuilder.serialize(tr);
168 tr.commit(); 167 tr.commit();