changeset 890:771ae1b2f0b1

More command descriptions
author Dmitry Neverov <dmitry.neverov@jetbrains.com>
date Fri, 07 Nov 2014 14:30:28 +0100
parents 62ebe9e449a3
children d1a5fc6c1d6e
files mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/AddRemoveCommand.java mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/ArchiveCommand.java mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CloneCommand.java mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CommitCommand.java mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/FreeStyleCommand.java mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/IdentifyCommand.java mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/Init.java mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/LoadDagCommand.java mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/MergeCommand.java mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/ParentsCommand.java mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/PurgeCommand.java mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/PushCommand.java mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/ResolveCommand.java mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/StatusCommand.java mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/TagCommand.java mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/UpdateBookmarkCommand.java mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/UpdateCommand.java
diffstat 17 files changed, 122 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/AddRemoveCommand.java	Fri Nov 07 13:12:56 2014 +0100
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/AddRemoveCommand.java	Fri Nov 07 14:30:28 2014 +0100
@@ -34,4 +34,10 @@
     cmd.addParameter("addremove");
     runCommand(cmd);
   }
+
+  @NotNull
+  @Override
+  protected String getDescription() {
+    return "hg addremove";
+  }
 }
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/ArchiveCommand.java	Fri Nov 07 13:12:56 2014 +0100
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/ArchiveCommand.java	Fri Nov 07 14:30:28 2014 +0100
@@ -122,4 +122,10 @@
     File hg_arhival = new File(myDestination, ".hg_archival.txt");
     FileUtil.delete(hg_arhival);
   }
+
+  @NotNull
+  @Override
+  protected String getDescription() {
+    return "hg archive -r " + (myToId != null ? myToId : "tip");
+  }
 }
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CloneCommand.java	Fri Nov 07 13:12:56 2014 +0100
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CloneCommand.java	Fri Nov 07 14:30:28 2014 +0100
@@ -111,4 +111,10 @@
 
     runCommand(cli, settings);
   }
+
+  @NotNull
+  @Override
+  protected String getDescription() {
+    return "hg clone " + myAuthSettings.getRepositoryUrlWithHiddenPassword(myRepository);
+  }
 }
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CommitCommand.java	Fri Nov 07 13:12:56 2014 +0100
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CommitCommand.java	Fri Nov 07 14:30:28 2014 +0100
@@ -53,4 +53,10 @@
     CommandResult result = runCommand(cmd);
     return result.getExitCode();
   }
+
+  @NotNull
+  @Override
+  protected String getDescription() {
+    return "hg commit";
+  }
 }
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/FreeStyleCommand.java	Fri Nov 07 13:12:56 2014 +0100
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/FreeStyleCommand.java	Fri Nov 07 14:30:28 2014 +0100
@@ -16,6 +16,7 @@
 
 package jetbrains.buildServer.buildTriggers.vcs.mercurial.command;
 
+import jetbrains.buildServer.util.StringUtil;
 import jetbrains.buildServer.vcs.VcsException;
 import org.jetbrains.annotations.NotNull;
 
@@ -43,4 +44,10 @@
     cmd.addParameters(myArgs);
     return runCommand(cmd);
   }
+
+  @NotNull
+  @Override
+  protected String getDescription() {
+    return "hg " + myCommand + " " + StringUtil.join(" ", myArgs);
+  }
 }
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/IdentifyCommand.java	Fri Nov 07 13:12:56 2014 +0100
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/IdentifyCommand.java	Fri Nov 07 14:30:28 2014 +0100
@@ -110,4 +110,18 @@
       return output.contains(" ") ? output.substring(0, output.indexOf(" ")) : output;
     }
   }
+
+  @NotNull
+  @Override
+  protected String getDescription() {
+    StringBuilder result = new StringBuilder("hg id");
+    if (myChangeSet != null) {
+      result.append(" --rev ").append(myChangeSet.getId());
+    } else if (myRevisionNumber != null) {
+      result.append(" --rev ").append(myRevisionNumber.toString());
+    } else if (myNamedRevision != null) {
+      result.append(" --rev ").append(myNamedRevision);
+    }
+    return result.toString();
+  }
 }
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/Init.java	Fri Nov 07 13:12:56 2014 +0100
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/Init.java	Fri Nov 07 14:30:28 2014 +0100
@@ -39,4 +39,10 @@
     cli.addParameter("init");
     runCommand(cli);
   }
+
+  @NotNull
+  @Override
+  protected String getDescription() {
+    return "hg init";
+  }
 }
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/LoadDagCommand.java	Fri Nov 07 13:12:56 2014 +0100
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/LoadDagCommand.java	Fri Nov 07 14:30:28 2014 +0100
@@ -84,4 +84,10 @@
       }
     });
   }
+
+  @NotNull
+  @Override
+  protected String getDescription() {
+    return "hg log <dag>";
+  }
 }
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/MergeCommand.java	Fri Nov 07 13:12:56 2014 +0100
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/MergeCommand.java	Fri Nov 07 14:30:28 2014 +0100
@@ -54,4 +54,10 @@
     if (result.getExitCode() == 1)
       throw new MergeConflictException();
   }
+
+  @NotNull
+  @Override
+  protected String getDescription() {
+    return "hg merge";
+  }
 }
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/ParentsCommand.java	Fri Nov 07 13:12:56 2014 +0100
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/ParentsCommand.java	Fri Nov 07 14:30:28 2014 +0100
@@ -54,4 +54,10 @@
     }
     return parentRevisions;
   }
+
+  @NotNull
+  @Override
+  protected String getDescription() {
+    return "hg parents";
+  }
 }
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/PurgeCommand.java	Fri Nov 07 13:12:56 2014 +0100
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/PurgeCommand.java	Fri Nov 07 14:30:28 2014 +0100
@@ -47,4 +47,10 @@
       cmd.addParameter("--all");
     runCommand(cmd);
   }
+
+  @NotNull
+  @Override
+  protected String getDescription() {
+    return "hg purge";
+  }
 }
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/PushCommand.java	Fri Nov 07 13:12:56 2014 +0100
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/PushCommand.java	Fri Nov 07 14:30:28 2014 +0100
@@ -59,4 +59,10 @@
     }
     runCommand(cli, myCommandSettings);
   }
+
+  @NotNull
+  @Override
+  protected String getDescription() {
+    return "hg push " + myAuthSettings.getRepositoryUrlWithHiddenPassword(myRepositoryUrl);
+  }
 }
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/ResolveCommand.java	Fri Nov 07 13:12:56 2014 +0100
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/ResolveCommand.java	Fri Nov 07 14:30:28 2014 +0100
@@ -46,4 +46,10 @@
     }
     return unresolvedFiles;
   }
+
+  @NotNull
+  @Override
+  protected String getDescription() {
+    return "hg resolve";
+  }
 }
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/StatusCommand.java	Fri Nov 07 13:12:56 2014 +0100
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/StatusCommand.java	Fri Nov 07 14:30:28 2014 +0100
@@ -133,4 +133,10 @@
     final Status status = Status.makeStatus(modifier);
     return new FileStatus(status, path);
   }
+
+  @NotNull
+  @Override
+  protected String getDescription() {
+    return "hg status";
+  }
 }
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/TagCommand.java	Fri Nov 07 13:12:56 2014 +0100
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/TagCommand.java	Fri Nov 07 14:30:28 2014 +0100
@@ -59,4 +59,10 @@
     cli.addParameter(myTag);
     runCommand(cli);
   }
+
+  @NotNull
+  @Override
+  protected String getDescription() {
+    return "hg tag";
+  }
 }
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/UpdateBookmarkCommand.java	Fri Nov 07 13:12:56 2014 +0100
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/UpdateBookmarkCommand.java	Fri Nov 07 14:30:28 2014 +0100
@@ -53,4 +53,15 @@
     }
     runCommand(cmd);
   }
+
+  @NotNull
+  @Override
+  protected String getDescription() {
+    StringBuilder result = new StringBuilder("hg bookmark");
+    if (myBookmarkName != null)
+      result.append(" ").append(myBookmarkName);
+    if (myRevision != null)
+      result.append(" ").append(myRevision);
+    return result.toString();
+  }
 }
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/UpdateCommand.java	Fri Nov 07 13:12:56 2014 +0100
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/UpdateCommand.java	Fri Nov 07 14:30:28 2014 +0100
@@ -84,4 +84,16 @@
   private File getWorkingDirLock() {
     return new File(getWorkDirectory(), ".hg" + File.separator + "wlock");
   }
+
+  @NotNull
+  @Override
+  protected String getDescription() {
+    StringBuilder result = new StringBuilder("hg update");
+    if (myToId != null) {
+      result.append(" -r ").append(myToId);
+    } else {
+      result.append(" -r ").append(myBranchName);
+    }
+    return result.toString();
+  }
 }