Commit Graph

100 Commits

Author SHA1 Message Date
Philippe Miossec a89f16ab70 Add Unit tests for IEnumerable<BranchTree>.GetAllChildren() 2014-12-24 18:49:59 +01:00
Matt Burke 7bd69cbbb3 Merge pull request #693 from idealist1508/fix_tfs_clone_throws_Exception
fix for #645 - ItemNotFoundException
2014-12-11 18:11:31 -05:00
idealist1508 45621291c7 Make Test happy 2014-12-10 00:19:36 +01:00
Matt Burke 9d01a022fa Add test for #645. 2014-12-09 16:07:04 +01:00
Philippe Miossec ae1b60cb4f Unit tests 2014-10-03 23:44:58 +02:00
Matt Burke ba5add04ab unshelve --force ignores errors while Geting files. 2014-09-24 10:01:29 -04:00
Philippe Miossec 9a70315b79 Merge pull request #603 from pmiossec/Support_branch_with_similar_name
Support branch with similar name
2014-06-11 09:46:46 +02:00
Philippe Miossec 841189410a Manage other strange cases 2014-06-07 14:28:01 +02:00
Cameron Jordan aea7e12037 Failing tests for changeset id parsing 2014-05-29 17:12:44 -07:00
Philippe Miossec a1f267da7e Same thing when using Subtree command 2014-05-26 23:34:10 +02:00
Philippe Miossec 15693f6a7b Correct case where one repository path is included in another one
When we are in a remote that have tfs path $/Project/MyBranch_1
and that we search the path in the git repository of the file $/Project/MyBranch_1.1/file.txt
we must return null (because this file is owned by the other remote $/Project/MyBranch_1.1)

In the past, we return ".1/file.txt" as relative path.

We should also managed well, folder path "$/Project/MyBranch_1.1" compare to "$/Project/MyBranch_1"
2014-05-26 23:34:08 +02:00
Matt Burke cab0fc2995 Merge pull request #586 from pmiossec/detect_rename_changeset
Detect rename changeset
2014-04-30 15:59:10 -04:00
Matt Burke da9c225dbc Merge pull request #562 from pmiossec/autoselect_remote_by_default
Set autoselect remote the default behavior
2014-04-28 18:16:15 -04:00
Matt Burke 2652f997c0 Merge #584 2014-04-28 12:34:15 -04:00
Philippe Miossec 3e1e0bdacc Adjust Unit tests 2014-04-28 18:29:59 +02:00
Kim Gybels 29fabab81c Fix unshelve
The optimization to prevent downloading of ignored files broke
unshelving[1]. A shelveset is treated as a changeset by git-tfs, but there
is no changeset version for it, so you can't ask the workspace to get a
shelveset by version, instead the shelveset itself needs to be responsible
for populating the workspace with the correct files[2].

[1] 351ed3d69f
[2] 26fe4ad269
2014-04-22 16:02:50 +02:00
Arkady Shapkin 276a70b4b5 IncludeInFetch support when new file was merged 2014-04-20 21:00:47 +04:00
Philippe Miossec a7c6d90f9b Unit Tests for Auto select remote 2014-04-20 18:12:17 +02:00
Arkady Shapkin 40ddbea799 Skip fetching merged items without changes from TFS 2014-03-14 13:21:18 +04:00
Matt Burke 99907eb3fd Also don't fetch anything if it's just going to be deleted and ignored. 2014-03-13 23:42:49 +01:00
Matt Burke bdfe29ae3f Ensure that other deleted directories don't affect this project. 2014-03-13 23:42:47 +01:00
Philippe Miossec 07807d4845 Detect a rename changeset (where all the datas are deleted) and prevent it
and Add Unit Test in ChangeSieveTests to support branch deletion
2014-03-13 23:37:16 +01:00
Matt Burke 55706a06b2 More self-explanatory. 2014-03-10 08:20:50 -04:00
Arkady Shapkin eccf07f525 DoesNotFetchBranchedFile test added 2014-03-08 03:18:37 +04:00
Arkady Shapkin 1b04454885 Test fixed 2014-03-06 12:49:50 +04:00
Matt Burke c3fd24e81f Differentiate between "Branch-with-no-file" and "Branch-with-file". 2014-03-05 16:07:08 +04:00
Arkady Shapkin 85eed1a20b Test added for changed ChangeSieve 2014-03-05 16:07:07 +04:00
Arkadiy Shapkin b90b8ca53f Removed unused using directives 2014-02-06 15:35:03 +04:00
Matt Burke aea1413e1d Merge remote-tracking branch 'origin/master' into p518
Conflicts:
	GitTfs/Core/TfsChangeset.cs

Other merge fixes:
	GitTfs/Core/GitObject.cs
	GitTfs/Util/ChangeSieve.cs
	GitTfsTest/Core/ChangeSieveTest.cs
2014-01-15 17:32:41 -05:00
Matt Burke f6784edc2a Preserve Mode with edits handled by ChangeSieve. 2014-01-15 12:07:53 -05:00
Matt Burke 2775e1f07c Rename ChangeSieve's public methods. 2014-01-15 10:14:38 -05:00
Matt Burke b2c50b08d6 Remove obsolete code. 2014-01-15 10:13:27 -05:00
Matt Burke 92d064b947 Extract PathResolver. 2014-01-15 10:05:42 -05:00
Matt Burke 32a2320dc4 HasChanges() is not useful.
It was used to indicate that ChangesToFetch() was
empty. However, ChangesToFetch() might now be empty
and ChangeToApply2() could still have entries.
2014-01-15 09:17:59 -05:00
Matt Burke 753b4e4421 Remove old ChangesToApply(). 2014-01-15 09:14:32 -05:00
Matt Burke 7369bdb7c1 Fixed up ChangeSieveTests. Rewrote ChangesToApply2(). 2014-01-15 09:01:53 -05:00
Matt Burke 26dbfaaa2d Progress on the new ChangeSieve.ChangesToApply(). 2014-01-15 08:30:04 -05:00
Matt Burke dc5799d962 Tests for the new interface. 2014-01-14 18:07:35 -05:00
Matt Burke 84aa95e5e0 Capture the current handling of renames and ignore rules. 2014-01-14 15:55:50 -05:00
Matt Burke 345c726b92 Test change sorting. 2014-01-14 15:39:09 -05:00
Matt Burke 8e57750644 Start testing ChangeSieve. 2014-01-10 16:29:48 -05:00
Philippe Miossec 02aaa3ea70 Merge branch 'master' into fetch_merge_when_no_commit
Conflicts:
	GitTfs/Commands/InitBranch.cs
	GitTfs/Core/ITfsWorkspace.cs
	GitTfs/Core/TfsInterop/ITfsHelper.cs
	GitTfsTest/Commands/InitBranchTest.cs
2013-09-15 23:32:50 +02:00
Gordon Burgett 85d85d4d5c Merge branch 'master' into subtree
Conflicts:
	GitTfs.VsCommon/TfsHelper.Common.cs
	GitTfs/Core/GitRepository.cs
	GitTfs/Core/GitTfsRemote.cs
	GitTfs/Core/IGitRepository.cs
	GitTfs/Core/TfsInterop/ITfsHelper.cs
2013-09-05 15:35:06 -05:00
Philippe Miossec 3eccf11e80 Unit Test for cloning repo with merge changeset 2013-07-02 10:39:27 +02:00
Chris Wundram bf61edfcc1 Added an additional ignore-except config option to add exceptions to files
ignored by the ignore-paths option.  For example if you want to ignore all
exe files except the .nuget/NuGet.exe file, you can add exe$ to the ignore-paths
and ^\.nuget to the ignore-except.

Added --except-regex command line option to RemoteOptions to set ignore-except
config.

New tfs-remotes for branches now will copy the ignore-paths and ingore-except
options from the default tfs remote.
2013-05-27 08:14:09 -05:00
Matt Burke bac056c50e Update libgit2sharp. 2013-04-29 11:48:51 -04:00
Gordon Burgett a3733a8c17 checkin works for remote with subtrees
Signed-off-by: Gordon Burgett <gordon.burgett@gmail.com>
2013-04-10 11:54:07 -05:00
Jonas Boesch 86bc1a4b77 Fixed code that failed test WorkspaceTests.Policy_failed_and_Force_with_an_OverrideReason.
- Updated test calls.
- Removed duplicate versions of Checkin and EvaluateCheckin without author.
2013-03-26 15:59:48 +01:00
Matt Burke 718fe632ed Remove debugging code. 2013-03-18 17:43:11 -04:00
Matt Burke 10aa79170d All green. 2013-03-18 17:42:18 -04:00