diff options
author | Han-Wen Nienhuys <hanwen@google.com> | 2022-08-18 18:13:54 +0200 |
---|---|---|
committer | Han-Wen NIenhuys <hanwen@google.com> | 2022-08-23 05:13:43 -0400 |
commit | 0887111ba525c7c9c4dea3018028a40041cec49b (patch) | |
tree | f690e88420b7b38b108688a07ba907519064eafb /org.eclipse.jgit | |
parent | ddb1a0c3a27c9a226601a7d909dcbca0c7a9da18 (diff) | |
download | jgit-0887111ba525c7c9c4dea3018028a40041cec49b.tar.gz jgit-0887111ba525c7c9c4dea3018028a40041cec49b.zip |
WorkTreeUpdater: rename metadata maps
Change-Id: I8ff3803da8fc13377d11c2dc5523e9e32d0650cb
Diffstat (limited to 'org.eclipse.jgit')
-rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/util/WorkTreeUpdater.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/WorkTreeUpdater.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/WorkTreeUpdater.java index a9f56c2ac9..e5de2b4a7d 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/WorkTreeUpdater.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/WorkTreeUpdater.java @@ -160,12 +160,12 @@ public class WorkTreeUpdater implements Closeable { /** * Keeps {@link CheckoutMetadata} for {@link #checkout()}. */ - private Map<String, CheckoutMetadata> checkoutMetadata; + private Map<String, CheckoutMetadata> checkoutMetadataByPath; /** * Keeps {@link CheckoutMetadata} for {@link #revertModifiedFiles()}. */ - private Map<String, CheckoutMetadata> cleanupMetadata; + private Map<String, CheckoutMetadata> cleanupMetadataByPath; /** * Whether the changes were successfully written. @@ -189,8 +189,8 @@ public class WorkTreeUpdater implements Closeable { Config config = repo.getConfig(); this.workingTreeOptions = config.get(WorkingTreeOptions.KEY); this.inCoreFileSizeLimit = getInCoreFileSizeLimit(config); - this.checkoutMetadata = new HashMap<>(); - this.cleanupMetadata = new HashMap<>(); + this.checkoutMetadataByPath = new HashMap<>(); + this.cleanupMetadataByPath = new HashMap<>(); } /** @@ -434,9 +434,9 @@ public class WorkTreeUpdater implements Closeable { // In some cases, we just want to add the metadata. toBeCheckedOut.put(path, entry); } - addCheckoutMetadata(cleanupMetadata, path, cleanupStreamType, + addCheckoutMetadata(cleanupMetadataByPath, path, cleanupStreamType, cleanupSmudgeCommand); - addCheckoutMetadata(checkoutMetadata, path, checkoutStreamType, + addCheckoutMetadata(checkoutMetadataByPath, path, checkoutStreamType, checkoutSmudgeCommand); } @@ -472,7 +472,7 @@ public class WorkTreeUpdater implements Closeable { String smudgeCommand) { toBeDeleted.put(path, file); if (file != null && file.isFile()) { - addCheckoutMetadata(cleanupMetadata, path, streamType, + addCheckoutMetadata(cleanupMetadataByPath, path, streamType, smudgeCommand); } } @@ -558,7 +558,7 @@ public class WorkTreeUpdater implements Closeable { .mkdirs(); } else { DirCacheCheckout.checkoutEntry(repo, dirCacheEntry, reader, - false, checkoutMetadata.get(entry.getKey()), + false, checkoutMetadataByPath.get(entry.getKey()), workingTreeOptions); result.modifiedFiles.add(entry.getKey()); } @@ -586,7 +586,7 @@ public class WorkTreeUpdater implements Closeable { DirCacheEntry entry = dirCache.getEntry(path); if (entry != null) { DirCacheCheckout.checkoutEntry(repo, entry, reader, false, - cleanupMetadata.get(path), workingTreeOptions); + cleanupMetadataByPath.get(path), workingTreeOptions); } } } @@ -761,4 +761,4 @@ public class WorkTreeUpdater implements Closeable { return Objects.requireNonNull(repo, () -> JGitText.get().repositoryIsRequired); } -}
\ No newline at end of file +} |