MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[hg] rename branch creation method

Browse Source
This commit is contained in:
Nadya Zabrodina
2016-03-09 14:29:19 +03:00
parent 9870485955
commit 6322d5c36d
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/hg4idea/src/org/zmlx/hg4idea/HgTaskHandler.java
+1 -1
View File
@@ -58,7 +58,7 @@ public class HgTaskHandler extends DvcsTaskHandler<HgRepository> {
@Override
protected void checkoutAsNewBranch(@NotNull String name, @NotNull List<HgRepository> repositories) {
HgBookmarkCommand.createBookmark(repositories, name, true);
HgBookmarkCommand.createBookmarkAsynchronously(repositories, name, true);
}
@Override
plugins/hg4idea/src/org/zmlx/hg4idea/branch/HgBranchPopupActions.java
+1 -1
View File
@@ -221,7 +221,7 @@ public class HgBranchPopupActions {
if (bookmarkDialog.showAndGet()) {
final String name = bookmarkDialog.getName();
if (!StringUtil.isEmptyOrSpaces(name)) {
HgBookmarkCommand.createBookmark(myRepositories, name, bookmarkDialog.isActive());
HgBookmarkCommand.createBookmarkAsynchronously(myRepositories, name, bookmarkDialog.isActive());
}
}
}
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgBookmarkCommand.java
+7 -7
View File
@@ -43,20 +43,20 @@ public class HgBookmarkCommand {
};
}
public void createBookmark(boolean isActive) throws HgCommandException {
public void createBookmarkAsynchronously(boolean isActive) throws HgCommandException {
if (isActive) {
executeBookmarkCommand();
executeBookmarkCommandAsynchronously();
}
else {
executeBookmarkCommand("--inactive");
executeBookmarkCommandAsynchronously("--inactive");
}
}
public static void createBookmark(@NotNull List<HgRepository> repositories, @NotNull String name, boolean isActive) {
public static void createBookmarkAsynchronously(@NotNull List<HgRepository> repositories, @NotNull String name, boolean isActive) {
for (HgRepository repository : repositories) {
Project project = repository.getProject();
try {
new HgBookmarkCommand(project, repository.getRoot(), name).createBookmark(isActive);
new HgBookmarkCommand(project, repository.getRoot(), name).createBookmarkAsynchronously(isActive);
}
catch (HgCommandException exception) {
HgErrorUtil.handleException(project, exception);
@@ -65,10 +65,10 @@ public class HgBookmarkCommand {
}
public void deleteBookmark() throws HgCommandException {
executeBookmarkCommand("-d"); //delete
executeBookmarkCommandAsynchronously("-d"); //delete
}
private void executeBookmarkCommand(@NotNull String... args) throws HgCommandException {
private void executeBookmarkCommandAsynchronously(@NotNull String... args) throws HgCommandException {
if (StringUtil.isEmptyOrSpaces(myBookmarkName)) {
throw new HgCommandException("bookmark name is empty");
}