summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'stable-1.0'Matthias Sohn2011-06-065-304/+259
|\ | | | | | | | | | | | | * stable-1.0: Prepare post v1.0.0.201106051725-r builds JGit v1.0.0.201106051725-r Update to eclipse.org's latest SUA
| * Prepare post v1.0.0.201106051725-r buildsMatthias Sohn2011-06-0640-69/+69
| | | | | | | | | | Change-Id: I4839877e1a6fa7782f37423213af8d579727a494 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v1.0.0.201106051725-rv1.0.0.201106051725-rMatthias Sohn2011-06-0540-69/+69
| | | | | | | | | | Change-Id: I39f4a23cf284505395d511dfedf02b7f5608df95 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Update to eclipse.org's latest SUAMatthias Sohn2011-06-025-304/+259
| | | | | | | | | | Change-Id: I0d016ddaed85656c2e680d0bc99829c6ea13b968 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge branch 'stable-1.0'Matthias Sohn2011-06-0237-31/+2637
|\| | | | | | | | | | | | | | | * stable-1.0: Prepare post v1.0.0.201106011211-rc3 builds JGit v1.0.0.201106011211-rc3 Remove incubation marker blame: Compute the origin of lines in a result file
| * Prepare post v1.0.0.201106011211-rc3 buildsMatthias Sohn2011-06-0141-69/+69
| | | | | | | | | | Change-Id: I4dec8eba7e35858aef65fcc10f91fad3fe5b52b9 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v1.0.0.201106011211-rc3v1.0.0.201106011211-rc3Matthias Sohn2011-06-0141-69/+69
| | | | | | | | | | Change-Id: I574a05200471c431b3a02ac6ff208dc6aa90f539 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Remove incubation markerMatthias Sohn2011-05-3124-31/+31
| | | | | | | | | | Change-Id: I6018ce0cd3b7c8137e137848fe1f04551b257538 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * blame: Compute the origin of lines in a result fileShawn O. Pearce2011-05-3113-0/+2606
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BlameGenerator digs through history and discovers the origin of each line of some result file. BlameResult consumes the stream of regions created by the generator and lays them out in a table for applications to display alongside of source lines. Applications may optionally push in the working tree copy of a file using the push(String, byte[]) method, allowing the application to receive accurate line annotations for the working tree version. Lines that are uncommitted (difference between HEAD and working tree) will show up with the description given by the application as the author, or "Not Committed Yet" as a default string. Applications may also run the BlameGenerator in reverse mode using the reverse(AnyObjectId, AnyObjectId) method instead of push(). When running in the reverse mode the generator annotates lines by the commit they are removed in, rather than the commit they were added in. This allows a user to discover where a line disappeared from when they are looking at an older revision in the repository. For example: blame --reverse 16e810b2..master -L 1080, org.eclipse.jgit.test/tst/org/eclipse/jgit/storage/file/RefDirectoryTest.java ( 1080) } 2302a6d3 (Christian Halstrick 2011-05-20 11:18:20 +0200 1081) 2302a6d3 (Christian Halstrick 2011-05-20 11:18:20 +0200 1082) /** 2302a6d3 (Christian Halstrick 2011-05-20 11:18:20 +0200 1083) * Kick the timestamp of a local file. Above we learn that line 1080 (a closing curly brace of the prior method) still exists in branch master, but the Javadoc comment below it has been removed by Christian Halstrick on May 20th as part of commit 2302a6d3. This result differs considerably from that of C Git's blame --reverse feature. JGit tells the reader which commit performed the delete, while C Git tells the reader the last commit that still contained the line, leaving it an exercise to the reader to discover the descendant that performed the removal. This is still only a basic implementation. Quite notably it is missing support for the smart block copy/move detection that the C implementation of `git blame` is well known for. Despite being incremental, the BlameGenerator can only be run once. After the generator runs it cannot be reused. A better implementation would support applications browsing through history efficiently. In regards to CQ 5110, only a little of the original code survives. CQ: 5110 Bug: 306161 Change-Id: I84b8ea4838bb7d25f4fcdd540547884704661b8f Signed-off-by: Kevin Sawicki <kevin@github.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* | Fix a complicated multi level nested if block structure to use a single ↵Ketan Padegaonkar2011-05-311-36/+35
| | | | | | | | | | | | level with multiple returns. Change-Id: I3f116f37045e83aba5c80d45b987ab075502dcc6
* | Merge branch 'stable-1.0'Shawn O. Pearce2011-05-3117-73/+295
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-1.0: DHT: Support removing a repository name DHT: Fix thread-safety issue in AbstractWriteBuffer jgit.sh: Implement pager support Change EditList to extend ArrayList Ensure the HTTP request is fully consumed Make sure test repositories are closed Fix CloneCommand not to fetch into remote tracking branches when bare Update Eclipse IP log for 1.0 Change-Id: I6340d551482e1dda01f82496296d2038b07fa68b
| * DHT: Support removing a repository nameShawn O. Pearce2011-05-313-0/+43
| | | | | | | | | | | | | | | | | | The first step to deleting a repository from the DHT storage is to remove the name binding in the RepositoryIndexTable, making the repository unavailable for lookup. Change-Id: I469bf92f4bf2f555a15949569b21937c14cb142b Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| * DHT: Fix thread-safety issue in AbstractWriteBufferShawn O. Pearce2011-05-311-7/+18
| | | | | | | | | | | | | | | | | | There is a data corruption issue with the 'running' list if a background thread schedules something onto the buffer while the application thread is also using it. Change-Id: I5ba78b98b6632965d677a9c8f209f0cf8320cc3d Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| * jgit.sh: Implement pager supportShawn O. Pearce2011-05-311-4/+33
| | | | | | | | | | | | | | | | | | If the command is either `diff` or `log`, there is often a lot of lines of output. Run these commands through $GIT_PAGER, $PAGER, or `less` in order to make it easier to browse the output on a terminal. Change-Id: I18b87ea4acf404b94788f2ac2101812bd13e6a0f Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| * Change EditList to extend ArrayListShawn O. Pearce2011-05-311-50/+6
| | | | | | | | | | | | | | | | | | | | | | There is no reason for this type to contain an ArrayList and try to hide the implementation. It only slows down execution by adding an extra layer of method dispatch to each invocation. Instead subclass from ArrayList. Change-Id: Ifbb9c7060c2fe3d5a7397c1aa85fbade14088637 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| * Ensure the HTTP request is fully consumedShawn O. Pearce2011-05-314-0/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some servlet containers require the servlet to read the EOF marker from the input stream before a response can be output if the stream is using "Transfer-Encoding: chunked"... which is typical for any sort of large push to a repository over smart HTTP. Ensure the EOF is always read by the PackParser when it is handling the stream, and fail fast if there is more data present than expected since this does indicate a protocol error. Also ensure the EOF is read by UploadPack before it starts to output a partial response using packing progress meters. Change-Id: I131db9dea20b2324cb7c3272a814f21296bc64bd Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| * Make sure test repositories are closedChristian Halstrick2011-05-315-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | Some repositories created during tests are not added to the 'toClose' list in LocalDiskRepositoryTestCase. Therefore when the tests end we may have open FileHandles and on Windows this may cause the tests to fail because we can't delete those files. This is fixed by adding the possibility to explicitly add repositories to the list of repos which are closed automatically. Change-Id: I1261baeef4c7d9aaedd7c34b546393bfa005bbcc Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
| * Fix CloneCommand not to fetch into remote tracking branches when bareChristian Halstrick2011-05-313-6/+88
| | | | | | | | | | | | | | | | | | | | | | When cloning into a bare repository we should not create remote tracking branches (e.g refs/remotes/origin/testX). Branches of the remote repository should but fetched into into branches of the same name (e.g refs/heads/testX). Also add the noCheckout option which would prevent checkout after fetch. Change-Id: I5d4cc0389f3f30c53aa0065f38119af2a1430909 Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
| * Merge 'Fix usage of FileSnapshot in RefDirectory' into stable-1.0Shawn O. Pearce2011-05-312-23/+24
| |\ | | | | | | | | | | | | | | | | | | * commit '475461d05266fe13b05bc2c6645b9ef928521b4c': Fix usage of FileSnapshot in RefDirectory Change-Id: Ie65bd8b36f4c6a91602a94e9b54a04a4fb335897
| * | Update Eclipse IP log for 1.0Matthias Sohn2011-05-251-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | CQ "4876" is jgit's CQ for usage of protobuf, CQ "5135" is the corresponding Orbit CQ. Change-Id: I300cf2b5758c7da9c18494325f2f38bb3744e459 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | CleanCommand: add the ability to do a dry runAbhishek Bhatnagar2011-05-312-1/+34
| | | | | | | | | | | | | | | Change-Id: I7b81a7e34a771951e2e7b789b080b2bfb8656e5c Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* | | Merge "Fix GitConstructionTest teardown"Shawn Pearce2011-05-311-0/+9
|\ \ \ | |_|/ |/| |
| * | Fix GitConstructionTest teardownRobin Rosenberg2011-05-301-0/+9
| |/ | | | | | | | | | | The teardown faile on Windows because the repos were not closed. Change-Id: I16cf5645558680029682f898386b061796948237 Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
* / Fix usage of FileSnapshot in RefDirectoryChristian Halstrick2011-05-312-23/+24
|/ | | | | | | | | | RefDirectory was not using FileSnapshot correctly in all places. This is fixed with this commit. Additionally the constructors for the different types of refs have been changed to take a FileSnapshot instead of a modification time. Change-Id: Ifb6a59e87e8b058a398c38cdfb9d648f0bad4bf8 Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
* Merge "Use the stored password instead of prompting for it all the time"Matthias Sohn2011-05-252-3/+13
|\
| * Use the stored password instead of prompting for it all the timeCarsten Pfeiffer2011-05-242-3/+13
| | | | | | | | | | | | | | | | EGit change Iba3b87293c22e5fe7d989fc312184aa7463c4387 is also required to make this work for EGit. Change-Id: Iedc80e133e66d72e78ff0980b6e12634f75eca36 Signed-off-by: Carsten Pfeiffer <carsten.pfeiffer@gebit.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | DHT: Add sequence RefDataShawn O. Pearce2011-05-256-224/+372
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RefData now uses a sequence number as part of the field, ensuring that updates always increase the sequence number by one whenever a reference is modified. Attaching a sequence number to RefData will help with storing reference log entries during updates. As the sequence number should be unique within the reference name space, log entries can be keyed by the sequence number and remain unique. Making this work over reference delete-create cycles will require an additional RefTable API to return the oldest sequence number previously used in the reference log to seed the recreated reference. Change-Id: I11cfff2a96ef962e57f29925a3eef41bdbf9f9bb Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* | DHT: Replace TinyProtobuf with Google Protocol BuffersShawn O. Pearce2011-05-2558-2406/+12217
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The standard Google distribution of Protocol Buffers in Java is better maintained than TinyProtobuf, and should be faster for most uses. It does use slightly more memory due to many of our key types being stored as strings in protobuf messages, but this is probably worth the small hit to memory in exchange for better maintained code that is easier to reuse in other applications. Exposing all of our data members to the underlying implementation makes it easier to develop reporting and data mining tools, or to expand out a nested structure like RefData into a flat format in a SQL database table. Since the C++ `protoc` tool is necessary to convert the protobuf script into Java code, the generated files are committed as part of the source repository to make it easier for developers who do not have this tool installed to still build the overall JGit package and make use of it. Reviewers will need to be careful to ensure that any edits made to a *.proto file come in a commit that also updates the generated code to match. CQ: 5135 Change-Id: I53e11e82c186b9cf0d7b368e0276519e6a0b2893 Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* | DHT: Remove per-process ChunkCacheShawn O. Pearce2011-05-256-626/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Performance testing has indicated the per-process ChunkCache isn't very effective for the DHT storage implementation. If a server is using the DHT storage backend, it is most likely part of a larger cluster where requests are distributed in a round-robin fashion between the member servers. In such a scenario there is insufficient data locality between requests to get a good hit ratio on the per-process ChunkCache. A low hit ratio means the cache is actually hurting performance by eating up memory that could otherwise be used for transient request data, and increasing pressure on the GC when it needs to find free space. Remove all of the ChunkCache code. Installations that want to cache (to reduce database usage) should wrap their Database with a CacheDatabase and use a network based CacheServer. I left the ChunkCache in the original DHT storage commit because I wanted to document in the history of the project that its probably worth *not* having, but leave open a door for someone to revert this change if they find otherwise at a later date. Change-Id: I364d0725c46c5a19f7443642a40c89ba4d3fdd29 Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* | Merge "Let RefDirectory use FileSnapShot to handle fast updates"Chris Aniszczyk2011-05-254-49/+98
|\ \
| * | Let RefDirectory use FileSnapShot to handle fast updatesChristian Halstrick2011-05-234-49/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since this change may affect performance and memory consumption on every access to a loose ref I explicitly made it a RFC to collect opinions. Previously RefDirectory.scanRef() was not detecting an update of a loose ref when the update didn't changed the modification time of the backing file. RefDirectory cached loose refs and the way to detect outdated cache entries was to compare lastmodification timestamp on the file representing the ref. If two updates to the same ref happen faster than the filesystem-timer granularity (for linux this is 2 seconds) there is the possiblity that we don't detect the update. Because of this bug EGit's PushOperationTest only works with 2 second sleeps inside. This change let RefDirectory use FileSnapshot to detect such situations. FileSnapshot helps to remember when a file was last read from disk and therefore enables to decide when to load a file from disk although modification time has not changed. Change-Id: I03b9a137af097ec69c4c5e2eaa512d2bdd7fe080 Signed-off-by: Christian Halstrick <christian.halstrick@sap.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* | | Add a DiffFormatter which calculates a patch-idStefan Lay2011-05-244-9/+304
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a class which can be used to calculates a SHA1 of the diff associated with a patch, similar to git patch-id. In this version whitespace is not ignored. Change-Id: I421d15ea905e23df543082786786841cbe3ef10d Signed-off-by: Stefan Lay <stefan.lay@sap.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* | | Add CleanCommandTest and fix CleanCommandAbhishek Bhatnagar2011-05-242-5/+122
| | | | | | | | | | | | | | | | | | Bug: 334767 Change-Id: I0a836451ceb668f943b1f353dc65420157810b23 Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* | | Add CleanCommand to JGit APIAbhishek Bhatnagar2011-05-242-0/+123
|/ / | | | | | | | | | | Bug: 334767 Change-Id: I2650c77bc4af2d8f401bbcce5384b44ff2a64ba2 Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* | Add shortening of note ref names to NoteMapKevin Sawicki2011-05-232-0/+21
| | | | | | | | | | Change-Id: I224190bbb41c7cbea38388d0148ecc6dc68f3a14 Signed-off-by: Kevin Sawicki <kevin@github.com>
* | Merge "Remove rebase temporary files on checkout failure"Shawn Pearce2011-05-232-4/+48
|\ \
| * | Remove rebase temporary files on checkout failureBernard Leach2011-05-232-4/+48
| |/ | | | | | | | | | | | | | | | | | | A checkout conflict during rebase setup should leave the repository in SAFE state which means ensuring that the rebase temporary files need to be removed. Bug: 346813 Change-Id: If8b758fde73ed5a452a99a195a844825a03bae1a Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* / Add GitAddTaskKetan Padegaonkar2011-05-234-1/+156
|/ | | | | Change-Id: Ia9a3c9f4728e13d1e62f530b1d843d09afb4eb42 Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* Add LsRemoteCommandTestChris Aniszczyk2011-05-191-0/+160
| | | | | | Bug: 343801 Change-Id: I4a91d93428bbf7f74033fcea5823266fa52d7a0c Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* Add LsRemoteCommand to JGit APIChristoph Brill2011-05-194-0/+200
| | | | | | | Bug: 343801 Change-Id: Ic651e8e09143e15ed459461b50b2222e13da56c4 Also-by: Chris Aniszczyk <caniszczyk@gmail.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* Add org.eclipse.jgit.ant.test to parent pom.xmlChris Aniszczyk2011-05-192-0/+103
| | | | | Change-Id: I3fd0b509e03cbd5f2bf3bd6377287dab14e8728e Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* Add GitCloneTaskTestKetan Padegaonkar2011-05-195-4/+145
| | | | | Change-Id: Iec8cd032d8d659a896d909f9094f76b7d35147e6 Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* Create a MergeResult for deleted/modified filesBernard Leach2011-05-192-0/+54
| | | | | | | | | | | | | | Change Ia2ab4f8dc95020f2914ff01c2bf3b1bc62a9d45d added merge support for when OURS or THEIRS was simultaneously deleted and modified. That changeset however did not add create an entry in the conflicts table so clients would see a CONFLICTING result but getConflicts() would return null. This change creates a MergeResult for the conflicting file. Bug: 345684 Change-Id: I52acb81c1729b49c9fb3e7a477c6448d8e55c317 Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* Add reset with paths support to ResetCommandBernard Leach2011-05-192-8/+154
| | | | | | Bug: 338701 Change-Id: Id7cbce47131b459e632ddc2c9a94628c7d0b75cd Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* Fix NPE in URIish when parsing an empty URIKetan Padegaonkar2011-05-193-0/+36
| | | | | Change-Id: Id1c42dc9843f62c581b9904b02150de53cf7777c Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* Add org.eclipse.jgit.ant.testKetan Padegaonkar2011-05-198-0/+67
| | | | | Change-Id: I9bfb1298864294b8ce29b91660f1cf8316e5f620 Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* Add tests for change If203ce5Bernard Leach2011-05-182-0/+171
| | | | | | Bug: 344779 Change-Id: I1628984479d93665bf4987d6a4ff8e67ad73eb36 Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* Implement rebase ff for upstream branches with merge commitsChris Aniszczyk2011-05-182-53/+64
| | | | | | | | | | | Change Ib9898fe0f982fa08e41f1dca9452c43de715fdb6 added support for the 'cherry-pick' fast forward case where the upstream commit history does not include any merge commits. This change adds support for the case where merge commits exist and the local branch has no changes. Bug: 344779 Change-Id: If203ce5aa1b4e5d4d7982deb621b710e71f4ee10 Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* Fix path filtering in LogCommandPiotr Janik2011-05-182-2/+58
| | | | | | | Bug: 346257 Change-Id: Ib897e1b4962162da9670164479a844aeea7dfcd1 Signed-off-by: Piotr Janik <janikpiotrek@gmail.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
* Merge "Optimize MergeAlgorithm if ours or theirs is empty"Robin Rosenberg2011-05-172-1/+50
|\
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-28 13:45:44 +0000