Upgrade to libgit2 ff8d635#1049

nulltoken · 2015-05-15T16:13:43Z

This is an attempt to update to the latest libgit2 while dogfooding the new libgit2 binaries NuGet package.

I've downloaded the Appveyor artifact from libgit2/libgit2sharp.nativebinaries#4 in a local folder. I then reconfigured VS to use this folder as a local NuGet package source.

While going through this process I'm taking notes in order to further update libgit2/libgit2sharp.nativebinaries#5 and fixlibgit2/libgit2sharp.nativebinaries#2.

/cc @bording @jamill

bording · 2015-05-15T16:47:57Z

LibGit2Sharp/packages.config

How did you update this to the 1.0.27 version? Manually? If you do that, then the corresponding targets stuff in the .csproj file doesn't get updated to point to the new package.
To make sure everything gets updated properly, you'll want to update the allowedVersions property first, then run a package update via nuget.
The allowedVersions has to be updated first, otherwise the package update won't be allowed to update to the newer version.

The allowedVersions has to be updated first, otherwise the package update won't be allowed to update to the newer version.
I've discovered this the hard way 😉 This is part of the things we should document as part of libgit2/libgit2sharp.nativebinaries#2
Thanks a lot for watching my back! 😍

FWIW, it took an embarrassingly long time to troubleshoot this. I kept on getting AccessViolationException on tests involving the IndexEntry. The native changes were quite straightforward. I investigated the memory, thinking I was getting padding issues. Which wasn't making any sense as everything was correctly aligned.
...Until I took a look at the libgit2 version being loaded...
And everything unfolded to me being an idiot 😜

Therzok · 2015-05-15T19:08:35Z

nulltoken · 2015-05-15T20:40:11Z

Current status:

1193 passed, 19 failed, 5 skipped (see 'Task List'), took 148,18 seconds (xUnit.net 1.9.2 build 1705).

nulltoken · 2015-05-15T20:59:37Z

🎉

1196 passed, 16 failed, 5 skipped (see 'Task List'), took 142,42 seconds (xUnit.net 1.9.2 build 1705)

All the remaining failing tests are because of the thrown System.NotImplementedException in the RemoteUpdater.

I'm done for today with this. I'll work on tackling the remaining issues tomorrow.

nulltoken · 2015-05-16T13:16:58Z

 1205 passed, 7 failed, 5 skipped (see 'Task List'), took 147,73 seconds (xUnit.net 1.9.2 build 1705).

The only remaining failing tests require a change to libgit2 so that git_remote_add_fetch() and git_remote_add_push() return GIT_EINVALIDSPEC when being passed a bogus refspec.

@carlosmn nicely agreed to make those changes. Stay tuned!

nulltoken · 2015-05-16T16:36:16Z

LibGit2Sharp/Core/GitPushUpdate.cs

Do we need this?

nulltoken · 2015-05-17T19:09:41Z

Depends on libgit2/libgit2#3127 and libgit2/libgit2#3134

nulltoken · 2015-05-22T12:06:11Z

Current status:

Test 'LibGit2Sharp.Tests.FetchFixture.CanFetchCustomRefSpecsIntoAnEmptyRepository(url: "https://github.com/libgit2/TestGitRepository", localBranchName: "master", remoteBranchName: "master")' failed: Assert.DoesNotContain() failure: Found: refs/remotes/testRemote/master TestHelpers\ExpectedFetchState.cs(85,0): at LibGit2Sharp.Tests.TestHelpers.ExpectedFetchState.RemoteUpdateTipsHandler(String referenceName, ObjectId oldId, ObjectId newId) RemoteCallbacks.cs(173,0): at LibGit2Sharp.RemoteCallbacks.GitUpdateTipsHandler(IntPtr str, GitOid& oldId, GitOid& newId, IntPtr data) at LibGit2Sharp.Core.NativeMethods.git_remote_fetch(RemoteSafeHandle remote, GitStrArray& refspecs, GitFetchOptions fetch_opts, String log_message) Core\Proxy.cs(2177,0): at LibGit2Sharp.Core.Proxy.git_remote_fetch(RemoteSafeHandle remote, IEnumerable`1 refSpecs, GitFetchOptions fetchOptions, String logMessage) Network.cs(162,0): at LibGit2Sharp.Network.DoFetch(RepositorySafeHandle repoHandle, Remote remote, String url, FetchOptions options, String logMessage, IEnumerable`1 refspecs) Network.cs(252,0): at LibGit2Sharp.Network.Fetch(Remote remote, IEnumerable`1 refspecs, FetchOptions options, String logMessage) Network.cs(226,0): at LibGit2Sharp.Network.Fetch(Remote remote, IEnumerable`1 refspecs, FetchOptions options) FetchFixture.cs(149,0): at LibGit2Sharp.Tests.FetchFixture.CanFetchCustomRefSpecsIntoAnEmptyRepository(String url, String localBranchName, String remoteBranchName) 1211 passed, 1 failed, 5 skipped (see 'Task List'), took 580,41 seconds (xUnit.net 1.9.2 build 1705).

The failing test is related to opportunistic updates.

The remotetips handler is called twice

once with (refs/heads/master:refs/remotes/testRemote/master,{0000000},{49322bb})
then with (refs/heads/master:refs/remotes/testRemote/master,{49322bb},{49322bb})

@carlosmn Do we actually need the second call?

carlosmn · 2015-05-22T15:18:09Z

The second call is unnecessary, I've updated the branch to skip it.

nulltoken · 2015-05-22T21:04:15Z

1212 passed, 0 failed, 5 skipped (see 'Task List'), took 141,71 seconds (xUnit.net 1.9.2 build 1705).

@carlosmn 😍

nulltoken · 2015-05-28T19:49:21Z

And the build is passing passing!!!!!

jamill · 2015-05-28T20:11:17Z

LibGit2Sharp/Core/GitFetchOptions.cs

Is there a reason to do this in the constructor, vs as a field initializer?

Should this be TagFetchMode.Fallback?

I'm not sure. Without it, the tests pass, but something seems weird to me (although I cannot identify what bugs me right now). Dropped it

jamill · 2015-05-28T20:56:14Z

👍 awesome!

nulltoken · 2015-05-28T21:49:01Z

@jamill Thanks for the review! Could you please double check the fixup proposal and see if that looks better?

jamill · 2015-05-29T02:33:47Z

@nulltoken looks good, thanks!

libgit2/libgit2@9bbc8f3...ff8d635

Upgrade to libgit2 ff8d635

nulltoken · 2015-05-29T05:59:51Z

That was a little of a bumpy road, but 🎉 ‼️ It's in!

whoisj · 2015-05-29T21:53:20Z

and I'm already making use of it! 🎉 🎈

nulltoken · 2015-06-06T11:40:29Z

Published as NuGet pre-release package LibGit2Sharp 0.22.0-pre20150529055949

coveralls · 2017-01-23T16:21:43Z

Changes Unknown when pulling 6c12de4 on ntk/upgrade_nuget into ** on vNext**.

nulltoken mentioned this pull request May 15, 2015
Update libgit2 to 47f3740 #1015
Closed

bording reviewed May 15, 2015
View reviewed changes

nulltoken force-pushed the ntk/upgrade_nuget branch from 763c45b to ec662a9Compare May 15, 2015 18:22

This was referenced May 15, 2015
Move native binaries into separate NuGet package #984
Merged
Deploy to other protocols the reporting of progress transfer when pushing libgit2/libgit2#1902
Closed

nulltoken force-pushed the ntk/upgrade_nuget branch from 2765530 to fc1e243Compare May 16, 2015 16:34

nulltoken reviewed May 16, 2015
View reviewed changes

LibGit2Sharp/Core/GitPushUpdate.cs
Copy link
MemberAuthor
nulltokenMay 16, 2015
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need this?

nulltoken force-pushed the ntk/upgrade_nuget branch from fc1e243 to 5b506beCompare May 17, 2015 11:45

nulltoken mentioned this pull request May 22, 2015
Tackle remote API issues from bindings libgit2/libgit2#3127
Merged

nulltoken force-pushed the ntk/upgrade_nuget branch 3 times, most recently from eff9aa4 to 86e8ac3Compare May 28, 2015 19:07

jamill reviewed May 28, 2015
View reviewed changes

Fix wrong interop definition
56b908c

nulltoken force-pushed the ntk/upgrade_nuget branch from 3de9707 to 190cd0cCompare May 28, 2015 22:08

Update libgit2 to ff8d635
6c12de4
libgit2/libgit2@9bbc8f3...ff8d635

nulltoken force-pushed the ntk/upgrade_nuget branch from 190cd0c to 6c12de4Compare May 29, 2015 05:48

nulltoken changed the title ~~Upgrade to latest libgit2~~Upgrade to libgit2 ff8d635May 29, 2015

nulltoken added a commit that referenced this pull request May 29, 2015
Merge pull request#1049from libgit2/ntk/upgrade_nuget
27abed1
Upgrade to libgit2 ff8d635

nulltoken merged commit 27abed1 into vNextMay 29, 2015

nulltoken deleted the ntk/upgrade_nuget branch May 29, 2015 05:59

nulltoken added the nuget-pre label Jun 6, 2015

nulltoken added this to the v0.22 milestone Jun 6, 2015

Upgrade to libgit2 ff8d635#1049

Upgrade to libgit2 ff8d635 #1049

Uh oh!

Conversation

nulltoken commented May 15, 2015

Uh oh!

bordingMay 15, 2015

Choose a reason for hiding this comment

Uh oh!

nulltokenMay 15, 2015

Choose a reason for hiding this comment

Uh oh!

nulltokenMay 15, 2015

Choose a reason for hiding this comment

Uh oh!

Therzok commented May 15, 2015

Uh oh!

nulltoken commented May 15, 2015

Uh oh!

nulltoken commented May 15, 2015

Uh oh!

nulltoken commented May 16, 2015

Uh oh!

nulltokenMay 16, 2015

Choose a reason for hiding this comment

Uh oh!

nulltoken commented May 17, 2015

Uh oh!

nulltoken commented May 22, 2015

Uh oh!

carlosmn commented May 22, 2015

Uh oh!

nulltoken commented May 22, 2015

Uh oh!

nulltoken commented May 28, 2015

Uh oh!

jamillMay 28, 2015

Choose a reason for hiding this comment

Uh oh!

jamillMay 28, 2015

Choose a reason for hiding this comment

Uh oh!

nulltokenMay 28, 2015

Choose a reason for hiding this comment

Uh oh!

jamill commented May 28, 2015

Uh oh!

nulltoken commented May 28, 2015

Uh oh!

jamill commented May 29, 2015

Uh oh!

nulltoken commented May 29, 2015

Uh oh!

whoisj commented May 29, 2015

Uh oh!

nulltoken commented Jun 6, 2015

Uh oh!

coveralls commented Jan 23, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants