Mercurial > hg4j

comparison src/org/tmatesoft/hg/core/HgPullCommand.java @ 704:7743a9c10bfa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge command introduced
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Wed, 14 Aug 2013 20:07:26 +0200
parents d2552e6a5af6
children b4242b7e7dfe
comparison
equal deleted inserted replaced
703:7839ff0bfd78 704:7743a9c10bfa
57 public HgPullCommand source(HgRemoteRepository hgRemote) { 57 public HgPullCommand source(HgRemoteRepository hgRemote) {
58 remote = hgRemote; 58 remote = hgRemote;
59 return this; 59 return this;
60 } 60 }
61 61
62 // FIXME get repository lock
62 public void execute() throws HgRemoteConnectionException, HgIOException, HgLibraryFailureException, CancelledException { 63 public void execute() throws HgRemoteConnectionException, HgIOException, HgLibraryFailureException, CancelledException {
63 final ProgressSupport progress = getProgressSupport(null); 64 final ProgressSupport progress = getProgressSupport(null);
64 try { 65 try {
65 progress.start(100); 66 progress.start(100);
66 // TODO refactor same code in HgIncomingCommand #getComparator and #getParentHelper 67 // TODO refactor same code in HgIncomingCommand #getComparator and #getParentHelper