Merge lp:~bzr-unbunt/bzr4j/subbranch-fix into lp:bzr4j

[Harry Hirsch]

Fixes incorrect handling of nested branches as reported in bug #727294.

The changes were tested in the current IDEA trunk (11.x) and PhpStorm 3.0.1.

With these the file status of nested branches is shown correctly in the Project tool window. Also the Changes tool window now reports changes in nested branches correctly.

Unmerged revisions

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

=== 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	2012-02-25 23:10:23 +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);
         }