summaryrefslogtreecommitdiff
path: root/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgPushCommand.java
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/hg4idea/src/org/zmlx/hg4idea/command/HgPushCommand.java')
-rw-r--r--plugins/hg4idea/src/org/zmlx/hg4idea/command/HgPushCommand.java23
1 files changed, 16 insertions, 7 deletions
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgPushCommand.java b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgPushCommand.java
index 357fa891201a..16748462a45f 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgPushCommand.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgPushCommand.java
@@ -33,7 +33,8 @@ public class HgPushCommand {
private String myRevision;
private boolean myForce;
- private HgTagBranch myBranch;
+ private String myBranchName;
+ private String myBookmarkName;
private boolean myIsNewBranch;
public HgPushCommand(Project project, @NotNull VirtualFile repo, String destination) {
@@ -50,13 +51,17 @@ public class HgPushCommand {
myForce = force;
}
- public void setBranch(HgTagBranch branch) {
- myBranch = branch;
+ public void setBranchName(String branchName) {
+ myBranchName = branchName;
}
public void setIsNewBranch(boolean isNewBranch) {
- myIsNewBranch = isNewBranch;
- }
+ myIsNewBranch = isNewBranch;
+ }
+
+ public void setBookmarkName(String bookmark) {
+ myBookmarkName = bookmark;
+ }
public void execute(final HgCommandResultHandler resultHandler) {
final List<String> arguments = new LinkedList<String>();
@@ -64,15 +69,19 @@ public class HgPushCommand {
arguments.add("-r");
arguments.add(myRevision);
}
- if (myBranch != null) {
+ if (myBranchName != null) {
if (myIsNewBranch) {
arguments.add("--new-branch");
}
else {
arguments.add("-b");
- arguments.add(myBranch.getName());
+ arguments.add(myBranchName);
}
}
+ if (!StringUtil.isEmptyOrSpaces(myBookmarkName)) {
+ arguments.add("-B");
+ arguments.add(myBookmarkName);
+ }
if (myForce) {
arguments.add("-f");
}