Commit Graph

579 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
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
Philippe Miossec 2ef7feb69d update libgit2sharp to v0.12 2013-06-04 00:31:25 +02:00
Matt Burke 7888efd7ba Fix links to wiki. 2013-06-03 09:53:40 -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
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 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
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 ff30f738f4 Correct a strange message when no branches found 2013-05-24 21:34:30 +02:00
Philippe Miossec 770656f44e Use saved author file for rcheckin commits 2013-05-22 17:01:55 +02:00
Philippe Miossec a2eeacbaac Clean workspace after running a tfs command
=> clone, fetch, init-branch, checkin, ...
2013-05-20 16:23:37 +02:00
Matt Burke 47d3a27532 Merge pull request #357 from l3m/quick-authors
Correct author attribution for RCheckin Quick
2013-05-08 07:24:34 -07:00
Matt Burke a5b56e8223 Merge pull request #361 from spraints/update-ref
Replace Process.Start with libgit2sharp. (closes #360)
2013-05-08 06:54:05 -07:00
Matt Burke f1d3f18e3e Use the new refs API.
Thanks @Saaman!!!!
2013-05-03 16:21:36 -04:00
Ricky Pike cea0ad2b1a Fix newline for branch checkout warning 2013-05-01 16:41:01 -05:00
Matt Burke 09606b228d Eliminate Process.Start("git", "update-ref", ...) 2013-04-29 12:00:34 -04:00
Matt Burke bac056c50e Update libgit2sharp. 2013-04-29 11:48:51 -04:00
J.Ru 34cef5d7d0 Introduce FindCommonGitCommit
Instead of relying on the base changeset IDs coming from the shelveset,
the first git commit that is found to contain the exact SHA1 for all
the files in the shelveset is used as the parent.
2013-04-25 18:47:32 +02:00
Jonas Boesch aa81462a95 RCheckin now has correct author attribution in quick mode too.
+ Refactored PerformRCheckin to remove duplicate code
2013-04-24 11:37:46 +02:00
Jonas Boesch 462dcc285a GitCommit can now return (forward) Sha of the wrapped commit. 2013-04-24 10:39:26 +02:00
Jonas Boesch 8d88d4540c Refactored PerformRCheckin
- Common checks are still in the base method
- 'Quick' specific code is in _PerformRCheckinQuick
- the non-Quick code is in _PferformRCheckin
2013-04-24 10:03:29 +02:00
Philippe Miossec bb9d724b1d Replace git command update-ref by a LibGit2Sharp call to UpdateRef() 2013-04-22 21:57:32 +02:00