Home » TeamGit

TeamGit

Posted by bain

Team Git is still under development. 
Roadmap can be viewed here.
Source : You can view latest repositary here.
Binary : Fedora repos have package teamgit, Ubuntu PPA here
Mailing List :  teamgit-(at)-googlegroups.com
Membership is not needed to post. Subscribe here

The Latest News

  • v0.0.10 -- interactive merge conflict resolution

    28 Mar 2009
    Posted by bain

    I have tagged the repo v0.0.10 (well actually few commits after that as well)

    The latest feature add includes : Interactive merge conflict resolution.
    Only meld is supported as merge tool for now...
    That also means meld is required to be installed.

    Shortlog follows

    Abhijit Bhopatkar (32):
          Revert "Check, whether valid data is parseable or not"
          guifycommanddialogimpl.cpp: Avoid crashing for unparsable man pages
          gitprocess: whitespace cleanup
          Add slot to check for merge conflicts
          Add merge conflict label
          Add merge conflict checking in refresh
          settings_ui: Add mergetool path text box and select button
          Move git specific settings from mainwindow to settings for easier management
          Add merge tool path setting
          Add mergetool selction and fix writing it to settings file
          whitespace fixes
          Fix merge conflict label
          Merge branch 'master' of git://gitorious.org/teamgit/mainline
          Show files with merge conflicts only once
          Move GIT_INVOKE from mainwindowsimpl to gitthread
          Added merge dialog ui file
          Added merge dialog implementation
          Added merge dialog file to the qmake project
          Execute merge dialog when merge conflict label is clicked
          Connect filediff signal from git thread to mergedialog

    Continue reading...
     1 Comment

  • v0.0.9 -- interactive rebase

    17 Jan 2009
    Posted by bain

    I have tagged the repo with v0.0.9!!!

    The major changes from v0.0.8 include
    1. Added preliminary interactive rebase support, now edit reabse queue
    visually
    2. Advanced menu is now disabled, since its still long way from being
    stable
    3. You can now drag and drop emailed patches straight from evoluion (may
    be others as well) or drop patch files/mboxes from nautilus.

    Shortlog since v0.0.8 appended
    Abhijit
    ---
    Abhijit Bhopatkar (23):
          guifydialogui: Fixed a groupbox title
          Added a rebase ui binary
          gitprocess: make rebase editor a variable and unset it after
    rebase
          mainwindowui: Added interactive rebase action to tools
          gitprocess: make rebase take an argument for rebase point
          mainwindowimpl: don't crash if git binary is not found
          Added rebase interactive functionality
          rabse-interactive: Added rebase control file reading
          Made teamgit a global project for main and rebase projects
          Added install target for rebase-interactive
          Added teamgit-rebase and editor for teamgit control file
          Removed stray merge conflict file
          Added suporject for main teamgit app
          Added basic merge command support
          mainwindowimpl.cpp: Use save/restoreGeometry function for window
    state.
          White space cleanup
          Drag and drop patch support
          mainwindowsimpl.cpp: fix stupid commenting

    Continue reading...
     Add a Comment

  • Eating your own dog food...

    23 Dec 2008
    Posted by bain

    Just read "As Christmas Bonus, Google Hands Out "Dogfood" " and came to know about the phrase "Eating one's own dog food".

    And as it turns out me is eating my own dog food as well....
    There was a couple of week gap in teamgit development due to a fact that i am helping out a friend doing some Qt coding for his company. Thats too much Qt already in daytime.

    But with that i am kinda distanced from the teamgit code itself (i forget fast).
    On top of that, last week when i decided to upgrade to latest 2.6.28 and got interested in btrfs. Guess what i had no trouble following latest linux topic trees for both these, all from inside teamGit.

    And i am quite impressed with myself. That's rare !!!

    There are few operations i still have to go back to commandline (the advanced guification thing works well for most as well but not perfect yet), particularly "git merge" and any conflicts. So thats on my next top priority now.

     458 Comments

  • Foss.in workout fails to make me thinner

    26 Nov 2008
    Posted by bain

    But it was quite successful in making teamgit a bit fatter !!!

    We already have a patch adding git rebase to the backend, thanks Rejesh Kosla.
    http://groups.google.com/group/teamgit/browse_thread/thread/c1f02b47a0917264
    We also added patches to establish a baseline framework for the UI upstream. And had quite a good hour long hack session on finding different alternatives for the proposed UI.
    http://gitorious.org/projects/teamgit/repos/mainline/commits/ac94c3fdf5c70818d25172bfc4e8e3063b3fc8fb

    Some of the interfaces discussed had really revolutionary ideas from your truly , like reimplementing the listbox paint function (;-) ) to implement the commit list and its manipulations. Fortunately there were saner ideas tossed out, like using a QTreeView with zero indentation or using stylesheets  in QListBox

    We finally settled on taking the ui forward  with a plain QListView with Rajagopal confidant about using stylesheets with LG liking the idea of grouping the squashed commits with a color background. All in all a very productive day for teamgit. With couple of new developers appearing on the mailing list.

     Add a Comment