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