Commit Graph

946 Commits

Author SHA1 Message Date
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 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
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
Philippe Miossec ff30f738f4 Correct a strange message when no branches found 2013-05-24 21:34:30 +02:00
Matt Burke def84ab443 v0.17.2 v0.17.2 2013-05-23 06:16:55 -04:00
Matt Burke f3cc9f7e99 Clean up Release.proj.
* Prettier Version.cs.
* Do not tag until the build succeeds.
2013-05-23 06:16:39 -04:00
Philippe Miossec 770656f44e Use saved author file for rcheckin commits 2013-05-22 17:01:55 +02:00
Matt Burke ccab394878 Merge pull request #372 from pmiossec/clean_after_run_command
Clean workspace after running a tfs command
2013-05-20 12:33:16 -07:00
Philippe Miossec a2eeacbaac Clean workspace after running a tfs command
=> clone, fetch, init-branch, checkin, ...
2013-05-20 16:23:37 +02:00
Philippe Miossec 592357b2f8 .gitattributes : diff as csharp for better diffs (get method name) 2013-05-19 01:13:14 +02:00
James Dunne c666e6a44a Fix #367 by adding ChangeType.SourceRename case for init-branch. 2013-05-15 15:39:38 -05:00
Philippe Miossec 8ca64032a5 Readme.md : add place to download binary 2013-05-13 23:44:15 +03: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 540ae7894a Merge pull request #362 from EPashkin/fix-git-tfs-authenticates-against-all-tfs-instances_vs2008
Apply fix for Vs2008
2013-05-08 07:19:46 -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
Evgeny Pashkin 915b137975 Apply fix for Vs2008
416543 Fix: git-tfs tries to authenticate against all TFS instances in the branch no matter how old they were in use and if they needed at all.
2013-05-07 10:40:40 +04:00
Matt Burke ea8e241fa2 Merge pull request #360 from pmiossec/checkintool_visible_taskbar
Show CheckinTool window in task bar. Closes #359
2013-05-06 13:04:07 -07:00
Philippe Miossec 20bac72878 Share ParentForm between Vs2010 and Vs11 projects 2013-05-06 18:37:48 +02:00
Philippe Miossec c7e5f7cf1a Show CheckinTool window in task bar 2013-05-05 17:18:48 +02:00
Matt Burke f1d3f18e3e Use the new refs API.
Thanks @Saaman!!!!
2013-05-03 16:21:36 -04:00
Matt Burke aaf8079cac Update libgit2sharp to include libgit2/libgit2sharp#421 2013-05-03 16:16:32 -04:00
Matt Burke a4e4847ecf Merge pull request #358 from arcanericky/branch-warning-list
Fix newline for branch checkout warning
2013-05-02 11:23:07 -07: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