Mercurial > jhg

comparison src/org/tmatesoft/hg/core/HgPullCommand.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 7743a9c10bfa
children
comparison
equal deleted inserted replaced
704:7743a9c10bfa 705:b4242b7e7dfe
19 import java.util.Collection; 19 import java.util.Collection;
20 import java.util.Collections; 20 import java.util.Collections;
21 import java.util.List; 21 import java.util.List;
22 22
23 import org.tmatesoft.hg.internal.AddRevInspector; 23 import org.tmatesoft.hg.internal.AddRevInspector;
24 import org.tmatesoft.hg.internal.COWTransaction;
25 import org.tmatesoft.hg.internal.Internals; 24 import org.tmatesoft.hg.internal.Internals;
26 import org.tmatesoft.hg.internal.PhasesHelper; 25 import org.tmatesoft.hg.internal.PhasesHelper;
27 import org.tmatesoft.hg.internal.RepositoryComparator; 26 import org.tmatesoft.hg.internal.RepositoryComparator;
28 import org.tmatesoft.hg.internal.RevisionSet; 27 import org.tmatesoft.hg.internal.RevisionSet;
29 import org.tmatesoft.hg.internal.Transaction; 28 import org.tmatesoft.hg.internal.Transaction;
76 HgBundle incoming = remote.getChanges(common); 75 HgBundle incoming = remote.getChanges(common);
77 // 76 //
78 // add revisions to changelog, manifest, files 77 // add revisions to changelog, manifest, files
79 final Internals implRepo = HgInternals.getImplementationRepo(repo); 78 final Internals implRepo = HgInternals.getImplementationRepo(repo);
80 final AddRevInspector insp; 79 final AddRevInspector insp;
81 Transaction.Factory trFactory = new COWTransaction.Factory(); 80 Transaction.Factory trFactory = implRepo.getTransactionFactory();
82 Transaction tr = trFactory.create(repo); 81 Transaction tr = trFactory.create(repo);
83 try { 82 try {
84 incoming.inspectAll(insp = new AddRevInspector(implRepo, tr)); 83 incoming.inspectAll(insp = new AddRevInspector(implRepo, tr));
85 insp.done(); 84 insp.done();
86 tr.commit(); 85 tr.commit();