Commit Graph

46 Commits

Author SHA1 Message Date
Steve Schmidt d7c24b6a09 Added unit tests to ensure that quotepath support is working 2012-02-22 17:06:50 +01:00
Sean M. Collins e532c767e5 Implement OptionSet from GitTFSCommand interface 2012-02-13 14:45:02 -05:00
Sean M. Collins 054fbf2181 Remove CSharpOptParse 2012-02-13 14:45:01 -05:00
Sean M. Collins 88e8fe2cec Add reference to NDesk.Options 2012-02-13 14:45:00 -05:00
Matt Burke 9299d2c69a dos2unix 2012-01-28 11:42:04 -05:00
Tuomas Järvensivu 8fc96a7ebe Fix commit regex used by FindTfsCommits to detect a commit from git log
FindTfsCommits failed in detecting Tfs commits when parsing a
revert commit.

For instance when parsing following git log report the Tfs commit finder
failed when parsing commit 027a14b24280ca3ba24e4c1e52411de35b944442.

Failure occurred when parsing the line
    This reverts commit e096daaf57d937fef3c0c639c3a59232310c6a20.
Old Regex("commit (" + GitTfsConstants.Sha1 + ")") failed by parsing this
as a start of a new commit.
Commit regex is tightened to Regex("^commit (" + Sha1 + ")\\s*$")

Added tests prove that the new Regex handles both commit topic lines
and revert commit subjects.

==================== Example git log report ====================
$ git log --no-color --pretty=medium HEAD
commit 8c7350acc9a1feffa9882badecc625129c9b8943
Merge: 027a14b fe03e90
Author: Tuomas J<C3><A4>rvensivu <tuomas.jarvensivu@reaktor.fi>
Date:   Sun Sep 11 22:16:46 2011 +0300

    Merge commit 'fe03e9009e46c4eb1b961578b201553eb59b11ed'

commit fe03e9009e46c4eb1b961578b201553eb59b11ed
Author: Tuomas J<C3><A4>rvensivu <tuomas.jarvensivu@reaktor.fi>
Date:   Sun Sep 11 22:02:48 2011 +0300

    Change on top of reverted commit

commit 027a14b24280ca3ba24e4c1e52411de35b944442
Merge: 2b9fe0c f3b25d8
Author: Administrator <WIN-R5AMS97DB6H\Administrator>
Date:   Sun Sep 11 18:50:31 2011 +0000

    Subject: Revert "This commit will be reverted."
    Author: Tuomas J<C7><CF>rvensivu tuomas.jarvensivu@reaktor.fi
    Date: Sun, 11 Sep 2011 21:45:01 +0300
    Git commit hash: d5e949694e8d1442921250e0df4fb38d314dce53

    This reverts commit e096daaf57d937fef3c0c639c3a59232310c6a20.

    git-tfs-id: [http://localhost:8888/tfs/GitTfsTestCollection]$/GitTfsTest;C9
==================== Example git log report ====================

Signed-off-by: Tuomas Järvensivu <tuomas.jarvensivu@reaktor.fi>
2011-09-28 11:25:50 +03:00
ivan-danilov ae679a2fc0 Removed unnecessary failing test 2011-08-23 20:03:56 +03:00
ivan-danilov be4e399c7a Renamed GetParentTfsCommits -> GetLastParentTfsCommits for clarity 2011-07-08 23:51:43 +03:00
Matt Burke b18420dc36 dos2unix 2011-06-10 22:11:42 -04:00
Ryan Hansen e4f7b83844 Changed git-tfs pull command to throw a GitTfsException if there are local changes that have not been committed. This prevents Issue #25 from occurring. Also added an exception recommendation to stash changes and try pulling again. This is also a new unit test to validate this behavior. 2011-06-10 16:33:36 -06:00
Matt Burke fe64790216 Add support for "Copy" in another way.
Copies can be reported if diff.renames is set to 'copies'.

#44
2011-05-21 14:19:09 -04:00
Matt Burke c96eca911b All newlines are unix (in the repo). 2011-01-27 16:40:32 -05:00
Matt Burke 5adae0d3db Got rid of DummyRemote. 2011-01-27 14:46:05 -05:00
Matt Burke d93049affe Add GitTfsCommandRunner to help make GitTfsCommands' APIs more sane. 2011-01-26 16:54:35 -05:00
Matt Burke 2ae026001f Fixed pushes back to TFS. 2011-01-26 16:23:35 -05:00
Matt Burke 1985919692 Elminate use of ObjectFactory. 2011-01-26 16:19:09 -05:00
Matt Burke 0573325c9b Fix build. 2011-01-26 13:43:37 -05:00
Nathan Roe 886500ef17 Fixed solution build issues 2010-12-16 06:09:55 -05:00
Nathan Roe 6455902563 Merge branch 'master' of http://github.com/spraints/git-tfs
Conflicts:
	GitTfs.sln
	GitTfs/Core/GitTfsRemote.cs
	GitTfs/Core/IGitTfsRemote.cs
	GitTfs/Core/TfsWorkspace.cs
2010-12-14 22:14:11 -05:00
Matt Burke 508a346252 Make the TFS changeset a merge commit in git-tfs. 2010-12-14 13:25:05 -05:00
Matt Burke 59a15e1200 Optionally evaluate checkin policies on shelve. 2010-12-02 12:38:23 -05:00
Nathan Roe 57a112e368 Upgraded to VS2010 2010-12-01 22:12:39 -05:00
Matt Burke f4ab1be544 Shelve now looks for a pre-existing shelveset. 2010-12-01 13:53:17 -05:00
Matt Burke 7acceda081 Added some tests for GitChangeInfo. 2010-10-13 10:02:45 -04:00
Matt Burke 283291e631 Got quick-clone to list tfs's files. 2010-06-21 13:21:04 -04:00
Matt Burke 2143eae934 Upgraded git-tfs to GitSharp 0.3. 2010-06-21 13:20:44 -04:00
Matt Burke 10f82fb93d Got all of the TF dll references isolated to the TfsInterop folder. 2010-04-20 11:51:58 -04:00
Matt Burke 7ba82f98b3 Started extracting TFS client dependencies in order to make them less dependent. 2010-04-19 15:15:45 -04:00
Matt Burke 025fb361ef Moved all external dlls to lib. 2010-02-04 08:03:41 -05:00
Matt Burke 0c4acfc761 Changed to use GitSharp for all file mode stuff. 2010-01-19 11:19:48 -05:00
Matt Burke 0bc16f555e Added a basic shelve implementation. 2009-09-08 14:18:02 -04:00
Matt Burke 6b00be05de Made a skeleton implementation of the Shelve command, and made the Shelve command more robust (i.e. handle multiple TFS parents). 2009-09-03 18:14:58 -04:00
Matt Burke 4b793b157f Implemented the shelve command (but not the actual shelving). Shuffled some other things around. 2009-09-03 14:26:18 -04:00
Matt Burke da834b996c Added a 'shelve' command, and test for invalid arguments (which may have gotten me over the hurdles that were keeping me from doing more TDD). 2009-09-03 11:14:25 -04:00
unknown 577d67df9f Forced project to 32-bit so it'll run on x64. 2009-08-13 16:14:11 -04:00
Matt Burke 18d346d14f Implemented a little bit more of TfsChangeset.Apply. 2009-07-10 18:15:41 -04:00
Matt Burke b54b4a4a7a Got changes from macbook to compile, and added some tests for Ext methods that I needed to write. 2009-07-10 15:14:56 -04:00
Matt Burke 72c4dd7ad4 Fixed tests. 2009-07-07 13:20:02 -04:00
Matt Burke 547b8f3714 Implemented date formatting for git as ISO 8601. Hopefully that's the right format. 2009-07-07 13:12:03 -04:00
Matt Burke 0bfcb72a35 Got the last two commits to compile. 2009-07-06 09:58:07 -04:00
Matt Burke 606824c61d Got init working! 2009-07-02 16:21:26 -04:00
Matt Burke e3fd6fec39 Started implementing 'command_oneline'. 2009-07-02 08:51:07 -04:00
Matt Burke 07c99979b2 Ported init (minus the low-level git command invocations). 2009-06-30 14:40:06 -04:00
Matt Burke 6ebeaa7f1d Ported some more of git-svn. 2009-06-29 18:19:33 -04:00
Matt Burke 3acb7e5ee3 Stubbed Init, with tests. Made an even rougher stub of Fetch. 2009-06-27 20:26:05 -04:00
Matt Burke 36b89740f7 Got structuremap and an opt parser wired in. Started TDD! 2009-06-26 17:01:01 -04:00