Merge lp:~wallyworld/bzr4j/track-submit-changes into lp:bzr4j

[Ian Booth]

Enhancement proposal

When tracking changes to my projects, via the Changes tab or the gutter change indicators, I often want to see what the differences are against the submit or ancestor revision, not just the branch tip revision. This allows me to easily see what a merge proposal diff would look like and makes it much easier to track the overall changes for the entire time working on the branch, not just since the last commit. At the moment, as soon as you do a local commit, all the changes are reset and you lose sight of the difference between your work and the trunk. Currently, you can run bzr from the command line for get a text based diff but it's much more convenient to have it all integrated into the IDE.

Implementation

Add new options "Track Changes Against Local|Submit|Ancestor Branch" to the bzr plugin configuration dialog. When selected, the local, submit, or ancestor branch is used as the basis for change tracking. By default, the default change tracking behaviour is to track changes against the local tip.

You can go to the plugin config screen and change the setting, and then you just need to hit refresh on the Changes tab for the chosen tracking method to be used. So it's easy enough to alter the method used as the need arises from within the IDE.

I had to add the use of the "-q" flag to the bzr command invocation since otherwise bzr sadly prints some info text to stderr and this confuses the command error detection.

The bulk of the changes in the diff (BzrConfigurationProjectPanel.java) are due to the auto generated code from Intellij's form designer tool.

[Ian Booth (wallyworld)]

I could also add an option to track changes against ancestor: as well as submit: if that seems appropriate. I guess there's also work that could be done to add these sorts of options to the right click bzr menu eg "Compare With Submit Revision" etc. I'll look into that if this mp gets approved.

[Ian Booth (wallyworld)]

I have added the option to track against ancestor:, and resubmitted the merge proposal since I did the changes against the lp:~frankoid/bzr4j/idea11-fixes branch so I could pick up support for PyCharm 2.0

Unmerged revisions

61. By Ian Booth on 2012-01-17

Merge in latest trunk and add support for tracking against ancestor branches

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/core/src/main/java/org/emergent/bzr4j/core/cli/BzrAbstractExec.java'
--- modules/core/src/main/java/org/emergent/bzr4j/core/cli/BzrAbstractExec.java	2010-09-23 17:37:33 +0000
+++ modules/core/src/main/java/org/emergent/bzr4j/core/cli/BzrAbstractExec.java	2012-01-17 00:40:29 +0000
@@ -159,7 +159,7 @@
   protected BzrAbstractResult exec(BzrAbstractResult result) throws BzrExecException {
     long startTime = System.currentTimeMillis();
     long execId = execCount.incrementAndGet();
-    ArrayList<String> args = new ArrayList<String>(Arrays.asList(getBzrExecutablePath(),m_cmd,"--no-aliases"));
+    ArrayList<String> args = new ArrayList<String>(Arrays.asList(getBzrExecutablePath(),m_cmd,"-q","--no-aliases"));
     args.addAll(m_args);
     Process process = null;
     try {

=== modified file 'modules/core/src/main/java/org/emergent/bzr4j/core/cli/CmdContext.java'
--- modules/core/src/main/java/org/emergent/bzr4j/core/cli/CmdContext.java	2010-07-29 10:15:04 +0000
+++ modules/core/src/main/java/org/emergent/bzr4j/core/cli/CmdContext.java	2012-01-17 00:40:29 +0000
@@ -56,7 +56,7 @@
 
 
   BzrAbstractResult exec(String m_cmd, File m_workingDir, BzrAbstractResult result, String... m_args) throws IOException {
-    ArrayList<String> args = new ArrayList<String>(Arrays.asList(getBzrExecutablePath(),m_cmd,"--no-aliases"));
+    ArrayList<String> args = new ArrayList<String>(Arrays.asList(getBzrExecutablePath(),m_cmd,"-q","--no-aliases"));
     args.addAll(Arrays.asList(m_args));
     Process process = null;
     try {

=== modified file 'modules/intellij/src/main/java/org/emergent/bzr4j/intellij/BzrProjectSettings.java'
--- modules/intellij/src/main/java/org/emergent/bzr4j/intellij/BzrProjectSettings.java	2010-03-02 20:44:47 +0000
+++ modules/intellij/src/main/java/org/emergent/bzr4j/intellij/BzrProjectSettings.java	2012-01-17 00:40:29 +0000
@@ -29,6 +29,9 @@
   private boolean checkOutgoing;
   private boolean m_scanTargetOptimizationEnabled;
   private boolean m_rootCheckingEnabled = true;
+  private boolean m_trackLocalStatus = true;
+  private boolean m_trackSubmitStatus = false;
+  private boolean m_trackAncestorStatus = false;
 
   public static BzrProjectSettings getInstance(Project project) {
     return ServiceManager.getService(project, BzrProjectSettings.class);
@@ -73,4 +76,28 @@
   public void setRootCheckingEnabled(boolean val) {
     m_rootCheckingEnabled = val;
   }
+
+  public boolean isTrackLocalStatus() {
+    return m_trackLocalStatus;
+  }
+
+  public boolean isTrackSubmitStatus() {
+    return m_trackSubmitStatus;
+  }
+  
+  public boolean isTrackAncestorStatus() {
+    return m_trackAncestorStatus;
+  }
+
+  public void setTrackLocalStatus(boolean trackLocalStatus) {
+    m_trackLocalStatus = trackLocalStatus;
+  }
+
+  public void setTrackSubmitStatus(boolean trackSubmitStatus) {
+    m_trackSubmitStatus = trackSubmitStatus;
+  }
+
+  public void setTrackAncestorStatus(boolean trackAncestorStatus) {
+    m_trackAncestorStatus = trackAncestorStatus;
+  }
 }

=== modified file 'modules/intellij/src/main/java/org/emergent/bzr4j/intellij/command/BzrMiscCommand.java'
--- modules/intellij/src/main/java/org/emergent/bzr4j/intellij/command/BzrMiscCommand.java	2010-03-02 20:44:47 +0000
+++ modules/intellij/src/main/java/org/emergent/bzr4j/intellij/command/BzrMiscCommand.java	2012-01-17 00:40:29 +0000
@@ -21,13 +21,18 @@
 import org.emergent.bzr4j.core.BazaarRoot;
 import org.emergent.bzr4j.core.cli.BzrAbstractResult;
 import org.emergent.bzr4j.core.cli.BzrExecException;
+import org.emergent.bzr4j.core.cli.BzrStandardResult;
+import org.emergent.bzr4j.core.cli.BzrXmlResult;
 import org.emergent.bzr4j.core.debug.DebugLogger;
 import org.emergent.bzr4j.core.debug.DebugManager;
+import org.emergent.bzr4j.intellij.BzrProjectSettings;
 import org.emergent.bzr4j.intellij.BzrRevisionNumber;
 import org.emergent.bzr4j.intellij.BzrRootConverter;
 import org.emergent.bzr4j.intellij.BzrUtil;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.List;
+
 /**
  * @author Patrick Woodworth
  */
@@ -36,6 +41,12 @@
   private static final DebugLogger LOG = DebugManager.getLogger(BzrMiscCommand.class);
 
   public static BzrRevisionNumber revno(Project project, @NotNull VirtualFile repo) {
+    if( BzrProjectSettings.getInstance(project).isTrackSubmitStatus() ) {
+        return BzrRevisionNumber.getLocalInstance("submit:");
+    }
+    if( BzrProjectSettings.getInstance(project).isTrackAncestorStatus() ) {
+        return BzrRevisionNumber.getLocalInstance("ancestor:");
+    }
     BazaarRoot bzrRoot = BzrRootConverter.INSTANCE.getBazaarRoot(project,repo);
     String revstr = bzrRoot == null ? null : bzrRoot.getRevno();
     if (revstr == null)
@@ -58,4 +69,5 @@
 
     return false;
   }
+
 }

=== 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-01-17 00:40:29 +0000
@@ -36,6 +36,7 @@
 import org.emergent.bzr4j.core.xmloutput.GenericChange;
 import org.emergent.bzr4j.core.xmloutput.XmlOutputHandler;
 import org.emergent.bzr4j.intellij.BzrContentRevision;
+import org.emergent.bzr4j.intellij.BzrProjectSettings;
 import org.emergent.bzr4j.intellij.BzrRevisionNumber;
 import org.emergent.bzr4j.intellij.BzrUtil;
 import org.emergent.bzr4j.intellij.command.BzrIdeaExec;
@@ -175,8 +176,17 @@
 
     BzrIdeaExec statusExec = new BzrIdeaExec(bzrRoot, "xmlstatus");
     statusExec.setStderrValidationEnabled(false);
-    if (relpath != null)
+    if (relpath != null) {
       statusExec.addArguments(relpath);
+    } else {
+      //we are getting the overall repo status so check what rev we need to diff against
+      if( BzrProjectSettings.getInstance(m_project).isTrackSubmitStatus() ) {
+          statusExec.addArguments("-r", "submit:");
+      }
+      if( BzrProjectSettings.getInstance(m_project).isTrackAncestorStatus() ) {
+          statusExec.addArguments("-r", "ancestor:");
+      }
+    }
     service.executeUnsafe(statusExec, BzrXmlResult.createBzrXmlResult(statusHandler));
 
     statusHandler.processResults();

=== modified file 'modules/intellij/src/main/java/org/emergent/bzr4j/intellij/ui/BzrConfigurationProjectPanel.form'
--- modules/intellij/src/main/java/org/emergent/bzr4j/intellij/ui/BzrConfigurationProjectPanel.form	2010-03-02 20:44:47 +0000
+++ modules/intellij/src/main/java/org/emergent/bzr4j/intellij/ui/BzrConfigurationProjectPanel.form	2012-01-17 00:40:29 +0000
@@ -1,18 +1,55 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.emergent.bzr4j.intellij.ui.BzrConfigurationProjectPanel">
-  <grid id="27dc6" binding="m_panel" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="27dc6" binding="m_panel" layout-manager="GridLayoutManager" row-count="5" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
-      <xy x="20" y="20" width="500" height="400"/>
+      <xy x="20" y="20" width="595" height="400"/>
     </constraints>
     <properties/>
     <border type="none"/>
     <children>
       <vspacer id="4794a">
         <constraints>
-          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+          <grid row="4" column="1" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
         </constraints>
       </vspacer>
+      <grid id="ccba4" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+        <margin top="0" left="0" bottom="0" right="0"/>
+        <constraints>
+          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties/>
+        <border type="etched" title-resource-bundle="org/emergent/bzr4j/intellij/BzrVcsMessages" title-key="configpanel.tracking_group.text"/>
+        <children>
+          <component id="c4bd3" class="javax.swing.JRadioButton" binding="m_trackSubmitChangesOption">
+            <constraints>
+              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <selected value="false"/>
+              <text value="Track changes against submit branch"/>
+            </properties>
+          </component>
+          <component id="c4bd2" class="javax.swing.JRadioButton" binding="m_trackLocalChangesOption">
+            <constraints>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <selected value="true"/>
+              <text value="Track changes against local branch"/>
+            </properties>
+          </component>
+          <component id="c4bd4" class="javax.swing.JRadioButton" binding="m_trackAncestorChangesOption">
+            <constraints>
+              <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <selected value="false"/>
+              <text value="Track changes against ancestor branch"/>
+            </properties>
+          </component>
+        </children>
+      </grid>
       <grid id="8c1f" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
@@ -41,10 +78,10 @@
           </component>
         </children>
       </grid>
-      <grid id="276d9" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+      <grid id="276d9" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
-          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <border type="none" title-resource-bundle="org/emergent/bzr4j/intellij/BzrVcsMessages" title-key="configpanel.miscellaneous_group.text"/>
@@ -66,5 +103,10 @@
       <member id="e2d67"/>
       <member id="9c6c7"/>
     </group>
+    <group name="trackOptionGroup">
+      <member id="c4bd2"/>
+      <member id="c4bd3"/>
+      <member id="c4bd4"/>
+    </group>
   </buttonGroups>
 </form>

=== 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	2012-01-17 00:40:29 +0000
+++ modules/intellij/src/main/java/org/emergent/bzr4j/intellij/ui/BzrConfigurationProjectPanel.java	2012-01-17 00:40:29 +0000
@@ -30,6 +30,10 @@
   private JCheckBox m_checkOutgoingCbx;
   private JCheckBox m_autoFixRootsCbx;
 
+  private JRadioButton m_trackLocalChangesOption;
+  private JRadioButton m_trackSubmitChangesOption;
+  private JRadioButton m_trackAncestorChangesOption;
+
   private final BzrProjectSettings m_projectSettings;
 
   public BzrConfigurationProjectPanel(BzrProjectSettings projectSettings) {
@@ -41,19 +45,28 @@
     return
         m_autoFixRootsCbx.isSelected() != m_projectSettings.isRootCheckingEnabled()
             || m_checkIncomingCbx.isSelected() != m_projectSettings.isCheckIncoming()
-            || m_checkOutgoingCbx.isSelected() != m_projectSettings.isCheckOutgoing();
+            || m_checkOutgoingCbx.isSelected() != m_projectSettings.isCheckOutgoing()
+            || m_trackLocalChangesOption.isSelected() != m_projectSettings.isTrackLocalStatus()
+            || m_trackSubmitChangesOption.isSelected() != m_projectSettings.isTrackSubmitStatus()
+            || m_trackAncestorChangesOption.isSelected() != m_projectSettings.isTrackAncestorStatus();
   }
 
   public void saveSettings() {
     m_projectSettings.setCheckIncoming(m_checkIncomingCbx.isSelected());
     m_projectSettings.setCheckOutgoing(m_checkOutgoingCbx.isSelected());
     m_projectSettings.setRootCheckingEnabled(m_autoFixRootsCbx.isSelected());
+    m_projectSettings.setTrackLocalStatus(m_trackLocalChangesOption.isSelected());
+    m_projectSettings.setTrackSubmitStatus(m_trackSubmitChangesOption.isSelected());
+    m_projectSettings.setTrackAncestorStatus(m_trackAncestorChangesOption.isSelected());
   }
 
   public void loadSettings() {
     m_checkIncomingCbx.setSelected(m_projectSettings.isCheckIncoming());
     m_checkOutgoingCbx.setSelected(m_projectSettings.isCheckOutgoing());
     m_autoFixRootsCbx.setSelected(m_projectSettings.isRootCheckingEnabled());
+    m_trackLocalChangesOption.setSelected(m_projectSettings.isTrackLocalStatus());
+    m_trackSubmitChangesOption.setSelected(m_projectSettings.isTrackSubmitStatus());
+    m_trackAncestorChangesOption.setSelected(m_projectSettings.isTrackAncestorStatus());
   }
 
   public JPanel getPanel() {
@@ -74,23 +87,52 @@
    */
   private void $$$setupUI$$$() {
     m_panel = new JPanel();
-    m_panel.setLayout(new GridLayoutManager(3, 1, new Insets(0, 0, 0, 0), -1, -1));
+    m_panel.setLayout(new GridLayoutManager(5, 2, 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,
+        new GridConstraints(4, 1, 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,
-        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(), "Changesets"));
+    panel1.setLayout(new GridLayoutManager(3, 1, new Insets(0, 0, 0, 0), -1, -1));
+    m_panel.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(BorderFactory.createEtchedBorder(),
+        ResourceBundle.getBundle("org/emergent/bzr4j/intellij/BzrVcsMessages")
+            .getString("configpanel.tracking_group.text")));
+    m_trackSubmitChangesOption = new JRadioButton();
+    m_trackSubmitChangesOption.setSelected(false);
+    m_trackSubmitChangesOption.setText("Track changes against submit branch");
+    panel1.add(m_trackSubmitChangesOption,
+        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));
+    m_trackLocalChangesOption = new JRadioButton();
+    m_trackLocalChangesOption.setSelected(true);
+    m_trackLocalChangesOption.setText("Track changes against local branch");
+    panel1.add(m_trackLocalChangesOption,
+        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));
+    m_trackAncestorChangesOption = new JRadioButton();
+    m_trackAncestorChangesOption.setSelected(false);
+    m_trackAncestorChangesOption.setText("Track changes against ancestor branch");
+    panel1.add(m_trackAncestorChangesOption,
+        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 JPanel panel2 = new JPanel();
+    panel2.setLayout(new GridLayoutManager(2, 1, new Insets(0, 0, 0, 0), -1, -1));
+    m_panel.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));
+    panel2.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "Changesets"));
     m_checkIncomingCbx = new JCheckBox();
     m_checkIncomingCbx.setSelected(true);
     m_checkIncomingCbx.setText("Check for incoming changesets");
     m_checkIncomingCbx.setMnemonic('I');
     m_checkIncomingCbx.setDisplayedMnemonicIndex(10);
-    panel1.add(m_checkIncomingCbx,
+    panel2.add(m_checkIncomingCbx,
         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));
@@ -99,25 +141,30 @@
     m_checkOutgoingCbx.setText("Check for outgoing changesets");
     m_checkOutgoingCbx.setMnemonic('O');
     m_checkOutgoingCbx.setDisplayedMnemonicIndex(10);
-    panel1.add(m_checkOutgoingCbx,
+    panel2.add(m_checkOutgoingCbx,
         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 JPanel panel2 = new JPanel();
-    panel2.setLayout(new GridLayoutManager(1, 1, new Insets(0, 0, 0, 0), -1, -1));
-    m_panel.add(panel2, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH,
+    final JPanel panel3 = new JPanel();
+    panel3.setLayout(new GridLayoutManager(2, 1, new Insets(0, 0, 0, 0), -1, -1));
+    m_panel.add(panel3, new GridConstraints(2, 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));
-    panel2.setBorder(BorderFactory.createTitledBorder(
+    panel3.setBorder(BorderFactory.createTitledBorder(
         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"));
-    panel2.add(m_autoFixRootsCbx,
+    panel3.add(m_autoFixRootsCbx,
         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));
+    ButtonGroup buttonGroup;
+    buttonGroup = new ButtonGroup();
+    buttonGroup.add(m_trackLocalChangesOption);
+    buttonGroup.add(m_trackSubmitChangesOption);
+    buttonGroup.add(m_trackAncestorChangesOption);
   }
 
   /** @noinspection ALL */

=== modified file 'modules/intellij/src/main/java/org/emergent/bzr4j/intellij/ui/BzrSwitchDialog.java'
--- modules/intellij/src/main/java/org/emergent/bzr4j/intellij/ui/BzrSwitchDialog.java	2010-01-05 02:18:38 +0000
+++ modules/intellij/src/main/java/org/emergent/bzr4j/intellij/ui/BzrSwitchDialog.java	2012-01-17 00:40:29 +0000
@@ -171,69 +171,59 @@
     cleanCbx.setText("Overwrite locally modified files (no backup)");
     cleanCbx.setMnemonic('O');
     cleanCbx.setDisplayedMnemonicIndex(0);
-    contentPanel.add(cleanCbx,
-        new GridConstraints(2, 0, 1, 2, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE,
-            GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW,
-            GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
+    contentPanel.add(cleanCbx, new GridConstraints(2, 0, 1, 2, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE,
+        GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED,
+        null, null, null, 0, false));
     final JPanel panel1 = new JPanel();
     panel1.setLayout(new GridLayoutManager(3, 2, new Insets(0, 0, 0, 0), -1, -1));
-    contentPanel.add(panel1,
-        new GridConstraints(1, 0, 1, 2, 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, 2, 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("Switch to:"));
     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));
+    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));
     branchSelector = new JComboBox();
     branchSelector.setEnabled(true);
-    final DefaultComboBoxModel defaultComboBoxModel1 = new DefaultComboBoxModel();
-    branchSelector.setModel(defaultComboBoxModel1);
     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));
     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));
     revisionTxt = new JTextField();
     revisionTxt.setEnabled(false);
     revisionTxt.setText("");
     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));
     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));
     tagSelector = new JComboBox();
     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));
     hgRepositorySelectorComponent = new BzrRepositorySelectorComponent();
     contentPanel.add(hgRepositorySelectorComponent.$$$getRootComponent$$$(),
         new GridConstraints(0, 0, 1, 2, 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/resources/org/emergent/bzr4j/intellij/BzrVcsMessages.properties'
--- modules/intellij/src/main/resources/org/emergent/bzr4j/intellij/BzrVcsMessages.properties	2010-03-02 20:50:05 +0000
+++ modules/intellij/src/main/resources/org/emergent/bzr4j/intellij/BzrVcsMessages.properties	2012-01-17 00:40:29 +0000
@@ -55,6 +55,7 @@
 configpanel.exechooser.title=Bazaar Configuration
 configpanel.miscellaneous_group.text=Miscellaneous settings
 configpanel.trim_annotation_author.text=Trim annotation author text
+configpanel.tracking_group.text=Changes Tracking
 confirmation.text.add.dir=Do you want to schedule the following directory for addition to Bazaar?\n{0}
 confirmation.text.add.file=Do you want to schedule the following file for addition to Bazaar?\n{0}
 confirmation.text.delete.dir=Do you want to schedule the following directory for deletion from Bazaar?\n{0}\nNOTE: The directory will be deleted from disk when the change is committed.