Commit Graph

524 Commits

Author SHA1 Message Date
tw
637cb7b6a3 [maven-release-plugin] prepare release java-diff-utils-parent-4.16 java-diff-utils-parent-4.16 2025-07-08 01:00:59 +02:00
tw
c4b752fa51 fixes #211 2025-07-07 23:00:25 +02:00
tw
c7f4dfb146 fixes #208 - reformatted source code 2025-07-07 22:27:16 +02:00
tw
de0e157a8f fixes #207 2025-07-07 21:58:42 +02:00
tw
755024ecee downgrade jgit 2025-05-24 23:11:54 +02:00
Tobias
a295c62451 Merge pull request #204 from java-diff-utils/dependabot/maven/java-diff-utils-jgit/org.eclipse.jgit-org.eclipse.jgit-7.2.1.202505142326-r
Bump org.eclipse.jgit:org.eclipse.jgit from 5.13.3.202401111512-r to 7.2.1.202505142326-r in /java-diff-utils-jgit
2025-05-24 23:03:50 +02:00
dependabot[bot]
8e8ba47939 Bump org.eclipse.jgit:org.eclipse.jgit in /java-diff-utils-jgit
Bumps [org.eclipse.jgit:org.eclipse.jgit](https://github.com/eclipse-jgit/jgit) from 5.13.3.202401111512-r to 7.2.1.202505142326-r.
- [Commits](https://github.com/eclipse-jgit/jgit/compare/v5.13.3.202401111512-r...v7.2.1.202505142326-r)

---
updated-dependencies:
- dependency-name: org.eclipse.jgit:org.eclipse.jgit
  dependency-version: 7.2.1.202505142326-r
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-05-22 18:52:05 +00:00
Tobias
0174358961 Merge pull request #203 from ngocnhan-tran1996/fix-typo
Fix typo javadoc
2025-05-05 00:53:23 +02:00
Tran Ngoc Nhan
d15ecbb568 Fix typo javadoc 2025-03-25 23:16:19 +07:00
Tobias
db58b82345 Merge pull request #200 from MadnessIRL/gen-docs
Fix a typo in DiffUtils.java javadocs
2025-03-06 15:13:17 +01:00
Davide Santonocito
c1aa689dce Fix a typo in DiffUtils.java javadocs 2025-03-05 15:43:04 +01:00
tw
01a7fb16cf updates test dependencies 2025-02-09 20:53:14 +01:00
rushii
8397e20ddc fix: parsing unified diff chunk headers (#198)
The regex matching chunk headers does not account for diffs generated with --show-function-line
2025-02-05 23:23:11 +01:00
tw
110a0da37b fixes #191 - downgraded patch to Java 8 compliance 2025-02-05 22:44:27 +01:00
tw
803fc4a188 fixes #191 - downgraded patch to Java 8 compliance 2025-02-05 22:04:26 +01:00
tw
7f5c3fa818 Merge origin/master 2025-02-05 21:49:14 +01:00
epictecch
b5b7dacc6e added support for merging inline deltas split by whitespace or a minor equality (#168) (#191)
Co-authored-by: Tobias <t.warneke@gmx.net>
2025-02-05 21:48:53 +01:00
tw
527e83cee1 fixes #197 - corrected revised filename output 2025-02-05 21:25:54 +01:00
Tobias
0f8365b35d Update README.md 2024-11-23 23:09:14 +01:00
Tobias Warneke
4b3367674a [maven-release-plugin] prepare for next development iteration 2024-11-23 22:58:05 +01:00
Tobias Warneke
71981d8faa [maven-release-plugin] prepare release java-diff-utils-parent-4.15 java-diff-utils-parent-4.15 2024-11-23 22:58:04 +01:00
Tobias Warneke
af9d84cd71 [maven-release-plugin] prepare for next development iteration 2024-11-23 22:51:42 +01:00
Tobias Warneke
1d8148ac05 [maven-release-plugin] prepare release java-diff-utils-parent-4.14 2024-11-23 22:51:38 +01:00
Tobias Warneke
0307c80edb downgraded plugins again, certificate problems for java 8 2024-11-23 22:49:57 +01:00
Tobias Warneke
5245ee8b77 [maven-release-plugin] rollback the release of java-diff-utils-parent-4.14 2024-11-23 22:43:15 +01:00
Tobias Warneke
b7c1aaeb2e [maven-release-plugin] prepare for next development iteration 2024-11-23 22:40:25 +01:00
Tobias Warneke
1560c22034 [maven-release-plugin] prepare release java-diff-utils-parent-4.14 2024-11-23 22:40:23 +01:00
Tobias Warneke
1fdcf13803 added missing sources plugin 2024-11-23 22:38:43 +01:00
Tobias Warneke
509d5071fd added missing sources plugin 2024-11-23 22:36:20 +01:00
Tobias Warneke
94aafa7e68 [maven-release-plugin] prepare for next development iteration 2024-11-23 22:13:49 +01:00
Tobias Warneke
23c80bc30d [maven-release-plugin] prepare release java-diff-utils-parent-4.13 2024-11-23 22:13:47 +01:00
Tobias Warneke
52e61d653f upgraded some plugins and dependencies 2024-11-23 22:10:34 +01:00
Tobias Warneke
dad43159a8 [maven-release-plugin] rollback the release of java-diff-utils-parent-4.13 2024-11-23 22:08:00 +01:00
Tobias Warneke
0f7c32b983 [maven-release-plugin] prepare for next development iteration 2024-11-23 22:00:16 +01:00
Tobias Warneke
ace11bc484 [maven-release-plugin] prepare release java-diff-utils-parent-4.13 2024-11-23 22:00:14 +01:00
Tobias Warneke
74586e6763 upgraded some plugins and dependencies 2024-11-23 21:39:25 +01:00
Tobias Warneke
f955268003 introduced a more complicated test which can only be solved using the linear space version 2024-09-27 23:31:24 +02:00
Tobias Warneke
aff6bfed29 fixes #193 - allow to parse copy commands from a diff 2024-09-24 21:46:04 +02:00
Tobias Warneke
5cc2cf4021 corrected word splitter in DiffRowGenerator 2024-09-24 21:20:24 +02:00
Tobias Warneke
903982517a added a testcase 2024-07-07 02:20:31 +02:00
dependabot[bot]
ba60ae8ca4 Bump org.eclipse.jgit:org.eclipse.jgit in /java-diff-utils-jgit (#187)
Bumps org.eclipse.jgit:org.eclipse.jgit from 5.8.1.202007141445-r to 5.13.3.202401111512-r.

---
updated-dependencies:
- dependency-name: org.eclipse.jgit:org.eclipse.jgit
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-04-12 07:18:35 +02:00
Sophiah Ho
6279142d0a Clarify what this parameter does without reference to internal logic, which also fixes the typo (#186) 2024-04-03 07:35:40 +02:00
Tobias Warneke
50da99fed0 corrected some naming problems 2024-02-28 22:09:46 +01:00
Joao Machado
54324fb792 Fixes #182 by parsing diffs with 'Binary files' (#183) 2024-02-28 22:07:49 +01:00
Pierre Baillet (Oct)
8df690fdd2 Typo on diff author's name (#176) 2023-11-22 08:44:30 +01:00
xiaohaitang
281c073c56 A problem was found and fixed about #164 (#170)
* Add generateOriginalAndDiff method and test class

* Add generateOriginalAndDiff method and test class.I split long code into short methods, changed ambiguous variable names to explicit variable names

* fixes #164

* fix build issues

* fix issues about (#164),detail:
When deleting the first line of comparison text and adding several lines of text, the first diff of the result returned by the generateOriginalAndDiff method is inserted incorrectly

* add a test for #170

---------

Co-authored-by: xutao <xutao@apexsoft.com.cn>
2023-08-13 21:55:34 +02:00
xiaohaitang
1664490a9f Add generateOriginalAndDiff method and test class (#164)
* Add generateOriginalAndDiff method and test class

* Add generateOriginalAndDiff method and test class.I split long code into short methods, changed ambiguous variable names to explicit variable names

* fixes #164

* fix build issues
2023-04-27 22:54:38 +02:00
Mohammad Ali Al Salti
02532a9720 Update JavaDoc for DiffUtils class (#163) 2023-03-21 21:54:11 +01:00
Tobias Warneke
9f88cf91fb added some example code into the readme examples 2023-01-04 21:53:00 +01:00
Tobias Warneke
dc5ecb8ded fixes #159 2022-11-20 12:04:13 +01:00