Merge remote-tracking branch 'origin/vNext' into roslyn-ivt

4 files changed, 21 insertions, 310 deletions

diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/CredentialsDialog.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/CredentialsDialog.cs
index e8652e774a..752929fdc9 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/CredentialsDialog.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/CredentialsDialog.cs
@@ -41,7 +41,7 @@ namespace MonoDevelop.VersionControl.Git
 
 			this.UseNativeContextMenus ();
 
-			labelTop1.Text = string.Format (labelTop1.Text, uri);
+			labelTop1.LabelProp = string.Format (labelTop1.LabelProp, uri);
 
 			var table = new Table (0, 0, false);
 			table.ColumnSpacing = 6;
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs
index 4ce6bd2ce9..af5426c485 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs
@@ -619,13 +619,17 @@ namespace MonoDevelop.VersionControl.Git
 						func (credType);
 						GitCredentials.StoreCredentials (credType);
 						retry = false;
-					} catch (AuthenticationException) {
+					} catch (AuthenticationException e) {
 						GitCredentials.InvalidateCredentials (credType);
-						retry = true;
+						retry = AlertButton.Yes == MessageService.AskQuestion (
+							GettextCatalog.GetString ("Remote server error: {0}", e.Message),
+							GettextCatalog.GetString ("Retry authentication?"),
+							AlertButton.Yes, AlertButton.No);
+						if (!retry)
+							monitor?.ReportError (e.Message, null);
 					} catch (VersionControlException e) {
 						GitCredentials.InvalidateCredentials (credType);
-						if (monitor != null)
-							monitor.ReportError (e.Message, null);
+						monitor?.ReportError (e.Message, null);
 						retry = false;
 					} catch (UserCancelledException) {
 						GitCredentials.StoreCredentials (credType);
@@ -633,7 +637,7 @@ namespace MonoDevelop.VersionControl.Git
 					} catch (LibGit2SharpException e) {
 						GitCredentials.InvalidateCredentials (credType);
 
-						if (!tfsSession.Disposed) {
+						if (credType == GitCredentialsType.Tfs) {
 							retry = true;
 							tfsSession.Dispose ();
 							continue;
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitService.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitService.cs
index b36b67eb2a..0105cbf529 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitService.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitService.cs
@@ -25,6 +25,7 @@
 // THE SOFTWARE.
 
 using System;
+using System.Linq;
 using MonoDevelop.Core;
 using MonoDevelop.Ide;
 using MonoDevelop.Ide.ProgressMonitoring;
@@ -42,6 +43,15 @@ namespace MonoDevelop.VersionControl.Git
 
 		public static void Push (GitRepository repo)
 		{
+			bool hasCommits = repo.RootRepository.Commits.Any ();
+			if (!hasCommits) {
+				MessageService.ShowMessage (
+					GettextCatalog.GetString ("There are no changes to push."),
+					GettextCatalog.GetString ("Create an initial commit first.")
+				);
+				return;
+			}
+
 			var dlg = new PushDialog (repo);
 			try {
 				if (MessageService.RunCustomDialog (dlg) != (int) Gtk.ResponseType.Ok)
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/objects.xml b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/objects.xml
index aa41067faf..f87c293eb8 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/objects.xml
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/gtk-gui/objects.xml
@@ -1,304 +1 @@
-<objects attr-sync="on">
-  <object type="MonoDevelop.VersionControl.CommitMessageStylePanelWidget" palette-category="General" allow-children="false" base-type="Gtk.Bin">
-    <itemgroups />
-    <signals>
-      <itemgroup label="CommitMessageStylePanelWidget Signals">
-        <signal name="Changed" />
-      </itemgroup>
-    </signals>
-  </object>
-  <object type="MonoDevelop.VersionControl.Views.ComparisonWidget" palette-category="General" allow-children="false" base-type="Gtk.Bin">
-    <itemgroups />
-    <signals />
-  </object>
-  <object type="MonoDevelop.VersionControl.Views.DropDownBox" palette-category="General" allow-children="false" base-type="Gtk.Button">
-    <itemgroups>
-      <itemgroup label="DropDownBox Properties">
-        <property name="Text" />
-        <property name="DefaultIconHeight" />
-        <property name="DefaultIconWidth" />
-      </itemgroup>
-    </itemgroups>
-    <signals />
-  </object>
-  <object type="MonoDevelop.VersionControl.Views.ChangeSetView" palette-category="General" allow-children="false" base-type="Gtk.ScrolledWindow">
-    <itemgroups />
-    <signals />
-  </object>
-  <object type="MonoDevelop.VersionControl.Views.LogWidget" palette-category="General" allow-children="false" base-type="Gtk.Bin">
-    <itemgroups />
-    <signals />
-  </object>
-  <object type="MonoDevelop.Ide.Gui.Components.ExtensibleTreeView" palette-category="General" allow-children="false" base-type="MonoDevelop.Components.CompactScrolledWindow">
-    <itemgroups>
-      <itemgroup label="ExtensibleTreeView Properties">
-        <property name="Id" />
-        <property name="Zoom" />
-        <property name="ShowSelectionPopupButton" />
-      </itemgroup>
-    </itemgroups>
-    <signals>
-      <itemgroup label="ExtensibleTreeView Signals">
-        <signal name="CurrentItemActivated" />
-      </itemgroup>
-    </signals>
-  </object>
-  <object type="MonoDevelop.Ide.Gui.Components.ExecutionModeComboBox" palette-category="General" allow-children="false" base-type="Gtk.Bin">
-    <itemgroups />
-    <signals>
-      <itemgroup label="ExecutionModeComboBox Signals">
-        <signal name="SelectionChanged" />
-      </itemgroup>
-    </signals>
-  </object>
-  <object type="MonoDevelop.Ide.Gui.Components.LogView" palette-category="General" allow-children="false" base-type="MonoDevelop.Components.CompactScrolledWindow">
-    <itemgroups />
-    <signals />
-  </object>
-  <object type="MonoDevelop.Components.FileEntry" palette-category="General" allow-children="false" base-type="Gtk.HBox">
-    <itemgroups />
-    <signals />
-  </object>
-  <object type="MonoDevelop.Components.FolderEntry" palette-category="General" allow-children="false" base-type="Gtk.HBox">
-    <itemgroups />
-    <signals />
-  </object>
-  <object type="MonoDevelop.Components.IconView" palette-category="General" allow-children="false" base-type="Gtk.ScrolledWindow">
-    <itemgroups />
-    <signals>
-      <itemgroup label="IconView Signals">
-        <signal name="IconSelected" />
-        <signal name="IconDoubleClicked" />
-      </itemgroup>
-    </signals>
-  </object>
-  <object type="MonoDevelop.Components.NotebookButtonBar" palette-category="General" allow-children="false" base-type="Gtk.Toolbar">
-    <itemgroups />
-    <signals />
-  </object>
-  <object type="MonoDevelop.Components.MenuButton" palette-category="General" allow-children="false" base-type="Gtk.Button">
-    <itemgroups>
-      <itemgroup label="MenuButton Properties">
-        <property name="Label" />
-        <property name="UseUnderline" />
-        <property name="UseMarkup" />
-      </itemgroup>
-    </itemgroups>
-    <signals />
-  </object>
-  <object type="MonoDevelop.Components.FixedWidthWrapLabel" palette-category="General" allow-children="false" base-type="Gtk.Widget">
-    <itemgroups>
-      <itemgroup label="FixedWidthWrapLabel Properties">
-        <property name="MaxWidth" />
-        <property name="Markup" />
-        <property name="Text" />
-        <property name="Indent" />
-        <property name="BreakOnPunctuation" />
-        <property name="BreakOnCamelCasing" />
-      </itemgroup>
-    </itemgroups>
-    <signals />
-  </object>
-  <object type="MonoDevelop.Components.ListView" palette-category="General" allow-children="false" base-type="Gtk.DrawingArea">
-    <itemgroups>
-      <itemgroup label="ListView Properties">
-        <property name="AllowMultipleSelection" />
-        <property name="SelectedRow" />
-        <property name="SelectionDisabled" />
-        <property name="Page" />
-      </itemgroup>
-    </itemgroups>
-    <signals>
-      <itemgroup label="ListView Signals">
-        <signal name="SelectionChanged" />
-        <signal name="ItemActivated" />
-      </itemgroup>
-    </signals>
-  </object>
-  <object type="MonoDevelop.Components.FolderListSelector" palette-category="General" allow-children="false" base-type="Gtk.Bin">
-    <itemgroups />
-    <signals />
-  </object>
-  <object type="MonoDevelop.Components.SearchEntry" palette-category="General" allow-children="false" base-type="Gtk.EventBox">
-    <itemgroups>
-      <itemgroup label="SearchEntry Properties">
-        <property name="ForceFilterButtonVisible" />
-        <property name="HasFrame" />
-        <property name="RoundedShape" />
-        <property name="IsCheckMenu" />
-        <property name="ActiveFilterID" />
-        <property name="EmptyMessage" />
-        <property name="Query" />
-        <property name="Ready" />
-        <property name="HasFocus" />
-      </itemgroup>
-    </itemgroups>
-    <signals>
-      <itemgroup label="SearchEntry Signals">
-        <signal name="Changed" />
-        <signal name="Activated" />
-        <signal name="FilterChanged" />
-        <signal name="RequestMenu" />
-      </itemgroup>
-    </signals>
-  </object>
-  <object type="MonoDevelop.Components.PropertyGrid.PropertyGrid" palette-category="General" allow-children="false" base-type="Gtk.VBox">
-    <itemgroups>
-      <itemgroup label="PropertyGrid Properties">
-        <property name="ShowToolbar" />
-        <property name="ShowHelp" />
-      </itemgroup>
-    </itemgroups>
-    <signals>
-      <itemgroup label="PropertyGrid Signals">
-        <signal name="Changed" />
-      </itemgroup>
-    </signals>
-  </object>
-  <object type="MonoDevelop.Components.MenuButtonEntry" palette-category="General" allow-children="false" base-type="Gtk.HBox">
-    <itemgroups>
-      <itemgroup label="MenuButtonEntry Properties">
-        <property name="Text" />
-      </itemgroup>
-    </itemgroups>
-    <signals />
-  </object>
-  <object type="MonoDevelop.Ide.Gui.Components.ProjectFileEntry" palette-category="General" allow-children="false" base-type="Gtk.HBox">
-    <itemgroups>
-      <itemgroup label="ProjectFileEntry Properties">
-        <property name="DialogTitle" />
-        <property name="DefaultFilter" />
-        <property name="VerifyFileExistsInProject" />
-        <property name="EntryIsEditable" />
-      </itemgroup>
-    </itemgroups>
-    <signals>
-      <itemgroup label="ProjectFileEntry Signals">
-        <signal name="Changed" />
-      </itemgroup>
-    </signals>
-  </object>
-  <object type="MonoDevelop.Ide.Projects.CombineEntryFeatureSelector" palette-category="General" allow-children="false" base-type="Gtk.Bin">
-    <itemgroups />
-    <signals />
-  </object>
-  <object type="MonoDevelop.Ide.Projects.OptionPanels.BaseDirectoryPanelWidget" palette-category="General" allow-children="false" base-type="Gtk.Bin">
-    <itemgroups>
-      <itemgroup label="BaseDirectoryPanelWidget Properties">
-        <property name="BaseDirectory" />
-      </itemgroup>
-    </itemgroups>
-    <signals />
-  </object>
-  <object type="MonoDevelop.Ide.Gui.Components.EnvVarList" palette-category="General" allow-children="false" base-type="Gtk.ScrolledWindow">
-    <itemgroups />
-    <signals />
-  </object>
-  <object type="MonoDevelop.Ide.Gui.Components.StringTagSelectorButton" palette-category="General" allow-children="false" base-type="Gtk.Bin">
-    <itemgroups />
-    <signals />
-  </object>
-  <object type="MonoDevelop.Components.CompactScrolledWindow" palette-category="General" allow-children="false" base-type="Gtk.ScrolledWindow">
-    <itemgroups>
-      <itemgroup label="CompactScrolledWindow Properties">
-        <property name="ShowBorderLine" />
-      </itemgroup>
-    </itemgroups>
-    <signals />
-  </object>
-  <object type="MonoDevelop.Components.DropDownBox" palette-category="General" allow-children="false" base-type="Gtk.Button">
-    <itemgroups>
-      <itemgroup label="DropDownBox Properties">
-        <property name="Text" />
-        <property name="DrawRightBorder" />
-        <property name="DefaultIconHeight" />
-        <property name="DefaultIconWidth" />
-        <property name="DrawButtonShape" />
-        <property name="DrawLeftBorder" />
-        <property name="FixedWidth" />
-        <property name="FixedHeight" />
-      </itemgroup>
-    </itemgroups>
-    <signals />
-  </object>
-  <object type="MonoDevelop.Ide.Gui.Components.ProjectSelectorWidget" palette-category="General" allow-children="false" base-type="Gtk.Bin">
-    <itemgroups>
-      <itemgroup label="ProjectSelectorWidget Properties">
-        <property name="ShowCheckboxes" />
-        <property name="CascadeCheckboxSelection" />
-      </itemgroup>
-    </itemgroups>
-    <signals>
-      <itemgroup label="ProjectSelectorWidget Signals">
-        <signal name="SelectionChanged" />
-        <signal name="ActiveChanged" />
-      </itemgroup>
-    </signals>
-  </object>
-  <object type="MonoDevelop.Ide.ProgressMonitoring.ProgressBarMonitor" palette-category="General" allow-children="false" base-type="Gtk.Bin">
-    <itemgroups>
-      <itemgroup label="ProgressBarMonitor Properties">
-        <property name="AllowCancel" />
-        <property name="ShowErrorsDialog" />
-      </itemgroup>
-    </itemgroups>
-    <signals />
-  </object>
-  <object type="MonoDevelop.Ide.Gui.Components.PriorityList" palette-category="General" allow-children="false" base-type="Gtk.Bin">
-    <itemgroups />
-    <signals />
-  </object>
-  <object type="MonoDevelop.Ide.Projects.OptionPanels.PortableRuntimeOptionsPanelWidget" palette-category="General" allow-children="false" base-type="Gtk.Bin">
-    <itemgroups />
-    <signals />
-  </object>
-  <object type="MonoDevelop.Components.ProgressControl" palette-category="General" allow-children="false" base-type="Gtk.DrawingArea">
-    <itemgroups />
-    <signals />
-  </object>
-  <object type="Mono.TextEditor.PopupWindow.TooltipWindow.FixedWidthWrapLabel" palette-category="General" allow-children="false" base-type="Gtk.Widget">
-    <itemgroups>
-      <itemgroup label="FixedWidthWrapLabel Properties">
-        <property name="MaxWidth" />
-        <property name="Markup" />
-        <property name="Text" />
-        <property name="Indent" />
-        <property name="BreakOnPunctuation" />
-        <property name="BreakOnCamelCasing" />
-      </itemgroup>
-    </itemgroups>
-    <signals />
-  </object>
-  <object type="Mono.TextEditor.Theatrics.AnimatedVBox" palette-category="General" allow-children="false" base-type="Gtk.Container">
-    <itemgroups />
-    <signals />
-  </object>
-  <object type="Mono.TextEditor.TextEditor" palette-category="General" allow-children="false" base-type="Gtk.Container">
-    <itemgroups>
-      <itemgroup label="TextEditor Properties">
-        <property name="TabsToSpaces" />
-        <property name="IMModule" />
-        <property name="LineHeight" />
-        <property name="SelectedText" />
-        <property name="SelectionAnchor" />
-        <property name="Text" />
-        <property name="SearchPattern" />
-        <property name="HighlightSearchPattern" />
-        <property name="IsCaseSensitive" />
-        <property name="IsWholeWordOnly" />
-      </itemgroup>
-    </itemgroups>
-    <signals>
-      <itemgroup label="TextEditor Signals">
-        <signal name="VScroll" />
-        <signal name="HScroll" />
-        <signal name="SelectionChanged" />
-        <signal name="Painted" />
-        <signal name="LinkRequest" />
-        <signal name="EditorOptionsChanged" />
-        <signal name="HighlightSearchPatternChanged" />
-        <signal name="BeginHover" />
-      </itemgroup>
-    </signals>
-  </object>
-</objects>
\ No newline at end of file
+<objects attr-sync="on"></objects>
\ No newline at end of file