← Back to branch summary

~sandy-carter/bzr4idea/compile_errors

« back to all changes in this revision

Viewing changes to src/bzr4idea/ui/GitUnstashDialog.java

  • Committer: Patrik Beno
  • Date: 2009-04-19 15:52:06 UTC
  • Revision ID: patrik.beno@gmail.com-20090419155206-a8v8ds3r5ks063g9
BZR-79 refactoring; some bzr4idea/* classes renamed

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/bzr4idea/ui/GitUnstashDialog.java
22
22
import com.intellij.openapi.vfs.VirtualFile;
23
23
import com.intellij.ui.DocumentAdapter;
24
24
import bzr4idea.GitBranch;
25
 
import bzr4idea.GitRevisionNumber;
 
25
import bzr4idea.BzrRevisionNumber;
26
26
import bzr4idea.actions.GitShowAllSubmittedFilesAction;
27
27
import bzr4idea.commands.*;
28
28
import bzr4idea.i18n.GitBundle;
174
174
        String resolvedStash;
175
175
        String selectedStash = getSelectedStash();
176
176
        try {
177
 
          resolvedStash = GitRevisionNumber.resolve(myProject, root, selectedStash).asString();
 
177
          resolvedStash = BzrRevisionNumber.resolve(myProject, root, selectedStash).asString();
178
178
        }
179
179
        catch (VcsException ex) {
180
180
          try {
181
181
            //noinspection HardCodedStringLiteral
182
182
            if (ex.getMessage().startsWith("fatal: bad revision 'stash@")) {
183
183
              selectedStash = translateStash(selectedStash);
184
 
              resolvedStash = GitRevisionNumber.resolve(myProject, root, selectedStash).asString();
 
184
              resolvedStash = BzrRevisionNumber.resolve(myProject, root, selectedStash).asString();
185
185
            }
186
186
            else {
187
187
              throw ex;