Last updated June 27, 2011 13:10, by ovrabec
Feedicon  
= NetBeans Git Integration Plan = ... work in progress ... == M1 (DONE) == End of June 2010 * usecases and func spec == M2 (DONE) == End of August 2010 * get an idea about jgit ** if and how it covers all the commands needed - see [[Git_func#Covered_git_commands|functional spec]] ** find alternatives if needed - e.g cli * finalize usecases and func spec * UI spec - cover at least interesting UC needed for implementation * implementation plan == M3 (DONE) == 12 November 2010 Early acces on UC. Covering: * standard workflow and diff usecases * limited IDE integration ==== setup, infrastructure & co. ==== * setup modules '''(DONE)''' ** add to repo (not in build) '''(DONE)''' ** mailing lists, bugzilla, ... '''(DONE)''' * document module install, setup, custom build etc. ==== IDE integration ==== * automatically recognize a git clone when opening a project /mounting a folder in the IDE '''(DONE)''' * rudimentary status caching '''(DONE)''' * show/annotate file status including inline diff in editor view '''(DONE)''' * main/popup menu '''(DONE)''' * handling file events from the IDE '''(DONE)''' ** most typical scenarios for create, delete, move, copy. ** discovering external changes or more complex file operations (scenarios) not included ==== Covered Use Cases ==== * [http://netbeans.org/projects/versioncontrol/pages/Git_uc#Quick_overview_of_file_status_in_IDE Quick overview of file status in IDE] '''(DONE)''' * [http://netbeans.org/projects/versioncontrol/pages/Git_uc#View_Modifications_(Show_Changes) View_Modifications_(Show_Changes)] '''(DONE)''' * [http://netbeans.org/projects/versioncontrol/pages/Git_uc#Add Add] - partially '''(DONE)''' * [http://netbeans.org/projects/versioncontrol/pages/Git_uc#Commit Commit] '''(DONE)''' * [http://netbeans.org/projects/versioncontrol/pages/Git_uc#Add_or_Exclude_to_or_from_commit Add or Exclude to or from commit] '''(DONE)''' * [http://netbeans.org/projects/versioncontrol/pages/Git_uc#Reset_Changes_(Revert_local_changes) Reset Changes (Revert local changes)] '''(DONE)''' * [http://netbeans.org/projects/versioncontrol/pages/Git_uc#Diff_-_view_local_modifications Diff - view local modifications] '''(DONE)''' * [http://netbeans.org/projects/versioncontrol/pages/Git_uc#Inline_diff_-_show_local_modifications_in_a_files_sidebar Inline diff - show local modifications in a files sidebar] '''(DONE)''' * [http://netbeans.org/projects/versioncontrol/pages/Git_uc#Repository_Init Repository Init] '''(DONE)''' == M4 (on update center of 7.0) == 17 February 2011 ==== IDE integration ==== * finalize status recognition and caching '''(DONE)''' * finalize file events handling '''(DONE)''' * bugtracking integration - commit '''(DONE)''', search history, ==== Covered Use Cases ==== * [http://netbeans.org/projects/versioncontrol/pages/Git_uc#Ignore Ignore] '''(DONE)''' ===== Branching and Merging ===== * [http://netbeans.org/projects/versioncontrol/pages/Git_uc#Checkout Checkout] '''(DONE)''' * [http://netbeans.org/projects/versioncontrol/pages/Git_uc#Create_Branch Create Branch] '''(DONE)''' * [http://netbeans.org/projects/versioncontrol/pages/Git_uc#Switch_to_Branch Switch to Branch] '''(DONE)''', the same as Checkout * maybe also [http://netbeans.org/projects/versioncontrol/pages/Git_uc#Merge_from_Branch Merge from Branch] '''(DONE)''' == M5 (14. May 2011, planned for 7.0.1) == ==== Covered Use Cases ==== ===== Distributed workflow ===== * [http://netbeans.org/projects/versioncontrol/pages/Git_uc#Repository_Clone Repository Clone] '''(DONE)''' * [http://netbeans.org/projects/versioncontrol/pages/Git_uc#Pull Pull] '''(DONE)''' * [http://netbeans.org/projects/versioncontrol/pages/Git_uc#Push Push] '''(DONE)''' * [http://netbeans.org/projects/versioncontrol/pages/Git_uc#Fetch Fetch] '''(DONE)''' ===== Branching and Merging ===== * finalize [http://netbeans.org/projects/versioncontrol/pages/Git_uc#Merge_from_Branch Merge from Branch] '''(DONE)''' * [http://netbeans.org/projects/versioncontrol/pages/Git_uc#Export_uncommited_changes_(Local_changes) Export uncommited changes (Local changes)] '''(DONE)''' * [http://netbeans.org/projects/versioncontrol/pages/Git_uc#Apply_Patch Apply Patch] '''using standard diff action: Tools > Apply Patch''' ===== Source Archeology ===== * [http://netbeans.org/projects/versioncontrol/pages/Git_uc#Search_history_of_files Search history of files] '''(DONE)''' - more or less. Implementation based on the old (mercurial) template, not according to the new UI specs. * [http://netbeans.org/projects/versioncontrol/pages/Git_uc#Blame Blame] "DONE" - integrated into 7.0.1 == M6 (finalize in 7.1)== ==== Use Cases ==== * [http://netbeans.org/projects/versioncontrol/pages/Git_uc#Revert_Changes_(Revert_previous_commits) Revert Changes (Revert previous commits)] '''(DONE)''' * [http://netbeans.org/projects/versioncontrol/pages/Git_uc#Export_commits_(Previous_commits) Export commits (Previous commits)] '''(DONE)''' * [http://netbeans.org/projects/versioncontrol/pages/Git_uc#Create_Tag Create Tag] '''(DONE)''' * [http://netbeans.org/projects/versioncontrol/pages/Git_uc#Manage_Tags Manage Tags] '''(DONE)''' * [http://netbeans.org/projects/versioncontrol/pages/Git_uc#Remove_Branch Remove Branch] '''(DONE)''' ===== Source Archeology ===== * [http://netbeans.org/projects/versioncontrol/pages/Git_uc#Blame Blame] '''(DONE)''' - implemented in trunk ===== Nice to Have ===== Features that might be implemented by the community: * [http://netbeans.org/projects/versioncontrol/pages/Git_uc#Save_Stash Save Stash] * [http://netbeans.org/projects/versioncontrol/pages/Git_uc#Manage_Stash Manage Stash] * [http://netbeans.org/projects/versioncontrol/pages/Git_uc#Cherrypick_from_Branch Cherrypick from Branch] * [http://netbeans.org/projects/versioncontrol/pages/Git_uc#Rebase_Branch_(TODO) Rebase]

Project Features

Wiki Controls

About this Project

VersionControl was started in November 2009, is owned by tpavek, and has 105 members.
By use of this website, you agree to the NetBeans Policies and Terms of Use (revision 20160708.bf2ac18). © 2014, Oracle Corporation and/or its affiliates. Sponsored by Oracle logo
 
 
Close
loading
Please Confirm
Close