Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ static void createPullRequest(@Nonnull final Project project, @Nullable VirtualF
@Override
public void run(@Nonnull ProgressIndicator indicator) {
LOG.info("Pushing current branch");
indicator.setTextValue(LocalizeValue.localizeTODO("Pushing current branch..."));
indicator.setText(LocalizeValue.localizeTODO("Pushing current branch..."));
GitCommandResult result = git.push(repository, remoteName, remoteUrl, puttyKey, currentBranch.getName(), true);
if (!result.success()) {
GithubNotifications.showError(
Expand All @@ -209,7 +209,7 @@ public void run(@Nonnull ProgressIndicator indicator) {
}

LOG.info("Creating pull request");
indicator.setTextValue(LocalizeValue.localizeTODO("Creating pull request..."));
indicator.setText(LocalizeValue.localizeTODO("Creating pull request..."));
GithubPullRequest request =
createPullRequest(project, auth, targetRepo, dialog.getRequestTitle(), dialog.getDescription(), from, onto);
if (request == null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ public void run(@Nonnull ProgressIndicator indicator) {

if (upstreamRemoteUrl == null) {
LOG.info("Configuring upstream remote");
indicator.setTextValue(LocalizeValue.localizeTODO("Configuring upstream remote..."));
indicator.setText(LocalizeValue.localizeTODO("Configuring upstream remote..."));
upstreamRemoteUrl = configureUpstreamRemote(project, root, gitRepository, indicator);
if (upstreamRemoteUrl == null) {
return;
Expand Down Expand Up @@ -160,13 +160,13 @@ public void run(@Nonnull ProgressIndicator indicator) {
}

LOG.info("Fetching upstream");
indicator.setTextValue(LocalizeValue.localizeTODO("Fetching upstream..."));
indicator.setText(LocalizeValue.localizeTODO("Fetching upstream..."));
if (!fetchParent(project, gitRepository, indicator)) {
return;
}

LOG.info("Rebasing current branch");
indicator.setTextValue(LocalizeValue.localizeTODO("Rebasing current branch..."));
indicator.setText(LocalizeValue.localizeTODO("Rebasing current branch..."));
rebaseCurrentBranch(project, root, gitRepository, indicator);
}
}.queue();
Expand Down Expand Up @@ -200,7 +200,7 @@ static String configureUpstreamRemote(
String parentRepoUrl = GithubUrlUtil.getGitHost() + '/' + repositoryInfo.getParent().getFullName() + ".git";

LOG.info("Adding GitHub parent as a remote host");
indicator.setTextValue(LocalizeValue.localizeTODO("Adding GitHub parent as a remote host..."));
indicator.setText(LocalizeValue.localizeTODO("Adding GitHub parent as a remote host..."));
return addParentAsUpstreamRemote(project, root, parentRepoUrl, gitRepository);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ public static void shareProjectOnGithub(@Nonnull final Project project, @Nullabl
public void run(@Nonnull ProgressIndicator indicator) {
// create GitHub repo (network)
LOG.info("Creating GitHub repository");
indicator.setTextValue(LocalizeValue.localizeTODO("Creating GitHub repository..."));
indicator.setText(LocalizeValue.localizeTODO("Creating GitHub repository..."));
String url = createGithubRepository(
project,
githubInfo.getAuthData(),
Expand All @@ -191,7 +191,7 @@ public void run(@Nonnull ProgressIndicator indicator) {
LOG.info("Binding local project with GitHub");
if (!gitDetected) {
LOG.info("No git detected, creating empty git repo");
indicator.setTextValue(LocalizeValue.localizeTODO("Creating empty git repo..."));
indicator.setText(LocalizeValue.localizeTODO("Creating empty git repo..."));
if (!createEmptyGitRepository(project, root, indicator)) {
return;
}
Expand All @@ -206,7 +206,7 @@ public void run(@Nonnull ProgressIndicator indicator) {

//git remote add origin git@github.com:login/name.git
LOG.info("Adding GitHub as a remote host");
indicator.setTextValue(LocalizeValue.localizeTODO("Adding GitHub as a remote host..."));
indicator.setText(LocalizeValue.localizeTODO("Adding GitHub as a remote host..."));
if (!addGithubRemote(project, root, remoteName, remoteUrl, repository)) {
return;
}
Expand All @@ -218,7 +218,7 @@ public void run(@Nonnull ProgressIndicator indicator) {

//git push origin master
LOG.info("Pushing to github master");
indicator.setTextValue(LocalizeValue.localizeTODO("Pushing to github master..."));
indicator.setText(LocalizeValue.localizeTODO("Pushing to github master..."));
if (!pushCurrentBranch(project, repository, remoteName, remoteUrl, name, url)) {
return;
}
Expand Down Expand Up @@ -344,7 +344,7 @@ private static boolean performFirstCommitIfRequired(
LOG.info("Trying to commit");
try {
LOG.info("Adding files for commit");
indicator.setTextValue(LocalizeValue.localizeTODO("Adding files to git..."));
indicator.setText(LocalizeValue.localizeTODO("Adding files to git..."));

// ask for files to add
List<VirtualFile> trackedFiles = ChangeListManager.getInstance(project).getAffectedFiles();
Expand Down Expand Up @@ -389,7 +389,7 @@ private static boolean performFirstCommitIfRequired(

// commit
LOG.info("Performing commit");
indicator.setTextValue(LocalizeValue.localizeTODO("Performing commit..."));
indicator.setText(LocalizeValue.localizeTODO("Performing commit..."));
GitSimpleHandler handler = new GitSimpleHandler(project, root, GitCommand.COMMIT);
handler.addParameters("-m", dialog.getCommitMessage());
handler.endOptions();
Expand Down
Loading