# HG changeset patch
# User eugene.petrenko@jetbrains.com
# Date 1401439038 -7200
# Node ID 4af42f0e4f595293f87c27897cf8837d7acf7207
# Parent  8aeb65cb8ca66e157b5a628f9fce3516cfbd78a3
@NotNull

diff -r 8aeb65cb8ca6 -r 4af42f0e4f59 mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/StatusCommand.java
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/StatusCommand.java	Fri May 30 10:35:28 2014 +0200
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/StatusCommand.java	Fri May 30 10:37:18 2014 +0200
@@ -37,21 +37,25 @@
     super(commandSettings, hgPath, workingDir, authSettings);
   }
 
+  @NotNull
   public StatusCommand fromRevision(@NotNull ChangeSet fromCset) {
     myFromId = fromCset.getId();
     return this;
   }
 
+  @NotNull
   public StatusCommand fromRevision(@NotNull String fromRevision) {
     myFromId = new ChangeSet(fromRevision).getId();
     return this;
   }
 
+  @NotNull
   public StatusCommand toRevision(@NotNull ChangeSet toCset) {
     myToId = toCset.getId();
     return this;
   }
 
+  @NotNull
   public StatusCommand toRevision(@NotNull String toRevision) {
     myToId = new ChangeSet(toRevision).getId();
     return this;
@@ -61,6 +65,7 @@
    * Adds option -A (--all)
    * @return self
    */
+  @NotNull
   public StatusCommand showAllFiles() {
     myShowAllFiles = true;
     return this;
@@ -70,32 +75,43 @@
    * Adds option -n (--no-status)
    * @return self
    */
+  @NotNull
   public StatusCommand hideStatus() {
     myHideStatus = true;
     return this;
   }
 
+  @NotNull
   public List<FileStatus> call() throws VcsException {
-    MercurialCommandLine cli = createCommandLine();
+    final MercurialCommandLine cli = createCommandLine();
     cli.addParameter("status");
-    if (myShowAllFiles)
+
+    if (myShowAllFiles) {
       cli.addParameter("-A");
-    if (myHideStatus)
+    }
+
+    if (myHideStatus) {
       cli.addParameter("-n");
+    }
     cli.addParameter("--rev");
+
     String from = myFromId;
     if (from == null)
       from = "0";
+
     String to = myToId;
-    if (to == null)
+    if (to == null) {
       to = "0";
+    }
     cli.addParameter(from + ":" + to);
-    CommandResult res = runCommand(cli);
+
+    final CommandResult res = runCommand(cli);
     return parseFiles(res.getStdout());
   }
 
-  private List<FileStatus> parseFiles(@NotNull String stdout) {
-    List<FileStatus> result = new ArrayList<FileStatus>();
+  @NotNull
+  private List<FileStatus> parseFiles(@NotNull final String stdout) {
+    final List<FileStatus> result = new ArrayList<FileStatus>();
     String[] lines = stdout.split("\n");
     for (String line : lines) {
       if (isEmpty(line))
@@ -109,12 +125,12 @@
   }
 
   @NotNull
-  private FileStatus parseLine(@NotNull String line) {
-    if (myHideStatus)
-      return new FileStatus(Status.UNKNOWN, line);
-    char modifier = line.charAt(0);
-    String path = line.substring(2);
-    Status status = Status.makeStatus(modifier);
+  private FileStatus parseLine(@NotNull final String line) {
+    if (myHideStatus) return new FileStatus(Status.UNKNOWN, line);
+
+    final char modifier = line.charAt(0);
+    final String path = line.substring(2);
+    final Status status = Status.makeStatus(modifier);
     return new FileStatus(status, path);
   }
 }