How To Use Git (Tfs) With A Microsoft Linux (Tosu) (Tfv) (For Linux) (Git) (Femmer) (V2) (Minor) (Permanent) (

Transcription

1 Basel Versionskontrolle mit TFS 2013 Marc Müller Principal Consultant 4tecture GmbH

2 Introduction 15 Demo Git What is Git? 15 Demo Git Branching Git Integration in TFS Demo Git-Tf Demo Git Deployment Conclusion 5 Agenda

3 Basel Introduction

4 Modern source-control approaches Check-in Check-out Strengths Scales to very large codebases Fine level permission control Allows usage monitoring Offline editing support Easy to edit files outside Visual Studio or Eclipse Best for Large integrated codebases Control and auditability over source code down to the file level Medium-sized integrated codebases A balance of fine-grained control with reduced friction

5 Modern source-control approaches Check-in Check-out Strengths Scales to very large codebases Fine level permission control Allows usage monitoring Best for Large integrated codebases Control and auditability over source code down to the file level Offline editing support Easy to edit files outside Visual Studio or Eclipse Medium-sized integrated codebases A balance of fine-grained control with reduced friction Full offline experience Complete repository with portable history Simplified branching model Modular codebases Integrating with open source Highly distributed teams

6 Trends in the DVCS Ecosystem Git is the Leading DVCS Tool Adoption of Git is growing exponentially Git is used to interchange data between SCM tools Git as a Deployment Protocol Used to deploy web applications on many cloud providers (Windows Azure, Heroku, Facebook) Git has support across platforms Strong Linux and Mac tooling Support could be improved for Windows developers

7 Decide at Project Creation Team Foundation Version Control (TFVC) uses a single, centralized server repository to track and version files. Local changes are always checked in to the central server where other developers can get the latest changes. Git is a Distributed Version Control System (DVCS) that uses a local repository to track and version files. Changes are shared with other developers by pushing and pulling changes through a remote, shared repository.

8 Demo Creating Git Repositories

9 Basel What is Git?

10

11 Distributed Version Control System Commit Commit Commit Commit Commit Commit Local Clone Shared Commit Commit Commit Commit Commit Commit Push Commit Commit Commit Commit Pull Commit

12 DVCS: Workflows TFVC-Style Worklow (aka Subversion-Style Workflow) Centralized model just works fine because: No push if someone has pushed since the last time you fetched Shared Local Local Local

13 DVCS: Workflows Integration Manager Worklow i.e. GitHub, Codeplex Blessed Developer Public Developer Public Integration Manager Developer Private Developer Private

14 Branching -wide branching (TFVC uses path based branching) Published branches and local branches Local Shared master dev private master dev

15 Data Assurance Data model ensures cryptographic integrity Every file and commit is checksummed It is not possible to change anything without changed the Ids.

16 Staging Area Staging Area = intermediate area where commits can be formatted and reviewed git add working directory git commit -a staging area git commit repository

17 Demo Branching

18 Basel Git Integration in TFS and VS

19 Fully integrated Git support Team Foundation Server / Service Project 1 Project 2 Local Repo 3 rd Party 3 rd Party Other Remote Git Repo

20 Development Environment Visual Studio 2012 Update 3 (VS Tools for Git) Visual Studio 2013 Command-Line Tools PowerShell Extension posh-git

21 Security Security restrictions only on -Level Branch-Level No control over local actions Local clone of repository Enterprise Git Fully Integrated in TFS environment TFS Security / AD Integration

22 / Branch Security Permission Name Name at Command Line Description Administer ADMINISTER rename the repository add additional repositories verify the database set permissions for the branch. deleting the repository requires also Force permission Branch Creation BRANCH publish branches in the repository (creating a branch sets Administer, Contribute, and Force) Contribute CONTRIBUTE push changes to the repository. Rewrite and destroy history Note Management FORCE force an update (can overwrite or discard commits) NOTE push and edit Git notes to the repository remove notes requires also the Force permission Read READ clone, fetch, pull, and explore the contents of the repository Tag Creation TAG push tags to the repository. edit or remove tags requires also Force permission.

23 Work Item Links Commits can be associated with WorkItems Through Team Explorer «Change»-Hub Commit Comment (also Command Line) i.e. #123

24 Build

25 Build

26 Currently Missing Features with Git My Work (Shelveset) Code-Review (Shelveset) Gated Check-In Build Trigger (Shelveset) Detailed Information:

27 Migrating / Syncing from TFVC Git TFVC Git-Tf Local Git Local Git Local Git

28 Git-Tf Git Plugin Open Source (MIT License) Cross-Platform (Java-based) gittf.codeplex.com Setup: chocolatey.org

29 Git-Tf Usage git tf configure $/PlaygroundTFVC/Main git tf checkin --deep --autosquash

30 Demo Integration with TFVC Git-Tf

31 Migrate from SVN to Git / TFVC No more TFS Integration Platform needed Git Plugin: Git-svn SVN Git-Svn Clone Git Git-Tf Checkin TFVC

32 Git as Deployment Protocol Git Push Azure Website Git Local Git Push i.e. Codeplex Git Notification Pull Azure Website Git

33 Git as Deployment Protocol

34 Basel Conclusion

35 Recap TFS 2013 supports TFVC and Git Git is a distributed version control system (DVCS) Fully Integrated in TFS Platform Enterprise Git Lightweight Branching

36 When to Pick TFVC Developers familiar with centralized version control Highly coupled codebase Tight audit/control requirements Git Modular Codebase Integrating with Open Source Highly distributed Teams VS and TFS Tooling: Use of MyWork + Code Review

37 4tecture GmbH Thurgauerstrasse 40 CH-8050 Zürich Marc 4tecture.ch/blog

38