mirrors/jgit - jgit - source @ dussan.org

Tree: 4a985f5aa8

Author	SHA1	Message	Date
KB Sriram	4a985f5aa8	Make diff locations more consistent DiffAlgorithms can return different edit locations for inserts or deletes, if they can be "shifted" up or down repeating blocks of lines. This causes the 3-way merge to apply both edits, resulting in incorrectly removing or duplicating lines. Augment an existing "tidy-up" stage in DiffAlgorithm to move all shiftable edits (not just the last INSERT edit) to a consistent location, and add test cases for previously incorrect merges. Bug: 514095 Change-Id: I5fe150a2fc04e1cdb012d22609d86df16dfb0b7e Signed-off-by: KB Sriram <kbsriram@google.com>	7 years ago
Robin Stocker	66909cd7a6	Fix Javadoc errors with Java 8 Bug: 440414 Change-Id: Icce87bd23a3698513b76246677f1d45ddbcaab47 Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	10 years ago
Robin Rosenberg	32ff57a2b2	Cleanup javadocs so they pass the java8 doclint checks Bug: 431552 Change-Id: I469316f5645205016e1fa6b0fbd2ff3b509b14bc Signed-off-by: Robin Stocker <robin@nibor.org>	10 years ago
Robin Rosenberg	c310fa0c80	Mark non-externalizable strings as such A few classes such as Constanrs are marked with @SuppressWarnings, as are toString() methods with many liternal, but otherwise $NLS-n$ is used for string containing text that should not be translated. A few literals may fall into the gray zone, but mostly I've tried to only tag the obvious ones. Change-Id: I22e50a77e2bf9e0b842a66bdf674e8fa1692f590	11 years ago
Shawn O. Pearce	6938f99ef3	Reduce compares in Edit.getType We can slightly optimize this method by removing some compares based on knowledge of how the orderings have to work. This way a getType() invocation requires at most 2 int compares for any result, vs. the 6 required to find REPLACE before. Change-Id: I62a04cc513a6d28c300d1c1496a8608d5df4efa6 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>	13 years ago
Shawn O. Pearce	fe8fe13349	Add helper methods to Edit Exposing isEmpty, getLengthA, getLengthB make it easier to examine the state of an edit and work with it from higher level code. The before and after cut routines make it easy to split an edit that contains another edit, such as to decompose a REPLACE that contains a common sequence within it. Change-Id: Id63d6476a7a6b23acb7ab237d414a0a1a7200290 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>	13 years ago
Git Development Community	1a6964c827	Initial JGit contribution to eclipse.org Per CQ 3448 this is the initial contribution of the JGit project to eclipse.org. It is derived from the historical JGit repository at commit `3a2dd9921c`. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>	14 years ago

7 Commits (4a985f5aa858a71561d55c9eb3ce007768c4d0c0)