lp:~ggascoigne/bzr4j/bzr4j

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:bzr4j

Patrick Woodworth: Pending requested 2012-08-05

Diff: 1394 lines (+374/-199)

29 files modified

BUILDING.txt (+3/-0)
modules/core/pom.xml (+2/-1)
modules/intellij/pom.xml (+40/-32)
modules/intellij/src/main/java/org/emergent/bzr4j/intellij/BzrFileRevision.java (+19/-7)
modules/intellij/src/main/java/org/emergent/bzr4j/intellij/BzrIncomingStatusUpdater.java (+2/-1)
modules/intellij/src/main/java/org/emergent/bzr4j/intellij/BzrOutgoingStatusUpdater.java (+2/-1)
modules/intellij/src/main/java/org/emergent/bzr4j/intellij/BzrRevisionNumber.java (+3/-11)
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 (+7/-6)
modules/intellij/src/main/java/org/emergent/bzr4j/intellij/action/BzrCommandResultNotifier.java (+2/-1)
modules/intellij/src/main/java/org/emergent/bzr4j/intellij/command/BzrAnnotateCommand.java (+4/-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/BzrHistoryProvider.java (+12/-8)
modules/intellij/src/main/java/org/emergent/bzr4j/intellij/provider/annotate/BzrAnnotation.java (+67/-32)
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/annotate/BzrAnnotationProvider.java (+7/-5)
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 (+10/-2)
modules/intellij/src/test/java/org/emergent/bzr4j/intellij/provider/annotate/BzrAnnotationLineTest.java (+39/-0)
modules/teamcity/pom.xml (+1/-1)
pom.xml (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

65. By Guy Gascoigne-Piggford on 2013-04-16

Add methods to fix compilation against IntelliJ IDEA 12.1
Bumped version number to 2.6.4

64. By Guy Gascoigne-Piggford on 2012-08-05

Add methods to fix compilation against IntelliJ IDEA 12.0
Bumped version number to 2.6.3
Bumped minimum idea version up to 120.00

63. By Guy Gascoigne-Piggford on 2012-04-28

Fix annotations. Previously they just showed the check in number by default, and gave a fairly verbose additional information.

Default:
5 *

With Additional Info:
revno:62 20120415 francis 5 *

Now the date format matches that of the command line, the revision # is trimmed. You can also select the element that you wish to display from the context menu.

Default:
62 2012-04-15 francis 5 *

The additional info option shows all fields, the normal has configurable fields.

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