Mercurial > hg4j

comparison src/org/tmatesoft/hg/core/HgAddRemoveCommand.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
16 */ 16 */
17 package org.tmatesoft.hg.core; 17 package org.tmatesoft.hg.core;
18 18
19 import java.util.LinkedHashSet; 19 import java.util.LinkedHashSet;
20 20
21 import org.tmatesoft.hg.internal.COWTransaction;
22 import org.tmatesoft.hg.internal.DirstateBuilder; 21 import org.tmatesoft.hg.internal.DirstateBuilder;
23 import org.tmatesoft.hg.internal.DirstateReader; 22 import org.tmatesoft.hg.internal.DirstateReader;
24 import org.tmatesoft.hg.internal.Internals; 23 import org.tmatesoft.hg.internal.Internals;
25 import org.tmatesoft.hg.internal.Transaction; 24 import org.tmatesoft.hg.internal.Transaction;
26 import org.tmatesoft.hg.repo.HgManifest.Flags; 25 import org.tmatesoft.hg.repo.HgManifest.Flags;
121 for (Path p : toRemove) { 120 for (Path p : toRemove) {
122 dirstateBuilder.recordRemoved(p); 121 dirstateBuilder.recordRemoved(p);
123 progress.worked(1); 122 progress.worked(1);
124 cancellation.checkCancelled(); 123 cancellation.checkCancelled();
125 } 124 }
126 Transaction.Factory trFactory = new COWTransaction.Factory(); 125 Transaction.Factory trFactory = implRepo.getTransactionFactory();
127 Transaction tr = trFactory.create(repo); 126 Transaction tr = trFactory.create(repo);
128 try { 127 try {
129 dirstateBuilder.serialize(tr); 128 dirstateBuilder.serialize(tr);
130 tr.commit(); 129 tr.commit();
131 } catch (RuntimeException ex) { 130 } catch (RuntimeException ex) {