Commit Graph

242 Commits

Author SHA1 Message Date
Brian Beard c2393ad975 Add support for ExtendedMerge of type Undelete 2014-11-21 10:59:19 -06:00
Dave Hanna c6eadbb477 Handle error case where no merge info is returned by QueryMerges 2014-11-16 18:13:21 +01:00
Matt Burke 591af4b864 Encapsulate NumFailures != 0. 2014-10-27 21:36:03 +01:00
Philippe Miossec 4de1afebf9 Retry after getting a file from TFS if the status is not satisfying
Should improve reliability.
Hope it will fix #444
2014-10-27 21:36:02 +01:00
Matt Burke f1a5cc531d Merge pull request #657 from JenasysDesign/f-TryToDeleteWorkspaceAgain
Add TryToDeleteWorkspace method for reliability
2014-10-16 17:23:23 -04:00
Jamie Clayton f911d135e2 Refactored the workspace.Delete() action into a TryToDeleteWorkspace method.
Includes alternate Retry.Do() values of 5 second delay between tries to help with busy TFS servers.
2014-10-15 11:58:05 +10:00
Matt Burke f66d439707 Replace one-off BatchSize with a pattern for command-line + git config values. 2014-10-02 13:42:42 +02:00
Philippe Miossec e956d1d340 Expose a BatchSize option...
Since 21f36fa47c, tfs changesets are
 fetched by batches of 100 changesets (instead of all at once)
 to better support big history when cloning (and use less memory).

This option let the user specify the size of the batch
(because perhaps even 100 is too big for some big repositories).

Values accepted:
x < 0 => Only one batch with ALL the changesets
x == 0 => default value of 100
x > 0 => batches of x changesets
2014-10-02 13:42:41 +02:00
Matt Burke 7b4ca36785 Directly as if "Is2008OrOlder" 2014-09-25 23:37:00 +02:00
Philippe Miossec e64dc25570 Correct the double fetch of changesets 2014-09-25 23:36:37 +02:00
Philippe Miossec d0c9ffbe9a Try without the Retry.Do() 2014-09-25 23:36:37 +02:00
Philippe Miossec 9da1684168 Method GetChangesets() only for tfs2008 to avoid bad changesets returned when getting by lots
Expected fix #642
2014-09-25 23:36:36 +02:00
Matt Burke 158d16b758 Merge pull request #636 from spraints/ignore-unshelve-errors
Add the option to ignore unshelve errors
2014-09-25 10:17:46 -04:00
Matt Burke ba5add04ab unshelve --force ignores errors while Geting files. 2014-09-24 10:01:29 -04:00
voloda 370047ae32 Fixed according to the discussion
Tested with failing code - compared the result and it matched what is in
TFS
2014-08-19 18:09:55 +02:00
Philippe Miossec ba6581a2d9 Drop VsCommon in namespace
(because that's an internal namespace)
2014-07-30 10:39:36 +02:00
Philippe Miossec e951a96afe Simplify a little more registry read for VS>=2012 2014-07-15 17:34:48 +02:00
Philippe Miossec 0ea1c3ae6d WrapperForWorkspace and WrapperForBranchObject could go in Wrappers.cs 2014-07-15 17:34:48 +02:00
Philippe Miossec cf5ca76d33 TfsPlugin is the same for all versions... 2014-07-15 17:34:47 +02:00
Philippe Miossec eabd86771d Bring back all the TFS common code in TfsHelper.Common.cs (DRY!) 2014-07-15 17:34:47 +02:00
Philippe Miossec 344c5a2a3e Merge back TfsHelper.PostVs2010.Common.cs in TfsHelper.Common.cs 2014-07-15 17:34:46 +02:00
Philippe Miossec 235d516d77 Better handling big history by fetching changesets by lots
of 100 max (and creating commits in the same time)
before fetching another lot if needed....

& little refactoring
2014-07-13 21:53:10 +02:00
Philippe Miossec 3d300bc494 Querying history bounded when knowing the last changeset id wished 2014-07-13 21:47:39 +02:00
Philippe Miossec cf35626f71 Don't retrieve all changes when getting just last changeset id 2014-07-10 13:35:44 +02:00
Philippe Miossec a702198aa3 Ask user when don't find root changeset 2014-07-05 13:50:25 +02:00
Arkady Shapkin 74abd9e30b Check parent branch history only before current branch changeset 2014-07-05 13:50:14 +02:00
Shapkin Arkady 6a716a0917 VersionControlException exception handling improved 2014-07-05 13:50:07 +02:00
Arkady Shapkin e62cd02a9d Minor changes in GetMergeInfo() 2014-07-05 13:50:04 +02:00
Arkady Shapkin 591323c90d Renamed branch handling improved 2014-07-05 13:50:03 +02:00
Arkady Shapkin 3d5119e453 Logging improved 2014-07-05 13:48:11 +02:00
Philippe Miossec 189b08f57a Finding root changeset: better finding of renaming
- Protection against find itself as parent branch
- Support of renaming of renaming
- keep the last "renamed" merge is important when no root found (with what is supposed to be the root branch)

+ catch problem when finding root changesets
2014-07-05 13:47:45 +02:00
Philippe Miossec 250286d51b Retrieve also deleted tfs branches if needed 2014-07-05 13:47:36 +02:00
Philippe Miossec f93dbc9dd0 Add debug datas 2014-07-05 13:47:32 +02:00
Philippe Miossec f245095162 Find the REAL root changeset when there is rename changeset(s) and get the list of successive branches...
and manage case where using flag '--nofetch' but with renamed branches
2014-07-05 13:47:30 +02:00
Philippe Miossec 4ebcae47bf Merge pull request #573 from KindDragon/checkintool
Assemblies loading for Policy Evaluator and Checkintool improved
2014-06-11 09:49:31 +02:00
Matt Burke b94e07feae Merge pull request #589 from kgybels/ignore_shelved_changes_outside_our_tree
Do not query shelved changes outside of our tree
2014-05-01 14:12:02 -04: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
Kim Gybels 58d271fdcb Do not query shelved changes outside of our tree
Because changes outside of the tree are ignored anyway, don't bother
querying them from TFS in the first place.
2014-04-21 20:35:48 +02:00
Arkady Shapkin 5b6c81e665 Check to install resolver only once 2014-04-14 22:36:06 +04:00
Matt Burke 3eefa1b760 Move the path resolver to the constructor.
This will ensure that it's in place before evaluating
checkin policies, which is when it is needed, without
expanding the interface of ITfsHelper.
2014-04-14 14:01:36 -04:00
Arkady Shapkin 9ac1a9be76 Assemblies loading for Policy Evaluator and Checkintool improved. Refs #258 2014-03-27 18:46:09 +04:00
Matt Burke 4ec20977a2 Merge pull request #530 from KindDragon/small-improvments
Small improvements
2014-03-14 00:27:10 -04:00
Arkady Shapkin 6ae08e4d20 HasWorkItems crash fixed 2014-03-13 16:51:24 +04:00
Arkady Shapkin fe59b853ae ReadIdentity crash fixed 2014-03-13 16:51:24 +04:00
Arkady Shapkin 84272bab5a GetChangesets() asks changesets by parts 2014-03-13 16:51:22 +04:00
Shapkin Arkady 3ed7d570dc Retry on timeout 2014-03-13 16:51:22 +04:00
Arkady Shapkin c28e0501d9 Ask Tfs server tfs branches only once 2014-03-13 16:51:22 +04:00
Philippe Miossec a76791e725 Better perf by caching branch list
Conflicts:
	GitTfs.VsCommon/TfsHelper.PostVs2010.Common.cs
2014-03-13 16:51:21 +04:00
Shapkin Arkady dc7c6d61bc Init branch crash fixed if branch already exist (big problem with branch --init --all) 2014-03-13 16:51:21 +04:00
Arkady Shapkin 6f03a2e2f6 GetRootChangesetForBranch catch VersionControlException 2014-03-12 19:15:14 +04:00