Permalink
Browse files

Merging in the nbjgit fork to master.

* nbgit based on Shawn Pearce's JGit library will now be the
  principal focus of development, and as such will now be
  housed in nbgit's master branch.

Squashed commit of the following:

commit 0e1b21c464f95a1cf308ec7b4c8c49c69ff73900
Author: Alex Coles <alexbcoles@mac.com>
Date:   Fri Sep 5 02:03:46 2008 +0200

    Minor fixes for Java 1.5 compatibility.

commit 25cc12eff8bc6319afebf6ea5a7838350665a4ec
Author: Alex Coles <alexbcoles@mac.com>
Date:   Fri Sep 5 02:03:12 2008 +0200

    Fix to use implementation version of Versioning Utils.

commit 2e7a67fa2a86c3df41d9566986fe8ab024bb0d79
Author: Alex Coles <alexbcoles@mac.com>
Date:   Fri Sep 5 02:01:52 2008 +0200

    Rename packages to org.nbgit.

commit 303aa72bb1663a3a1ebfb2a13cc03239752fa1ef
Merge: 8fc578d... 7a22cf0...
Author: Alex Coles <alexbcoles@mac.com>
Date:   Fri Sep 5 01:32:06 2008 +0200

    Merge branch 'master' of git://repo.or.cz/nbjgit into jgit

    Initial merge of 'nbjgit' fork into nbgit.

    Conflicts:
    	.gitignore
    	LICENSE
    	README
    	build.xml
    	manifest.mf
    	nbproject/build-impl.xml
    	nbproject/genfiles.properties
    	nbproject/platform.properties
    	nbproject/project.properties
    	nbproject/project.xml
    	src/META-INF/services/org.netbeans.modules.versioning.spi.VersioningSystem

commit 7a22cf013fa57e44ecc4050c8560f92843ed631a
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Wed Sep 3 01:51:42 2008 +0200

    Improve performance and remove race conditions during commit

    Remove calls to reset() and dispose() after walking revisions or trees.
    If they are no longer needed the calls will mainly cause more memory
    to be allocated.

    Create the RefUpdate object before making the commit so that there
    will not be a later race condition when the branch reference is updated.

    Thanks to Shawn O. Spearce for the advices.

commit 93bfbd150c1ee21e3f9e415aa077b2b513699f8e
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Tue Sep 2 21:59:01 2008 +0200

    Teach the log UI how to filter by author name and message content

commit 17778ec6695b6da1da5179170353785b721e3863
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Tue Sep 2 21:39:57 2008 +0200

    Show information about files changed in the log summary

    Code adapted from EGit's FileDiff class.

commit bc6d355ca5f31107f831b2c066aaceba0198d3d6
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Tue Sep 2 16:19:41 2008 +0200

    Improve memory usage of the log UI

    ... by making RepositoryRevision extend RevCommit and use a custom
    RevWalk class. The implementation needs to be cleaned up, but should
    safe some object creation.

    Thanks to Shawn for this idea.

commit eefc889b4f4cfb086eaa2e18224b6a6c785455e8
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Tue Sep 2 01:39:10 2008 +0200

    Move GitFileNode to .ui package

commit 136438ede70a833abd0e06ad7152409e5f4641b2
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Tue Sep 2 01:30:51 2008 +0200

    Squash Git.getNodes() into VersioningPanel.getNodes()

commit f782ed1e355fcf0d3e8e647c547caee099d2791f
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Tue Sep 2 00:18:04 2008 +0200

    Fix revision code in the disabled part of the log UI

commit c15d31e19bf9a6451dd639312e889d460d703a45
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Tue Sep 2 00:04:05 2008 +0200

    Use RevCommit instead of Commit in for the log UI

    As adviced by Shawn O. Pearce RevCommit is much more lightweight
    and this saves us an extra object anyway.

commit be6a4a64a6b40f9a2e345a5dc6f05367b933fbde
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Mon Sep 1 23:58:23 2008 +0200

    Make RevisionNode provide a much simpler interface to access commit info

commit d58a4eda4ce4d05ddccc5c5f976603ded9044c6b
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Mon Sep 1 23:42:01 2008 +0200

    Make GitIgnore provide an interface for SharabilityQuery

commit c6869bc15ee9c900e66dafcc50f4afd8399913d2
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Mon Sep 1 13:21:43 2008 +0200

    Remove unused code

commit 5667c0860b3e345197a0d4eb9b570a9537ca42ef
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Mon Sep 1 13:20:09 2008 +0200

    Remove bundled messages related to checking the git CLI version

commit bdd94c684c436e47e10e3405b6fc5b9e2237671e
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Mon Sep 1 02:08:48 2008 +0200

    Minor rewording in the README file

commit 7844d01426971f6e93e787c8fd07b7913ea45d68
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Sun Aug 31 18:21:10 2008 +0200

    Minor documentation fixes

commit 77c8cc2a11cc62b13060593c564ab0ab32137b9a
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Sun Aug 31 13:06:42 2008 +0200

    Partially fix the tool tip of the status component

    The HTML code seems to hide so that only one root file is shown.

commit 85008f6d80246aab7fd0c56814d0bfd276756d24
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Sun Aug 31 04:23:06 2008 +0200

    Update project information and add LICENSE file

commit 62610495e9b80a938ad4ed63e662c7e56ce20477
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Sun Aug 31 02:52:00 2008 +0200

    Remove unused GitLogMessage class

commit b033438bc41e3b5983517b397eb1ca9282bb829a
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Sun Aug 31 02:19:23 2008 +0200

    Move list of issues to Google Code issue tracker

commit 169ca96d33f8201a970e66393818a1c48a12f9d3
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Sun Aug 31 01:40:56 2008 +0200

    Improve showing the branch name in the status UI

commit 49c3c9505b69c1c884d1f30a06c0a436bce8bbc5
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Sun Aug 31 00:03:33 2008 +0200

    Add .gitignore file with build/ and nbproject/private/

commit 516316fd90973e3115461ae795cb1108dc33f7a6
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Sat Aug 30 23:37:19 2008 +0200

    Add a small README with the most important information

commit d30112231fc14b762fd5f47adaf75324d451fe7f
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Sat Aug 30 23:37:00 2008 +0200

    More documentation updates

commit fc23d14a3fc545312ef11eac5a9ee3bcfe8a82d6
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Sat Aug 30 22:01:33 2008 +0200

    Update project information

commit 1bc4d73f39fdeb6b4c84ec160a84b2cc1941ff93
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Sat Aug 30 22:01:03 2008 +0200

    Add some more issues to work on

commit f9e7ae5df26e4677e266b5818c8d362c13c9f92c
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Sat Aug 30 21:49:39 2008 +0200

    Expand the credits page and improve linking

commit d4e5129e7ed7991d537c7f8db1f5b571eb9ad3d5
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Sat Aug 30 19:44:28 2008 +0200

    Make the properties UI save settings to the repository config file

    As the last two commits show it should now be possible to configure
    the commit related configuration options properly.

commit 1c124e448950e0d53a1f0b52f540dd4a9aaf2ca4
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Sat Aug 30 19:41:38 2008 +0200

    More fixes to the code used for getting the repository config file

commit 23e2378c9c72845d64202223eb07ac21bdc1d775
Author: Jonas Fonseca <Jonas Fonseca@192.168.1.101>
Date:   Sat Aug 30 19:12:06 2008 +0200

    Do not open a log tab when opening the log UI

    Signed-off-by: Jonas Fonseca <Jonas Fonseca@192.168.1.101>

commit 21b40e08b426bc6ba47f5ab09a65ac966af2da3d
Author: Jonas Fonseca <Jonas Fonseca@192.168.1.101>
Date:   Sat Aug 30 19:11:04 2008 +0200

    Fix NullPointerExceptions on systems where no user or system gitconfig file is found

    Signed-off-by: Jonas Fonseca <Jonas Fonseca@192.168.1.101>

commit cd80656ceffd7a70b8756390503923452ad2514e
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Sat Aug 30 16:21:25 2008 +0200

    TODO: add module option for sanitizing space in commit messages

commit fbe0db789294d761c8ef399743ebdbaf32221bb5
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Sat Aug 30 16:11:51 2008 +0200

    Polish the log summary view by removing and disabling unusable links

    The export diff link has been completely removed while the diff and revert links
    are disabled for now.

commit 2e335d4e544af50b700dbc3dacfbc824157b74ae
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Sat Aug 30 15:39:59 2008 +0200

    Move some context action setup into ContextAction

    Also provide a default isEnabled() metdhod.

commit ec901ea0cd8bd6b1a117421fe7a797014a74be0c
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Sat Aug 30 15:14:52 2008 +0200

    Enable the properties UI

commit 8f87d05572c0b2841c252c7a27cf5c58896f2e9f
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Sat Aug 30 13:45:11 2008 +0200

    Expand the documentation a bit

commit 4205f70dccb35d6e82597b29723b08d197440405
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Sat Aug 30 03:55:30 2008 +0200

    Update project files

commit 468d1025e5cc0761f3d81c86568d41f58ed2a830
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Sat Aug 30 03:52:35 2008 +0200

    Add update UI code

commit 3dbd5623f1e575f4888a32e391c1fd28066cb32b
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Sat Aug 30 01:59:56 2008 +0200

    Reformat some of the log UI code

commit 31fea98f384d65d8ab6eb467786044c89c2950e1
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Sat Aug 30 01:58:59 2008 +0200

    Remove unused GitLogMessage

    JGit's Commit class is used instead.

commit 82920d72626900c6c8acd45ef02c4c697898033e
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Sat Aug 30 01:08:31 2008 +0200

    Oops, add the GitPanel files

commit 388a7b9d4ea5b469b3d3a6cd568d2450ec324787
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Sat Aug 30 01:03:49 2008 +0200

    Fix bundle paths in .form files

commit 9d0e79113aaee748734d243b02f056e019c3f186
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Sat Aug 30 00:13:42 2008 +0200

    Add the option and properties code

commit 079cae09fb8891070ab569a3740c8cdb8dc1ee69
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Fri Aug 29 22:30:39 2008 +0200

    Renable the original code for CommitAction.isEnabled()

commit 39873bf70406fb244288a55263f862037edf8279
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Fri Aug 29 22:27:27 2008 +0200

    Add some @Override annotations

commit 2cac2aa08109fdb38d4027f4227fa24c5443e977
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Fri Aug 29 22:02:05 2008 +0200

    Simplify Git instance init

commit 4134424e9fc8154d577a2966f206635c9da8f1f3
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Fri Aug 29 21:56:47 2008 +0200

    Move GitAnnotator instance to GitVCS

commit 26086fcff5368e93e4e5a9d3c7a0508da602593c
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Fri Aug 29 21:53:40 2008 +0200

    Move HTML formatting to the HTMLFormatter utility class

commit 40655bb5714f69548a8687e6b58b265bfcc1e0d6
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Fri Aug 29 21:24:48 2008 +0200

    Move GitInterceptor instance to GitVCS

commit 7965cf96240acda6d9c2979732aa8c9a0656cdfe
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Fri Aug 29 21:14:05 2008 +0200

    Remove some date related GitUtils formerly used by the log UI

commit 8c1d8d6cf681286e12d0528f30b55edbe11c6634
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Fri Aug 29 21:08:13 2008 +0200

    Add license header to GitCommand

commit 3334cba0cf818627f04d99b853f99eb7ef35fc75
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Fri Aug 29 20:40:27 2008 +0200

    Brand the history top component with the git icon

    ... and drop the "Git " prefix from the tab title to safe screen real estate.

commit 2e13f643cae58414bbc6b5700943fd0879a566ac
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Fri Aug 29 20:32:08 2008 +0200

    Add the log action with a lot of stuff disabled and even more not working

commit 9493809d813fff068879040bff058195d42fb7c7
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Fri Aug 29 12:46:52 2008 +0200

    Ignore non-sharable files when getting status of single files

    This finally fixes the status maintenance of changed files.

commit 6cd4595ca4d7ab42c9afd4557b9459dd5c628367
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Fri Aug 29 12:32:31 2008 +0200

    Fix file refreshing by disabling ignore handling for now

commit 188332d558cbda2e9c95fddb6898f23fe9f7fe2c
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Fri Aug 29 12:28:01 2008 +0200

    Refresh the index from disk also when getting single file status

commit 7daed883dd6aa4ed037da2b8aaa6a0c2a861782d
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Fri Aug 29 12:26:32 2008 +0200

    Remove FIXME code that caused post-commit state to be broken

commit 3379c0ffec316a338332dc0455db8b9f43a324fd
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Fri Aug 29 06:33:25 2008 +0200

    Fix the pop up menu in the status tab

commit 99205b4f4494257dd62d7fd2776e465768294d5e
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Fri Aug 29 06:19:20 2008 +0200

    Remove GitConfigFiles and cleanup GitModuleConfig

commit 60dfcd124f1ea5903ea716ff94bf054e87994ebe
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Fri Aug 29 04:56:15 2008 +0200

    Remove getComparableStatus() implementation from GitAnnotator

    There already exists one in GitUtils.

commit 553a08770e123a2d5ad90a363b527e83ac71f4fd
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Fri Aug 29 04:48:14 2008 +0200

    Remove GitException and friends

commit 87987264647cc5d67176d236a454be7bb9f7dc56
Author: Jonas Fonseca <fonseca@diku.dk>
Date:   Fri Aug 29 04:17:42 2008 +0200

    Remove extra separators from the action menus

commit 3a672278efbb43b9abf9ba36e3ed775f7ad1479d
Author: Jonas Fonseca <Jonas Fonseca@192.168.1.101>
Date:   Fri Aug 29 03:23:20 2008 +0200

    Remove more unnecessary casts

    Signed-off-by: Jonas Fonseca <Jonas Fonseca@192.168.1.101>

commit ebb1f1b2ed63ec91044602da370e046783c12f59
Author: Jonas Fonseca <Jonas Fonseca@192.168.1.101>
Date:   Fri Aug 29 03:00:30 2008 +0200

    Remove more unnecessary casts

commit cd9fa65f39413d86b240ae73cac570e1672e8c84
Author: Jonas Fonseca <Jonas Fonseca@192.168.1.101>
Date:   Fri Aug 29 02:38:33 2008 +0200

    Remove logging for the status related GitCommand methods

commit b54aa5e0827964ffad891d7466c0dd1fb47230aa
Author: Jonas Fonseca <Jonas Fonseca@192.168.1.101>
Date:   Fri Aug 29 02:37:27 2008 +0200

    Remove unnecessary casts

commit 112da6aeae8249100ee96c556d5d489f7b825768
Author: Jonas Fonseca <Jonas Fonseca@192.168.1.101>
Date:   Fri Aug 29 02:31:33 2008 +0200

    Remove unused Status class

commit 0191d1109bf349a25b94bf0f78bc7a9dc652b101
Author: Jonas Fonseca <Jonas Fonseca@192.168.1.101>
Date:   Fri Aug 29 02:20:30 2008 +0200

    Initial import
  • Loading branch information...
1 parent 8fc578d commit 609d0cffba1ba7fc495103838dff6c6ee5313b47 @myabc committed Sep 5, 2008
Showing with 16,917 additions and 34,333 deletions.
  1. +2 −2 .gitignore
  2. +819 −270 LICENSE
  3. +37 −3 README
  4. +17 −5 build.xml
  5. +90 −0 javahelp/org/nbgit/docs/about.html
  6. +125 −0 javahelp/org/nbgit/docs/credits.html
  7. +28 −0 javahelp/org/nbgit/docs/helpset.xml
  8. +9 −0 javahelp/org/nbgit/docs/index.xml
  9. +49 −0 javahelp/org/nbgit/docs/issues.html
  10. +8 −0 javahelp/org/nbgit/docs/map.xml
  11. +26 −0 javahelp/org/nbgit/docs/news.html
  12. +10 −0 javahelp/org/nbgit/docs/toc.xml
  13. +0 −63 javahelp/org/netbeans/modules/git/docs/credits.html
  14. +0 −29 javahelp/org/netbeans/modules/git/docs/git-about.html
  15. +0 −32 javahelp/org/netbeans/modules/git/docs/git-hs.xml
  16. +0 −9 javahelp/org/netbeans/modules/git/docs/git-idx.xml
  17. +0 −9 javahelp/org/netbeans/modules/git/docs/git-map.xml
  18. +0 −11 javahelp/org/netbeans/modules/git/docs/git-toc.xml
  19. +4 −5 manifest.mf
  20. +1 −1 nbproject/build-impl.xml
  21. +5 −5 nbproject/genfiles.properties
  22. +9 −15 nbproject/project.properties
  23. +18 −71 nbproject/project.xml
  24. +30 −0 release/modules/ext/com-jcraft-jsch.LICENSE.txt
  25. BIN release/modules/ext/com-jcraft-jsch.jar
  26. +34 −0 release/modules/ext/org-spearce-jgit.LICENSE.txt
  27. BIN release/modules/ext/org-spearce-jgit.jar
  28. +1 −1 src/META-INF/services/org.netbeans.modules.versioning.spi.VersioningSystem
  29. +121 −149 src/org/{netbeans/modules/git → nbgit}/Bundle.properties
  30. +11 −11 src/org/{netbeans/modules/git → nbgit}/DiskMapTurboProvider.java
  31. +300 −0 src/org/nbgit/Git.java
  32. +433 −0 src/org/nbgit/GitAnnotator.java
  33. +438 −0 src/org/nbgit/GitInterceptor.java
  34. +556 −0 src/org/nbgit/GitModuleConfig.java
  35. +189 −0 src/org/nbgit/GitProgressSupport.java
  36. +8 −0 src/org/nbgit/GitRepository.java
  37. +135 −0 src/org/nbgit/GitVCS.java
  38. +314 −0 src/org/nbgit/OutputLogger.java
  39. +803 −0 src/org/nbgit/StatusCache.java
  40. +375 −0 src/org/nbgit/StatusInfo.java
  41. 0 src/org/{netbeans/modules/git → nbgit}/options/Bundle.properties
  42. +17 −14 src/org/{netbeans/modules/git → nbgit}/options/GitAdvancedOption.java
  43. +309 −0 src/org/nbgit/options/GitExtProperties.java
  44. +334 −0 src/org/nbgit/options/GitOptionsPanelController.java
  45. +38 −84 src/org/{netbeans/modules/git → nbgit}/options/GitPanel.form
  46. +327 −0 src/org/nbgit/options/GitPanel.java
  47. 0 src/org/{netbeans/modules/git → nbgit}/options/LabelsPanel.form
  48. +1 −1 src/org/{netbeans/modules/git → nbgit}/options/LabelsPanel.java
  49. +8 −8 src/org/{netbeans/modules/git → nbgit}/options/PropertiesPanel.form
  50. +2 −2 src/org/{netbeans/modules/git → nbgit}/options/PropertiesPanel.java
  51. +229 −0 src/org/nbgit/options/PropertiesTable.java
  52. +2 −2 src/org/{netbeans/modules/git → nbgit}/options/PropertiesTableModel.java
  53. +5 −2 src/org/{netbeans/modules/git/config → nbgit/resources}/Bundle.properties
  54. +2 −2 src/org/{netbeans/modules/git/resources/git_annotation.xml → nbgit/resources/annotation.xml}
  55. +1 −1 src/org/{netbeans/modules/git/resources/git-helpset.xml → nbgit/resources/helpset.xml}
  56. BIN src/org/{netbeans/modules/git → nbgit}/resources/icons/commit.png
  57. BIN src/org/{netbeans/modules/git → nbgit}/resources/icons/conflicts-badge.png
  58. BIN src/org/{netbeans/modules/git → nbgit}/resources/icons/diff-next.png
  59. BIN src/org/{netbeans/modules/git → nbgit}/resources/icons/diff-prev.png
  60. BIN src/org/{netbeans/modules/git → nbgit}/resources/icons/diff.png
  61. BIN src/org/{netbeans/modules/git → nbgit}/resources/icons/ending_revision.png
  62. BIN src/org/{netbeans/modules/git → nbgit}/resources/icons/gitvcs-icon.png
  63. BIN src/org/{netbeans/modules/git → nbgit}/resources/icons/modified-badge.png
  64. BIN src/org/{netbeans/modules/git → nbgit}/resources/icons/onefolder.png
  65. BIN src/org/{netbeans/modules/git → nbgit}/resources/icons/recent_messages.png
  66. BIN src/org/{netbeans/modules/git → nbgit}/resources/icons/refresh.png
  67. BIN src/org/{netbeans/modules/git → nbgit}/resources/icons/sinceorigin.png
  68. BIN src/org/{netbeans/modules/git → nbgit}/resources/icons/starting_revision.png
  69. BIN src/org/{netbeans/modules/git → nbgit}/resources/icons/twofolders.png
  70. BIN src/org/{netbeans/modules/git → nbgit}/resources/icons/update.png
  71. BIN src/org/{netbeans/modules/git → nbgit}/resources/icons/versioning-view.png
  72. +15 −16 src/org/{netbeans/modules/git/resources/git-layer.xml → nbgit/resources/layer.xml}
  73. +3 −3 src/org/{netbeans/modules/git/resources/gitversioning.xml → nbgit/resources/settings.xml}
  74. +1 −1 src/org/{netbeans/modules/git/resources/git_wstcref.xml → nbgit/resources/wstcref.xml}
  75. +33 −18 src/org/{netbeans/modules/git/ui/actions → nbgit/ui}/ContextAction.java
  76. +45 −36 src/org/{netbeans/modules/git → nbgit/ui}/GitFileNode.java
  77. 0 src/org/{netbeans/modules/git → nbgit}/ui/commit/Bundle.properties
  78. +409 −0 src/org/nbgit/ui/commit/CommitAction.java
  79. +1 −1 src/org/{netbeans/modules/git → nbgit}/ui/commit/CommitOptions.java
  80. +13 −16 src/org/{netbeans/modules/git → nbgit}/ui/commit/CommitPanel.form
  81. +3 −3 src/org/{netbeans/modules/git → nbgit}/ui/commit/CommitPanel.java
  82. +366 −0 src/org/nbgit/ui/commit/CommitTable.java
  83. +259 −0 src/org/nbgit/ui/commit/CommitTableModel.java
  84. +149 −0 src/org/nbgit/ui/commit/ExcludeFromCommitAction.java
  85. 0 src/org/{netbeans/modules/git → nbgit}/ui/diff/Bundle.properties
  86. +124 −0 src/org/nbgit/ui/diff/DiffAction.java
  87. +2 −2 src/org/{netbeans/modules/git → nbgit}/ui/diff/DiffFileTable.java
  88. +211 −0 src/org/nbgit/ui/diff/DiffNode.java
  89. +1 −1 src/org/{netbeans/modules/git → nbgit}/ui/diff/DiffSetupSource.java
  90. +245 −0 src/org/nbgit/ui/diff/DiffStreamSource.java
  91. +1 −1 src/org/{netbeans/modules/git → nbgit}/ui/diff/DiffTopComponent.java
  92. +5 −20 src/org/{netbeans/modules/git → nbgit}/ui/diff/MultiDiffPanel.form
  93. +30 −30 src/org/{netbeans/modules/git → nbgit}/ui/diff/MultiDiffPanel.java
  94. +283 −0 src/org/nbgit/ui/diff/Setup.java
  95. +1 −1 src/org/{netbeans/modules/git → nbgit}/ui/diff/VerticalFlowLayout.java
  96. 0 src/org/{netbeans/modules/git/ui/create → nbgit/ui/init}/Bundle.properties
  97. +281 −0 src/org/nbgit/ui/init/InitAction.java
  98. +1 −1 src/org/{netbeans/modules/git → nbgit}/ui/log/Bundle.properties
  99. +406 −0 src/org/nbgit/ui/log/DiffResultsView.java
  100. +269 −0 src/org/nbgit/ui/log/DiffTreeTable.java
  101. +138 −0 src/org/nbgit/ui/log/Divider.java
  102. +33 −20 src/org/{netbeans/modules/git/FileStatus.java → nbgit/ui/log/GitLogMessageChangedPath.java}
  103. +17 −22 src/org/{netbeans/modules/git/ui/remove/RemoveAction.java → nbgit/ui/log/LogAction.java}
  104. +305 −0 src/org/nbgit/ui/log/RepositoryRevision.java
  105. +314 −0 src/org/nbgit/ui/log/RevisionNode.java
  106. +1 −1 src/org/{netbeans/modules/git → nbgit}/ui/log/RevisionNodeChildren.java
  107. +11 −11 src/org/{netbeans/modules/git → nbgit}/ui/log/SearchCriteriaPanel.form
  108. +2 −2 src/org/{netbeans/modules/git → nbgit}/ui/log/SearchCriteriaPanel.java
  109. +265 −0 src/org/nbgit/ui/log/SearchExecutor.java
  110. +219 −0 src/org/nbgit/ui/log/SearchHistoryAction.java
  111. +8 −8 src/org/{netbeans/modules/git → nbgit}/ui/log/SearchHistoryPanel.form
  112. +13 −14 src/org/{netbeans/modules/git → nbgit}/ui/log/SearchHistoryPanel.java
  113. +175 −0 src/org/nbgit/ui/log/SearchHistoryTopComponent.java
  114. +831 −0 src/org/nbgit/ui/log/SummaryView.java
  115. 0 src/org/{netbeans/modules/git → nbgit}/ui/properties/Bundle.properties
  116. +216 −0 src/org/nbgit/ui/properties/GitProperties.java
  117. +1 −1 src/org/{netbeans/modules/git → nbgit}/ui/properties/GitPropertiesNode.java
  118. +114 −0 src/org/nbgit/ui/properties/PropertiesAction.java
  119. +3 −3 src/org/{netbeans/modules/git → nbgit}/ui/properties/PropertiesPanel.form
  120. +2 −2 src/org/{netbeans/modules/git → nbgit}/ui/properties/PropertiesPanel.java
  121. +1 −1 src/org/{netbeans/modules/git → nbgit}/ui/properties/PropertiesTable.java
  122. +1 −1 src/org/{netbeans/modules/git → nbgit}/ui/properties/PropertiesTableModel.java
  123. +4 −4 src/org/{netbeans/modules/git → nbgit}/ui/status/Bundle.properties
  124. +16 −11 src/org/{netbeans/modules/git → nbgit}/ui/status/GitVersioningTopComponent.java
  125. +62 −59 src/org/{netbeans/modules/git → nbgit}/ui/status/OpenInEditorAction.java
  126. +2 −2 src/org/{netbeans/modules/git → nbgit}/ui/status/OpenVersioningAction.java
  127. +1 −1 src/org/{netbeans/modules/git → nbgit}/ui/status/ShowAllChangesAction.java
  128. +75 −27 src/org/{netbeans/modules/git/ui/log/IncomingAction.java → nbgit/ui/status/StatusAction.java}
  129. +241 −0 src/org/nbgit/ui/status/SyncFileNode.java
  130. +518 −0 src/org/nbgit/ui/status/SyncTable.java
  131. +6 −18 src/org/{netbeans/modules/git → nbgit}/ui/status/VersioningPanel.form
  132. +845 −0 src/org/nbgit/ui/status/VersioningPanel.java
  133. 0 src/org/{netbeans/modules/git → nbgit}/ui/update/Bundle.properties
  134. +85 −26 src/org/{netbeans/modules/git/ui/log/OutAction.java → nbgit/ui/update/ConflictResolvedAction.java}
  135. +55 −28 src/org/{netbeans/modules/git/ui/log/LogAction.java → nbgit/ui/update/ResolveConflictsAction.java}
  136. +3 −3 src/org/{netbeans/modules/git → nbgit}/ui/update/ResolveConflictsExecutor.java
  137. +1 −1 src/org/{netbeans/modules/git → nbgit}/ui/update/RevertModifications.java
  138. +193 −0 src/org/nbgit/ui/update/RevertModificationsAction.java
  139. +6 −6 src/org/{netbeans/modules/git → nbgit}/ui/update/RevertModificationsPanel.form
  140. +115 −108 src/org/{netbeans/modules/git → nbgit}/ui/update/RevertModificationsPanel.java
  141. +1 −1 src/org/{netbeans/modules/git → nbgit}/ui/update/Update.java
  142. +138 −0 src/org/nbgit/ui/update/UpdateAction.java
  143. +8 −8 src/org/{netbeans/modules/git → nbgit}/ui/update/UpdatePanel.form
  144. +105 −98 src/org/{netbeans/modules/git → nbgit}/ui/update/UpdatePanel.java
  145. +59 −54 src/org/{netbeans/modules/git/ui/annotate → nbgit/util}/Bundle.properties
  146. +650 −0 src/org/nbgit/util/GitCommand.java
  147. +427 −0 src/org/nbgit/util/GitIgnore.java
  148. +169 −0 src/org/nbgit/util/GitProjectUtils.java
  149. +700 −0 src/org/nbgit/util/GitUtils.java
  150. +325 −0 src/org/nbgit/util/HtmlFormatter.java
  151. +0 −183 src/org/netbeans/modules/git/ExceptionHandler.java
  152. +0 −353 src/org/netbeans/modules/git/FileInformation.java
  153. +0 −861 src/org/netbeans/modules/git/FileStatusCache.java
  154. +0 −400 src/org/netbeans/modules/git/Git.java
  155. +0 −709 src/org/netbeans/modules/git/GitAnnotator.java
  156. +0 −52 src/org/netbeans/modules/git/GitException.java
  157. +0 −400 src/org/netbeans/modules/git/GitInterceptor.java
  158. +0 −62 src/org/netbeans/modules/git/GitMail.java
  159. +0 −497 src/org/netbeans/modules/git/GitModuleConfig.java
  160. +0 −193 src/org/netbeans/modules/git/GitProgressSupport.java
  161. +0 −128 src/org/netbeans/modules/git/GitVCS.java
  162. +0 −258 src/org/netbeans/modules/git/OutputLogger.java
  163. +0 −34 src/org/netbeans/modules/git/SuperGitAction.java
  164. +0 −115 src/org/netbeans/modules/git/VersionsCache.java
  165. +0 −448 src/org/netbeans/modules/git/config/GitConfigFiles.java
  166. +0 −278 src/org/netbeans/modules/git/options/GitExtProperties.java
  167. +0 −352 src/org/netbeans/modules/git/options/GitOptionsPanelController.java
  168. +0 −335 src/org/netbeans/modules/git/options/GitPanel.java
  169. +0 −214 src/org/netbeans/modules/git/options/PropertiesTable.java
  170. +0 −326 src/org/netbeans/modules/git/ui/annotate/AnnotateAction.java
  171. +0 −174 src/org/netbeans/modules/git/ui/annotate/AnnotateLine.java
  172. +0 −1,006 src/org/netbeans/modules/git/ui/annotate/AnnotationBar.java
  173. +0 −97 src/org/netbeans/modules/git/ui/annotate/AnnotationBarManager.java
  174. +0 −88 src/org/netbeans/modules/git/ui/annotate/AnnotationMark.java
  175. +0 −70 src/org/netbeans/modules/git/ui/annotate/AnnotationMarkInstaller.java
  176. +0 −67 src/org/netbeans/modules/git/ui/annotate/AnnotationMarkProvider.java
  177. +0 −91 src/org/netbeans/modules/git/ui/annotate/LinesReader.java
  178. +0 −97 src/org/netbeans/modules/git/ui/clone/Bundle.properties
  179. +0 −120 src/org/netbeans/modules/git/ui/clone/Clone.java
  180. +0 −319 src/org/netbeans/modules/git/ui/clone/CloneAction.java
  181. +0 −195 src/org/netbeans/modules/git/ui/clone/CloneCompleted.java
  182. +0 −115 src/org/netbeans/modules/git/ui/clone/CloneCompletedPanel.form
  183. +0 −125 src/org/netbeans/modules/git/ui/clone/CloneCompletedPanel.java
  184. +0 −70 src/org/netbeans/modules/git/ui/clone/CloneExternalAction.java
  185. +0 −169 src/org/netbeans/modules/git/ui/clone/ClonePanel.form
  186. +0 −258 src/org/netbeans/modules/git/ui/clone/ClonePanel.java
  187. +0 −196 src/org/netbeans/modules/git/ui/clone/ProjectUtilities.java
  188. +0 −409 src/org/netbeans/modules/git/ui/commit/CommitAction.java
  189. +0 −349 src/org/netbeans/modules/git/ui/commit/CommitTable.java
  190. +0 −246 src/org/netbeans/modules/git/ui/commit/CommitTableModel.java
  191. +0 −144 src/org/netbeans/modules/git/ui/commit/ExcludeFromCommitAction.java
  192. +0 −245 src/org/netbeans/modules/git/ui/create/CreateAction.java
  193. +0 −140 src/org/netbeans/modules/git/ui/diff/ApplyDiffAction.java
  194. +0 −122 src/org/netbeans/modules/git/ui/diff/DiffAction.java
  195. +0 −192 src/org/netbeans/modules/git/ui/diff/DiffNode.java
  196. +0 −235 src/org/netbeans/modules/git/ui/diff/DiffStreamSource.java
  197. +0 −132 src/org/netbeans/modules/git/ui/diff/ExportDiff.java
  198. +0 −180 src/org/netbeans/modules/git/ui/diff/ExportDiffAction.java
  199. +0 −128 src/org/netbeans/modules/git/ui/diff/ExportDiffPanel.form
  200. +0 −282 src/org/netbeans/modules/git/ui/diff/ExportDiffPanel.java
  201. +0 −276 src/org/netbeans/modules/git/ui/diff/Setup.java
  202. +0 −52 src/org/netbeans/modules/git/ui/ignore/Bundle.properties
  203. +0 −202 src/org/netbeans/modules/git/ui/ignore/IgnoreAction.java
  204. +0 −382 src/org/netbeans/modules/git/ui/log/DiffResultsView.java
  205. +0 −239 src/org/netbeans/modules/git/ui/log/DiffTreeTable.java
  206. +0 −136 src/org/netbeans/modules/git/ui/log/Divider.java
  207. +0 −197 src/org/netbeans/modules/git/ui/log/FileEnvironment.java
  208. +0 −174 src/org/netbeans/modules/git/ui/log/GitLogMessage.java
  209. +0 −74 src/org/netbeans/modules/git/ui/log/GitLogMessageChangedPath.java
  210. +0 −167 src/org/netbeans/modules/git/ui/log/RepositoryRevision.java
  211. +0 −284 src/org/netbeans/modules/git/ui/log/RevisionNode.java
  212. +0 −227 src/org/netbeans/modules/git/ui/log/SearchExecutor.java
  213. +0 −232 src/org/netbeans/modules/git/ui/log/SearchHistoryAction.java
  214. +0 −163 src/org/netbeans/modules/git/ui/log/SearchHistoryTopComponent.java
  215. +0 −810 src/org/netbeans/modules/git/ui/log/SummaryView.java
  216. +0 −75 src/org/netbeans/modules/git/ui/merge/Bundle.properties
  217. +0 −228 src/org/netbeans/modules/git/ui/merge/MergeAction.java
  218. +0 −110 src/org/netbeans/modules/git/ui/merge/MergeRevisions.java
  219. +0 −56 src/org/netbeans/modules/git/ui/merge/MergeRevisionsPanel.form
  220. +0 −187 src/org/netbeans/modules/git/ui/merge/MergeRevisionsPanel.java
  221. +0 −180 src/org/netbeans/modules/git/ui/properties/GitProperties.java
  222. +0 −121 src/org/netbeans/modules/git/ui/properties/PropertiesAction.java
  223. +0 −89 src/org/netbeans/modules/git/ui/pull/Bundle.properties
  224. +0 −117 src/org/netbeans/modules/git/ui/pull/FetchAction.java
  225. +0 −336 src/org/netbeans/modules/git/ui/pull/PullAction.java
  226. +0 −138 src/org/netbeans/modules/git/ui/pull/PullOtherAction.java
  227. +0 −83 src/org/netbeans/modules/git/ui/push/Bundle.properties
  228. +0 −285 src/org/netbeans/modules/git/ui/push/PushAction.java
  229. +0 −145 src/org/netbeans/modules/git/ui/push/PushOtherAction.java
  230. +0 −40 src/org/netbeans/modules/git/ui/remove/Bundle.properties
  231. +0 −91 src/org/netbeans/modules/git/ui/repository/Bundle.properties
  232. +0 −103 src/org/netbeans/modules/git/ui/repository/GitURL.java
  233. +0 −756 src/org/netbeans/modules/git/ui/repository/Repository.java
  234. +0 −234 src/org/netbeans/modules/git/ui/repository/RepositoryConnection.java
  235. +0 −52 src/org/netbeans/modules/git/ui/repository/RepositoryDialogPanel.form
  236. +0 −98 src/org/netbeans/modules/git/ui/repository/RepositoryDialogPanel.java
  237. +0 −391 src/org/netbeans/modules/git/ui/repository/RepositoryPanel.form
  238. +0 −231 src/org/netbeans/modules/git/ui/repository/RepositoryPanel.java
  239. +0 −119 src/org/netbeans/modules/git/ui/rollback/Backout.java
  240. +0 −190 src/org/netbeans/modules/git/ui/rollback/BackoutAction.java
  241. +0 −174 src/org/netbeans/modules/git/ui/rollback/BackoutPanel.form
  242. +0 −284 src/org/netbeans/modules/git/ui/rollback/BackoutPanel.java
  243. +0 −125 src/org/netbeans/modules/git/ui/rollback/Bundle.properties
  244. +0 −185 src/org/netbeans/modules/git/ui/rollback/RollbackAction.java
  245. +0 −110 src/org/netbeans/modules/git/ui/rollback/Strip.java
  246. +0 −172 src/org/netbeans/modules/git/ui/rollback/StripAction.java
  247. +0 −193 src/org/netbeans/modules/git/ui/rollback/StripPanel.form
  248. +0 −282 src/org/netbeans/modules/git/ui/rollback/StripPanel.java
  249. +0 −1 src/org/netbeans/modules/git/ui/stash/Bundle.properties
  250. +0 −38 src/org/netbeans/modules/git/ui/stash/StashAction.java
  251. +0 −107 src/org/netbeans/modules/git/ui/status/StatusAction.java
  252. +0 −217 src/org/netbeans/modules/git/ui/status/SyncFileNode.java
  253. +0 −478 src/org/netbeans/modules/git/ui/status/SyncTable.java
  254. +0 −799 src/org/netbeans/modules/git/ui/status/VersioningPanel.java
  255. 0 src/org/netbeans/modules/git/ui/status/package.html
  256. +0 −130 src/org/netbeans/modules/git/ui/update/ConflictResolvedAction.java
  257. +0 −103 src/org/netbeans/modules/git/ui/update/ResolveConflictsAction.java
  258. +0 −194 src/org/netbeans/modules/git/ui/update/RevertModificationsAction.java
  259. +0 −148 src/org/netbeans/modules/git/ui/update/UpdateAction.java
  260. +0 −52 src/org/netbeans/modules/git/ui/view/Bundle.properties
  261. +0 −155 src/org/netbeans/modules/git/ui/view/ViewAction.java
  262. +0 −75 src/org/netbeans/modules/git/ui/wizards/Bundle.properties
  263. +0 −152 src/org/netbeans/modules/git/ui/wizards/CloneDestinationDirectoryPanel.form
  264. +0 −280 src/org/netbeans/modules/git/ui/wizards/CloneDestinationDirectoryPanel.java
  265. +0 −194 src/org/netbeans/modules/git/ui/wizards/CloneDestinationDirectoryWizardPanel.java
  266. +0 −123 src/org/netbeans/modules/git/ui/wizards/ClonePathsPanel.form
  267. +0 −185 src/org/netbeans/modules/git/ui/wizards/ClonePathsPanel.java
  268. +0 −197 src/org/netbeans/modules/git/ui/wizards/ClonePathsWizardPanel.java
  269. +0 −75 src/org/netbeans/modules/git/ui/wizards/CloneRepositoryPanel.form
  270. +0 −115 src/org/netbeans/modules/git/ui/wizards/CloneRepositoryPanel.java
  271. +0 −329 src/org/netbeans/modules/git/ui/wizards/CloneRepositoryWizardPanel.java
  272. +0 −186 src/org/netbeans/modules/git/ui/wizards/CloneWizardAction.java
  273. +0 −128 src/org/netbeans/modules/git/ui/wizards/WizardStepProgressSupport.java
  274. +0 −83 src/org/netbeans/modules/git/util/Bundle.properties
  275. +0 −2,915 src/org/netbeans/modules/git/util/GitCommand.java
  276. +0 −108 src/org/netbeans/modules/git/util/GitLogMessage.java
  277. +0 −162 src/org/netbeans/modules/git/util/GitProjectUtils.java
  278. +0 −218 src/org/netbeans/modules/git/util/GitProxySettings.java
  279. +0 −139 src/org/netbeans/modules/git/util/GitRepositoryContextCache.java
  280. +0 −1,080 src/org/netbeans/modules/git/util/GitUtils.java
  281. +0 −79 test/build-qa-functional.xml
  282. +0 −48 test/build-unit.xml
  283. +0 −59 test/build.xml
  284. +0 −65 test/cfg-qa-functional.xml
  285. +0 −58 test/cfg-unit.xml
  286. +0 −14 test/qa-functional/src/org/netbeans/test/git/main/archeology/AnnotationsTest.java
  287. +0 −73 test/qa-functional/src/org/netbeans/test/git/main/commit/CommitDataTest.java
  288. +0 −14 test/qa-functional/src/org/netbeans/test/git/main/commit/CommitUiTest.java
  289. +0 −138 test/qa-functional/src/org/netbeans/test/git/main/commit/IgnoreTest.java
  290. +0 −14 test/qa-functional/src/org/netbeans/test/git/main/delete/DeleteTest.java
  291. +0 −14 test/qa-functional/src/org/netbeans/test/git/main/properties/GitPropertiesTest.java
  292. +0 −232 test/qa-functional/src/org/netbeans/test/git/operators/CommitOperator.java
  293. +0 −164 test/qa-functional/src/org/netbeans/test/git/operators/RevertModificationsOperator.java
  294. +0 −342 test/qa-functional/src/org/netbeans/test/git/operators/VersioningOperator.java
  295. +0 −27 test/qa-functional/src/org/netbeans/test/git/operators/actions/CommitAction.java
  296. +0 −28 test/qa-functional/src/org/netbeans/test/git/operators/actions/RevertAction.java
  297. +0 −109 test/qa-functional/src/org/netbeans/test/git/utils/RepositoryMaintenance.java
  298. +0 −50 test/qa-functional/src/org/netbeans/test/git/utils/StreamHandler.java
  299. +0 −287 test/qa-functional/src/org/netbeans/test/git/utils/TestKit.java
View
@@ -1,2 +1,2 @@
-build
-nbproject/private
+build/
+nbproject/private/
View
1,089 LICENSE
Oops, something went wrong.
View
@@ -1,3 +1,37 @@
-= NetBeans Git Module
-
-Please see README.markdown.
+Netbeans Git Plugin
+===================
+
+A versioning plugin for working with Git repositories in Netbeans. It supports
+the basic tasks of status, diff, commit, and log viewing.
+
+It uses the JGit library for accessing repositories. To ease installation
+a JGit jar is distributed with the project source in release/modules/ext/.
+
+More information and documentation are available in the form of JavaHelp files
+which can be found under:
+
+ - javahelp/org/nbgit/docs/
+
+They will also be accessible via the Help menu when the plugin has been
+installed.
+
+To download the latest version, check the current status of development, or
+report an issue visit the project page at:
+
+ - http://nbgit.googlecode.com/
+
+Installation
+------------
+
+This module is still under development and thus may randomly crash, eat
+all your memory, etc. So consider yourself warned! Before installing or
+upgrading make sure you read the release notes and list of known issues.
+They can be found in:
+
+ - javahelp/org/nbgit/docs/news.html
+ - javahelp/org/nbgit/docs/issues.html
+
+To install from source clone the repository and use File > Open Project to
+add it to your project list in Netbeans. Then right click on the new project
+and select "Install/Reload in Development IDE". You are advised to first test
+the plugin by "running" the project.
View
@@ -1,5 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project basedir="." default="netbeans" name="git">
- <description>Builds, tests, and runs the project org.netbeans.modules.git</description>
- <import file="nbproject/build-impl.xml"/>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
+<!-- for some information on what you could do (e.g. targets to override). -->
+<!-- If you delete this file and reopen the project it will be recreated. -->
+<project name="org.nbgit" default="netbeans" basedir=".">
+ <description>Builds, tests, and runs the project org.nbgit.</description>
+ <import file="nbproject/build-impl.xml"/>
+ <target name="netbeans-extra" depends="init">
+ <mkdir dir="${cluster}/modules/ext"/>
+ <copy todir="${cluster}/modules/ext">
+ <fileset dir="release/modules/ext">
+ <include name="com-jcraft-jsch.jar"/>
+ <include name="org-spearce-jgit.jar"/>
+ </fileset>
+ </copy>
+ </target>
+</project>
@@ -0,0 +1,90 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+ <head>
+ <title>About Git</title>
+ <link rel="stylesheet" href="nbdocs:/org/netbeans/modules/usersguide/ide.css" type="text/css">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ </head>
+ <body>
+ <h1>About Git</h1>
+ <p>
+ Git is an open source version control system designed to
+ scale from small to very large projects in terms of speed and
+ efficiency. Git falls in the category of distributed source
+ code management tools which means that a Git repository
+ is a full-fledged copy with complete history and full
+ revision tracking capabilities, not dependent on network
+ access or a central server. Still, Git stays extremely
+ fast and space efficient.
+ </p>
+
+ <h3>About NbGit</h3>
+ <p>
+ NbGit is a Netbeans plugin that adds support for working
+ with the Git version control system. It uses the JGit
+ library to interact with the Git repository.
+ </p>
+
+ <h3>Licensing</h3>
+ <p>
+ The code of the module itself is dual licensed under the
+ the Common Development and Distribution License("CDDL")
+ and the GNU General Public License Version 2 only ("GPL")
+ with the "Classpath" exception. The module and the
+ installable Netbeans module (the ".nbm" file) is distributed
+ with <a href="nbdocs:/org/nbgit/docs/credits.html">
+ several third-party components</a> (.jar files, icons,
+ etc.) which have different licensing than the NbGit code.
+ </p>
+
+ <h3>Status</h3>
+ <p>
+ This module is still under development and thus
+ may randomly crash, eat all your memory, etc. Be sure to check
+ <a href="nbdocs:/org/nbgit/docs/news.html">the release
+ notes</a> and <a href="nbdocs:/org/nbgit/docs/issues.html">
+ the known issues</a> before installing and upgrading.
+ </p>
+
+ <h3>More About Git</h3>
+ <p>
+ For more information about Git and this plugin visit
+ the following sites:
+ </p>
+ <ul>
+ <li>NbGit Project Page:<br/>
+ <object classid="java:org.netbeans.modules.javahelp.BrowserDisplayer">
+ <param name="content" value="http://nbgit.googlecode.com/">
+ <param name="text" value="<html><u>http://nbgit.googlecode.com/</u></html>">
+ <param name="textFontSize" value="medium">
+ <param name="textColor" value="blue">
+ </object>
+ </li>
+ <li>NbGit GitWeb Page:<br/>
+ <object classid="java:org.netbeans.modules.javahelp.BrowserDisplayer">
+ <param name="content" value="http://repo.or.cz/w/nbgit.git">
+ <param name="text" value="<html><u>http://repo.or.cz/w/nbgit.git</u></html>">
+ <param name="textFontSize" value="medium">
+ <param name="textColor" value="blue">
+ </object>
+ </li>
+ <li>Git Homepage:<br/>
+ <object classid="java:org.netbeans.modules.javahelp.BrowserDisplayer">
+ <param name="content" value="http://www.git-scm.org/">
+ <param name="text" value="<html><u>http://git-scm.org/</u></html>">
+ <param name="textFontSize" value="medium">
+ <param name="textColor" value="blue">
+ </object>
+ </li>
+ <li>Git Wiki:<br/>
+ <object classid="java:org.netbeans.modules.javahelp.BrowserDisplayer">
+ <param name="content" value="http://www.git-scm.org/gitwiki/">
+ <param name="text" value="<html><u>http://git-scm.org/gitwiki/</u></html>">
+ <param name="textFontSize" value="medium">
+ <param name="textColor" value="blue">
+ </object>
+ </li>
+ </ul>
+
+ </body>
+</html>
@@ -0,0 +1,125 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+ <head>
+ <title>Credits and Legal Notices</title>
+ <link rel="stylesheet" href="nbdocs://org.netbeans.modules.usersguide/org/netbeans/modules/usersguide/ide.css" type="text/css">
+ </head>
+ <body>
+ <h1>Credits and Legal Notices</h1>
+ <p>
+ Below credits are given to third-party components that
+ the NbGit module uses. Here you will also find information
+ about their individual terms of licensing.
+ </p>
+
+ <h3>The Mercurial and NbGit plugins</h3>
+ <p>
+ Most of the core plugin code in NbGit is based on code
+ from NbGit (a git CLI-based Netbeans plugin), which in
+ terms borrows its code from the Mercurial and Subversion
+ plugins.
+ </p>
+ <p>
+ The Mercurial and Subversion code is dual licensed under
+ the Common Development and Distribution License("CDDL")
+ and the GNU General Public License Version 2 only ("GPL")
+ with the "Classpath" exception. NbGit is licensed under
+ the GNU General Public License Version 2 only ("GPL")
+ with the "Classpath" exception.
+ </p>
+ <ul>
+ <li>
+ The license can be view at:<br/>
+ <object classid="java:org.netbeans.modules.javahelp.BrowserDisplayer">
+ <param name="content" value="http://www.netbeans.org/cddl-gplv2.html"/>
+ <param name="text" value="<html><u>http://www.netbeans.org/cddl-gplv2.html</u></html>"/>
+ <param name="textFontSize" value="medium">
+ <param name="textColor" value="blue"/>
+ </object>
+ </li>
+ </ul>
+
+ <h3>JGit / EGit</h3>
+ <p>
+ JGit is a pure Java implementation of Git. The library
+ is what makes it possible for NbGit to be a truely
+ cross platform, easy-to-install Netbeans plugin. NbGit's
+ sibling project EGit, an Eclipse plugin, along with the
+ JGit example programs has served as an excellent source
+ of inspiration for working with JGit.
+ </p>
+ <p>
+ JGit is distributed under a BSD-style license.
+ The license is available in the source repository as
+ <code>release/modules/ext/org-spearce-jgit.LICENSE.txt</code>.
+ EGit is distributed under the Eclipse Public License v1.0.
+ </p>
+ <ul>
+ <li>
+ More info about JGit/EGit can be found at:<br/>
+ <object classid="java:org.netbeans.modules.javahelp.BrowserDisplayer">
+ <param name="content" value="http://code.google.com/p/egit/"/>
+ <param name="text" value="<html><u>http://code.google.com/p/egit/</u></html>"/>
+ <param name="textFontSize" value="medium">
+ <param name="textColor" value="blue"/>
+ </object>
+ </li>
+ <li>
+ The specific license for JGit can be found at:<br/>
+ <object classid="java:org.netbeans.modules.javahelp.BrowserDisplayer">
+ <param name="content" value="http://repo.or.cz/w/egit.git?a=blob;f=org.spearce.jgit/LICENSE;hb=HEAD"/>
+ <param name="text" value="<html><u>http://repo.or.cz/w/egit.git?a=blob;f=org.spearce.jgit/LICENSE;hb=HEAD</u></html>"/>
+ <param name="textFontSize" value="medium">
+ <param name="textColor" value="blue"/>
+ </object>
+ </li>
+ </ul>
+
+ <h3>JSch</h3>
+ <p>
+ The SSH transport support in JGit uses JSch. To easy
+ installation the version distributed with the JGit/EGit
+ project is included in this project. However, Netbeans
+ seem to include its own JSch jar file so it might be
+ possible to remove this dependency in the future.
+ </p>
+ <p>
+ JSch is distributed under a BSD-style license.
+ The license is available in the source repository as
+ <code>release/modules/ext/com-jcraft-jsch.LICENSE.txt</code>.
+ </p>
+
+ <h3>Git Icon</h3>
+ <p>
+ The Git icon used for "branding" the status and history
+ tabs is made by Henrik Nyh.
+ </p>
+ <p>
+ Regarding license, the blog post that announced this
+ alternative logo for Git states that anyone is
+ "Free to modify and redistribute with due credit,
+ and obviously free to use".
+ </p>
+ <ul>
+ <li>
+ The blog post can be found at:<br/>
+ <object classid="java:org.netbeans.modules.javahelp.BrowserDisplayer">
+ <param name="content" value="http://henrik.nyh.se/2007/06/alternative-git-logo-and-favicon">
+ <param name="text" value="<html><u>http://henrik.nyh.se/2007/06/alternative-git-logo-and-favicon</u></html>">
+ <param name="textFontSize" value="medium">
+ <param name="textColor" value="blue">
+ </object>
+ </li>
+ <li>
+ Other versions can be found at:<br/>
+ <object classid="java:org.netbeans.modules.javahelp.BrowserDisplayer">
+ <param name="content" value="http://git.or.cz/gitwiki/GitRelatedLogos">
+ <param name="text" value="<html><u>http://git.or.cz/gitwiki/GitRelatedLogos</u></html>">
+ <param name="textFontSize" value="medium">
+ <param name="textColor" value="blue">
+ </object>
+ </li>
+ </ul>
+
+ </body>
+</html>
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE helpset PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp HelpSet Version 2.0//EN" "http://java.sun.com/products/javahelp/helpset_2_0.dtd">
+<helpset version="2.0">
+ <title>Git Help</title>
+ <maps>
+ <homeID>org.nbgit.docs.about</homeID>
+ <mapref location="map.xml"/>
+ </maps>
+ <view mergetype="javax.help.AppendMerge">
+ <name>TOC</name>
+ <label>Table of Contents</label>
+ <type>javax.help.TOCView</type>
+ <data>toc.xml</data>
+ </view>
+ <view mergetype="javax.help.AppendMerge">
+ <name>Index</name>
+ <label>Index</label>
+ <type>javax.help.IndexView</type>
+ <data>index.xml</data>
+ </view>
+ <view>
+ <name>Search</name>
+ <label>Search</label>
+ <type>javax.help.SearchView</type>
+ <data engine="com.sun.java.help.search.DefaultSearchEngine">JavaHelpSearch
+ </data>
+ </view>
+</helpset>
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE index PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp Index Version 2.0//EN" "http://java.sun.com/products/javahelp/index_2_0.dtd">
+<index version="2.0">
+ <indexitem text="About Git" target="org.nbgit.docs.about"/>
+ <indexitem text="Release notes" target="org.nbgit.docs.news"/>
+ <indexitem text="Issues" target="org.nbgit.docs.issues"/>
+ <indexitem text="Bug reporting" target="org.nbgit.docs.issues"/>
+ <indexitem text="Credits" target="org.nbgit.docs.credits"/>
+</index>
@@ -0,0 +1,49 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+ <head>
+ <title>Issues and Bug Reporting</title>
+ <link rel="stylesheet" href="nbdocs:/org/netbeans/modules/usersguide/ide.css" type="text/css">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ </head>
+ <body>
+ <h1>Issues and Bug Reporting</h1>
+ <p>
+ The module is far from complete. Below some of the known
+ problems are listed along with how to report bugs.
+ </p>
+
+ <h3>Known Issues</h3>
+ <p>
+ Known issues that are deemed worthy is listed here. Others
+ can be found in the issue tracker.
+ </p>
+ <ul>
+ <li>The status information is not always updated correctly.</li>
+ <li>When listing the status for a project, files in build/
+ is visible.</li>
+ </ul>
+
+ <h3>Bug Reporting</h3>
+ <p>
+ Did you find a bug? Got an idea for a must-have feature?
+ </p>
+ <ul>
+ <li>Report an issue:<br/>
+ <object classid="java:org.netbeans.modules.javahelp.BrowserDisplayer">
+ <param name="content" value="http://code.google.com/p/nbgit/issues/entry">
+ <param name="text" value="<html><u>http://code.google.com/p/nbgit/issues/entry</u></html>">
+ <param name="textFontSize" value="medium">
+ <param name="textColor" value="blue">
+ </object>
+ </li>
+ <li>View all issues in the issue tracker:<br/>
+ <object classid="java:org.netbeans.modules.javahelp.BrowserDisplayer">
+ <param name="content" value="http://code.google.com/p/nbgit/issues/">
+ <param name="text" value="<html><u>http://code.google.com/p/nbgit/issues/</u></html>">
+ <param name="textFontSize" value="medium">
+ <param name="textColor" value="blue">
+ </object>
+ </li>
+ </ul>
+ </body>
+</html>
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp Map Version 2.0//EN" "http://java.sun.com/products/javahelp/map_2_0.dtd">
+<map version="2.0">
+ <mapID target="org.nbgit.docs.about" url="about.html"/>
+ <mapID target="org.nbgit.docs.credits" url="credits.html"/>
+ <mapID target="org.nbgit.docs.news" url="news.html"/>
+ <mapID target="org.nbgit.docs.issues" url="issues.html"/>
+</map>
Oops, something went wrong.

0 comments on commit 609d0cf

Please sign in to comment.