Merge lp:~ggascoigne/bzr4j/bzr4j into lp:bzr4j

[Guy Gascoigne-Piggford]

I think that this is a complete roll up merge of all of the proposed changes to this branch as well as my latest changed to support Idea 12.

[lp:~ggascoigne/bzr4j/bzr4j]

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

Unmerged revisions

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

=== modified file 'BUILDING.txt'
--- BUILDING.txt	2010-03-02 20:44:47 +0000
+++ BUILDING.txt	2013-04-16 16:02:26 +0000
@@ -4,6 +4,9 @@
   set BZR4J_IDEA_SDK_DIR=C:\Program Files\JetBrains\ideaIU-93.67-jdk15
   set BZR4J_TEAMCITY_SDK_DIR=C:\TeamCity
 
+or:
+  export BZR4J_IDEA_SDK_DIR=/Applications/IntelliJ\ IDEA\ 11\ CE.app/
+
 Build the custom maven-idea-plugin:
 
   pushd extras\maven-idea-plugin

=== modified file 'modules/core/pom.xml'
--- modules/core/pom.xml	2011-02-15 12:12:50 +0000
+++ modules/core/pom.xml	2013-04-16 16:02:26 +0000
@@ -6,7 +6,7 @@
 
   <groupId>org.emergent.bzr4j</groupId>
   <artifactId>bzr4j-core</artifactId>
-  <version>2.6.1</version>
+  <version>2.6.4-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Bzr4J Core Library</name>
   <url>http://launchpad.net/bzr4j</url>
@@ -62,6 +62,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.3.2</version>
         <configuration>
           <source>1.5</source>
           <target>1.5</target>

=== modified file 'modules/intellij/pom.xml'
--- modules/intellij/pom.xml	2011-02-15 12:12:50 +0000
+++ modules/intellij/pom.xml	2013-04-16 16:02:26 +0000
@@ -6,14 +6,14 @@
 
   <groupId>org.emergent.bzr4j</groupId>
   <artifactId>bzr4intellij</artifactId>
-  <version>2.6.1</version>
+  <version>2.6.4-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Bzr4IntelliJ Plugin</name>
   <url>http://bzr4j.emergent.org/</url>
 
   <properties>
     <project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
-    <idea.sdk.version>93.94</idea.sdk.version>
+    <idea.sdk.version>117.281</idea.sdk.version>
     <idea.sdk.dir>${env.BZR4J_IDEA_SDK_DIR}</idea.sdk.dir>
   </properties>
 
@@ -74,9 +74,9 @@
     </dependency>
 
     <dependency>
-        <groupId>commons-codec</groupId>
-        <artifactId>commons-codec</artifactId>
-        <version>1.3</version>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>1.3</version>
     </dependency>
 
     <dependency>
@@ -86,27 +86,27 @@
     </dependency>
 
     <dependency>
-        <groupId>org.jdom</groupId>
-        <artifactId>jdom</artifactId>
-        <version>1.1</version>
-    </dependency>
-
-    <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-io</artifactId>
-        <version>1.3.2</version>
-    </dependency>
-
-    <dependency>
-        <groupId>javax.mail</groupId>
-        <artifactId>mail</artifactId>
-        <version>1.4.1</version>
-    </dependency>
-
-    <dependency>
-        <groupId>javax.activation</groupId>
-        <artifactId>activation</artifactId>
-        <version>1.1</version>
+      <groupId>org.jdom</groupId>
+      <artifactId>jdom</artifactId>
+      <version>1.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>1.3.2</version>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.mail</groupId>
+      <artifactId>mail</artifactId>
+      <version>1.4.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.activation</groupId>
+      <artifactId>activation</artifactId>
+      <version>1.1</version>
     </dependency>
 
     <dependency>
@@ -116,6 +116,11 @@
       <version>5.8</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.emergent.bzr4j</groupId>
+      <artifactId>bzr4j-core</artifactId>
+      <version>2.6.4-SNAPSHOT</version>
+    </dependency>
 
   </dependencies>
 
@@ -141,6 +146,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.3.2</version>
         <configuration>
           <source>1.5</source>
           <target>${javac.target.level}</target>
@@ -178,13 +184,14 @@
                     <include name="${project.artifactId}*"/>
                   </fileset>
                 </delete>
-<!--
-                <copy overwrite="true" verbose="true" preservelastmodified="true"
-                      file="${project.build.directory}/install-bundles/${project.artifactId}-jarbundle.jar"
-                      tofile="${idea.plugins.dir}/${project.artifactId}.jar"/>
--->
+                <!--
+                                <copy overwrite="true" verbose="true" preservelastmodified="true"
+                                      file="${project.build.directory}/install-bundles/${project.artifactId}-jarbundle.jar"
+                                      tofile="${idea.plugins.dir}/${project.artifactId}.jar"/>
+                -->
                 <copy todir="${idea.plugins.dir}" preservelastmodified="true">
-                  <zipfileset src="${project.build.directory}/install-bundles/bzr4intellij-zipbundle.zip"/>
+                  <zipfileset
+                      src="${project.build.directory}/install-bundles/bzr4intellij-zipbundle.zip"/>
                 </copy>
               </tasks>
             </configuration>
@@ -196,6 +203,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-clean-plugin</artifactId>
+        <version>2.4.1</version>
         <configuration>
           <filesets>
             <fileset>

=== modified file 'modules/intellij/src/main/java/org/emergent/bzr4j/intellij/BzrFileRevision.java'
--- modules/intellij/src/main/java/org/emergent/bzr4j/intellij/BzrFileRevision.java	2010-03-02 20:44:47 +0000
+++ modules/intellij/src/main/java/org/emergent/bzr4j/intellij/BzrFileRevision.java	2013-04-16 16:02:26 +0000
@@ -1,9 +1,11 @@
 package org.emergent.bzr4j.intellij;
 
-import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.Throwable2Computable;
+import com.intellij.openapi.vcs.RepositoryLocation;
 import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vcs.history.VcsFileRevision;
+import com.intellij.openapi.vcs.impl.ContentRevisionCache;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.emergent.bzr4j.core.utils.StringUtil;
@@ -24,7 +26,6 @@
   private final Date revisionDate;
   private final String author;
   private final String commitMessage;
-  private byte[] content;
 
   public BzrFileRevision(Project project, BzrFile file, BzrRevisionNumber revisionNumber,
       String branchName, String revisionDate, String author, String commitMessage) throws ParseException {
@@ -62,22 +63,28 @@
     return commitMessage;
   }
 
-  public void loadContent() throws VcsException {
+  public byte[] loadContent() throws VcsException {
     try {
       Charset charset = m_file.toFilePath().getCharset();
       String result = new BzrCatCommand(m_project).execute(m_file, m_revisionNumber, charset);
       if (result == null) {
-        content = new byte[0];
+        return new byte[0];
       } else {
-        content = result.getBytes(charset.name());
+        return result.getBytes(charset.name());
       }
     } catch (UnsupportedEncodingException e) {
       throw new VcsException(e);
     }
   }
 
-  public byte[] getContent() throws IOException {
-    return content;
+  public byte[] getContent() throws IOException, VcsException {
+    return ContentRevisionCache.getOrLoadAsBytes(m_project, m_file.toFilePath(), getRevisionNumber(), BzrVcs.getKey(),
+        ContentRevisionCache.UniqueType.REPOSITORY_CONTENT,
+        new Throwable2Computable<byte[], VcsException, IOException>() {
+          public byte[] compute() throws VcsException, IOException {
+            return loadContent();
+          }
+        });
   }
 
   @Override
@@ -102,4 +109,9 @@
         .append(m_revisionNumber, that.m_revisionNumber)
         .isEquals();
   }
+
+  @Override
+  public RepositoryLocation getChangedRepositoryPath() {
+    return null;  // use initial url..
+  }
 }

=== modified file 'modules/intellij/src/main/java/org/emergent/bzr4j/intellij/BzrIncomingStatusUpdater.java'
--- modules/intellij/src/main/java/org/emergent/bzr4j/intellij/BzrIncomingStatusUpdater.java	2010-01-05 02:18:38 +0000
+++ modules/intellij/src/main/java/org/emergent/bzr4j/intellij/BzrIncomingStatusUpdater.java	2013-04-16 16:02:26 +0000
@@ -50,7 +50,8 @@
             VcsRoot[] roots = ProjectLevelVcsManager.getInstance(project).getAllVcsRoots();
             List<BzrFileRevision> changesets = new LinkedList<BzrFileRevision>();
             for (VcsRoot root : roots) {
-              BzrFile hgFile = new BzrFile(root.path, new File("."));
+              @SuppressWarnings("ConstantConditions")
+              BzrFile hgFile = new BzrFile(root.getPath(), new File("."));
               changesets.addAll(command.execute(hgFile, LIMIT - changesets.size()));
             }
             status.setChanges(changesets.size(), new IncomingChangesetFormatter(changesets));

=== modified file 'modules/intellij/src/main/java/org/emergent/bzr4j/intellij/BzrOutgoingStatusUpdater.java'
--- modules/intellij/src/main/java/org/emergent/bzr4j/intellij/BzrOutgoingStatusUpdater.java	2010-01-05 02:18:38 +0000
+++ modules/intellij/src/main/java/org/emergent/bzr4j/intellij/BzrOutgoingStatusUpdater.java	2013-04-16 16:02:26 +0000
@@ -50,7 +50,8 @@
             VcsRoot[] roots = ProjectLevelVcsManager.getInstance(project).getAllVcsRoots();
             List<BzrFileRevision> outgoing = new LinkedList<BzrFileRevision>();
             for (VcsRoot root : roots) {
-              BzrFile hgFile = new BzrFile(root.path, new File("."));
+              @SuppressWarnings("ConstantConditions")
+              BzrFile hgFile = new BzrFile(root.getPath(), new File("."));
               outgoing.addAll(command.execute(hgFile, LIMIT - outgoing.size()));
             }
             status.setChanges(outgoing.size(), new OutgoingChangesetFormatter(outgoing));

=== modified file 'modules/intellij/src/main/java/org/emergent/bzr4j/intellij/BzrRevisionNumber.java'
--- modules/intellij/src/main/java/org/emergent/bzr4j/intellij/BzrRevisionNumber.java	2010-03-02 20:44:47 +0000
+++ modules/intellij/src/main/java/org/emergent/bzr4j/intellij/BzrRevisionNumber.java	2013-04-16 16:02:26 +0000
@@ -24,9 +24,9 @@
 
   private BzrRevisionNumber(@NotNull String rev) {
     m_rev = rev;
-    if (rev.length() > 0 && rev.indexOf(':') < 0) {
-      m_rev = "revno:" + m_rev;
-    }
+//    if (rev.length() > 0 && rev.indexOf(':') < 0) {
+//      m_rev = "revno:" + m_rev;
+//    }
   }
 
   public String asString() {
@@ -42,13 +42,6 @@
       return -1;
     }
 
-//        BzrRevisionNumber hgRevisionNumber = (BzrRevisionNumber)o;
-//        if (changeset.equals(hgRevisionNumber.changeset)) {
-//            return 0;
-//        }
-
-//        return revision.compareTo(hgRevisionNumber.revision);
-
     return NaturalOrderComparator.compareObjects(asString(), o.asString());
   }
 
@@ -61,7 +54,6 @@
   public int hashCode() {
     return new HashCodeBuilder()
         .append(m_rev)
-//                .append(changeset)
         .toHashCode();
   }
 

=== modified file 'modules/intellij/src/main/java/org/emergent/bzr4j/intellij/BzrVcs.java'
--- modules/intellij/src/main/java/org/emergent/bzr4j/intellij/BzrVcs.java	2011-01-22 16:02:47 +0000
+++ modules/intellij/src/main/java/org/emergent/bzr4j/intellij/BzrVcs.java	2013-04-16 16:02:26 +0000
@@ -33,6 +33,7 @@
 import com.intellij.openapi.vcs.AbstractVcs;
 import com.intellij.openapi.vcs.ProjectLevelVcsManager;
 import com.intellij.openapi.vcs.VcsException;
+import com.intellij.openapi.vcs.VcsKey;
 import com.intellij.openapi.vcs.annotate.AnnotationProvider;
 import com.intellij.openapi.vcs.changes.ChangeListManager;
 import com.intellij.openapi.vcs.changes.ChangeProvider;
@@ -90,6 +91,8 @@
 
   public static final String VCS_METADATA_DIR = ".bzr";
 
+  private final static VcsKey ourKey = createKey(VCS_NAME);
+
   public static final Topic<BzrUpdater> BRANCH_TOPIC = new Topic<BzrUpdater>("bzr4intellij.branch", BzrUpdater.class);
   public static final Topic<BzrUpdater> INCOMING_TOPIC =
       new Topic<BzrUpdater>("bzr4intellij.incoming", BzrUpdater.class);
@@ -488,4 +491,8 @@
   public BzrRootTracker getMyRootTracker() {
     return myRootTracker;
   }
+
+  public static VcsKey getKey() {
+    return ourKey;
+  }
 }

=== modified file 'modules/intellij/src/main/java/org/emergent/bzr4j/intellij/action/BzrAbstractGlobalAction.java'
--- modules/intellij/src/main/java/org/emergent/bzr4j/intellij/action/BzrAbstractGlobalAction.java	2010-03-02 20:44:47 +0000
+++ modules/intellij/src/main/java/org/emergent/bzr4j/intellij/action/BzrAbstractGlobalAction.java	2013-04-16 16:02:26 +0000
@@ -23,10 +23,10 @@
 import com.intellij.openapi.vcs.VcsRoot;
 import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.vcsUtil.VcsUtil;
-import org.emergent.bzr4j.intellij.util.BzrDebug;
+import com.intellij.vcsUtil.VcsImplUtil;
 import org.emergent.bzr4j.intellij.BzrVcs;
 import org.emergent.bzr4j.intellij.command.BzrCommandException;
+import org.emergent.bzr4j.intellij.util.BzrDebug;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Collection;
@@ -54,7 +54,7 @@
     try {
       command.execute();
     } catch (BzrCommandException e) {
-      VcsUtil.showErrorMessage(project, e.getMessage(), "Error");
+      VcsImplUtil.showErrorMessage(project, e.getMessage(), "Error");
     }
     VcsDirtyScopeManager vcsDirtyScopeManager = VcsDirtyScopeManager.getInstance(project);
     vcsDirtyScopeManager.dirDirtyRecursively(command.getRepo());
@@ -83,7 +83,7 @@
 
     BzrVcs vcs = (BzrVcs)ProjectLevelVcsManager.getInstance(project).findVcsByName(BzrVcs.VCS_NAME);
 
-    if (!vcs.isStarted()) {
+    if (vcs == null || !vcs.isStarted()) {
       presentation.setEnabled(false);
     }
   }
@@ -92,8 +92,9 @@
     List<VirtualFile> repos = new LinkedList<VirtualFile>();
     VcsRoot[] roots = ProjectLevelVcsManager.getInstance(project).getAllVcsRoots();
     for (VcsRoot root : roots) {
-      if (BzrVcs.VCS_NAME.equals(root.vcs.getName())) {
-        repos.add(root.path);
+      //noinspection ConstantConditions
+      if (BzrVcs.VCS_NAME.equals(root.getVcs().getName())) {
+        repos.add(root.getPath());
       }
     }
     return repos;

=== modified file 'modules/intellij/src/main/java/org/emergent/bzr4j/intellij/action/BzrCommandResultNotifier.java'
--- modules/intellij/src/main/java/org/emergent/bzr4j/intellij/action/BzrCommandResultNotifier.java	2010-03-02 20:44:47 +0000
+++ modules/intellij/src/main/java/org/emergent/bzr4j/intellij/action/BzrCommandResultNotifier.java	2013-04-16 16:02:26 +0000
@@ -13,6 +13,7 @@
 package org.emergent.bzr4j.intellij.action;
 
 import com.intellij.openapi.project.Project;
+import com.intellij.vcsUtil.VcsImplUtil;
 import com.intellij.vcsUtil.VcsUtil;
 import org.apache.commons.lang.StringUtils;
 import org.emergent.bzr4j.core.cli.BzrStandardResult;
@@ -34,7 +35,7 @@
       VcsUtil.showStatusMessage(project, out.get(out.size() - 1));
     }
     if (!err.isEmpty()) {
-      VcsUtil.showErrorMessage(
+      VcsImplUtil.showErrorMessage(
           project, "<html>" + StringUtils.join(err, "<br>") + "</html>", "Error"
       );
     }

=== modified file 'modules/intellij/src/main/java/org/emergent/bzr4j/intellij/command/BzrAnnotateCommand.java'
--- modules/intellij/src/main/java/org/emergent/bzr4j/intellij/command/BzrAnnotateCommand.java	2010-03-02 20:44:47 +0000
+++ modules/intellij/src/main/java/org/emergent/bzr4j/intellij/command/BzrAnnotateCommand.java	2013-04-16 16:02:26 +0000
@@ -51,7 +51,10 @@
         if (atIdx > 0 && BzrGlobalSettings.getInstance().isAnnotationTrimmingEnabled()) {
           user = user.substring(0, atIdx);
         }
-        BzrAnnotationLine annotationLine = new BzrAnnotationLine(user, revision, date, annotations.size(), content);
+        // convert the strftime'%Y%m%d' - '%Y-%m-%d' to match the command line tool
+        String expandedDate = date.substring(0, 4) + "-" + date.substring(4, 6) + "-" + date.substring(6, 8);
+        BzrAnnotationLine annotationLine = new BzrAnnotationLine(user, revision, expandedDate,
+          annotations.size(), content);
         annotations.add(annotationLine);
       }
     };

=== modified file 'modules/intellij/src/main/java/org/emergent/bzr4j/intellij/command/BzrPullCommand.java'
--- modules/intellij/src/main/java/org/emergent/bzr4j/intellij/command/BzrPullCommand.java	2010-03-02 20:44:47 +0000
+++ modules/intellij/src/main/java/org/emergent/bzr4j/intellij/command/BzrPullCommand.java	2013-04-16 16:02:26 +0000
@@ -14,7 +14,7 @@
 
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.vcsUtil.VcsUtil;
+import com.intellij.vcsUtil.VcsImplUtil;
 import org.apache.commons.lang.StringUtils;
 import org.emergent.bzr4j.core.cli.BzrStandardResult;
 import org.emergent.bzr4j.intellij.BzrVcs;
@@ -88,7 +88,7 @@
           }
         }
       } catch (URISyntaxException e) {
-        VcsUtil.showErrorMessage(project, "Invalid source: " + source, "Error");
+        VcsImplUtil.showErrorMessage(project, "Invalid source: " + source, "Error");
       }
     }
 

=== modified file 'modules/intellij/src/main/java/org/emergent/bzr4j/intellij/command/BzrPushCommand.java'
--- modules/intellij/src/main/java/org/emergent/bzr4j/intellij/command/BzrPushCommand.java	2010-03-02 20:44:47 +0000
+++ modules/intellij/src/main/java/org/emergent/bzr4j/intellij/command/BzrPushCommand.java	2013-04-16 16:02:26 +0000
@@ -14,7 +14,7 @@
 
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.vcsUtil.VcsUtil;
+import com.intellij.vcsUtil.VcsImplUtil;
 import org.apache.commons.lang.StringUtils;
 import org.emergent.bzr4j.core.cli.BzrStandardResult;
 import org.emergent.bzr4j.intellij.BzrVcs;
@@ -67,7 +67,7 @@
           }
         }
       } catch (URISyntaxException e) {
-        VcsUtil.showErrorMessage(project, "Invalid destination: " + destination, "Error");
+        VcsImplUtil.showErrorMessage(project, "Invalid destination: " + destination, "Error");
       }
     }
 

=== modified file 'modules/intellij/src/main/java/org/emergent/bzr4j/intellij/command/ShellCommandService.java'
--- modules/intellij/src/main/java/org/emergent/bzr4j/intellij/command/ShellCommandService.java	2010-03-02 20:44:47 +0000
+++ modules/intellij/src/main/java/org/emergent/bzr4j/intellij/command/ShellCommandService.java	2013-04-16 16:02:26 +0000
@@ -15,9 +15,8 @@
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.vcsUtil.VcsUtil;
+import com.intellij.vcsUtil.VcsImplUtil;
 import org.emergent.bzr4j.core.cli.BzrAbstractResult;
-import org.emergent.bzr4j.core.cli.BzrExecException;
 import org.emergent.bzr4j.core.cli.BzrExecService;
 import org.emergent.bzr4j.core.cli.BzrStandardResult;
 import org.emergent.bzr4j.core.cli.BzrXmlResult;
@@ -26,7 +25,6 @@
 import org.emergent.bzr4j.intellij.BzrVcsMessages;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.xml.sax.helpers.DefaultHandler;
 
 import java.io.File;
 import java.util.List;
@@ -141,7 +139,7 @@
         .append(e.getMessage());
 
     Object[] params = new Object[] { };
-    VcsUtil.showErrorMessage(
+    VcsImplUtil.showErrorMessage(
         project,
         message.toString(),
         BzrVcsMessages.message("bzr4intellij.error", params)

=== modified file 'modules/intellij/src/main/java/org/emergent/bzr4j/intellij/provider/BzrChangeProvider.java'
--- modules/intellij/src/main/java/org/emergent/bzr4j/intellij/provider/BzrChangeProvider.java	2010-07-29 10:15:04 +0000
+++ modules/intellij/src/main/java/org/emergent/bzr4j/intellij/provider/BzrChangeProvider.java	2013-04-16 16:02:26 +0000
@@ -46,12 +46,7 @@
 import org.xml.sax.SAXParseException;
 
 import java.io.File;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 public class BzrChangeProvider implements ChangeProvider {
 
@@ -93,7 +88,20 @@
       }
 
       for (Map.Entry<VirtualFile,FilePath> rootEntry : rootsMap.entrySet()) {
-        process(builder, rootEntry.getKey(), rootEntry.getValue(), rootRevnos);
+        VirtualFile virtualRoot = rootEntry.getKey();
+        FilePath rootPath = rootEntry.getValue();
+
+        HashMap<VirtualFile, FilePath> subRoots = new HashMap<VirtualFile, FilePath>();
+        for (Map.Entry<VirtualFile, FilePath> subEntry : rootsMap.entrySet()) {
+          VirtualFile virtualSubRoot = subEntry.getKey();
+          FilePath subPath = subEntry.getValue();
+          if (!subPath.isUnder(rootPath, true)) {
+            continue;
+          }
+          subRoots.put(virtualSubRoot, subPath);
+        }
+
+        process(builder, virtualRoot, rootPath, rootRevnos, subRoots);
       }
     } catch (BzrExecException e) {
       LOG.debug(e);
@@ -133,7 +141,7 @@
       ChangelistBuilder builder,
       VirtualFile vcsVirtualRoot,
       FilePath filePath,
-      Map<File, BzrRevisionNumber> processedRoots) throws BzrExecException {
+      Map<File, BzrRevisionNumber> processedRoots, HashMap<VirtualFile, FilePath> subRoots) throws BzrExecException {
 
     if (filePath.isNonLocal()) {
       CHANGES.debug("no processing (nonlocal path): " + String.valueOf(filePath));
@@ -150,6 +158,18 @@
 
     final File ioRoot = bzrRoot.getFile();
 
+    Set<File> ioSubRoots = new HashSet<File>();
+    for (FilePath path : subRoots.values()) {
+      BazaarRoot bzrSubRoot = BazaarRoot.findBranchLocation(path.getIOFile());
+      if (bzrSubRoot == null) {
+        continue;
+      }
+      File ioSubRoot = bzrSubRoot.getFile();
+      if (!ioRoot.equals(ioSubRoot)) {
+        ioSubRoots.add(ioSubRoot);
+      }
+    }
+
     final String relpath = target.equals(ioRoot) ? null : BzrUtil.relativePath(ioRoot,target);
 
     CHANGES.debug("is processing: " + String.valueOf(filePath));
@@ -162,7 +182,7 @@
 
     final ShellCommandService service = ShellCommandService.getInstance(m_project);
 
-    MyIgnoredHandler ignoredHandler = new MyIgnoredHandler(builder, ioRoot);
+    MyIgnoredHandler ignoredHandler = new MyIgnoredHandler(builder, ioRoot, ioSubRoots);
 
     BzrIdeaExec ignoredExec = new BzrIdeaExec(bzrRoot, "xmlls");
     ignoredExec.addArguments("--ignored");
@@ -171,7 +191,7 @@
     service.executeUnsafe(ignoredExec, BzrXmlResult.createBzrXmlResult(ignoredHandler));
     ignoredHandler.processResults();
 
-    MyStatusHandler statusHandler = new MyStatusHandler(vcsVirtualRoot, builder, ioRoot, revno);
+    MyStatusHandler statusHandler = new MyStatusHandler(vcsVirtualRoot, builder, ioRoot, revno, ioSubRoots);
 
     BzrIdeaExec statusExec = new BzrIdeaExec(bzrRoot, "xmlstatus");
     statusExec.setStderrValidationEnabled(false);
@@ -186,11 +206,13 @@
 
     private ChangelistBuilder m_builder;
     private File m_bzrRoot;
+    private Set<File> m_bzrSubRoots;
     private final Collection<String> m_ignoredList = new LinkedList<String>();
 
-    public MyIgnoredHandler(ChangelistBuilder builder, File bzrRoot) {
+    public MyIgnoredHandler(ChangelistBuilder builder, File bzrRoot, Set<File> ioSubRoots) {
       m_builder = builder;
       m_bzrRoot = bzrRoot;
+      m_bzrSubRoots = ioSubRoots;
     }
 
     public void processResults() {
@@ -211,6 +233,9 @@
 
     private void processIgnore(String path) {
       File ignored = new File(m_bzrRoot, path);
+      if (m_bzrSubRoots.contains(ignored)) {
+        return;
+      }
       IGNORED.debug(String.format("%10s \"%s\"", "ignored", ignored));
       m_builder.processIgnoredFile(VcsUtil.getVirtualFile(ignored));
     }
@@ -223,12 +248,14 @@
     private VirtualFile m_vcsRoot;
     private File m_bzrRoot;
     private final Collection<GenericChange> m_changes = new LinkedList<GenericChange>();
+    private Set<File> m_bzrSubRoots;
 
-    public MyStatusHandler(VirtualFile vcsRoot, ChangelistBuilder builder, File bzrRoot, BzrRevisionNumber bzrRev) {
+    public MyStatusHandler(VirtualFile vcsRoot, ChangelistBuilder builder, File bzrRoot, BzrRevisionNumber bzrRev, Set<File> ioSubRoots) {
       m_vcsRoot = vcsRoot;
       m_builder = builder;
       m_bzrRoot = bzrRoot;
       m_bzrRev = bzrRev;
+      m_bzrSubRoots = ioSubRoots;
     }
 
     public void processResults() {
@@ -324,6 +351,10 @@
       UNKNOWN.debug(String.format("%10s \"%s\"", "unknown", vFile));
       builder.processUnversionedFile(vFile);
       if (vFile.isDirectory()) {
+        File ioFile = VcsUtil.getFilePath(vFile.getPath(), true).getIOFile();
+        if (this.m_bzrSubRoots.contains(ioFile)) {
+          return;
+        }
         for (VirtualFile child : vFile.getChildren()) {
           processRecursive(builder, child);
         }

=== modified file 'modules/intellij/src/main/java/org/emergent/bzr4j/intellij/provider/BzrHistoryProvider.java'
--- modules/intellij/src/main/java/org/emergent/bzr4j/intellij/provider/BzrHistoryProvider.java	2010-09-17 01:44:34 +0000
+++ modules/intellij/src/main/java/org/emergent/bzr4j/intellij/provider/BzrHistoryProvider.java	2013-04-16 16:02:26 +0000
@@ -17,14 +17,7 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vcs.FilePath;
 import com.intellij.openapi.vcs.VcsException;
-import com.intellij.openapi.vcs.history.HistoryAsTreeProvider;
-import com.intellij.openapi.vcs.history.VcsAbstractHistorySession;
-import com.intellij.openapi.vcs.history.VcsAppendableHistorySessionPartner;
-import com.intellij.openapi.vcs.history.VcsDependentHistoryComponents;
-import com.intellij.openapi.vcs.history.VcsFileRevision;
-import com.intellij.openapi.vcs.history.VcsHistoryProvider;
-import com.intellij.openapi.vcs.history.VcsHistorySession;
-import com.intellij.openapi.vcs.history.VcsRevisionNumber;
+import com.intellij.openapi.vcs.history.*;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.Consumer;
 import com.intellij.util.ui.ColumnInfo;
@@ -32,6 +25,7 @@
 import org.emergent.bzr4j.intellij.BzrFile;
 import org.emergent.bzr4j.intellij.command.BzrLogCommand;
 import org.emergent.bzr4j.intellij.command.BzrMiscCommand;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import java.util.Collections;
@@ -117,4 +111,14 @@
   public boolean supportsHistoryForDirectories() {
     return true;
   }
+
+  @Override
+  public DiffFromHistoryHandler getHistoryDiffHandler() {
+    return null;
+  }
+
+  @Override
+  public boolean canShowHistoryFor(@NotNull VirtualFile file) {
+    return true;
+  }
 }

=== modified file 'modules/intellij/src/main/java/org/emergent/bzr4j/intellij/provider/annotate/BzrAnnotation.java'
--- modules/intellij/src/main/java/org/emergent/bzr4j/intellij/provider/annotate/BzrAnnotation.java	2011-01-22 16:02:47 +0000
+++ modules/intellij/src/main/java/org/emergent/bzr4j/intellij/provider/annotate/BzrAnnotation.java	2013-04-16 16:02:26 +0000
@@ -13,22 +13,24 @@
 package org.emergent.bzr4j.intellij.provider.annotate;
 
 import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vcs.VcsException;
-import com.intellij.openapi.vcs.annotate.AnnotationListener;
-import com.intellij.openapi.vcs.annotate.AnnotationSourceSwitcher;
-import com.intellij.openapi.vcs.annotate.FileAnnotation;
-import com.intellij.openapi.vcs.annotate.LineAnnotationAspect;
+import com.intellij.openapi.vcs.annotate.*;
 import com.intellij.openapi.vcs.changes.CurrentContentRevision;
 import com.intellij.openapi.vcs.history.VcsFileRevision;
 import com.intellij.openapi.vcs.history.VcsRevisionNumber;
+import com.intellij.openapi.vfs.LocalFileSystem;
+import com.intellij.openapi.vfs.VirtualFile;
 import org.apache.commons.lang.StringUtils;
 import org.emergent.bzr4j.intellij.BzrFile;
-import org.emergent.bzr4j.intellij.BzrFileRevision;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
+import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
 
-public class BzrAnnotation implements FileAnnotation {
+public class BzrAnnotation extends FileAnnotation {
 
   private static final Logger LOG = Logger.getInstance(BzrAnnotation.class.getName());
 
@@ -45,12 +47,17 @@
 
   private final List<BzrAnnotationLine> lines;
   private final List<VcsFileRevision> vcsFileRevisions;
-  private final BzrFile hgFile;
-
-  public BzrAnnotation(BzrFile hgFile, List<BzrAnnotationLine> lines, List<VcsFileRevision> vcsFileRevisions) {
+  private final BzrFile bzrFile;
+  private final VcsRevisionNumber currentRevision;
+
+
+  public BzrAnnotation(@NotNull Project project, BzrFile bzrFile, List<BzrAnnotationLine> lines, List<VcsFileRevision> vcsFileRevisions,
+                       VcsRevisionNumber revision) {
+    super(project);
     this.lines = lines;
     this.vcsFileRevisions = vcsFileRevisions;
-    this.hgFile = hgFile;
+    this.bzrFile = bzrFile;
+    this.currentRevision = revision;
   }
 
   public AnnotationSourceSwitcher getAnnotationSourceSwitcher() {
@@ -61,21 +68,21 @@
     return getLineRevisionNumber(lineNumber);
   }
 
+  @Nullable
+  @Override
+  public VcsRevisionNumber getCurrentRevision() {
+    return currentRevision;
+  }
+
   public boolean revisionsNotEmpty() {
     return true;
   }
 
-  public void addListener(AnnotationListener listener) {
-  }
-
-  public void removeListener(AnnotationListener listener) {
-  }
-
   public void dispose() {
   }
 
   public LineAnnotationAspect[] getAspects() {
-    return new LineAnnotationAspect[] {
+    return new LineAnnotationAspect[]{
         revisionAnnotationAspect,
         dateAnnotationAspect,
         userAnnotationAspect
@@ -88,7 +95,7 @@
 
   public String getAnnotatedContent() {
     try {
-      return CurrentContentRevision.create(hgFile.toFilePath()).getContent();
+      return CurrentContentRevision.create(bzrFile.toFilePath()).getContent();
     } catch (VcsException e) {
       LOG.error(e);
       return StringUtils.EMPTY;
@@ -103,17 +110,48 @@
     return annotationLine.getVcsRevisionNumber();
   }
 
+  @Override
+  public Date getLineDate(int lineNumber) {
+    if (lineNumber >= lines.size() || lineNumber < 0) {
+      return null;
+    }
+    return lines.get(lineNumber).getDate();
+  }
+
   public List<VcsFileRevision> getRevisions() {
     List<VcsFileRevision> result = new LinkedList<VcsFileRevision>();
     result.addAll(vcsFileRevisions);
     return result;
   }
 
-  class HgLineAnnotationAspect implements LineAnnotationAspect {
+  @Override
+  public int getLineCount() {
+    return lines.size();
+  }
+
+  private static String id(FIELD field) {
+    switch (field) {
+      case USER:
+        return LineAnnotationAspect.AUTHOR;
+      case REVISION:
+        return LineAnnotationAspect.REVISION;
+      case DATE:
+        return LineAnnotationAspect.DATE;
+      default:
+        return null;
+    }
+  }
+
+  private static boolean isShowByDefault(FIELD aspectType) {
+    return aspectType == FIELD.DATE || aspectType == FIELD.USER;
+  }
+
+  class HgLineAnnotationAspect extends LineAnnotationAspectAdapter {
 
     private final FIELD aspectType;
 
     public HgLineAnnotationAspect(FIELD aspectType) {
+      super(id(aspectType), BzrAnnotation.isShowByDefault(aspectType));
       this.aspectType = aspectType;
     }
 
@@ -127,17 +165,14 @@
           : annotationLine.get(aspectType).toString();
     }
 
-    public String getTooltipText(int lineNumber) {
-      return null;
-    }
-
-    public String getId() {
-      return null;
-    }
-
-    public boolean isShowByDefault() {
-      return false;
-    }
-  }
-
+    @Override
+    protected void showAffectedPaths(int lineNum) {
+      // todo
+    }
+  }
+
+  @Override
+  public VirtualFile getFile() {
+    return LocalFileSystem.getInstance().refreshAndFindFileByIoFile(bzrFile.getFile());
+  }
 }

=== modified file 'modules/intellij/src/main/java/org/emergent/bzr4j/intellij/provider/annotate/BzrAnnotationLine.java'
--- modules/intellij/src/main/java/org/emergent/bzr4j/intellij/provider/annotate/BzrAnnotationLine.java	2010-01-05 02:18:38 +0000
+++ modules/intellij/src/main/java/org/emergent/bzr4j/intellij/provider/annotate/BzrAnnotationLine.java	2013-04-16 16:02:26 +0000
@@ -14,6 +14,9 @@
 
 import com.intellij.openapi.vcs.history.VcsRevisionNumber;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.EnumMap;
 
 public class BzrAnnotationLine {
@@ -21,6 +24,13 @@
   private EnumMap<BzrAnnotation.FIELD, Object> fields =
       new EnumMap<BzrAnnotation.FIELD, Object>(BzrAnnotation.FIELD.class);
 
+  private ThreadLocal<SimpleDateFormat> dateFormat = new ThreadLocal<SimpleDateFormat>() {
+    @Override
+    public SimpleDateFormat get() {
+      return new SimpleDateFormat("yyyyMMdd");
+    }
+  };
+
   public BzrAnnotationLine(String user, VcsRevisionNumber revision, String date, Integer line, String content) {
     fields.put(BzrAnnotation.FIELD.USER, user);
 
@@ -38,4 +48,17 @@
     return fields.get(field);
   }
 
+  public Date getDate() {
+    String sDate = (String)get(BzrAnnotation.FIELD.DATE);
+    if (sDate != null) {
+      try {
+        return dateFormat.get().parse(sDate);
+      } catch (ParseException e) {
+        return null;
+      }
+    }
+    else {
+      return null;
+    }
+  }
 }

=== modified file 'modules/intellij/src/main/java/org/emergent/bzr4j/intellij/provider/annotate/BzrAnnotationProvider.java'
--- modules/intellij/src/main/java/org/emergent/bzr4j/intellij/provider/annotate/BzrAnnotationProvider.java	2010-03-03 00:18:15 +0000
+++ modules/intellij/src/main/java/org/emergent/bzr4j/intellij/provider/annotate/BzrAnnotationProvider.java	2013-04-16 16:02:26 +0000
@@ -33,6 +33,10 @@
   }
 
   public FileAnnotation annotate(VirtualFile file) throws VcsException {
+    return annotate(file, null);
+  }
+
+  public FileAnnotation annotate(VirtualFile file, VcsFileRevision revision) throws VcsException {
     VirtualFile vcsRoot = VcsUtil.getVcsRootFor(project, file);
     if (vcsRoot == null) {
       throw new VcsException("vcs root is null");
@@ -41,16 +45,14 @@
     BzrAnnotateCommand hgAnnotateCommand = new BzrAnnotateCommand(project);
     BzrLogCommand hgLogCommand = new BzrLogCommand(project);
     return new BzrAnnotation(
+        project,
         hgFile,
         hgAnnotateCommand.execute(hgFile),
-        hgLogCommand.execute(hgFile)
+        hgLogCommand.execute(hgFile),
+        null
     );
   }
 
-  public FileAnnotation annotate(VirtualFile file, VcsFileRevision revision) throws VcsException {
-    return annotate(file);
-  }
-
   public boolean isAnnotationValid(VcsFileRevision rev) {
     return true;
   }

=== modified file 'modules/intellij/src/main/java/org/emergent/bzr4j/intellij/provider/commit/BzrCheckinEnvironment.java'
--- modules/intellij/src/main/java/org/emergent/bzr4j/intellij/provider/commit/BzrCheckinEnvironment.java	2010-09-29 23:00:58 +0000
+++ modules/intellij/src/main/java/org/emergent/bzr4j/intellij/provider/commit/BzrCheckinEnvironment.java	2013-04-16 16:02:26 +0000
@@ -37,6 +37,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 public class BzrCheckinEnvironment implements CheckinEnvironment {
 
@@ -75,7 +76,11 @@
   }
 
   @SuppressWarnings({ "ThrowableInstanceNeverThrown" })
-  public List<VcsException> commit(List<Change> changes, String preparedComment, @NotNull NullableFunction<Object, Object> parametersHolder) {
+  public List<VcsException> commit(
+      List<Change> changes,
+      String preparedComment,
+      @NotNull NullableFunction<Object, Object> parametersHolder,
+      Set<String> feedback) {
     List<VcsException> exceptions = new LinkedList<VcsException>();
     for (Map.Entry<VirtualFile, List<BzrFile>> entry : getFilesByRepository(changes).entrySet()) {
       BzrCommitCommand command = new BzrCommitCommand(project, entry.getKey(), preparedComment);
@@ -121,6 +126,10 @@
     return false;
   }
 
+  public boolean isRefreshAfterCommitNeeded() {
+    return false;
+  }
+
   private Map<VirtualFile, List<BzrFile>> getFilesByRepository(List<Change> changes) {
     Map<VirtualFile, List<BzrFile>> result = new HashMap<VirtualFile, List<BzrFile>>();
     for (Change change : changes) {

=== modified file 'modules/intellij/src/main/java/org/emergent/bzr4j/intellij/provider/commit/BzrCommitSession.java'
--- modules/intellij/src/main/java/org/emergent/bzr4j/intellij/provider/commit/BzrCommitSession.java	2010-01-05 02:18:38 +0000
+++ modules/intellij/src/main/java/org/emergent/bzr4j/intellij/provider/commit/BzrCommitSession.java	2013-04-16 16:02:26 +0000
@@ -19,6 +19,7 @@
 import com.intellij.openapi.vcs.changes.ContentRevision;
 import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.vcsUtil.VcsImplUtil;
 import com.intellij.vcsUtil.VcsUtil;
 import org.apache.commons.lang.StringUtils;
 import org.emergent.bzr4j.intellij.BzrVcsMessages;
@@ -64,7 +65,7 @@
         vcsDirtyScopeManager.dirDirtyRecursively(root);
         root.refresh(true, true);
       } catch (BzrCommandException e) {
-        VcsUtil.showErrorMessage(project, e.getMessage(), "Error");
+        VcsImplUtil.showErrorMessage(project, e.getMessage(), "Error");
       }
     }
   }
@@ -97,4 +98,7 @@
     return result;
   }
 
+  public String getHelpId() {
+    return null;
+  }
 }

=== modified file 'modules/intellij/src/main/java/org/emergent/bzr4j/intellij/ui/BzrConfigurationIdePanel.java'
--- modules/intellij/src/main/java/org/emergent/bzr4j/intellij/ui/BzrConfigurationIdePanel.java	2010-03-02 20:44:47 +0000
+++ modules/intellij/src/main/java/org/emergent/bzr4j/intellij/ui/BzrConfigurationIdePanel.java	2013-04-16 16:02:26 +0000
@@ -200,8 +200,8 @@
         GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW,
         GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));
     panel1.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
-        ResourceBundle.getBundle("org/emergent/bzr4j/intellij/BzrVcsMessages").getString(
-            "bzr4intellij.path_to_executable.text")));
+        ResourceBundle.getBundle("org/emergent/bzr4j/intellij/BzrVcsMessages")
+            .getString("bzr4intellij.path_to_executable.text")));
     pathSelector = new TextFieldWithBrowseButton();
     pathSelector.setEnabled(true);
     panel1.add(pathSelector,
@@ -210,9 +210,8 @@
             GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, new Dimension(100, -1), null,
             null, 0, false));
     pathDefaultButton = new JButton();
-    this.$$$loadButtonText$$$(pathDefaultButton,
-        ResourceBundle.getBundle("org/emergent/bzr4j/intellij/BzrVcsMessages").getString(
-            "configdialog.default_path_button.text"));
+    this.$$$loadButtonText$$$(pathDefaultButton, ResourceBundle.getBundle("org/emergent/bzr4j/intellij/BzrVcsMessages")
+        .getString("configdialog.default_path_button.text"));
     panel1.add(pathDefaultButton,
         new GridConstraints(0, 2, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL,
             GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW,
@@ -232,12 +231,12 @@
         GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW,
         GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));
     panel2.setBorder(BorderFactory.createTitledBorder(
-        ResourceBundle.getBundle("org/emergent/bzr4j/intellij/BzrVcsMessages").getString(
-            "configpanel.miscellaneous_group.text")));
+        ResourceBundle.getBundle("org/emergent/bzr4j/intellij/BzrVcsMessages")
+            .getString("configpanel.miscellaneous_group.text")));
     m_trimAnnotationCheckBox = new JCheckBox();
     this.$$$loadButtonText$$$(m_trimAnnotationCheckBox,
-        ResourceBundle.getBundle("org/emergent/bzr4j/intellij/BzrVcsMessages").getString(
-            "configpanel.trim_annotation_author.text"));
+        ResourceBundle.getBundle("org/emergent/bzr4j/intellij/BzrVcsMessages")
+            .getString("configpanel.trim_annotation_author.text"));
     panel2.add(m_trimAnnotationCheckBox,
         new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE,
             GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW,
@@ -247,8 +246,8 @@
         GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, 0, false));
     m_modalErrorPopupEnabledCheckBox = new JCheckBox();
     this.$$$loadButtonText$$$(m_modalErrorPopupEnabledCheckBox,
-        ResourceBundle.getBundle("org/emergent/bzr4j/intellij/BzrVcsMessages").getString(
-            "configpanel.allow_modal_error_popup.text"));
+        ResourceBundle.getBundle("org/emergent/bzr4j/intellij/BzrVcsMessages")
+            .getString("configpanel.allow_modal_error_popup.text"));
     panel2.add(m_modalErrorPopupEnabledCheckBox,
         new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE,
             GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW,
@@ -259,8 +258,8 @@
         GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW,
         GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));
     panel3.setBorder(BorderFactory.createTitledBorder(
-        ResourceBundle.getBundle("org/emergent/bzr4j/intellij/BzrVcsMessages").getString(
-            "configpanel.envvars_group.text")));
+        ResourceBundle.getBundle("org/emergent/bzr4j/intellij/BzrVcsMessages")
+            .getString("configpanel.envvars_group.text")));
     m_envBzrEmailTextField = new JTextField();
     m_envBzrEmailTextField.setEnabled(true);
     m_envBzrEmailTextField.setText("");
@@ -298,12 +297,12 @@
         GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW,
         GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));
     panel4.setBorder(BorderFactory.createTitledBorder(
-        ResourceBundle.getBundle("org/emergent/bzr4j/intellij/BzrVcsMessages").getString(
-            "configpanel.experimental_group.text")));
+        ResourceBundle.getBundle("org/emergent/bzr4j/intellij/BzrVcsMessages")
+            .getString("configpanel.experimental_group.text")));
     m_granularExecLockingCheckBox = new JCheckBox();
     this.$$$loadButtonText$$$(m_granularExecLockingCheckBox,
-        ResourceBundle.getBundle("org/emergent/bzr4j/intellij/BzrVcsMessages").getString(
-            "configpanel.fine_grained_exec_locking.text"));
+        ResourceBundle.getBundle("org/emergent/bzr4j/intellij/BzrVcsMessages")
+            .getString("configpanel.fine_grained_exec_locking.text"));
     panel4.add(m_granularExecLockingCheckBox,
         new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE,
             GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW,

=== modified file 'modules/intellij/src/main/java/org/emergent/bzr4j/intellij/ui/BzrConfigurationProjectPanel.java'
--- modules/intellij/src/main/java/org/emergent/bzr4j/intellij/ui/BzrConfigurationProjectPanel.java	2010-03-02 20:44:47 +0000
+++ modules/intellij/src/main/java/org/emergent/bzr4j/intellij/ui/BzrConfigurationProjectPanel.java	2013-04-16 16:02:26 +0000
@@ -76,8 +76,9 @@
     m_panel = new JPanel();
     m_panel.setLayout(new GridLayoutManager(3, 1, new Insets(0, 0, 0, 0), -1, -1));
     final Spacer spacer1 = new Spacer();
-    m_panel.add(spacer1, new GridConstraints(2, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_VERTICAL, 1,
-        GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, false));
+    m_panel.add(spacer1,
+        new GridConstraints(2, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_VERTICAL, 1,
+            GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, false));
     final JPanel panel1 = new JPanel();
     panel1.setLayout(new GridLayoutManager(2, 1, new Insets(0, 0, 0, 0), -1, -1));
     m_panel.add(panel1, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH,
@@ -108,12 +109,11 @@
         GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW,
         GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));
     panel2.setBorder(BorderFactory.createTitledBorder(
-        ResourceBundle.getBundle("org/emergent/bzr4j/intellij/BzrVcsMessages").getString(
-            "configpanel.miscellaneous_group.text")));
+        ResourceBundle.getBundle("org/emergent/bzr4j/intellij/BzrVcsMessages")
+            .getString("configpanel.miscellaneous_group.text")));
     m_autoFixRootsCbx = new JCheckBox();
-    this.$$$loadButtonText$$$(m_autoFixRootsCbx,
-        ResourceBundle.getBundle("org/emergent/bzr4j/intellij/BzrVcsMessages").getString(
-            "configpanel.check_roots_enabled.text"));
+    this.$$$loadButtonText$$$(m_autoFixRootsCbx, ResourceBundle.getBundle("org/emergent/bzr4j/intellij/BzrVcsMessages")
+        .getString("configpanel.check_roots_enabled.text"));
     panel2.add(m_autoFixRootsCbx,
         new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE,
             GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW,

=== modified file 'modules/intellij/src/main/java/org/emergent/bzr4j/intellij/ui/BzrIntegrateDialog.java'
--- modules/intellij/src/main/java/org/emergent/bzr4j/intellij/ui/BzrIntegrateDialog.java	2010-01-05 02:18:38 +0000
+++ modules/intellij/src/main/java/org/emergent/bzr4j/intellij/ui/BzrIntegrateDialog.java	2013-04-16 16:02:26 +0000
@@ -170,61 +170,55 @@
     contentPanel.setLayout(new GridLayoutManager(3, 1, new Insets(0, 0, 0, 0), -1, -1));
     final JPanel panel1 = new JPanel();
     panel1.setLayout(new GridLayoutManager(4, 2, new Insets(0, 0, 0, 0), -1, -1));
-    contentPanel.add(panel1,
-        new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH,
-            GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW,
-            GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null,
-            0, false));
+    contentPanel.add(panel1, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH,
+        GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW,
+        GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));
     panel1.setBorder(BorderFactory.createTitledBorder(
-        ResourceBundle.getBundle("org/emergent/bzr4j/intellij/BzrVcsMessages").getString(
-            "dialog.integrate.merge_from")));
+        ResourceBundle.getBundle("org/emergent/bzr4j/intellij/BzrVcsMessages")
+            .getString("dialog.integrate.merge_from")));
     branchOption = new JRadioButton();
     branchOption.setSelected(true);
     branchOption.setText("Branch");
     branchOption.setMnemonic('B');
     branchOption.setDisplayedMnemonicIndex(0);
     panel1.add(branchOption, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE,
-        GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW,
-        GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+        GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED,
+        null, null, null, 0, false));
     tagOption = new JRadioButton();
     tagOption.setText("Tag");
     tagOption.setMnemonic('T');
     tagOption.setDisplayedMnemonicIndex(0);
     panel1.add(tagOption, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE,
-        GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW,
-        GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+        GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED,
+        null, null, null, 0, false));
     branchSelector = new JComboBox();
     branchSelector.setEditable(true);
     branchSelector.setEnabled(true);
     panel1.add(branchSelector,
         new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL,
-            GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0,
-            false));
+            GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
     tagSelector = new JComboBox();
     tagSelector.setEnabled(false);
     panel1.add(tagSelector,
         new GridConstraints(1, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL,
-            GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0,
-            false));
+            GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
     final Spacer spacer1 = new Spacer();
-    panel1.add(spacer1,
-        new GridConstraints(3, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL,
-            GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, 0, false));
+    panel1.add(spacer1, new GridConstraints(3, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL,
+        GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, 0, false));
     revisionTxt = new JTextField();
     revisionTxt.setEnabled(false);
     panel1.add(revisionTxt,
         new GridConstraints(2, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL,
-            GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null,
-            new Dimension(150, -1), null, 0, false));
+            GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null,
+            0, false));
     revisionOption = new JRadioButton();
     revisionOption.setSelected(false);
     revisionOption.setText("Revision");
     revisionOption.setMnemonic('R');
     revisionOption.setDisplayedMnemonicIndex(0);
-    panel1.add(revisionOption,
-        new GridConstraints(2, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE,
-            GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW,
-            GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+    panel1.add(revisionOption, new GridConstraints(2, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE,
+        GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED,
+        null, null, null, 0, false));
     final Spacer spacer2 = new Spacer();
     contentPanel.add(spacer2,
         new GridConstraints(2, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_VERTICAL, 1,
@@ -233,8 +227,7 @@
     contentPanel.add(repositorySelectorComponent.$$$getRootComponent$$$(),
         new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL,
             GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW,
-            GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null,
-            0, false));
+            GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));
     ButtonGroup buttonGroup;
     buttonGroup = new ButtonGroup();
     buttonGroup.add(revisionOption);

=== modified file 'modules/intellij/src/main/java/org/emergent/bzr4j/intellij/ui/BzrSendErrorForm.java'
--- modules/intellij/src/main/java/org/emergent/bzr4j/intellij/ui/BzrSendErrorForm.java	2010-03-02 20:49:34 +0000
+++ modules/intellij/src/main/java/org/emergent/bzr4j/intellij/ui/BzrSendErrorForm.java	2013-04-16 16:02:26 +0000
@@ -147,8 +147,8 @@
     myMainPanel = new JPanel();
     myMainPanel.setLayout(new GridLayoutManager(4, 1, new Insets(0, 0, 0, 0), -1, -1));
     final JLabel label1 = new JLabel();
-    this.$$$loadLabelText$$$(label1, ResourceBundle.getBundle("org/emergent/bzr4j/intellij/BzrVcsMessages").getString(
-        "diagnostic.error.report.prompt"));
+    this.$$$loadLabelText$$$(label1, ResourceBundle.getBundle("org/emergent/bzr4j/intellij/BzrVcsMessages")
+        .getString("diagnostic.error.report.prompt"));
     myMainPanel.add(label1, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE,
         GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
     final JScrollPane scrollPane1 = new JScrollPane();
@@ -170,21 +170,21 @@
         GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW,
         GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));
     panel1.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
-        ResourceBundle.getBundle("org/emergent/bzr4j/intellij/BzrVcsMessages").getString(
-            "diagnostic.error.report.login.group")));
+        ResourceBundle.getBundle("org/emergent/bzr4j/intellij/BzrVcsMessages")
+            .getString("diagnostic.error.report.login.group")));
     final JPanel panel2 = new JPanel();
     panel2.setLayout(new GridLayoutManager(4, 2, new Insets(0, 0, 0, 0), -1, -1));
     panel1.add(panel2, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH,
         GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW,
         GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));
     final JLabel label2 = new JLabel();
-    this.$$$loadLabelText$$$(label2, ResourceBundle.getBundle("org/emergent/bzr4j/intellij/BzrVcsMessages").getString(
-        "diagnostic.error.report.login.password"));
+    this.$$$loadLabelText$$$(label2, ResourceBundle.getBundle("org/emergent/bzr4j/intellij/BzrVcsMessages")
+        .getString("diagnostic.error.report.login.password"));
     panel2.add(label2, new GridConstraints(3, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE,
         GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
     final JLabel label3 = new JLabel();
-    this.$$$loadLabelText$$$(label3, ResourceBundle.getBundle("org/emergent/bzr4j/intellij/BzrVcsMessages").getString(
-        "diagnostic.error.report.login.name"));
+    this.$$$loadLabelText$$$(label3, ResourceBundle.getBundle("org/emergent/bzr4j/intellij/BzrVcsMessages")
+        .getString("diagnostic.error.report.login.name"));
     panel2.add(label3, new GridConstraints(2, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE,
         GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
     myItnLoginTextField = new JTextField();
@@ -198,13 +198,13 @@
             GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null,
             0, false));
     final JLabel label4 = new JLabel();
-    this.$$$loadLabelText$$$(label4, ResourceBundle.getBundle("org/emergent/bzr4j/intellij/BzrVcsMessages").getString(
-        "diagnostic.error.report.smtp.server"));
+    this.$$$loadLabelText$$$(label4, ResourceBundle.getBundle("org/emergent/bzr4j/intellij/BzrVcsMessages")
+        .getString("diagnostic.error.report.smtp.server"));
     panel2.add(label4, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE,
         GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
     final JLabel label5 = new JLabel();
-    this.$$$loadLabelText$$$(label5, ResourceBundle.getBundle("org/emergent/bzr4j/intellij/BzrVcsMessages").getString(
-        "diagnostic.error.report.email"));
+    this.$$$loadLabelText$$$(label5, ResourceBundle.getBundle("org/emergent/bzr4j/intellij/BzrVcsMessages")
+        .getString("diagnostic.error.report.email"));
     panel2.add(label5, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE,
         GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
     myItnServerTextField = new JTextField();
@@ -220,15 +220,15 @@
             0, false));
     myRememberITNPasswordCheckBox = new JCheckBox();
     this.$$$loadButtonText$$$(myRememberITNPasswordCheckBox,
-        ResourceBundle.getBundle("org/emergent/bzr4j/intellij/BzrVcsMessages").getString(
-            "diagnostic.error.report.login.remember.password.checkbox"));
+        ResourceBundle.getBundle("org/emergent/bzr4j/intellij/BzrVcsMessages")
+            .getString("diagnostic.error.report.login.remember.password.checkbox"));
     panel1.add(myRememberITNPasswordCheckBox,
         new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE,
             GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW,
             GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
     final JLabel label6 = new JLabel();
-    this.$$$loadLabelText$$$(label6, ResourceBundle.getBundle("org/emergent/bzr4j/intellij/BzrVcsMessages").getString(
-        "diagnostic.error.report.description"));
+    this.$$$loadLabelText$$$(label6, ResourceBundle.getBundle("org/emergent/bzr4j/intellij/BzrVcsMessages")
+        .getString("diagnostic.error.report.description"));
     myMainPanel.add(label6, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE,
         GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW,
         GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));

=== modified file 'modules/intellij/src/main/resources/META-INF/plugin.xml'
--- modules/intellij/src/main/resources/META-INF/plugin.xml	2011-02-15 12:12:50 +0000
+++ modules/intellij/src/main/resources/META-INF/plugin.xml	2013-04-16 16:02:26 +0000
@@ -9,8 +9,8 @@
   <p>
   System Requirements:
   <ul>
-    <li>IntelliJ IDEA 10+ (Ultimate or Community)
-    <li>Java 5+
+    <li>IntelliJ IDEA 12+ (Ultimate or Community)
+    <li>Java 6+
     <li>Bazaar 2.0+
     <ul>
       <li>xmloutput plugin
@@ -95,6 +95,14 @@
 
   <change-notes>
   <![CDATA[
+  <h3>Changes since 2.6.3</h3>
+  <ul>
+    <li>[feature] Supports IntelliJ IDEA 12.1</li>
+  </ul>
+  <h3>Changes since 2.6.1</h3>
+  <ul>
+    <li>[feature] Supports IntelliJ IDEA 11.0</li>
+  </ul>
   <h3>Changes since 2.6.0</h3>
   <ul>
     <li>[bugfix] <a href="https://launchpad.net/bugs/716279">716279</a>

=== added directory 'modules/intellij/src/test/java/org/emergent/bzr4j/intellij/provider'
=== added directory 'modules/intellij/src/test/java/org/emergent/bzr4j/intellij/provider/annotate'
=== added file 'modules/intellij/src/test/java/org/emergent/bzr4j/intellij/provider/annotate/BzrAnnotationLineTest.java'
--- modules/intellij/src/test/java/org/emergent/bzr4j/intellij/provider/annotate/BzrAnnotationLineTest.java	1970-01-01 00:00:00 +0000
+++ modules/intellij/src/test/java/org/emergent/bzr4j/intellij/provider/annotate/BzrAnnotationLineTest.java	2013-04-16 16:02:26 +0000
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2011 Francis Devereux
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you
+ * may not use this file except in compliance with the License. You may
+ * obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package org.emergent.bzr4j.intellij.provider.annotate;
+
+import static org.testng.Assert.*;
+import org.testng.annotations.Test;
+
+import java.util.Calendar;
+import java.util.Date;
+
+/**
+ * @author Francis Devereux
+ */
+public class BzrAnnotationLineTest {
+  @Test
+  public void testGetDate() {
+    BzrAnnotationLine line = new BzrAnnotationLine("user", null, "20091210", 32, "    public static void main(String args[])");
+    Date d = line.getDate();
+    Calendar c = Calendar.getInstance();
+    c.setTime(d);
+    assertEquals(2009, c.get(Calendar.YEAR));
+    assertEquals(11, c.get(Calendar.MONTH));
+    assertEquals(10, c.get(Calendar.DAY_OF_MONTH));
+  }
+}

=== modified file 'modules/teamcity/pom.xml'
--- modules/teamcity/pom.xml	2011-02-15 12:12:50 +0000
+++ modules/teamcity/pom.xml	2013-04-16 16:02:26 +0000
@@ -6,7 +6,7 @@
 
   <groupId>org.emergent.bzr4j</groupId>
   <artifactId>bzr4teamcity</artifactId>
-  <version>2.6.1</version>
+  <version>2.6.4-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Bzr4TeamCity Plugin</name>
   <url>http://launchpad.net/bzr4j</url>

=== modified file 'pom.xml'
--- pom.xml	2011-02-15 12:12:50 +0000
+++ pom.xml	2013-04-16 16:02:26 +0000
@@ -5,7 +5,7 @@
 
   <groupId>org.emergent.bzr4j</groupId>
   <artifactId>bzr4j</artifactId>
-  <version>2.6.1</version>
+  <version>2.6.4-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Bzr4J Aggregator Project</name>
   <url>http://launchpad.net/bzr4j</url>
@@ -39,7 +39,7 @@
         <artifactId>maven-idea-plugin</artifactId>
         <version>2.3-bzr4j</version>
         <configuration>
-          <jdkLevel>1.5</jdkLevel>
+          <jdkLevel>1.6</jdkLevel>
           <jdkName>${java.specification.version}</jdkName>
           <downloadSources>true</downloadSources>
           <exclude>target</exclude>