Commit Graph

78 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
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 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 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 1b42dc93c1 Being able to clone TFS path "$/" 2014-10-27 00:58:52 +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
Arkady Shapkin e5b24d6a56 Test ShouldDoNothingBecauseRemoteAlreadyExisting fixed 2014-07-05 13:50:24 +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
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 74661c4d73 Correct UnitTests 2014-07-05 13:47:47 +02:00
Philippe Miossec 7a7df65d63 Adapt Shelve unit tests 2014-04-20 18:12:20 +02:00
Philippe Miossec 34969bd98f correct --no-fetch option 2014-03-07 18:53:53 +01:00
Arkadiy Shapkin b90b8ca53f Removed unused using directives 2014-02-06 15:35:03 +04:00
Matt Burke 4ca946daf4 💄
* Expand an abbreviation
* Explain why we have a method that just calls its base method.
2014-01-15 16:46:31 -05:00
Kim Gybels bcd282c399 Fix simple compiler warnings 2014-01-03 17:09:28 +01:00
pmiossec 1c027a0d17 Rewrite FindCommitByCommitMessage to better find by changeset Id
(for better performance and maintainability)
2013-10-07 14:05:49 +02:00
Philippe Miossec 4933ac1cd2 Add message about the online help 2013-09-30 14:49:34 +02:00
Philippe Miossec 5394dae487 InitBranchTest : Remove not needed Expectation Never() 2013-09-16 00:34:42 +02: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
Pat Thoyts 003ddb40a1 Updated test for help on a command.
This tests actually works ok but the expected output was out of date.
We could check more of the standard help prefix here.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2013-09-12 14:43:39 +01:00
Pat Thoyts 6bfbbf416c Fixed test for help with no arguments.
When run with no arguments, the command dispatcher checks the number of
parameters and when no arguments are provided it calls the Run() method
on the Help class. We must also load at least one command instance to avoid
Help.GetCommandInstances from raising an exception.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2013-09-12 14:43:38 +01:00
Pat Thoyts b130f56923 Added tests for the --ignorecase option and another --autocrlf option
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2013-09-12 14:43:37 +01:00
Matt Burke 539854440c Merge pull request #350 from gburgett/subtree
Subtree command for git-tfs
2013-09-11 17:10:12 -07:00
Philippe Miossec 83b78272d1 Merge branch 'master' into fetch_merge_when_no_commit
Conflicts:
	GitTfs/Commands/InitBranch.cs
2013-09-07 21:08:06 +02:00
Matt Burke ab13eb2f3b Merge remote-tracking branch 'origin/master' into pr/378
Conflicts:
	GitTfs/Commands/InitOptions.cs
2013-09-05 16:44:56 -04: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
Anders Abel 289dce6da7 Fixed #425 Improved error message for branch --init when branch doesn't exist
- Removed magic value -1 returned from GetRootChangesetForBranch. Now throws instead.
- Updated calling code and a test case accordingly.
2013-09-05 21:33:15 +02:00
Philippe Miossec 3eccf11e80 Unit Test for cloning repo with merge changeset 2013-07-02 10:39:27 +02:00
Philippe Miossec 17e4cfdf8d Merge branch 'master' into fetch_merge_when_no_commit
Conflicts:
	GitTfs/Commands/Clone.cs
	GitTfs/Commands/Fetch.cs
	GitTfs/Commands/InitBranch.cs
	GitTfs/Core/IGitRepository.cs
	GitTfs/Core/TfsInterop/ITfsHelper.cs
2013-06-06 23:10:52 +02:00
Gordon Burgett c696499dfb Subtree remote's git-tfs ID is now applied when pulling new changesets, TfsWriter now handles determining whether to write with subtree or its owner.
This facilitates using git-tfs after having performed a subtree-split.  In the subtree's artificial revision history, the owner's git-tfs ID will not be present, so the TfsWriter will proceed as though the subtree remote were a normal remote.

Signed-off-by: Gordon Burgett <gordon.burgett@gmail.com>
2013-06-05 14:02:57 -05:00
Chris Wundram 4c173a85be Merge branch 'master' into autocrlf 2013-05-29 16:17:48 -05:00
Chris Wundram 54807c30f5 Added --nofetch option to init-branch to set up TFS remote for branch
without doing a fetch.  Usefull to check config file before executing
fetch.
Now fails when --all and --nofetch are used on init-branch at the same time
Added test for case with --all and --nofetch
2013-05-27 08:19:59 -05:00
Chris Wundram 5c1fdf5f1d Fixed --autocrlf option on init so that it will set the autocrlf option
in the config.
Added --ignore case option to set ignorecase config setting.

These changes allow these settings to be controled when creating new repo
with git tfs init

Fixed unit tests to work with new CreateTfsRemote signature
2013-05-27 07:52:01 -05:00
Philippe Miossec 265c52ee3a Correct UnitTests 2013-05-21 18:35:24 +02:00
Matt Burke bee409ed42 Fallout from those merge conflicts. 2013-01-09 16:58:05 -05:00
Matt Burke 3f8a9e280c Merge branch 'master' into test-changes
Conflicts:
	GitTfsTest/Integration/IntegrationHelper.cs
2013-01-09 15:24:29 -05:00
Matt Burke 3911338152 Change IBranch into a simple-ish value object BranchTree. 2013-01-08 06:53:15 -05:00
Matt Burke 28b8e93a91 DateCreated isn't used. 2013-01-08 06:39:00 -05:00
Matt Burke 4a3fe9c864 Handle the "not on a branch" case for init-branch. 2013-01-08 06:34:49 -05:00
Matt Burke 9d7039a396 Separate base TFS interaction from higher-level logic. 2013-01-08 06:27:56 -05:00
Matt Burke ed016a21d8 Run integration tests in-process.
Hopefully this doesn't mess too many things up.
2013-01-04 16:52:01 -05:00
David Alpert 1bcd9b0ea3 improving the error message when InitBranch fails because it needs a clone of the trunk 2013-01-02 00:50:21 -06:00
David Alpert 457770bc1f fixed the mocked setup of some IBranches to surface an issue with the InitBranch command:
the IBranch structure is a node in a tree containing a path and referencing it's children, thus getting only its children never includes the root path, causing the current implementation of InitBranch to always throw an exception.
2013-01-02 00:50:20 -06:00
David Alpert 20bc4b0221 adding the expected error message to an InitBranchTest to verify that it is throwing the expected exception 2013-01-02 00:50:19 -06:00
Philippe Miossec a2a1916f70 Correct clone message and init-branch using the good branches informations 2013-01-02 00:24:58 +01:00
Philippe Miossec f75b7ca5be Remove unallowed chars in labels
TFS permit chars that are not allowed in Git tag name (for exemple space)
2012-12-20 14:06:07 +01:00
Philippe Miossec 12617efec0 Save and re-use author file until overwritten 2012-12-04 13:42:09 +01:00
Philippe Miossec 5f4479241b Use author file to manage author mapping in init-branch command 2012-12-04 13:20:31 +01:00