Successfully reported this slideshow.
We use your LinkedIn profile and activity data to personalize ads and to show you more relevant ads. You can change your ad preferences anytime.

Git with Style


Published on

Talk from Pharodays 2017.

Published in: Software
  • Video:
    Are you sure you want to  Yes  No
    Your message goes here

Git with Style

  1. 1. Git with style by Esteban Lorenzano
  2. 2. Today is no-release day!
  3. 3. What is iceberg • A front-end to work with git using - filetree - libgit2 • Yes, it can be other things tomorrow, but now is that.
  4. 4. Presented to you by (Sponsored by the Pharo consortium) Nicolás Passerini
  5. 5. Iceberg goals • Nicely move Pharo into git world • Allow Pharo development itself on it • To grow incrementally - Starts with some few use-cases - Add functionality as needed - That’s why there are a lot of functionality missing • Extensible
  6. 6. Why • Monticello is showing age • With time, the “package” metaphor became insufficient. - We now use more complex “projects” - Programs often have different kind of sources
  7. 7. Iceberg status • Version 0.4 released last week, and integrated into Pharo6 as preview. • Tested in several projects and working (some minor problems on different platforms) • It will work to develop Pharo7, so it should work for you too. • Hot-fixes will be incorporated (I already have a couple on the works)
  8. 8. Use-cases we have in mind
  9. 9. Solo
  10. 10. clone work commit push
  11. 11. Team on unique repository
  12. 12. clone branch commit push pull work Pull request
  13. 13. Distributed team
  14. 14. clone branch commit push to fork pull from origin work Pull request FORK
  15. 15. Demo (The Pharo process)
  16. 16. Pharo process in a nutshell • Clone from pharo-project/pharo • Create a branch with issue number (or feature name) • Work on it as needed • Push to your fork • Submit a Pull Request to “development” branch
  17. 17. Near future (v0.5) • Work on 64bits (requires move to libgit2 0.25.1) • Support for multiple directories (allow subtrees) • Support for cherry-pick • fix filetree export properties problem • it should be there ~1 month from now
  18. 18. Thanks!