Commit Graph

450 Commits

Author SHA1 Message Date
Matt Burke e17136e524 Use a context object instead of feeding back the fetchresult. 2014-12-27 11:53:22 -05:00
Matt Burke 7d5bd79d02 Add an extension method overload. 2014-12-27 11:33:03 -05:00
Philippe Miossec f2d713e9f6 Refacto: Store rename data in FetchResult and pass it to the fetch of the next branch! 2014-12-26 19:32:03 +01:00
Philippe Miossec 2fa751931e We should look for renames even if there is a tfs remote (but empty!) 2014-12-26 19:28:07 +01:00
Philippe Miossec 322c55dbb4 Being able to clone sub branches and use of --with-branches option
We are now, not obliged to clone the trunk to use the `--with-branches` option!
That way the sub branch will be cloned (with all the branches merged into it)
 and all its children branches will be initialized after.

There is no more technical reasons that prevent cloning a sub branch...

Solve https://groups.google.com/forum/#!topic/git-tfs-dev/XndbEXRcx1M
2014-12-26 19:25:32 +01:00
Philippe Miossec 62d141e2bc Merge pull request #675 from pmiossec/improve_init_when_renames
Prevent fetching already fetch changesets from already initialized branches
2014-11-16 18:12:35 +01:00
Philippe Miossec 26d131ad52 Fix crash when parent tfs is not found
because the branch is a pure git branch
2014-11-03 13:28:28 +01:00
Philippe Miossec 2aa1a77b6b Prevent fetching already fetch changesets from already initialized branches
by removing branches when the changeset of child branch
is alredy found in the repository
2014-11-02 20:26:58 +01:00
Philippe Miossec d76181de7d Merge pull request #662 from pmiossec/clone_tfs_root
Being able to clone TFS path "$/"
2014-10-27 22:44:57 +01:00
Philippe Miossec a6ab755f81 Prevent using 'branch' command when cloned whole repository 2014-10-27 00:58:52 +01:00
Philippe Miossec 1b42dc93c1 Being able to clone TFS path "$/" 2014-10-27 00:58:52 +01:00
Philippe Miossec d3722592d1 A lot of fixes in documentation 2014-10-26 17:19:44 +01:00
Philippe Miossec 54786eab19 Improve doc
fix #669
2014-10-25 14:08:50 +02:00
Philippe Miossec 9129d0f0d9 Better error management and messages 2014-10-13 23:59:55 +02:00
Philippe Miossec d38051f63c Make it build... 2014-10-02 13:42:43 +02: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 1dc2fc988b Doc 2014-10-02 13:42:42 +02:00
Philippe Miossec ed48555765 Save the option only when cloning 2014-10-02 13:42:41 +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
Philippe Miossec c3e624ddc8 cleaning spaces 2014-10-02 00:10:10 +02:00
Matt Burke 8bdd754a0f Make the unshelve --force warnings shorter. 2014-09-24 10:05:28 -04:00
Matt Burke 95effc1d9a Let unshelve continue after errors. 2014-07-28 09:49:22 -04:00
Philippe Miossec c731b99487 Merge pull request #620 from pmiossec/recheckin_quick_as_default
Set quick rcheckin as default rcheckin process
2014-07-10 15:48:33 +02:00
Philippe Miossec 73abf84f51 Add a parameter to only return the sha of a commit given a changeset id 2014-07-10 14:42:35 +02:00
Philippe Miossec 0225dd5ea2 Add checkout command
git tfs checkout changesetId [-b=branch_name]
ex: git-tfs checkout 2365
      git-tfs checkout 2365 -b=bugfix_2365

Solve #563
2014-07-10 14:29:58 +02:00
Philippe Miossec e231dbe6bf Set quick rcheckin as default rcheckin process 2014-07-10 13:39:59 +02:00
Arkady Shapkin 6b6dcde978 branch init support initializing by specifying git branch or git remote 2014-07-05 13:50:23 +02:00
Arkady Shapkin e69357280f InitBranch support fetching parent branch 2014-07-05 13:50:18 +02:00
Arkady Shapkin 74abd9e30b Check parent branch history only before current branch changeset 2014-07-05 13:50:14 +02:00
Arkady Shapkin e96a09df4f Support resume interrupted clone in debug mode 2014-07-05 13:50:12 +02:00
Philippe Miossec acc8b11d2f refacto InitBranchSupportingRename 2014-07-05 13:48:21 +02:00
Philippe Miossec 88dfce4638 refactoring / cleaning 2014-07-05 13:48:19 +02:00
Philippe Miossec cf9dfd433b preventing crash when init branch is no more needed
...and should correct end loop when fail to find root changeset
2014-07-05 13:48:18 +02:00
Philippe Miossec 9ca63cdcc7 disable branch support in subtreecommand 2014-07-05 13:48:10 +02:00
Philippe Miossec 971abcb3dc Add an option "-ignore-branches" to ignore merged branch when fetching in merge changeset
It correspond to the old way git-tfs worked!
2014-07-05 13:48:09 +02:00
Philippe Miossec 95bde55f74 Create local branch only when it don't already existing (to prevent crash)... 2014-07-05 13:48:07 +02:00
Philippe Miossec 56fc7fd542 Introduce a config value GitTfsConstants.AutoInitBranches
...to know if we should auto init branch when merge is encountered
 and the branch not actualy initialized
2014-07-05 13:48:04 +02:00
Philippe Miossec f759c4da71 Get the TfsRemotes if branch was already initialized 2014-07-05 13:48:02 +02:00
Philippe Miossec e114350e7f better way to find if changesets fetched 2014-07-05 13:48:01 +02:00
Philippe Miossec 4a62b6b816 Move InitBranch() in the GitTfsRemote (to be able to init one from there!) 2014-07-05 13:47:49 +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 7cc78519eb Manage and don't stop initializing branches if some fails (and report at the end of the process) 2014-07-05 13:47:42 +02:00
Philippe Miossec 29df90f40e Delete remotes corresponding to renamed branches 2014-07-05 13:47:40 +02:00
Philippe Miossec 27ebc9bd25 Don't create git branch when renamed branch! 2014-07-05 13:47:38 +02:00
Philippe Miossec 46e5c6b2d6 Manage rename tfs branch the good way 2014-07-05 13:47:34 +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 84d4288b72 Fix work-item option ( -w1234 is now supported)
to work how the help say...
Before this fix, only `-w1234:` or `-w1234:associate` was supported

Should fix #612
2014-06-03 23:37:55 +02:00
Philippe Miossec dd7dfb31cf Refactoring... 2014-05-26 23:19:29 +02:00
Philippe Miossec 51fc6026ca Use libGit2Sharp to merge branches 2014-05-26 22:24:47 +02:00