Skip to content

Fixed normalized paths bug that prevented copying class in IDE. Issue 8497 #8499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FolsomHunter wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed normalized paths bug that prevented copying class in IDE. Issue 8497 #8499

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions ide/libs.git/src/org/netbeans/libs/git/jgit/commands/MoveTreeCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,23 +77,29 @@ protected void run() throws GitException {
}
sourceFile = tryNormalizeSymlink(sourceFile);
targetFile = tryNormalizeSymlink(targetFile);

Repository repository = getRepository();

File repoWorkTreeNormalized = tryNormalizeSymlink(repository.getWorkTree());

try {
DirCache cache = repository.lockDirCache();
try {
List<String> ignoredTargets = getIgnores(targetFile);

List<String> ignoredTargets = getIgnores(this.source);

boolean retried = false;
DirCacheBuilder builder = cache.builder();
TreeWalk treeWalk = new TreeWalk(repository);
PathFilter sourceFilter = PathFilter.create(Utils.getRelativePath(repository.getWorkTree(), sourceFile));
PathFilter targetFilter = PathFilter.create(Utils.getRelativePath(repository.getWorkTree(), targetFile));
PathFilter sourceFilter = PathFilter.create(Utils.getRelativePath(repoWorkTreeNormalized, sourceFile));
PathFilter targetFilter = PathFilter.create(Utils.getRelativePath(repoWorkTreeNormalized, targetFile));
treeWalk.setFilter(PathFilterGroup.create(Arrays.asList(sourceFilter, targetFilter)));
treeWalk.setRecursive(true);
treeWalk.reset();
treeWalk.addTree(new DirCacheBuildIterator(builder));
while (treeWalk.next() && !monitor.isCanceled()) {
String path = treeWalk.getPathString();
File file = new File(repository.getWorkTree().getAbsolutePath() + File.separator + path);
File file = new File(repoWorkTreeNormalized.getAbsolutePath() + File.separator + path);
DirCacheEntry e = treeWalk.getTree(0, DirCacheBuildIterator.class).getDirCacheEntry();
if (e != null) {
if (targetFilter.include(treeWalk)) {
Expand All @@ -118,8 +124,8 @@ protected void run() throws GitException {
// reset whole iterator and start from the beginning
sourceFile = sourceFile.getCanonicalFile();
targetFile = targetFile.getCanonicalFile();
sourceFilter = PathFilter.create(Utils.getRelativePath(repository.getWorkTree(), sourceFile));
targetFilter = PathFilter.create(Utils.getRelativePath(repository.getWorkTree(), targetFile));
sourceFilter = PathFilter.create(Utils.getRelativePath(repoWorkTreeNormalized, sourceFile));
targetFilter = PathFilter.create(Utils.getRelativePath(repoWorkTreeNormalized, targetFile));
treeWalk.setFilter(PathFilterGroup.create(Arrays.asList(sourceFilter, targetFilter)));
treeWalk.reset();
builder = cache.builder();
Expand Down Expand Up @@ -185,7 +191,9 @@ private void rename () throws GitException {

private String getRelativePath (File file, File ancestor, File target) {
String relativePathToAncestor = Utils.getRelativePath(ancestor, file);
StringBuilder relativePathToSource = new StringBuilder(Utils.getRelativePath(getRepository().getWorkTree(), target));
StringBuilder relativePathToSource = new StringBuilder(
Utils.getRelativePath(tryNormalizeSymlink(getRepository().getWorkTree()), target)
);
if (!relativePathToAncestor.isEmpty()) {
if (relativePathToSource.length() > 0) {
relativePathToSource.append("/"); //NOI18N
Expand Down
Loading