From 448052dc2e698b2e4e5d6dbca54be773aac687da Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 30 Aug 2022 15:08:48 +0200 Subject: [PATCH] Move WorkTreeUpdater to merge package This avoids making it public with the associated costs for backward compatibility guarantees. Change-Id: I888f313f3854deace8d4cd92f354a6ef0d3b5460 --- .../src/org/eclipse/jgit/merge/ResolveMerger.java | 1 - .../org/eclipse/jgit/{util => merge}/WorkTreeUpdater.java | 7 +++---- 2 files changed, 3 insertions(+), 5 deletions(-) rename org.eclipse.jgit/src/org/eclipse/jgit/{util => merge}/WorkTreeUpdater.java (99%) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java index b134cdcf59..23f8e4a5d5 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java @@ -60,7 +60,6 @@ import org.eclipse.jgit.treewalk.WorkingTreeIterator; import org.eclipse.jgit.treewalk.filter.TreeFilter; import org.eclipse.jgit.util.FS; import org.eclipse.jgit.util.LfsFactory; -import org.eclipse.jgit.util.WorkTreeUpdater; import org.eclipse.jgit.util.TemporaryBuffer; /** diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/WorkTreeUpdater.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/WorkTreeUpdater.java similarity index 99% rename from org.eclipse.jgit/src/org/eclipse/jgit/util/WorkTreeUpdater.java rename to org.eclipse.jgit/src/org/eclipse/jgit/merge/WorkTreeUpdater.java index 16cd7f890b..1db9bc659c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/WorkTreeUpdater.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/WorkTreeUpdater.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -package org.eclipse.jgit.util; +package org.eclipse.jgit.merge; import static org.eclipse.jgit.lib.Constants.OBJ_BLOB; @@ -49,6 +49,7 @@ import org.eclipse.jgit.lib.ObjectReader; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.treewalk.TreeWalk.OperationType; import org.eclipse.jgit.treewalk.WorkingTreeOptions; +import org.eclipse.jgit.util.LfsFactory; import org.eclipse.jgit.util.LfsFactory.LfsInputStream; import org.eclipse.jgit.util.io.EolStreamTypeUtil; @@ -58,10 +59,8 @@ import org.eclipse.jgit.util.io.EolStreamTypeUtil; * You should use a single instance for all of your file changes. In case of an * error, make sure your instance is released, and initiate a new one if * necessary. - * - * @since 6.3 */ -public class WorkTreeUpdater implements Closeable { +class WorkTreeUpdater implements Closeable { /** * The result of writing the index changes. -- 2.39.5