gittf Discussions Rss Feed

New Post: Checkin creates only one commit on deep mode

arukhlin — Fri, 17 May 2013 18:32:02 GMT

Hi yosy

I've cloned the repository you've provided https://github.com/yosy/tfs_test/commits/master and when tried to check it into a TFS folder, I got a message:

git-tf: cannot check in - commit 3560b45 has multiple parents, please rebase to form a linear history or use --shallow or --autosquash

Unfortunately, Git-TF requires linear commit history to be able to perform deep check-in.

Thanks,
Alex

New Post: Checkin creates only one commit on deep mode

yosy — Fri, 17 May 2013 11:52:53 GMT

Hi,
I started to play with gittf checkin, I have created a tfs repo in the online edition and clone it with gittf, pulled and merged gitlabhq repository and tried to checkin using deep.

git-tf checkin --deep

In my tfs repository I have got only one checkin which is the Gitlabhq commit (https://github.com/yosy/tfs_test/commits/master) and not all commits created by gitlabhq,
I have uploaded the git repository that I tried to checkin to github - https://github.com/yosy/tfs_test/commits/master

New Post: git-tf: checkout conflict with files

arukhlin — Wed, 08 May 2013 15:51:16 GMT

Hi,

One more question: why do you use --force and --ours parameters in your pull command? What exactly would you like to achieve? The --force parameter is used by Git-TF and means that it should download again the latest change set downloaded previous time. The --ours parameter is just passed to JGit and means that you wish to take the entire your tree without looking onto individual files. The latest action could cause big troubles, because GitTF keeps a map between commits in the master branch and change sets downloaded from/uploaded to TFS. If you change your master branch's history dramatically, that could cause serious and unpredictable issues.

When using Git-TF, we strongly recommend to keep a linear history in the master branch of your local repository that you use to exchange data between Git and TFS. If you don't do that, because of deep difference between TFS and Git ideologies, its highly possible that Git-TF won't be able to map Git's commits to TFS's change sets and vice versa. So, usually Git_TF users develop their code in other branches (even repositories sometimes) and always use --rebase option when pulling from TFS or merging their changes into the master branch.

Alex

New Post: git-tf: checkout conflict with files

arukhlin — Tue, 07 May 2013 19:18:12 GMT

Hi,

I'm sorry to hear you have issues with Git-TF. What version of Git-TF do you have, and what error message do you get? Also, could you send us Git-TF log files reflecting the issue? You could found them as

~/Library/Application Support/Microsoft/Team Foundation/4.0/Logs/git-tf-*.log

Just to unblock you for a moment: could you try and clone the latest version from TFS to a fresh new empty directory? After that you might fetch the cloned branch into a new branch in your working Git repository and merge the branches using Git.

I do understand that it's extremely inconvenient, but just to unblock might work out...

Thanks,
Alex

New Post: git-tf: checkout conflict with files

ProVega — Tue, 07 May 2013 18:58:08 GMT

So I am stuck, I am trying to get the latest files from TFS on my Mac and I am getting an error about a conflict.

I am running this command:

git tf pull --deep --force --ours

Thinking this will overwrite tell it to ignore the server version. But that doesn't seem to work. I also try --theirs and it gives the same error.

How the heck do I tell this thing to PULL the latest version and merge this file that apparently conflicts.

Thank you

New Post: Error while trying to checkin for the first time

arukhlin — Tue, 16 Apr 2013 14:24:02 GMT

Hi ionutvasiliu,

Could you please provide some additional information regarding this issue?

Which versions of Git-TF and TFS server do you use?
You mentioned that you checked in for the first time. Does it mean that the TFS folder you checked into was empty? Or it is not empty and other users could pend changes to it?
Could you send us Git-TF logs related to the issue. You could find them in:

Windows: %LOCALAPPDATA%\Microsoft\Team Foundation\4.0\Logs\git-tf-*.log.
Unix: ~/Library/Application Support/Microsoft/Team Foundation/4.0/Logs/git-tf-*.log.

Thanks,
Alex

New Post: Error while trying to checkin for the first time

mireilleanwar — Tue, 16 Apr 2013 14:19:35 GMT

Hi,

Did the checkin fail before due to a different reason then the second time you tried the checkin you got this error? what type of changes did you have?

Thanks
Mireille

New Post: Error while trying to checkin for the first time

ionutvasiliu — Tue, 16 Apr 2013 07:12:50 GMT

I'm trying to checkin for the first time to TFS using "git tf checkin --deep". It reaches 55% but stops with the following error: "git-tf: failed to pend changes to TFS due to the following errors. Please fix the errors and retry check in. The item [filename with full path on TFS] already has pending changes.".

How can this be solved? Thanks

New Post: git tf pull only fetches and merges the last tfs commit

luv2code — Tue, 09 Apr 2013 01:30:22 GMT

So, now I can't reproduce it, and I had already deleted the troubled folder. I probably did something wrong on Friday.

New Post: git tf pull only fetches and merges the last tfs commit

luv2code — Mon, 08 Apr 2013 21:53:03 GMT

I'm pretty sure that it did not pull all the changesets when I did git tf pull --rebase.

I had been working in a directory all day, and I did a git tf pull --rebase because I was ready to checkin. But the app didn't pass a smoke test because members were renamed and/or missing in files that I hadn't touched. Since our ci deployment was working okay, I figured the problem must be on my machine.

So I re-cloned the repo to a new directory. copied my changed files over from the previous directory and manually merged them (luckily, no-one else had touched them.) It passed the smoke test, and I was able to git tf checkin.

so you can see why I came to the conclusion that I have to do git tf pull --deep. It didn't make sense, and that's why I started the topic.

Sounds like I may have discovered a bug. So, I'll work on reproduction steps now and file a proper report when i'm done.

New Post: git tf pull only fetches and merges the last tfs commit

ethomson — Sat, 06 Apr 2013 01:57:53 GMT

I don't understand what you mean by "a state of dysfunction". What it doesn't do is take only the changes in the latest changeset. All those intermediate changesets were rolled up. So the latest commit will have the same contents regardless of whether you use deep or not.

Deep is intended to be used if, for some reason, you might need to roll back to a changeset. It has no impact on the contents of the tree.

New Post: git tf pull only fetches and merges the last tfs commit

luv2code — Sat, 06 Apr 2013 01:55:20 GMT

If I follow the usage guide (https://gittf.codeplex.com/wikipage?referringTitle=Documentation), git tf will only pull in the last checkin.

At first, I thought it was rolling all the previous changesets into a single git commit. but no. It leaves my repo in a state of dysfunction because I've missed several checkins from other devs.

It was a bit of a pain to figure out that I'm supposed to use git tf pull --deep if I want all the checkins.

I don't understand why anyone would only want the last check in.

After cloning (a shallow clone), my workflow is like this:

git pull --rebase --deep
[ do work ]
git commit
git pull --rebase --deep
git checkin --associate wi#

I'm I missing something? why would anyone not use --deep?

New Post: Batch items download

yosy — Sat, 30 Mar 2013 18:24:40 GMT

Hi ethomson,
Thanks for the detailed answer, How can I increase the http worker thread pool threads?

New Post: Batch items download

ethomson — Sat, 30 Mar 2013 18:21:16 GMT

Here is fine. Another appropriate forum would be the TFS Cross-Platform / Team Explorer Everywhere forum

When we talk about thread safety and thread compatibility, we talk about the guarantees that you can make when calling from multiple threads with regard to race conditions, locking, memory, etc. Nothing in your post suggests that we're violating thread safety guarantees.

Posting your sample code here would be elucidating. There are a number of factors at play here but I suspect that you're maxing out the http worker thread pool. We limit the number of simultaneous connections to a single host, like most http clients. Thus there's an upper limit on the number of downloads that can occur at once. So throwing more threads at the problem is only going to make them wait.

That's just my hunch, though.

-ed

New Post: Batch items download

yosy — Sat, 30 Mar 2013 14:32:13 GMT

Hi Youhana,
I am doing some experiments with downloadItems, and I am trying to do multiple clones at the same time (using ExecutorService, with 15 threads).

As I can see, for some reason, as more items are downloaded the method get slow and slow -

Downloading 3098 items for changeset 14 , TOOK - 72113 ms
Downloading 3098 items for changeset 14 , TOOK - 98789 ms
Downloading 3098 items for changeset 14 , TOOK - 95447 ms
Downloading 3098 items for changeset 14 , TOOK - 96630 ms
Downloading 3098 items for changeset 14 , TOOK - 95786 ms
Downloading 3098 items for changeset 14 , TOOK - 95399 ms
Downloading 3098 items for changeset 14 , TOOK - 96376 ms
Downloading 3098 items for changeset 14 , TOOK - 95063 ms
Downloading 3098 items for changeset 14 , TOOK - 93769 ms
Downloading 3098 items for changeset 14 , TOOK - 94540 ms
Downloading 3098 items for changeset 14 , TOOK - 93962 ms
Downloading 3098 items for changeset 14 , TOOK - 94702 ms
Downloading 3098 items for changeset 14 , TOOK - 93103 ms
Downloading 3098 items for changeset 14 , TOOK - 88811 ms
Downloading 3098 items for changeset 14 , TOOK - 49782 ms
Downloading 3098 items for changeset 14 , TOOK - 33543 ms
Downloading 3098 items for changeset 14 , TOOK - 58334 ms
Downloading 3098 items for changeset 14 , TOOK - 36073 ms
Downloading 3098 items for changeset 14 , TOOK - 21014 ms
Downloading 3098 items for changeset 14 , TOOK - 21544 ms

For one single download at a time it takes - 4 to 5 seconds.
As the documentation says, VersionControlClient is thread-safe.. do you know why it happens? or where should I ask it?

New Post: Batch items download

youhanaNaseim — Wed, 27 Mar 2013 17:40:34 GMT

Hello,

For example today to do a deep clone we call the following:

QueryHistory - to get all the changeset to create commits for
ForEach Changeset in QueryHistory we call QueryItems at that version to get how the tree looks like
Then for each item returned we check whether we have downloaded it before or not using the version. If yes then we just reuse that blob id if no we call DownloadItem.

The main advantage of the logic above is that it is simple but it suffers performance bottle necks.

The alternative more complex logic would roughly look like this:

QueryHistory - to get all the changeset to create commits for
Call QueryItems for the first changeset only
For each changeset after call QueryChangesetDetails
Then replay the changes that happened in every changeset

We use codeplex to track all of the work for git-tf there are a couple of issues that are around improving clone's performance for large repos.

Thanks,
Youhana

New Post: Batch items download

yosy — Wed, 27 Mar 2013 17:28:49 GMT

Hi Youhana,

Can you explain the second thing? where are we calling QueryChangeset ? do you mean QueryHistory?

I am wondering, when I can see the roadmap/backlog of the project?

Thanks,
Yosy

New Post: Batch items download

youhanaNaseim — Wed, 27 Mar 2013 17:14:54 GMT

Hello yosy,

This is on our backlog to improve in the future. There are 2 things we need to do to make this scenario faster and perform better:

1) Batch download as you specified above.

2) When performing a deep clone today we will call QueryItems for every changeset we need to download (we only download the changed items though which is good). But QueryItems will bring in more data from the server than what is needed, we need to change that call to QueryChangeset which will only bring down info on the changed items.

But this scenario surely needs some work.

Thanks for your suggestion,

Thanks,
Youhana

New Post: Batch items download

yosy — Wed, 27 Mar 2013 17:05:08 GMT

Hi,
I saw that cloning large TFS repository takes long time, I started to investigate the reason in git-tf source code, and I saw that in CreateCommitForChangesetVersionSpecTask - createBlob each item is download separately.

I changed the code to do batch download to the temp directory and remove the downloadFile call in createBlob.

It improved the download performance from 12 seconds to 4 seconds (!).
What is the reason for not using batch download?

New Post: Add associated Work Item information to commit comments

arukhlin — Mon, 25 Mar 2013 15:56:20 GMT

Hi chrisortman,

No, it's a different feature.

We added a new option --mentions to Git-TF clone, fetch, and pull commands. When you specify this option along with the --deep option, Git-TF adds references in the commit comments for any work items linked to the corresponding change set. Links are added in form of

#<number>   <work item title>

lines, one line per a work item associated with the change set on TFS server. These comments are processed by TFS with Git version control when you push your local repository to the remote repository in the same Team Project Collection on the server, and build association beween commits and work items.

The feature has been designed to support migration process from TFS version control to Git.

Regards,
Alex