Commit Graph

37 Commits

Author SHA1 Message Date
Philippe Miossec 2d65a81050 revert workspace cleanup... 2013-06-07 12:26:24 +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 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
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
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 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
Jonas Boesch 3872763f27 Rcheckin now passes the GitCommit instance to the checkin options factory. 2013-03-26 14:16:29 +01:00
Philippe Miossec 3264d8bdb8 Add a short option -q for rcheckin quick 2013-03-25 14:29:11 +01:00
ivan.danilov-econ e74170291a Fix: Rcheckin ignores --no-build-default-comment option (during rcheckin of merge commit prevents including all comments from merged commits below original merge-commit comment in git) 2013-03-21 14:53:28 +02:00
Philippe Miossec a34bf716de Add an option '--autorebase' to the 'rcheckin --quick' command to continue with rebasing when new changesets fetched 2013-03-09 11:23:24 +01:00
Philippe Miossec da4fee0d46 rebase remaining commits on last commit done before exiting
... due to external commit detected or error during checkin
2013-03-09 11:23:23 +01:00
Philippe Miossec 6e78b56d4d rcheckin --quick : reset current branch to tfs remote to be synchronized with tfs 2013-03-09 11:23:21 +01:00
David Alpert 705d4d9f5b refactoring the generic caretaker into an explicitly passed and customized clone of the checkinoptions. 2012-09-10 09:38:18 -05:00
David Alpert edd0cd4deb refactoring the Rcheckin command to lean on the GenericCaretaker via a CheckinOptionsHelper when processing special actions in commit messages to associate and resolve work items 2012-09-04 04:22:29 -05:00
Collins, Sean 1c2438ee2d Trim after processing work items 2012-03-14 14:00:49 -04:00
Sean M. Collins eae316711a Revert "Trim after running the regex"
This reverts commit a8ee3a252a.
2012-02-23 12:31:04 -05:00
Sean M. Collins a8ee3a252a Trim after running the regex 2012-02-22 11:03:38 -05:00
Sean M. Collins d879162cc8 Clear _checkinOptions.WorkItemsTo* after successful checkin 2012-02-22 10:38:47 -05:00
Sean M. Collins 4efa6f6adf Strip out tfs-work-item-id string from TFS commits 2012-02-18 21:05:39 -05:00
Sean M. Collins ad69066120 Final touches
Change Regex pattern, add console output, and
call when Quick is true or false
2012-02-17 11:14:48 -05:00
Sean M. Collins 10ac06f85d Associate or Resolve items based on regex 2012-02-17 10:34:35 -05:00
Sean M. Collins 4aca0cc4dd Call TfsWorkItemRegex during rcheckin operation 2012-02-13 17:30:46 -05:00
Matt Burke bbd8c742ab Convert the rest to NDesk.Options. 2012-02-01 07:27:49 -05:00
Matt Burke c0b98b0fe5 Convert Rcheckin to NDesk.Options. 2012-01-31 08:11:45 -05:00
Matt Burke 157676c473 Rough-in NDesk.Options. 2012-01-28 12:04:36 -05:00
ivan-danilov f604a20287 Added '--quick' option to rcheckin to omit rebases (some code cleanup needed) 2011-12-08 09:52:43 +02:00
Matt Burke 78a5575326 Fix.
See https://github.com/spraints/git-tfs/commit/1280f8e103af9f465d1e43a1bb255cfd2ca5b544#commitcomment-478349
2011-07-15 06:53:02 -04:00
ivan-danilov 443cbb7fa7 Fixed bug with rcheckin (CommandOneline() could return null unlike ReadToEnd()) 2011-07-14 15:24:53 +03:00
ivan-danilov ac30a2542f Minor changes according to review. 2011-07-13 23:06:32 +03:00
ivan-danilov b5f0a167f8 RCheckin command implementation 2011-07-11 06:15:52 +03:00