GitHub Git Merge 2013, 7 Jun 2013

Previous Meeting Next Meeting

⏯

youtube image

►

From YouTube: Git Merge • Git in Team Foundation (Ed Thomson)

Description

Subscribe: http://bit.ly/subgithub •

About Git Merge
Git Merge is a Git user conference, held to bring together Git users and Git developers. This May, they came together in Berlin to improve the world of Git for everyone.

A

Hey everybody!, my name's ed thomson., I'm also from a little software company in washington state called microsoft.

A

My coworker, martin, spoke earlier about the visual studio integration of git.

A

And that's kind of the--.

A

A

A

So the visual studio integration with git is really the culmination of what we've been working on., but we got into this--.

A

Powerpoint does not love me.

A

The beginnings of our git work at microsoft were really around this version: control tool that we have.

A

Called team foundation, server. tfs was built as a very,, very large scale, deployment.

A

It was built for the windows code base..

A

It was built for the visual studio code, base.

A

things with a lot of binaries and a lot of files that you kind of need, specialized version, control, tools.

A

You need semantics that nobody else wants to use.

A

So we built tfs for ourselves.

A

And at some point, other people started using it 'cause we started selling it. and we built a cross platform version of it.

A

It's called team explorer everywhere.

A

and it's got this great xcode plugin., because apple is--oh,, oh no!, it doesn't have an xcode plugin., because apple won't give us access to the sdk that we need.

A

To write source control plugins., we can build an eclipse plugin.. We can build a visual studio plugin.. We couldn't build an xcode plugin.

A

that was very disappointing to us..

A

So we started thinking about how we could maybe plugin to xcode.

A

It turns out that xcode has some other plugins for subversion.

A

Or it did., I don't actually think that it exists anymore.

A

and at some point they added git support.

A

So that was great!. There's a git-tfs project out there, that bridges, team foundation version control to git., except it's written c-sharp, because it's a microsoft, friendly project.

A

So we decided that we wanted to bridge git to team foundation server.

A

If you will, kind of like svn, gitp4,, all those other fine tools.

A

And just like what git-tfs already does only when you make a cross platform., so we decided to write it in java because microsoft loves java. As you all know, from lawsuits that happened a decade or so ago.

A

We really love java..

A

The hard part, of course for us was taking team foundation, server version control.

A

Which is a centralized version, control system that uses monotonically.

A

Increasing change sets that build upon each other..

A

It doesn't use a dag.. How do you represent this crazy history of ours in a graph?.

A

Well,, it took a long time and finally, we realized that tfs'.

A

Linear history model is, in fact a form of a dag!.

A

It's in fact a really simple dag., so once we figured that out,, then we realized that.

A

The hard part was, in fact,, taking the dag and turning that into a linear, history.

A

So, just like all the other tools that take a linear history model.

A

Like gitsvn and gitp4 and turn it into a git repository.

A

We don't do a very good job going. The other either.

A

you've got to pick a line through there and flatten it basically.

A

No surprise there.

A

This fancy tool has some of the same semantics.

A

I've just got a little tfs repository.

A

This is team foundation server for those of you who haven't seen it.

A

Which, I suspect, is almost everyone in this room..

A

This is microsoft, team foundation, server.. It's got a little web interface like other popular version, control tools, might.

A

And I'm just gonna go ahead and clone this down.

A

Using git-tf make a git repository [editous].

A

And the internet in here is not the best, but we'll give it a second.

A

While that's going, interesting things about git-tf.

A

again,, I mentioned it was written in java.

A

We use the very fine jgit library.

A

Which is a wonderful implementation of git in java.

A

Pure java., no jni.

A

I think I remember somebody asking.

A

"Were there libgit2 bindings for java?".

A

The answer is no.

A

Although you may have heard some mumbling., it's something that we kinda considered a little bit.

A

I've kinda considered personally a little bit., because we spend a lot of time talking to libgit2 at microsoft..

A

We spend a lot of time talking to jgit at microsoft.

A

There's some thought that maybe we could talk to libgit2 just in java.

A

I'm just gonna: let you guys trust me that this will actually pull down.

A

And create a git repository for my tfs repository.

A

And then I could check the results back in.

A

'cause it gonna sit here at eight percent.. This is like,. I don't know, a dozen files.

A

My internet has not been real happy today.

A

Anyway., like I said,, this was kinda the first step.

A

Of microsoft, going down the road towards git.

A

This was one of the things that helped us build. The integration.

A

Individual studio and team foundation server that we have now for git proper instead of some crazy cloned madness.

A

Oh yeah, of course,, I apologize. this is--and. Of course, git-tf is open. Source.

A

it's under an mit license.. You can find it at gittf.codeplex.com.

A

Codeplex is microsoft's open, source hosting site, which I'm sure you're also all familiar with., it's similar to another hosting site called github,. I think it's called.

A

Only it's for team foundation version control, instead.

A

Wildly popular in the open source, community.

A

Alright, well thanks so much!.