lp:~frankoid/bzr4j/idea11-fixes

Branch merges

Propose for merging

2 branches dependent on this one.

Ready for review for merging into lp:bzr4j

Harry Hirsch (community): Approve on 2012-02-26

Patrick Woodworth: Pending requested 2011-12-18

Diff: 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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #906895: AbstractMethodError: org.emergent.bzr4j.intellij.provider.commit.BzrCheckinEnvironment.commit	Undecided	In Progress
Bug #910352: AbstractMethodError: org.emergent.bzr4j.intellij.BzrFileRevision.loadContent()	Undecided	In Progress

Link a bug report

Related blueprints

62. By Francis Devereux on 2012-04-15

Add methods to BzrCheckinEnvironment to fix compilation against IntelliJ IDEA 11.1

61. By Harry Hirsch on 2012-02-23

Honour branch boundaries when determining ignored/unversion status of files

60. By Francis Devereux on 2011-12-18

Update <change-notes> in plugin.xml and bump version to 2.6.2-SNAPSHOT

59. By Francis Devereux on 2011-12-18

Add methods to BzrAnnotation to fix compilation against IntelliJ IDEA 11.0

58. By Francis Devereux on 2011-12-18

Add Set<String> feedback argument to BzrCheckinEnvironment.commit so that it compiles against IntelliJ IDEA 11.0

57. By Francis Devereux on 2011-12-18

Form changes made automatically when building with IntelliJ 11.0

56. By Francis Devereux on 2011-12-18

Update BzrFileRevision to compile against IntelliJ IDEA 11.0 SDK and to use ContentRevisionCache

55. By Francis Devereux on 2011-12-18

VcsUtil.showErrorMessage has moved to VcsImplUtil

54. By Francis Devereux on 2011-02-23

Fixed IDEA 10 (latest git as of 14 Feb 2011) compile errors

53. By Patrick Woodworth on 2011-02-15

Fix for bug 716279.