github/jgit - jgit - 帆软第三方插件仓库

Commit Graph

Author	SHA1	Message	Date
Matthias Sohn	4cb80f897f	Prepare 5.6.1-SNAPSHOT builds Change-Id: Iaa72d2ea6764ccd4fb6a124b51d89fe6492c602d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	5 years ago
Matthias Sohn	9710c6292a	JGit v5.6.0.201912101111-r Change-Id: Icbb3b46f9d04e45da53936860e07e69fde12971c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	5 years ago
Matthias Sohn	f487a9eb2e	Prepare 5.7.0-SNAPSHOT builds Change-Id: I7efa0cd08dee711d6fefc3e6bb478a3cb11fe85c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	5 years ago
Matthias Sohn	473527e42c	Prepare 5.6.0-SNAPSHOT builds Change-Id: I5e737ff7f262fdd43fc975a0b3594c8b33919663 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	5 years ago
Matthias Sohn	a7e454bc51	JGit v5.6.0.201912041214-rc1 Change-Id: I5ed21fbc5f83096bf0b79f2aa751db415cbcc7e8 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	5 years ago
Matthias Sohn	4ea42bc816	Prepare 5.6.0-SNAPSHOT builds Change-Id: I1e52d2dfb202b87ecb9d0273deaa2c8d8ce1864e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	5 years ago
Matthias Sohn	6c9aa82f70	JGit v5.6.0.201911271000-m3 Change-Id: I3810892c2bed947e4dfaa615a7b4d93eeb46abb9 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	5 years ago
Thomas Wolf	533a81db9d	JGit pgm: Format blame output to match canonical git Canonical git shows the zero-Id for lines without commit, and uses the current time stamp for such lines. Also consider lines without commit when calculating the field widths. Change-Id: If0bee9b3e7f90861ad0f387f68e52ecc4a53dfd7 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>	5 years ago
Thomas Wolf	59f9d206c9	Make blame work correctly on merge conflicts When a conflicting file was blamed, JGit would not identify lines coming from the merge parents. The main cause for this was that Blame and BlameCommand simply added the first DirCacheEntry found for a file to its queue of candidates (blobs or commits) to consider. In case of a conflict this typically is the merge base commit, and comparing a auto-merged contents against that base would yield incorrect results. Such cases have to be handled specially. The candidate to be considered by the blame must use the working tree contents, but at the same time behave like a merge commit/candidate with HEAD and the MERGE_HEADs as parents. Canonical git does something very similar, see [1]. Implement that and add tests. I first did this for the JGit pgm Blame command. When I then tried to do the same in BlameCommand, I noticed that the latter also included some fancy but incomplete CR-LF handling. In order to be able to use the new BlameGenerator.prepareHead() also in BlameCommand this CR-LF handling was also moved into BlameGenerator and corrected in doing so. (Just considering the git config settings was not good enough, CR-LF behavior can also be influenced by .gitattributes, and even by whether the file in the index has CR-LF. To correctly determine CR-LF handling for check-in one needs to do a TreeWalk with at least a FileTreeIterator and a DirCacheIterator.) [1] https://github.com/git/git/blob/v2.22.0/blame.c#L174 Bug: 434330 Change-Id: I9d763dd6ba478b0b6ebf9456049d6301f478ef7c Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>	5 years ago
Han-Wen Nienhuys	0356613f48	pgm: add write stats to BenchmarkReftable Usage: git ls-remote https://gerrit.googlesource.com/gerrit > lsr bazel build org.eclipse.jgit.pgm:jgit && rm -rf /tmp/reftable* && \ ./bazel-bin/org.eclipse.jgit.pgm/jgit debug-benchmark-reftable \ --test write_stack lsr /tmp/reftable On my Lenovo x250 laptop, this yields about 1ms per ref write. Signed-off-by: Han-Wen Nienhuys <hanwen@google.com> Change-Id: I31c74a08026ba188a3256ef6862dae9d85e6d5ef	5 years ago
Han-Wen Nienhuys	a8f4bf6abe	pgm: add command to convert repo to reftable Change-Id: I2f870699995da164a3e7adec430301ac7a53c425 Signed-off-by: Han-Wen Nienhuys <hanwen@google.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	5 years ago
Matthias Sohn	c24eee4fa4	[pgm] Add --mirror option to clone command Bug: 552173 Change-Id: Ic8a98b2e0f8f29afd599723f93e51b06b9f13314 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	5 years ago
David Pursehouse	98cdca9b5a	Enable and fix "Statement unnecessarily nested within else clause" warnings Since [1] the gerrit project includes jgit as a submodule, and has this warning enabled, resulting in 100s of warnings in the console. Also enable the warning here, and fix them. At the same time, add missing braces around adjacent and nearby one-line blocks. [1] https://gerrit-review.googlesource.com/c/gerrit/+/227897 Change-Id: I81df3fc7ed6eedf6874ce1a3bedfa727a1897e4c Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>	5 years ago
Matthias Sohn	b570b6907c	Prepare 5.5.2-SNAPSHOT builds Change-Id: Ief9940182fd6e3f3e2df88e6485be753c1260e6b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	5 years ago
Matthias Sohn	2796d86d1e	JGit v5.5.1.201910021850-r Change-Id: I9930b35b095f638119b4601a8311257daf5e5420 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	5 years ago
Matthias Sohn	ca207cd3ae	Prepare 5.3.7-SNAPSHOT builds Change-Id: I3465b6a4d913bfb2864abba58448423e7c262f60 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	5 years ago
Matthias Sohn	38258f3f72	JGit v5.3.6.201910020505-r Change-Id: I12d1c6af03f2d7474c99c22cd2aabb77e95fcb32 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	5 years ago
Matthias Sohn	929dd414c1	Prepare 5.1.13-SNAPSHOT builds Change-Id: Ic1dca14924f49ad07eb5cd0570ce7ece9f319d0d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	5 years ago
Matthias Sohn	ebe1e15781	JGit v5.1.12.201910011832-r Change-Id: I69fef9b2cdc18bbf1c8b9b290fb3d190684be13c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	5 years ago
Han-Wen Nienhuys	e5880d9531	reftable: pass OutputStream at construction time This makes the intended use of the classes more clear. It also simplifies generic functions that write reftables: they only need a ReftableWriter as argument, as the stream is carried within the ReftableWriter. Change-Id: Idbb06f89ae33100f0c0b562cc38e5b3b026d5181 Signed-off-by: Han-Wen Nienhuys <hanwen@google.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	5 years ago
Matthias Sohn	7f262b8745	Prepare 5.5.1-SNAPSHOT builds Change-Id: Iaf929168770dfef54ce2a7bfcbee9b87c450ca8a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	5 years ago
Matthias Sohn	de2df8adde	JGit v5.5.0.201909110433-r Change-Id: I5715730ac47d32462f235c2f50581bf1579d46b9 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	5 years ago
David Pursehouse	85cea8c583	Bazel: Add fixes for --incompatible_load_java_rules_from_bzl Change-Id: I24746335db132bf20f400cb3db400737596d4542 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>	5 years ago
David Pursehouse	eb1c18565c	CLI: Remove unused externalized strings Change-Id: Id44117dd72b0e71e9bf0046a3c965eeae64cf3ea Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>	5 years ago
Matthias Sohn	fdd63b183c	Prepare 5.5.0-SNAPSHOT builds Change-Id: I96bbefd698c74e450d05d21572d4769c6c5aaea6 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	5 years ago
Matthias Sohn	685f2f8ec4	JGit v5.5.0.201909041048-rc1 Change-Id: I77a8c73cfd0a27b1242eddf32da513ce0148260e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	5 years ago
Matthias Sohn	32116da0cd	Prepare 5.4.4-SNAPSHOT builds Change-Id: I64c03436c285bd8eb5e87abe560417402b60e695 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	5 years ago
Matthias Sohn	fb08804e91	JGit v5.4.3.201909031940-r Change-Id: I48ff1d51122ff73e0561f1fcf52a532221810e5d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	5 years ago
Matthias Sohn	927ae2f55b	Prepare 5.3.6-SNAPSHOT builds Change-Id: I4d57f8ea0ab1f8fbd73fd75861f2f751c4aba0a6 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	5 years ago
Matthias Sohn	2a3c8a86aa	JGit v5.3.5.201909031855-r Change-Id: I7f5dcebc2e5816c845fa63046c67bc2301926e2a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	5 years ago
Matthias Sohn	c8e42ca3ba	Prepare 5.1.12-SNAPSHOT builds Change-Id: I353ac3f23024063722abc7340bc9a6df3c615741 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	5 years ago
Matthias Sohn	002f1628c6	JGit v5.1.11.201909031202-r Change-Id: I288acf670160b9bcd2d04f572a902b5838b4d4f8 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	5 years ago
Matthias Sohn	261881055d	Prepare 4.11.10-SNAPSHOT builds Change-Id: Ic98bd87d96ce627d38e1ecc2c3cb28b517ab489e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	5 years ago
Matthias Sohn	9a2deb2049	JGit v4.11.9.201909030838-r Change-Id: Ie60468569074197d49e19cbd0ffaedfe88f3d74e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	5 years ago
Matthias Sohn	5e24753ab0	Prepare 5.6.0-SNAPSHOT builds Change-Id: I9eceb7b1272b27b979144041c75eb09ab4eeca6b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	5 years ago
Matthias Sohn	d5a0d76ed0	Prepare 5.5.0-SNAPSHOT builds Change-Id: Ib498303c8787a5fbee89377eaed332a5a6b4f3b0 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	5 years ago
Matthias Sohn	e0ea41b500	JGit v5.5.0.201908280940-m3 Change-Id: I0920767979d7927bc18f3e395963aeebae5ea540 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	5 years ago
Thomas Wolf	bdd6cf74cf	JGit pgm: make Blame more robust against bogus input Make the command die with proper messages when the revision cannot be resolved or the file doesn't exist in the repository. Previously the command would throw NPEs in these cases. Bug: 490798 Change-Id: Ia457347aa22cf6bd2c2b6e7b9d705a66b3826307 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>	5 years ago
Matthias Sohn	85a1d8bcf8	Prepare 5.4.3-SNAPSHOT builds Change-Id: Iaf5140446dcf86a50bdb1a30860dfd624d3ec337 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	5 years ago
Matthias Sohn	2c0f02244c	JGit v5.4.2.201908231537-r Change-Id: I1d808c63db81435173987c399c90bda7bc5c8d9d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	5 years ago
Matthias Sohn	f30382b191	Prepare 5.3.5-SNAPSHOT builds Change-Id: Ic0b9dfcac814ac7584e5eb19105f46344a10465a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	5 years ago
Matthias Sohn	06309fdc43	JGit v5.3.4.201908231101-r Change-Id: Ia98f47d9a10d6b8cccca6b697230dad4f350d720 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	5 years ago
Matthias Sohn	418722df34	Prepare 5.1.11-SNAPSHOT builds Change-Id: I8608580424d0e523dcace63f83ae530ba78dbb15 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	5 years ago
Matthias Sohn	1c44bf8caf	JGit v5.1.10.201908230655-r Change-Id: I68d15ebd6054bdeaf62e14cddb87724828db7943 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	5 years ago
Matthias Sohn	2eb83f4b4a	Prepare 5.4.2-SNAPSHOT builds Change-Id: I5b2fde2d69ef1cc11b085874ab783ba48e070470 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	5 years ago
Matthias Sohn	0af59e1212	JGit v5.4.1.201908211225-r Change-Id: Ifa99b930bd20a9bc10696c414c73ebde0cd4b0c8 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	5 years ago
Matthias Sohn	bbf3da1aac	Prepare 5.3.4-SNAPSHOT builds Change-Id: I1ccfeb28e87d13b25a8892947e62f1151130b6a6 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	5 years ago
Matthias Sohn	e9fcf1932e	JGit v5.3.3.201908210735-r Change-Id: I799859e47616af0ac5ee3a982cb9350d141681d7 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	5 years ago
Matthias Sohn	edc67125b7	Prepare 5.1.10-SNAPSHOT builds Change-Id: If10afc8e663299a15db8c5fd0574fb51bf7e7ae9 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	5 years ago
Matthias Sohn	38adb548c3	JGit v5.1.9.201908210455-r Change-Id: Iaade207292acb8b27e01aca7e1af97ad7db1e854 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>	5 years ago

1 2 3 4 5 ...

840 Commits (1b3a555f667712ece7f17f009b5444862cbac54f)