1 files changed, 14 insertions, 1 deletions
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/HgProjectSettings.java b/plugins/hg4idea/src/org/zmlx/hg4idea/HgProjectSettings.java
index 936587d19755..8abac1bb0b1e 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/HgProjectSettings.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/HgProjectSettings.java
@@ -12,6 +12,8 @@
 // limitations under the License.
 package org.zmlx.hg4idea;
 
+import com.intellij.dvcs.branch.DvcsBranchSync;
+import com.intellij.dvcs.branch.DvcsSyncBranchSettings;
 import com.intellij.openapi.components.PersistentStateComponent;
 import com.intellij.openapi.components.State;
 import com.intellij.openapi.components.Storage;
@@ -24,7 +26,7 @@ import org.jetbrains.annotations.NotNull;
   name = "hg4idea.settings",
   storages = @Storage(file = StoragePathMacros.WORKSPACE_FILE)
 )
-public class HgProjectSettings implements PersistentStateComponent<HgProjectSettings.State> {
+public class HgProjectSettings implements PersistentStateComponent<HgProjectSettings.State>, DvcsSyncBranchSettings {
 
   @NotNull private final HgGlobalSettings myAppSettings;
   @NotNull private final Project myProject;
@@ -37,10 +39,12 @@ public class HgProjectSettings implements PersistentStateComponent<HgProjectSett
   }
 
   public static class State {
+
     public boolean myCheckIncoming = true;
     public boolean myCheckOutgoing = true;
     public Boolean CHECK_INCOMING_OUTGOING = null;
     public boolean myIgnoreWhitespacesInAnnotations = true;
+    public DvcsBranchSync SYNC_SETTING = DvcsBranchSync.NOT_DECIDED;
   }
 
   public State getState() {
@@ -62,6 +66,15 @@ public class HgProjectSettings implements PersistentStateComponent<HgProjectSett
     return myState.myIgnoreWhitespacesInAnnotations;
   }
 
+  @NotNull
+  public DvcsBranchSync getSyncSetting() {
+    return myState.SYNC_SETTING;
+  }
+
+  public void setSyncSetting(@NotNull DvcsBranchSync syncSetting) {
+    myState.SYNC_SETTING = syncSetting;
+  }
+
   public void setCheckIncomingOutgoing(boolean checkIncomingOutgoing) {
     myState.CHECK_INCOMING_OUTGOING = checkIncomingOutgoing;
   }