Skip to content
This repository was archived by the owner on Oct 4, 2021. It is now read-only.

Port our Git model to LibGit2 and LibGit2Sharp #587

Closed
Therzok wants to merge 63 commits into from
Closed

Port our Git model to LibGit2 and LibGit2Sharp #587

Therzok wants to merge 63 commits into from

Conversation

@Therzok
Copy link
Contributor

@Therzok Therzok commented Jun 13, 2014

There are three things to be pushed remaining for this PR to be mergeable:

  • LibGit2Sharp to merge Update binaries to e93206e libgit2/libgit2sharp#762 so I can bump. This fixes a problem in the native libs with authentication.
  • Linux build script - I have a commit for this that's after a local commit bump to my libgit2sharp module. Waiting on above.
  • Progress monitoring - I have a commit that's on top of the linux build script.

Therzok added 30 commits June 6, 2014 13:01
@Therzok
Fully remove NGit. Code changes aren't reflected here.
205f569
@Therzok
[LibGit2] Add libgit2sharp submodule.
fa5fffd
@Therzok
[LibGit2] Add libgit2sharp to build.
8a16acc
@Therzok
[LibGit2] Initial working version. No credentials and monitoring.
7db78d2
@Therzok
[LibGit2] Some fixups to Push and Update.
e42a1df
@Therzok
[LibGit2] Fix tests on Mac since symlink is replaced with fullpath on…
71895b3 
… clone

But our Path system has no way to dig into symlinks.
@Therzok
[LibGit2] Fix UpdateIsDone test for Windows and general file:// for w…
8b55654 
…indows/unix.
@Therzok
[LibGit2] Add .targets for Windows XS build.
2da01c7
@Therzok
[LibGit2] Bump libgit2sharp module.
af94281
@Therzok
[LibGit2] Enabled branch/remote editing.
43bf970
@Therzok
Merge remote-tracking branch 'origin' into libgit2ftw
3c49ad0
@Therzok
[LibGit2] Fix NRE in Log.
1d847e7
@Therzok
[LibGit2] Fix GetPushChangeSet for UI and initial Credentials usage.
d3742ca
@Therzok
[LibGit2] A repository's WorkingDirectory isn't canonical, so store i…
37104bd 
…t in the cache.
@Therzok
[LibGit2] Bunch of fixes to Branch/Remote dialogs.
2ddf148
@Therzok
[LibGit2] Fix Branch name in solution explorer.
fed20bd
@Therzok
[LibGit2] Working merge.
45a58ca
@Therzok
[LibGit2] Add Mac binaries as a submodule.
b050fdd 
LibGit2Sharp already supplies Windows binaries. For Linux, we'll use a cmake to build them.
@Therzok
[Build] Add native file copying on Mac and Windows
3d529a8
@Therzok
[LibGit2] Apply stash with cherry-pick.
4ca1fa9
@Therzok
[LibGit2] Fix issue with RootPath being wrong.
9f9df82
@Therzok
[LibGit2] Implement Git Rebase.
6eb1ffd
@Therzok
[LibGit2] Fix .git directory in Clone too.
91e5794
@Therzok
[LibGit2] Bump submodule.
9b4107f
@Therzok
[LibGit2] Username and password credentials handling.
9daeb19 
Also, a fixup in Update when the HEAD isn't tracking a remote.
@Therzok
[LibGit2] Add credentials hook on push.
f0a60d1
@Therzok
[LibGit2] Update submodules.
bc3ed97
@Therzok
[LibGit2] Add Gnome build script.
9a7a1d5
@Therzok
[LibGit2] Fix mistake with NGit submodule being readded.
6b8e8d3
@Therzok
[LibGit2] No need to do CanonicalPath, trailing slash is ensured.
c2f0e5e
Therzok added 24 commits June 19, 2014 03:49
@Therzok
[LibGit2] Fix Mac build issues.
7e72336
@Therzok
Merge remote-tracking branch 'origin/master' into libgit2ftw
1dd8c73
@Therzok
[LibGit2] Bump md-addins.
0310005
@Therzok
[LibGit2] Bump libgit-binary submodule.
83a46ac
@Therzok
Revert "[LibGit2] Bump md-addins."
dbbc485 
This reverts commit 0310005.
@Therzok
Merge remote-tracking branch 'origin/master' into libgit2ftw
56a76f6
@Therzok
[LibGit2] Fix MoveFile for Git.
f080e47
@Therzok
Merge remote-tracking branch 'origin/master' into libgit2ftw
4874fd2
@Therzok
[LibGit2] Enable Delete tests.
6a040a0
@Therzok
Merge remote-tracking branch 'origin/master' into libgit2ftw
c7853aa
@Therzok
Merge remote-tracking branch 'origin/master' into libgit2ftw
88b1711 
Conflicts:
	main/Main.sln
@Therzok
Bump libgit2sharp to current tip.
1042be9
@Therzok
Fix diff for upcoming binary bump.
04de01c
@Therzok
[LibGit2] Add progress monitoring for Git operations.
a462536
@Therzok
Bug 21128 - Getting error while publishing application
6d06c9a
@Therzok
[Git] Cleanup in files.
0dc74d2
@Therzok
[LibGit2] Fix test building.
ed0095b
@Therzok
Merge remote-tracking branch 'origin/master' into libgit2ftw
fcd8706
@Therzok
Bump libgit2sharp.
d3463d8
@Therzok
[LibGit2] Implement SSH support.
61b6971
@Therzok
[LibGit2] Modify target to choose custom windows files.
f60964c
@Therzok
[LibGit2] Newline changes index on windows/unix.
a0e0374
@Therzok
[LibGit2] Fixup to previous commit.
dfc5a45 
Also includes cleanup to use Path.Combine.
@Therzok
[VersionControl] Disable CorrectTextAtRevision for Subversion.
472a303
@Therzok
Copy link
Contributor Author

Therzok commented Sep 16, 2014

build

@Therzok
Copy link
Contributor Author

Therzok commented Sep 16, 2014

Let's spin up unit tests on Linux.

@Therzok
Copy link
Contributor Author

Therzok commented Sep 22, 2014

build

@Therzok Therzok closed this Oct 21, 2014
@Therzok Therzok deleted the libgit2ftw branch October 21, 2014 13:31
nosami pushed a commit that referenced this pull request Apr 17, 2019
@sgmunn
Merge pull request #587 from xamarin/pr-sandy-cocoa-sighelp
7a25e0c 
TextEditor.Cocoa: Add missing signature help icons
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@Therzok