← Back to branch summary

~piastucki/bzr-eclipse/option-to-disable-logs

« back to all changes in this revision

Viewing changes to org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/UpdateCommand.java

  • Committer: Piotr Piastucki
  • Date: 2013-09-20 21:32:33 UTC
  • mfrom: (361.1.1 dev)
  • Revision ID: piotr_piastucki-20130920213233-wt8ofs0oc7gz3345
Merge lp:~piastucki/bzr-eclipse/report-conflicts-in-update-pull-merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
org.vcs.bazaar.eclipse.core/src/org/vcs/bazaar/eclipse/core/commands/UpdateCommand.java
18
18
public class UpdateCommand extends ResourceChangeCommand {
19
19
 
20
20
        private IBzrBranch branch;
21
 
        private String info;
22
21
 
23
22
        public UpdateCommand(IBzrBranch branch) {
24
23
                super();
31
30
                        monitor.beginTask("Update command", 100);
32
31
                        monitor.setTaskName("Updating");
33
32
                        IBazaarClient client = getClient(branch);
34
 
                        info = client.update(branch.getFile(), new CommandProgressListener(monitor));
35
 
                        return BzrWorkspaceRoot.findProjectsInBranch(branch);
 
33
                        client.update(branch.getFile(), new CommandProgressListener(monitor));
36
34
                } catch (BazaarClientException e) {
37
 
                        throw BazaarException.wrapException(e);
 
35
                        if (!setPostCommandErrorOnConflicts(e.getMessage())) {
 
36
                                throw BazaarException.wrapException(e);
 
37
                        }
38
38
                } finally {
39
39
                        monitor.done();
40
40
                }
41
 
        }
42
 
 
43
 
        public String getOutputMessage() {
44
 
                return info;
45
 
        }
46
 
 
 
41
                return BzrWorkspaceRoot.findProjectsInBranch(branch);
 
42
        }
47
43
 
48
44
}