diff options
20 files changed, 182 insertions, 169 deletions
diff --git a/.gitmodules b/.gitmodules index 1b4c2db678..cb047cfe6f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -48,7 +48,11 @@ [submodule "main/external/libgit2sharp"] path = main/external/libgit2sharp url = git://github.com/libgit2/libgit2sharp.git - branch = therzok/mdNext + branch = xs-5.10-v1 [submodule "main/external/libgit-binary"] path = main/external/libgit-binary url = git://github.com/mono/libgit-binary.git +[submodule "main/external/libgit2"] + path = main/external/libgit2 + url = git://github.com/mono/libgit2.git + branch = xs-5.10-v1 diff --git a/main/external/libgit-binary b/main/external/libgit-binary -Subproject 65d641c93f5392c151788ebb466932b5c6181a7 +Subproject face80ee17413af12a31c3690df664526f8b5ca diff --git a/main/external/libgit2 b/main/external/libgit2 new file mode 160000 +Subproject edb2afa37f01179361ccecceb96acc75094b277 diff --git a/main/external/libgit2sharp b/main/external/libgit2sharp -Subproject 71feabfe58a742e9913add3baadf87c27956e58 +Subproject 2733f93dcd7376f3c83ed7e9cd97a324386be76 diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/MonoDevelop.VersionControl.Git.Tests.csproj b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/MonoDevelop.VersionControl.Git.Tests.csproj index 2c05b7c460..13adc1d047 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/MonoDevelop.VersionControl.Git.Tests.csproj +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/MonoDevelop.VersionControl.Git.Tests.csproj @@ -139,11 +139,11 @@ </When> <When Condition=" '$(Configuration)' == 'DebugGnome' OR '$(Configuration)' == 'ReleaseGnome' "> <ItemGroup> - <NativeBinaries Include="..\..\..\..\external\libgit2sharp\libgit2\build\*.*" /> + <NativeBinaries Include="..\..\..\..\external\libgit2\build\*.so*" /> </ItemGroup> </When> </Choose> <Target Name="AfterBuild"> <Copy SourceFiles="@(NativeBinaries)" DestinationFolder="$(OutputPath)\" SkipUnchangedFiles="true" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.csproj b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.csproj index 5295821399..ecbfa50bf4 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.csproj +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.csproj @@ -206,6 +206,14 @@ <Gettext-ScanForTranslations>False</Gettext-ScanForTranslations> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </None> + <None Include="..\..\..\..\external\libgit-binary\libgit2.license.txt"> + <Link>libgit2.license.txt</Link> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="..\..\..\..\external\libgit-binary\libssh2.license.txt"> + <Link>libssh2.license.txt</Link> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Choose> @@ -221,7 +229,7 @@ </When> <When Condition=" '$(Configuration)' == 'DebugGnome' OR '$(Configuration)' == 'ReleaseGnome' "> <ItemGroup> - <NativeBinaries Include="..\..\..\..\external\libgit2sharp\libgit2\build\*.*" /> + <NativeBinaries Include="..\..\..\..\external\libgit2\build\*.so*" /> </ItemGroup> </When> </Choose> @@ -231,4 +239,4 @@ <Target Name="AfterBuild"> <Copy SourceFiles="@(NativeBinaries)" DestinationFolder="$(OutputPath)\" SkipUnchangedFiles="true" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/Commands.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/Commands.cs index dcf04df666..a443b57119 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/Commands.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/Commands.cs @@ -110,8 +110,8 @@ namespace MonoDevelop.VersionControl.Git { string currentBranch = repo.GetCurrentBranch (); foreach (Branch branch in repo.GetBranches ()) { - CommandInfo ci = info.Add (branch.Name, branch.Name); - if (branch.Name == currentBranch) + CommandInfo ci = info.Add (branch.FriendlyName, branch.FriendlyName); + if (branch.FriendlyName == currentBranch) ci.Checked = true; } } diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/EditBranchDialog.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/EditBranchDialog.cs index d128c9f0ac..5681a3c7d4 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/EditBranchDialog.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/EditBranchDialog.cs @@ -66,7 +66,7 @@ namespace MonoDevelop.VersionControl.Git TypeDescriptor.AddAttributes (comboStore, modelAttr); foreach (Branch b in repo.GetBranches ()) { - AddValues (b.Name, ImageService.GetIcon ("vc-branch", IconSize.Menu), "refs/heads/"); + AddValues (b.FriendlyName, ImageService.GetIcon ("vc-branch", IconSize.Menu), "refs/heads/"); } foreach (Remote r in repo.GetRemotes ()) { @@ -117,7 +117,7 @@ namespace MonoDevelop.VersionControl.Git { comboSources.Sensitive = checkTrack.Active; buttonOk.Sensitive = entryName.Text.Length > 0; - if (oldName != entryName.Text && repo.GetBranches ().Any (b => b.Name == entryName.Text)) { + if (oldName != entryName.Text && repo.GetBranches ().Any (b => b.FriendlyName == entryName.Text)) { labelError.Markup = "<span color='red'>" + GettextCatalog.GetString ("A branch with this name already exists") + "</span>"; labelError.Show (); buttonOk.Sensitive = false; diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCommitDialogExtension.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCommitDialogExtension.cs index 041e94b036..632f1a26d0 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCommitDialogExtension.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitCommitDialogExtension.cs @@ -107,7 +107,8 @@ namespace MonoDevelop.VersionControl.Git } } - if (user != sol.AuthorInformation.Name || email != sol.AuthorInformation.Email) { + if ((!string.IsNullOrEmpty (sol.AuthorInformation.Name) && !string.IsNullOrEmpty (sol.AuthorInformation.Email)) && + (user != sol.AuthorInformation.Name || email != sol.AuthorInformation.Email)) { // There is a conflict. Ask the user what to do string gitInfo = GetDesc (user, email); string mdInfo = GetDesc (sol.AuthorInformation.Name, sol.AuthorInformation.Email); diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitConfigurationDialog.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitConfigurationDialog.cs index 2552f07ad4..eff6a2683a 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitConfigurationDialog.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitConfigurationDialog.cs @@ -69,7 +69,7 @@ namespace MonoDevelop.VersionControl.Git string currentBranch = repo.GetCurrentBranch (); var b = (Branch) storeBranches.GetValue (it, 0); - buttonRemoveBranch.Sensitive = b.Name != currentBranch; + buttonRemoveBranch.Sensitive = b.FriendlyName != currentBranch; }; buttonRemoveBranch.Sensitive = buttonEditBranch.Sensitive = buttonSetDefaultBranch.Sensitive = false; @@ -126,8 +126,8 @@ namespace MonoDevelop.VersionControl.Git storeBranches.Clear (); string currentBranch = repo.GetCurrentBranch (); foreach (Branch branch in repo.GetBranches ()) { - string text = branch.Name == currentBranch ? "<b>" + branch.Name + "</b>" : branch.Name; - storeBranches.AppendValues (branch, text, branch.IsTracking ? branch.TrackedBranch.Name : String.Empty, branch.Name); + string text = branch.FriendlyName == currentBranch ? "<b>" + branch.FriendlyName + "</b>" : branch.FriendlyName; + storeBranches.AppendValues (branch, text, branch.IsTracking ? branch.TrackedBranch.FriendlyName : String.Empty, branch.FriendlyName); } state.Load (); } @@ -176,12 +176,12 @@ namespace MonoDevelop.VersionControl.Git if (!listBranches.Selection.GetSelected (out it)) return; var b = (Branch) storeBranches.GetValue (it, 0); - var dlg = new EditBranchDialog (repo, b.Name, b.IsTracking ? b.TrackedBranch.Name : String.Empty); + var dlg = new EditBranchDialog (repo, b.FriendlyName, b.IsTracking ? b.TrackedBranch.FriendlyName : String.Empty); try { if (MessageService.RunCustomDialog (dlg) == (int) ResponseType.Ok) { - if (dlg.BranchName != b.Name) { + if (dlg.BranchName != b.FriendlyName) { try { - repo.RenameBranch (b.Name, dlg.BranchName); + repo.RenameBranch (b.FriendlyName, dlg.BranchName); } catch (Exception ex) { MessageService.ShowError (GettextCatalog.GetString ("The branch could not be renamed"), ex); } @@ -201,11 +201,11 @@ namespace MonoDevelop.VersionControl.Git return; var b = (Branch) storeBranches.GetValue (it, 0); string txt = null; - if (!repo.IsBranchMerged (b.Name)) + if (!repo.IsBranchMerged (b.FriendlyName)) txt = GettextCatalog.GetString ("WARNING: The branch has not yet been merged to HEAD"); - if (MessageService.Confirm (GettextCatalog.GetString ("Are you sure you want to delete the branch '{0}'?", b.Name), txt, AlertButton.Delete)) { + if (MessageService.Confirm (GettextCatalog.GetString ("Are you sure you want to delete the branch '{0}'?", b.FriendlyName), txt, AlertButton.Delete)) { try { - repo.RemoveBranch (b.Name); + repo.RemoveBranch (b.FriendlyName); FillBranches (); } catch (Exception ex) { MessageService.ShowError (GettextCatalog.GetString ("The branch could not be deleted"), ex); @@ -219,7 +219,7 @@ namespace MonoDevelop.VersionControl.Git if (!listBranches.Selection.GetSelected (out it)) return; var b = (Branch) storeBranches.GetValue (it, 0); - GitService.SwitchToBranch (repo, b.Name); + GitService.SwitchToBranch (repo, b.FriendlyName); FillBranches (); } 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 001e7ec621..abf390756e 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 @@ -211,10 +211,12 @@ namespace MonoDevelop.VersionControl.Git monitor.BeginTask ("Applying stash", 1); int progress = 0; - var res = RootRepository.Stashes.Apply (stashIndex, StashApplyModifiers.Default, new CheckoutOptions { - OnCheckoutProgress = (path, completedSteps, totalSteps) => OnCheckoutProgress (completedSteps, totalSteps, monitor, ref progress), - OnCheckoutNotify = RefreshFile, - CheckoutNotifyFlags = refreshFlags, + StashApplyStatus res = RootRepository.Stashes.Apply (stashIndex, new StashApplyOptions { + CheckoutOptions = new CheckoutOptions { + OnCheckoutProgress = (path, completedSteps, totalSteps) => OnCheckoutProgress (completedSteps, totalSteps, monitor, ref progress), + OnCheckoutNotify = RefreshFile, + CheckoutNotifyFlags = refreshFlags, + } }); NotifyFilesChangedForStash (RootRepository.Stashes [stashIndex]); @@ -231,10 +233,12 @@ namespace MonoDevelop.VersionControl.Git var stash = RootRepository.Stashes [stashIndex]; int progress = 0; - var res = RootRepository.Stashes.Pop (stashIndex, StashApplyModifiers.Default, new CheckoutOptions { - OnCheckoutProgress = (path, completedSteps, totalSteps) => OnCheckoutProgress (completedSteps, totalSteps, monitor, ref progress), - OnCheckoutNotify = RefreshFile, - CheckoutNotifyFlags = refreshFlags, + StashApplyStatus res = RootRepository.Stashes.Pop (stashIndex, new StashApplyOptions { + CheckoutOptions = new CheckoutOptions { + OnCheckoutProgress = (path, completedSteps, totalSteps) => OnCheckoutProgress (completedSteps, totalSteps, monitor, ref progress), + OnCheckoutNotify = RefreshFile, + CheckoutNotifyFlags = refreshFlags, + } }); NotifyFilesChangedForStash (stash); if (monitor != null) @@ -456,15 +460,15 @@ namespace MonoDevelop.VersionControl.Git VersionStatus fstatus = VersionStatus.Versioned; if (status != FileStatus.Unaltered) { - if ((status & FileStatus.Added) != 0) + if ((status & FileStatus.NewInIndex) != 0) fstatus |= VersionStatus.ScheduledAdd; - else if ((status & (FileStatus.Removed | FileStatus.Missing)) != 0) + else if ((status & (FileStatus.DeletedFromIndex | FileStatus.DeletedFromWorkdir)) != 0) fstatus |= VersionStatus.ScheduledDelete; - else if ((status & (FileStatus.TypeChanged | FileStatus.Modified)) != 0) + else if ((status & (FileStatus.TypeChangeInWorkdir | FileStatus.ModifiedInWorkdir)) != 0) fstatus |= VersionStatus.Modified; - else if ((status & (FileStatus.RenamedInIndex | FileStatus.RenamedInWorkDir)) != 0) + else if ((status & (FileStatus.RenamedInIndex | FileStatus.RenamedInWorkdir)) != 0) fstatus |= VersionStatus.ScheduledReplace; - else if ((status & (FileStatus.Nonexistent | FileStatus.Untracked)) != 0) + else if ((status & (FileStatus.Nonexistent | FileStatus.NewInWorkdir)) != 0) fstatus = VersionStatus.Unversioned; else if ((status & FileStatus.Ignored) != 0) fstatus = VersionStatus.Ignored; @@ -582,9 +586,9 @@ namespace MonoDevelop.VersionControl.Git GitUpdateOptions options = GitService.StashUnstashWhenUpdating ? GitUpdateOptions.NormalUpdate : GitUpdateOptions.UpdateSubmodules; if (GitService.UseRebaseOptionWhenPulling) - Rebase (RootRepository.Head.TrackedBranch.Name, options, monitor); + Rebase (RootRepository.Head.TrackedBranch.FriendlyName, options, monitor); else - Merge (RootRepository.Head.TrackedBranch.Name, options, monitor); + Merge (RootRepository.Head.TrackedBranch.FriendlyName, options, monitor); monitor.Step (1); } @@ -1087,9 +1091,7 @@ namespace MonoDevelop.VersionControl.Git RetryUntilSuccess (monitor, () => RootRepository.Network.Push (RootRepository.Network.Remotes [remote], "refs/heads/" + remoteBranch, new PushOptions { - OnPushStatusError = delegate (PushStatusError pushStatusErrors) { - success = false; - }, + OnPushStatusError = pushStatusErrors => success = false, CredentialsProvider = GitCredentials.TryGet }) ); @@ -1189,7 +1191,7 @@ namespace MonoDevelop.VersionControl.Git public IEnumerable<string> GetTags () { - return RootRepository.Tags.Select (t => t.Name); + return RootRepository.Tags.Select (t => t.FriendlyName); } public void AddTag (string name, Revision rev, string message) @@ -1218,12 +1220,12 @@ namespace MonoDevelop.VersionControl.Git public IEnumerable<string> GetRemoteBranches (string remoteName) { - return RootRepository.Branches.Where (b => b.IsRemote && b.Remote.Name == remoteName).Select (b => b.Name.Substring (b.Name.IndexOf ('/') + 1)); + return RootRepository.Branches.Where (b => b.IsRemote && b.Remote.Name == remoteName).Select (b => b.FriendlyName.Substring (b.FriendlyName.IndexOf ('/') + 1)); } public string GetCurrentBranch () { - return RootRepository.Head.Name; + return RootRepository.Head.FriendlyName; } public void SwitchToBranch (ProgressMonitor monitor, string branch) @@ -1414,8 +1416,8 @@ namespace MonoDevelop.VersionControl.Git repositoryPath = repository.ToGitPath (repositoryPath); var status = repository.RetrieveStatus (repositoryPath); - if (status != FileStatus.Added && status != FileStatus.Untracked) { - foreach (var hunk in repository.Blame (repositoryPath)) { + if (status != FileStatus.NewInIndex && status != FileStatus.NewInWorkdir) { + foreach (var hunk in repository.Blame (repositoryPath, new BlameOptions { Strategy = BlameStrategy.FollowExactRenames })) { var commit = hunk.FinalCommit; var author = hunk.FinalSignature; working = new Annotation (commit.Sha, author.Name, author.When.LocalDateTime, String.Format ("<{0}>", author.Email)); diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/MergeDialog.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/MergeDialog.cs index af942e07a4..a55cce2785 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/MergeDialog.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/MergeDialog.cs @@ -114,7 +114,7 @@ namespace MonoDevelop.VersionControl.Git store.Clear (); foreach (Branch b in repo.GetBranches ()) - store.AppendValues (b.Name, ImageService.GetIcon ("vc-branch", IconSize.Menu), b.Name, "branch"); + store.AppendValues (b.FriendlyName, ImageService.GetIcon ("vc-branch", IconSize.Menu), b.FriendlyName, "branch"); foreach (string t in repo.GetTags ()) store.AppendValues (t, ImageService.GetIcon ("vc-tag", IconSize.Menu), t, "tag"); diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/Stash.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/Stash.cs index f7491ed5e6..f882cb1631 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/Stash.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/Stash.cs @@ -34,7 +34,7 @@ namespace MonoDevelop.VersionControl.Git { int i = 0; foreach (var s in sc) { - if (s.Name == stash.Name) { + if (s.FriendlyName == stash.FriendlyName) { sc.Remove (i); break; } diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/StashManagerDialog.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/StashManagerDialog.cs index 45cc2243bf..28ca83bbf8 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/StashManagerDialog.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/StashManagerDialog.cs @@ -66,7 +66,7 @@ namespace MonoDevelop.VersionControl.Git tvs.Save (); store.Clear (); foreach (var s in stashes) { - string name = s.Name; + string name = s.FriendlyName; string branch = GitRepository.GetStashBranchName (name); if (branch != null) { if (branch == "_tmp_") diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/build_libgit2.sh b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/build_libgit2.sh index 8f57096214..9f02ccbc13 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/build_libgit2.sh +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/build_libgit2.sh @@ -1,28 +1,28 @@ #!/bin/bash -pushd ../../../../external/libgit2sharp/ -LIBGIT2SHA=`cat LibGit2Sharp/libgit2_hash.txt` +pushd ../../../../external/libgit2/ +LIBGIT2SHA=`cat ../libgit-binary/libgit2_hash.txt` SHORTSHA=${LIBGIT2SHA:0:7} -if [[ -d libgit2/build ]] +if [[ -d build ]] then - pushd libgit2/build + pushd build if [[ -n $(ls libgit2-${SHORTSHA}.*) ]] then exit 0 else popd - rm -rf libgit2/build + rm -rf build fi fi -cp libgit2/CMakeLists.txt libgit2/.CMakeLists.txt.mdcopy -echo 'SET(CMAKE_SKIP_RPATH TRUE)' > libgit2/CMakeLists.txt -cat libgit2/.CMakeLists.txt.mdcopy >> libgit2/CMakeLists.txt +cp CMakeLists.txt .CMakeLists.txt.mdcopy +echo 'SET(CMAKE_SKIP_RPATH TRUE)' > CMakeLists.txt +cat .CMakeLists.txt.mdcopy >> CMakeLists.txt -mkdir libgit2/build -pushd libgit2/build +mkdir build +pushd build cmake -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \ -DTHREADSAFE:BOOL=ON \ @@ -35,5 +35,5 @@ cmake -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \ cmake --build . popd -mv libgit2/.CMakeLists.txt.mdcopy libgit2/CMakeLists.txt +mv .CMakeLists.txt.mdcopy CMakeLists.txt popd diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.UserGitConfigDialog.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.UserGitConfigDialog.cs index 831ba940e1..264f8bd1c3 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.UserGitConfigDialog.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/MonoDevelop.VersionControl.Git.UserGitConfigDialog.cs @@ -5,16 +5,25 @@ namespace MonoDevelop.VersionControl.Git internal partial class UserGitConfigDialog
{
private global::Gtk.VBox vbox2;
- private global::Gtk.VBox vbox5;
+
+ private global::Gtk.HBox hbox5;
+
private global::Gtk.Label label1;
+
+ private global::Gtk.Alignment alignment8;
+
private global::Gtk.Entry usernameEntry;
- private global::Gtk.VBox vbox6;
+
+ private global::Gtk.HBox hbox6;
+
private global::Gtk.Label label2;
+
+ private global::Gtk.Alignment alignment7;
+
private global::Gtk.Entry emailEntry;
- private global::Gtk.VBox vbox4;
- private global::Gtk.RadioButton globalConfigRadio;
- private global::Gtk.RadioButton repoConfigRadio;
+
private global::Gtk.Button buttonCancel;
+
private global::Gtk.Button buttonOk;
protected virtual void Build ()
@@ -32,107 +41,78 @@ namespace MonoDevelop.VersionControl.Git this.vbox2.Name = "vbox2";
this.vbox2.Spacing = 6;
// Container child vbox2.Gtk.Box+BoxChild
- this.vbox5 = new global::Gtk.VBox ();
- this.vbox5.Name = "vbox5";
- this.vbox5.Spacing = 6;
- // Container child vbox5.Gtk.Box+BoxChild
+ this.hbox5 = new global::Gtk.HBox ();
+ this.hbox5.Name = "hbox5";
+ this.hbox5.Spacing = 6;
+ // Container child hbox5.Gtk.Box+BoxChild
this.label1 = new global::Gtk.Label ();
this.label1.Name = "label1";
- this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("Username");
- this.vbox5.Add (this.label1);
- global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.label1]));
+ this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("Username:");
+ this.hbox5.Add (this.label1);
+ global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox5 [this.label1]));
w2.Position = 0;
w2.Expand = false;
w2.Fill = false;
- // Container child vbox5.Gtk.Box+BoxChild
+ // Container child hbox5.Gtk.Box+BoxChild
+ this.alignment8 = new global::Gtk.Alignment (1F, 1F, 0.9F, 1F);
+ this.alignment8.Name = "alignment8";
+ // Container child alignment8.Gtk.Container+ContainerChild
this.usernameEntry = new global::Gtk.Entry ();
this.usernameEntry.CanFocus = true;
this.usernameEntry.Name = "usernameEntry";
this.usernameEntry.IsEditable = true;
this.usernameEntry.InvisibleChar = '●';
- this.vbox5.Add (this.usernameEntry);
- global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.usernameEntry]));
- w3.Position = 1;
- w3.Expand = false;
- w3.Fill = false;
- this.vbox2.Add (this.vbox5);
- global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.vbox5]));
- w4.Position = 0;
- w4.Expand = false;
- w4.Fill = false;
- // Container child vbox2.Gtk.Box+BoxChild
- this.vbox6 = new global::Gtk.VBox ();
- this.vbox6.Name = "vbox6";
- this.vbox6.Spacing = 6;
- // Container child vbox6.Gtk.Box+BoxChild
- this.label2 = new global::Gtk.Label ();
- this.label2.Name = "label2";
- this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("Email");
- this.vbox6.Add (this.label2);
- global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox6 [this.label2]));
+ this.alignment8.Add (this.usernameEntry);
+ this.hbox5.Add (this.alignment8);
+ global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox5 [this.alignment8]));
+ w4.Position = 1;
+ this.vbox2.Add (this.hbox5);
+ global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox5]));
w5.Position = 0;
w5.Expand = false;
w5.Fill = false;
- // Container child vbox6.Gtk.Box+BoxChild
+ // Container child vbox2.Gtk.Box+BoxChild
+ this.hbox6 = new global::Gtk.HBox ();
+ this.hbox6.Name = "hbox6";
+ this.hbox6.Spacing = 6;
+ // Container child hbox6.Gtk.Box+BoxChild
+ this.label2 = new global::Gtk.Label ();
+ this.label2.Name = "label2";
+ this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("Email:");
+ this.hbox6.Add (this.label2);
+ global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.hbox6 [this.label2]));
+ w6.Position = 0;
+ w6.Expand = false;
+ w6.Fill = false;
+ // Container child hbox6.Gtk.Box+BoxChild
+ this.alignment7 = new global::Gtk.Alignment (1F, 1F, 0.71F, 1F);
+ this.alignment7.Name = "alignment7";
+ // Container child alignment7.Gtk.Container+ContainerChild
this.emailEntry = new global::Gtk.Entry ();
this.emailEntry.CanFocus = true;
this.emailEntry.Name = "emailEntry";
this.emailEntry.IsEditable = true;
this.emailEntry.InvisibleChar = '●';
- this.vbox6.Add (this.emailEntry);
- global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox6 [this.emailEntry]));
- w6.Position = 1;
- w6.Expand = false;
- w6.Fill = false;
- this.vbox2.Add (this.vbox6);
- global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.vbox6]));
- w7.Position = 1;
- w7.Expand = false;
- w7.Fill = false;
- // Container child vbox2.Gtk.Box+BoxChild
- this.vbox4 = new global::Gtk.VBox ();
- this.vbox4.Name = "vbox4";
- this.vbox4.Spacing = 6;
- // Container child vbox4.Gtk.Box+BoxChild
- this.globalConfigRadio = new global::Gtk.RadioButton (global::Mono.Unix.Catalog.GetString ("Global Config (Recommended)"));
- this.globalConfigRadio.CanFocus = true;
- this.globalConfigRadio.Name = "globalConfigRadio";
- this.globalConfigRadio.DrawIndicator = true;
- this.globalConfigRadio.UseUnderline = true;
- this.globalConfigRadio.Group = new global::GLib.SList (global::System.IntPtr.Zero);
- this.vbox4.Add (this.globalConfigRadio);
- global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.globalConfigRadio]));
- w8.Position = 0;
- w8.Expand = false;
- w8.Fill = false;
- // Container child vbox4.Gtk.Box+BoxChild
- this.repoConfigRadio = new global::Gtk.RadioButton (global::Mono.Unix.Catalog.GetString ("Repository Config"));
- this.repoConfigRadio.CanFocus = true;
- this.repoConfigRadio.Name = "repoConfigRadio";
- this.repoConfigRadio.DrawIndicator = true;
- this.repoConfigRadio.UseUnderline = true;
- this.repoConfigRadio.Group = this.globalConfigRadio.Group;
- this.vbox4.Add (this.repoConfigRadio);
- global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.repoConfigRadio]));
+ this.alignment7.Add (this.emailEntry);
+ this.hbox6.Add (this.alignment7);
+ global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.hbox6 [this.alignment7]));
+ w8.Position = 1;
+ this.vbox2.Add (this.hbox6);
+ global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox6]));
w9.Position = 1;
w9.Expand = false;
w9.Fill = false;
- this.vbox2.Add (this.vbox4);
- global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.vbox4]));
- w10.Position = 2;
+ w1.Add (this.vbox2);
+ global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox2]));
+ w10.Position = 0;
w10.Expand = false;
w10.Fill = false;
- w1.Add (this.vbox2);
- global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox2]));
- w11.Position = 0;
- w11.Expand = false;
- w11.Fill = false;
// Internal child MonoDevelop.VersionControl.Git.UserGitConfigDialog.ActionArea
- global::Gtk.HButtonBox w12 = this.ActionArea;
- w12.Name = "dialog1_ActionArea";
- w12.Spacing = 10;
- w12.BorderWidth = ((uint)(5));
- w12.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
+ global::Gtk.HButtonBox w11 = this.ActionArea;
+ w11.Name = "dialog1_ActionArea";
+ w11.Spacing = 10;
+ w11.BorderWidth = ((uint)(5));
+ w11.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
this.buttonCancel = new global::Gtk.Button ();
this.buttonCancel.CanDefault = true;
@@ -142,9 +122,9 @@ namespace MonoDevelop.VersionControl.Git this.buttonCancel.UseUnderline = true;
this.buttonCancel.Label = "gtk-cancel";
this.AddActionWidget (this.buttonCancel, -6);
- global::Gtk.ButtonBox.ButtonBoxChild w13 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w12 [this.buttonCancel]));
- w13.Expand = false;
- w13.Fill = false;
+ global::Gtk.ButtonBox.ButtonBoxChild w12 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w11 [this.buttonCancel]));
+ w12.Expand = false;
+ w12.Fill = false;
// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
this.buttonOk = new global::Gtk.Button ();
this.buttonOk.CanDefault = true;
@@ -154,15 +134,15 @@ namespace MonoDevelop.VersionControl.Git this.buttonOk.UseUnderline = true;
this.buttonOk.Label = "gtk-ok";
this.AddActionWidget (this.buttonOk, -5);
- global::Gtk.ButtonBox.ButtonBoxChild w14 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w12 [this.buttonOk]));
- w14.Position = 1;
- w14.Expand = false;
- w14.Fill = false;
+ global::Gtk.ButtonBox.ButtonBoxChild w13 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w11 [this.buttonOk]));
+ w13.Position = 1;
+ w13.Expand = false;
+ w13.Fill = false;
if ((this.Child != null)) {
this.Child.ShowAll ();
}
- this.DefaultWidth = 400;
- this.DefaultHeight = 240;
+ this.DefaultWidth = 332;
+ this.DefaultHeight = 184;
this.Show ();
this.usernameEntry.Changed += new global::System.EventHandler (this.OnChanged);
this.emailEntry.Changed += new global::System.EventHandler (this.OnChanged);
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/gui.stetic b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/gui.stetic index 80457d97aa..0f9ba94b81 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/gui.stetic +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/gtk-gui/gui.stetic @@ -1938,7 +1938,7 @@ </widget> </child> </widget> - <widget class="Gtk.Dialog" id="MonoDevelop.VersionControl.Git.UserGitConfigDialog" design-size="400 184"> + <widget class="Gtk.Dialog" id="MonoDevelop.VersionControl.Git.UserGitConfigDialog" design-size="332 184"> <property name="MemberName" /> <property name="GeneratePublic">False</property> <property name="WindowPosition">CenterOnParent</property> @@ -1953,13 +1953,13 @@ <property name="MemberName" /> <property name="Spacing">6</property> <child> - <widget class="Gtk.VBox" id="vbox5"> + <widget class="Gtk.HBox" id="hbox5"> <property name="MemberName" /> <property name="Spacing">6</property> <child> <widget class="Gtk.Label" id="label1"> <property name="MemberName" /> - <property name="LabelProp" translatable="yes">Username</property> + <property name="LabelProp" translatable="yes">Username:</property> </widget> <packing> <property name="Position">0</property> @@ -1969,18 +1969,24 @@ </packing> </child> <child> - <widget class="Gtk.Entry" id="usernameEntry"> + <widget class="Gtk.Alignment" id="alignment8"> <property name="MemberName" /> - <property name="CanFocus">True</property> - <property name="IsEditable">True</property> - <property name="InvisibleChar">●</property> - <signal name="Changed" handler="OnChanged" /> + <property name="Xscale">0.9</property> + <property name="Xalign">1</property> + <property name="Yalign">1</property> + <child> + <widget class="Gtk.Entry" id="usernameEntry"> + <property name="MemberName" /> + <property name="CanFocus">True</property> + <property name="IsEditable">True</property> + <property name="InvisibleChar">●</property> + <signal name="Changed" handler="OnChanged" /> + </widget> + </child> </widget> <packing> <property name="Position">1</property> <property name="AutoSize">True</property> - <property name="Expand">False</property> - <property name="Fill">False</property> </packing> </child> </widget> @@ -1992,13 +1998,13 @@ </packing> </child> <child> - <widget class="Gtk.VBox" id="vbox6"> + <widget class="Gtk.HBox" id="hbox6"> <property name="MemberName" /> <property name="Spacing">6</property> <child> <widget class="Gtk.Label" id="label2"> <property name="MemberName" /> - <property name="LabelProp" translatable="yes">Email</property> + <property name="LabelProp" translatable="yes">Email:</property> </widget> <packing> <property name="Position">0</property> @@ -2008,18 +2014,24 @@ </packing> </child> <child> - <widget class="Gtk.Entry" id="emailEntry"> + <widget class="Gtk.Alignment" id="alignment7"> <property name="MemberName" /> - <property name="CanFocus">True</property> - <property name="IsEditable">True</property> - <property name="InvisibleChar">●</property> - <signal name="Changed" handler="OnChanged" /> + <property name="Xscale">0.71</property> + <property name="Xalign">1</property> + <property name="Yalign">1</property> + <child> + <widget class="Gtk.Entry" id="emailEntry"> + <property name="MemberName" /> + <property name="CanFocus">True</property> + <property name="IsEditable">True</property> + <property name="InvisibleChar">●</property> + <signal name="Changed" handler="OnChanged" /> + </widget> + </child> </widget> <packing> <property name="Position">1</property> <property name="AutoSize">True</property> - <property name="Expand">False</property> - <property name="Fill">False</property> </packing> </child> </widget> diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest/AutoTestClientSession.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest/AutoTestClientSession.cs index ac3640a90b..70875b45a8 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest/AutoTestClientSession.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.AutoTest/AutoTestClientSession.cs @@ -82,7 +82,7 @@ namespace MonoDevelop.Components.AutoTest process = Process.Start (pi); - if (!waitEvent.WaitOne (15000)) { + if (!waitEvent.WaitOne (120000)) { try { process.Kill (); } catch { } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/Ide.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/Ide.cs index a3a6c35034..892c0465bc 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/Ide.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/Ide.cs @@ -180,7 +180,6 @@ namespace MonoDevelop.Ide commandService = new CommandManager (); ideServices = new IdeServices (); CustomToolService.Init (); - AutoTestService.Start (commandService, Preferences.EnableAutomatedTesting); commandService.CommandTargetScanStarted += CommandServiceCommandTargetScanStarted; commandService.CommandTargetScanFinished += CommandServiceCommandTargetScanFinished; @@ -297,6 +296,7 @@ namespace MonoDevelop.Ide IdeApp.Preferences.EnableInstrumentation.Changed += delegate { UpdateInstrumentationIcon (); }; + AutoTestService.Start (commandService, Preferences.EnableAutomatedTesting); AutoTestService.NotifyEvent ("MonoDevelop.Ide.IdeStart"); } diff --git a/main/src/core/MonoDevelop.Ide/gtkrc.mac b/main/src/core/MonoDevelop.Ide/gtkrc.mac index 8db60738fd..6d6fced496 100644 --- a/main/src/core/MonoDevelop.Ide/gtkrc.mac +++ b/main/src/core/MonoDevelop.Ide/gtkrc.mac @@ -124,6 +124,7 @@ style "button" { GtkWidget::focus-padding = 0 engine "xamarin" { + rgba = FALSE contrast = 1.0 gradient_shades = {0.96, 0.918, 0.926, 0.858} focus_color = shade(0.6, @bg_color) @@ -150,6 +151,7 @@ style "toggle-button" = "button" { bg[PRELIGHT] = shade(0.98, @base_color) engine "xamarin" { + rgba = FALSE contrast = 1.0 gradient_shades = {0.96, 0.918, 0.926, 0.858} focus_color = shade(0.6, @bg_color) @@ -301,6 +303,10 @@ style "entry" = "default" ythickness = 4 GtkEntry::inner-border = { 2, 2, 2, 2 } base[INSENSITIVE] = shade(1.02, @bg_color) + + engine "xamarin" { + rgba = FALSE + } } style "search-entry" = "wider" |