Merge lp://staging/~frankoid/bzr4j/idea11-fixes into lp://staging/bzr4j
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~frankoid/bzr4j/idea11-fixes |
| Merge into: | lp://staging/bzr4j |
| Diff against target: |
907 lines (+229/-105) 22 files modified
modules/core/pom.xml (+1/-1) modules/intellij/pom.xml (+1/-1) modules/intellij/src/main/java/org/emergent/bzr4j/intellij/BzrFileRevision.java (+13/-7) modules/intellij/src/main/java/org/emergent/bzr4j/intellij/BzrVcs.java (+7/-0) modules/intellij/src/main/java/org/emergent/bzr4j/intellij/action/BzrAbstractGlobalAction.java (+3/-3) modules/intellij/src/main/java/org/emergent/bzr4j/intellij/action/BzrCommandResultNotifier.java (+2/-1) modules/intellij/src/main/java/org/emergent/bzr4j/intellij/command/BzrPullCommand.java (+2/-2) modules/intellij/src/main/java/org/emergent/bzr4j/intellij/command/BzrPushCommand.java (+2/-2) modules/intellij/src/main/java/org/emergent/bzr4j/intellij/command/ShellCommandService.java (+2/-4) modules/intellij/src/main/java/org/emergent/bzr4j/intellij/provider/BzrChangeProvider.java (+43/-12) modules/intellij/src/main/java/org/emergent/bzr4j/intellij/provider/annotate/BzrAnnotation.java (+12/-2) modules/intellij/src/main/java/org/emergent/bzr4j/intellij/provider/annotate/BzrAnnotationLine.java (+23/-0) modules/intellij/src/main/java/org/emergent/bzr4j/intellij/provider/commit/BzrCheckinEnvironment.java (+10/-1) modules/intellij/src/main/java/org/emergent/bzr4j/intellij/provider/commit/BzrCommitSession.java (+5/-1) modules/intellij/src/main/java/org/emergent/bzr4j/intellij/ui/BzrConfigurationIdePanel.java (+16/-17) modules/intellij/src/main/java/org/emergent/bzr4j/intellij/ui/BzrConfigurationProjectPanel.java (+7/-7) modules/intellij/src/main/java/org/emergent/bzr4j/intellij/ui/BzrIntegrateDialog.java (+19/-26) modules/intellij/src/main/java/org/emergent/bzr4j/intellij/ui/BzrSendErrorForm.java (+16/-16) modules/intellij/src/main/resources/META-INF/plugin.xml (+4/-0) modules/intellij/src/test/java/org/emergent/bzr4j/intellij/provider/annotate/BzrAnnotationLineTest.java (+39/-0) modules/teamcity/pom.xml (+1/-1) pom.xml (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~frankoid/bzr4j/idea11-fixes |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Harry Hirsch (community) | Approve | ||
| Patrick Woodworth | Pending | ||
|
Review via email:
|
|||
Description of the change
Update to work with IntelliJ 11.0
I don't know if this version will work with IntelliJ 10.0.
I've done basic testing against 11.0, i.e. I've tested diffing and committing.
Unmerged revisions
- 62. By Francis Devereux
-
Add methods to BzrCheckinEnvir
onment to fix compilation against IntelliJ IDEA 11.1 - 61. By Harry Hirsch
-
Honour branch boundaries when determining ignored/unversion status of files
- 60. By Francis Devereux
-
Update <change-notes> in plugin.xml and bump version to 2.6.2-SNAPSHOT
- 59. By Francis Devereux
-
Add methods to BzrAnnotation to fix compilation against IntelliJ IDEA 11.0
- 58. By Francis Devereux
-
Add Set<String> feedback argument to BzrCheckinEnvir
onment. commit so that it compiles against IntelliJ IDEA 11.0 - 57. By Francis Devereux
-
Form changes made automatically when building with IntelliJ 11.0
- 56. By Francis Devereux
-
Update BzrFileRevision to compile against IntelliJ IDEA 11.0 SDK and to use ContentRevision
Cache - 55. By Francis Devereux
-
VcsUtil.
showErrorMessag e has moved to VcsImplUtil - 54. By Francis Devereux
-
Fixed IDEA 10 (latest git as of 14 Feb 2011) compile errors
Works for me and a few co-workers in PhpStorm 3.0.1. Also works for me in IDEA Community Edition 11.0.
To additionally support the current IDEA trunk (11.x) there's only one thing missing...
org.emergent.
com.intellij.
public boolean isRefreshAfterC
return false;
}