Git: moved stash/shelve classes to git4idea.stash

diff --git a/plugins/git4idea/src/git4idea/checkin/GitPushActiveBranchesDialog.java b/plugins/git4idea/src/git4idea/checkin/GitPushActiveBranchesDialog.java
index f6939e289a445cece5f4cdd7254279c49c8a6659..58260620f5f4dbdfc52c121718617d5887f5c629 100644 (file)
--- a/plugins/git4idea/src/git4idea/checkin/GitPushActiveBranchesDialog.java
+++ b/plugins/git4idea/src/git4idea/checkin/GitPushActiveBranchesDialog.java
@@ -51,6 +51,9 @@ import git4idea.commands.*;
 import git4idea.config.GitVcsSettings;
 import git4idea.i18n.GitBundle;
 import git4idea.rebase.GitRebaser;
+import git4idea.stash.GitChangesSaver;
+import git4idea.stash.GitShelveChangesSaver;
+import git4idea.stash.GitStashChangesSaver;
 import git4idea.ui.GitUIUtil;
 import git4idea.update.*;
 import org.jetbrains.annotations.NotNull;

diff --git a/plugins/git4idea/src/git4idea/checkout/branches/GitCheckoutProcess.java b/plugins/git4idea/src/git4idea/checkout/branches/GitCheckoutProcess.java
index f0616594052a351801283dd1639efbdd557f9bfc..b228b195f177628711af69eca30d8544b61091d1 100644 (file)
--- a/plugins/git4idea/src/git4idea/checkout/branches/GitCheckoutProcess.java
+++ b/plugins/git4idea/src/git4idea/checkout/branches/GitCheckoutProcess.java
@@ -44,8 +44,8 @@ import git4idea.checkout.branches.GitBranchConfigurations.BranchChanges;
 import git4idea.checkout.branches.GitBranchConfigurations.ChangeInfo;
 import git4idea.checkout.branches.GitBranchConfigurations.ChangeListInfo;
 import git4idea.commands.*;
+import git4idea.stash.GitStashUtils;
 import git4idea.ui.GitUIUtil;
-import git4idea.update.GitStashUtils;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.File;

diff --git a/plugins/git4idea/src/git4idea/update/GitChangesSaver.java b/plugins/git4idea/src/git4idea/stash/GitChangesSaver.java
similarity index 99%
rename from plugins/git4idea/src/git4idea/update/GitChangesSaver.java
rename to plugins/git4idea/src/git4idea/stash/GitChangesSaver.java
index cd275d55b89ac655c0d094fdfa9bc4283e6b8869..69cbdf1c7fb0f9ab2a61cfbf07f9f1f6de1447ae 100644 (file)
--- a/plugins/git4idea/src/git4idea/update/GitChangesSaver.java
+++ b/plugins/git4idea/src/git4idea/stash/GitChangesSaver.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package git4idea.update;
+package git4idea.stash;
 
 import com.intellij.notification.Notification;
 import com.intellij.notification.NotificationListener;

diff --git a/plugins/git4idea/src/git4idea/update/GitShelveChangesSaver.java b/plugins/git4idea/src/git4idea/stash/GitShelveChangesSaver.java
similarity index 99%
rename from plugins/git4idea/src/git4idea/update/GitShelveChangesSaver.java
rename to plugins/git4idea/src/git4idea/stash/GitShelveChangesSaver.java
index 57000d3eebad5da65a145a25ee4baf826fc95ec6..2e37e16df698f84580201eb62bb66184db0f079b 100644 (file)
--- a/plugins/git4idea/src/git4idea/update/GitShelveChangesSaver.java
+++ b/plugins/git4idea/src/git4idea/stash/GitShelveChangesSaver.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package git4idea.update;
+package git4idea.stash;
 
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.progress.ProgressIndicator;

diff --git a/plugins/git4idea/src/git4idea/update/GitStashChangesSaver.java b/plugins/git4idea/src/git4idea/stash/GitStashChangesSaver.java
similarity index 99%
rename from plugins/git4idea/src/git4idea/update/GitStashChangesSaver.java
rename to plugins/git4idea/src/git4idea/stash/GitStashChangesSaver.java
index e9b323e94d77b5f01686c1dd82bbf2f7517c209d..ca8f4120ed408b73d26a96afd9ab4eaf1360ae60 100644 (file)
--- a/plugins/git4idea/src/git4idea/update/GitStashChangesSaver.java
+++ b/plugins/git4idea/src/git4idea/stash/GitStashChangesSaver.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package git4idea.update;
+package git4idea.stash;
 
 import com.intellij.notification.Notification;
 import com.intellij.notification.NotificationListener;

diff --git a/plugins/git4idea/src/git4idea/update/GitStashUtils.java b/plugins/git4idea/src/git4idea/stash/GitStashUtils.java
similarity index 99%
rename from plugins/git4idea/src/git4idea/update/GitStashUtils.java
rename to plugins/git4idea/src/git4idea/stash/GitStashUtils.java
index 2c42bf58ff1cc7d4a9328afa48e0927e316564df..3bfc731c3109f45f33353a0dfc3dc887ae3b5c0b 100644 (file)
--- a/plugins/git4idea/src/git4idea/update/GitStashUtils.java
+++ b/plugins/git4idea/src/git4idea/stash/GitStashUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package git4idea.update;
+package git4idea.stash;
 
 import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.diagnostic.Logger;

diff --git a/plugins/git4idea/src/git4idea/ui/GitUnstashDialog.java b/plugins/git4idea/src/git4idea/ui/GitUnstashDialog.java
index 36865fd50fdbb1c90ddb74feff7b85c4d6b3ec59..820749a286c66391683350c2f197dd7d96399bc3 100644 (file)
--- a/plugins/git4idea/src/git4idea/ui/GitUnstashDialog.java
+++ b/plugins/git4idea/src/git4idea/ui/GitUnstashDialog.java
@@ -33,7 +33,7 @@ import git4idea.actions.GitShowAllSubmittedFilesAction;
 import git4idea.commands.*;
 import git4idea.config.GitVersionSpecialty;
 import git4idea.i18n.GitBundle;
-import git4idea.update.GitStashUtils;
+import git4idea.stash.GitStashUtils;
 import git4idea.validators.GitBranchNameValidator;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/plugins/git4idea/src/git4idea/update/GitUpdateProcess.java b/plugins/git4idea/src/git4idea/update/GitUpdateProcess.java
index 1b5a53be66b26777c09e74c18253302f1017515b..ab4dba37129db69f864687dc81d6165a6ca973e2 100644 (file)
--- a/plugins/git4idea/src/git4idea/update/GitUpdateProcess.java
+++ b/plugins/git4idea/src/git4idea/update/GitUpdateProcess.java
@@ -35,6 +35,7 @@ import git4idea.merge.GitMergeConflictResolver;
 import git4idea.merge.GitMergeUtil;
 import git4idea.merge.GitMerger;
 import git4idea.rebase.GitRebaser;
+import git4idea.stash.GitChangesSaver;
 import git4idea.ui.GitUIUtil;
 import org.jetbrains.annotations.NotNull;