Commit Graph

971 Commits

Author SHA1 Message Date
Matt Burke ea7c82c038 Show timing information in debug output. 2013-06-08 07:48:25 -04:00
Matt Burke 4e18d1ec82 Do even less cleanup. 2013-06-08 06:56:49 -04:00
Philippe Miossec 2d65a81050 revert workspace cleanup... 2013-06-07 12:26:24 +02:00
Philippe Miossec f20a9da861 rename 'bare' option of fetch to not conflict from the one of clone 2013-06-06 19:56:33 +02:00
Matt Burke a81f5a2fb1 Merge pull request #389 from pmiossec/prevent_multiple_register_events
Keep reference on VersionControlServer to prevent multiple event registration.
2013-06-06 04:31:24 -07:00
Matt Burke 05a52937a4 Merge pull request #353 from pmiossec/bare
Add support of bare repository for init, clone, fetch and rcheckin commands
2013-06-06 04:24:12 -07:00
Philippe Miossec 8c4ce5e339 Keep refrence on VersionControlServer to prevent multiple event registration 2013-06-05 00:00:01 +02:00
Philippe Miossec 0ceb86d9f6 fetch : throw error when ahead commit and introduce --force flag
return an error that fetch is not allowed when there is ahead commits in bare repository
and introduce a flag --force which, when used, do fetch anyway and loose the ahead commits
2013-06-04 21:14:27 +02:00
Philippe Miossec 22d815f5f6 Add a reference to checkin parameter to the checkin method! 2013-06-04 21:14:26 +02:00
Philippe Miossec 488e3465fe correct indentation introduced by merge with master 2013-06-04 21:14:24 +02:00
Philippe Miossec c1b461ec03 corrections.... 2013-06-04 21:14:23 +02:00
Philippe Miossec 191fad0ee3 refactoring of how get ref for a head branch... 2013-06-04 21:14:21 +02:00
Philippe Miossec ff0de1c560 Add branch support in fetch and rcheckin for a bare repository
But should specify the git branch name that should be updated with --bare option

Use :
git tfs fetch --bare=master
git tfs fetch --bare=branch1 -i branch1
git tfs rcheckin --bare=master
git tfs rcheckin --bare=branch1 -i branch1
2013-06-04 21:14:19 +02:00
Philippe Miossec 7e4db38057 Manage clone and init in a bare repository 2013-06-04 21:13:14 +02:00
Philippe Miossec bb1c055f18 Modify fetch command to manage bare repositories 2013-06-04 21:13:12 +02:00
Philippe Miossec 45493c141a prevent rcheckin by error in a bare repository 2013-06-04 21:13:11 +02:00
Philippe Miossec 512784426b if another commit was done in TFS, keep the repository in good state before reporting error 2013-06-04 21:13:08 +02:00
Philippe Miossec 8e9f7f8142 Manage rcheckin in bare repository 2013-06-04 21:13:07 +02:00
Matt Burke b1c7793fb4 Merge pull request #385 from sc68cal/docs and spraints/docs
Move docs from the wiki to the repo.
2013-06-04 11:08:06 -04:00
Matt Burke 4e97d8b836 New libgit2 naming conventions
See https://github.com/libgit2/libgit2sharp/commit/96df5f8d6d3e35f8aadafdc25a95ede3eb9e86b5
2013-06-04 10:57:09 -04:00
Philippe Miossec 2ef7feb69d update libgit2sharp to v0.12 2013-06-04 00:31:25 +02:00
Matt Burke 5415cc5be0 contributing update. 2013-06-03 11:14:13 -04:00
Matt Burke b9265d0e97 Updated links.
* All file names are lowercase.
* All command docs are in the `commands/` directory.
* A couple of useless files are gone.
2013-06-03 10:57:51 -04:00
Matt Burke db39dd55f4 Move the old home wiki page so that it's the default file in the doc dir. 2013-06-03 10:00:28 -04:00
Matt Burke 218d9e43ed mv config.md into the one doc dir 2013-06-03 09:54:28 -04:00
Matt Burke 7888efd7ba Fix links to wiki. 2013-06-03 09:53:40 -04:00
Matt Burke 1cad8c8e11 Merge pull request #377 from wundram/ignoreexcept
except-regex option
2013-06-03 08:38:15 -04:00
Matt Burke 2d612bc19c Extract the ignore logic.
Working towards #381 and #not-a-hack.
2013-06-03 08:36:23 -04:00
Matt Burke 2071076682 was ((i1 && !e1) || (i2 && !e2)), is (i1 || i2) && !(e1 || e2) 2013-06-03 07:48:01 -04:00
Sean M. Collins 6f2e97de8e Subtree merge in Git-Tfs wiki repo
Resolves #383
2013-05-30 11:43:27 -04:00
Chris Wundram 77edbdc0bb Updated signature on IsIgnored method to require all three arguments 2013-05-29 16:38:16 -05:00
Chris Wundram 4d034293c4 Merge branch 'master' into ignoreexcept 2013-05-29 16:33:13 -05:00
Matt Burke 6f899a730d Merge pull request #351 from jru/UnshelveFromTFSParent_autocrlf
Unshelve from the actual Shelveset's parent
2013-05-29 10:43:55 -04:00
Matt Burke e334ed1afd IsExistingInTfs() for VsFake. 2013-05-29 10:41:55 -04:00
Matt Burke 36b48acbb4 Reuse the index scrubber. 2013-05-29 10:41:28 -04:00
Matt Burke 3efd3c3e42 Less shelling 2013-05-29 10:32:43 -04:00
Matt Burke f2e140f72c I didn't mean to change this. 2013-05-29 10:26:10 -04:00
Matt Burke a0b228661e Merge remote-tracking branch 'origin/master'
Conflicts:
	GitTfs/Core/GitTfsRemote.cs
2013-05-29 10:23:59 -04:00
Matt Burke 0680742a44 Resolve a couple of things. 2013-05-29 10:19:10 -04:00
Matt Burke ec02c285f6 Revert "Introduce FindCommonGitCommit"
This reverts commit 34cef5d7d0.
2013-05-29 10:13:40 -04:00
Matt Burke 106a064c98 Merge pull request #366 from pmiossec/use_saved_author_file
Use saved author file for rcheckin commits
2013-05-29 07:09:21 -07:00
Matt Burke 68d6d3afc1 Merge pull request #376 from pmiossec/little_clone_improvements
Little clone improvements
2013-05-29 09:56:56 -04:00
Matt Burke 60190dd1f1 s/in/to 2013-05-29 09:56:24 -04:00
Matt Burke 479064a375 Merge pull request #379 from wundram/initbranch-nofetch
Added --nofetch option to init-branch
2013-05-29 05:52:40 -07:00
Matt Burke 2a57b5f4f6 Merge pull request #370 from JamesDunne/init-branch-fix-#367
Fix #367 by adding ChangeType.SourceRename case for init-branch.
2013-05-29 05:18:39 -07: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 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
Philippe Miossec 9cf3c578f8 Add messages to help user if one branch is not displayed 2013-05-25 12:09:10 +02:00
Philippe Miossec 20f2eb6832 clone: verify if tfs path exists 2013-05-25 12:01:38 +02:00
Philippe Miossec df159384c5 ParentForm.cs is a Form and should be seen as this 2013-05-25 11:57:18 +02:00