Skip to content

Make diff for packages independent of file system #2002

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
stimberm wants to merge 1 commit into
base: Pharo14
Choose a base branch
from
Open

Make diff for packages independent of file system #2002

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
6 changes: 1 addition & 5 deletions Iceberg-Libgit/IceGitChangeImporter.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,10 @@ IceGitChangeImporter >> importOn: aNode [
filePath := aNode path / currentSegment.
fileReference := version fileSystem resolve: filePath.

"Do not import if the file does not exist in git"
fileReference exists
ifFalse: [ ^ self ].

"If I represent a package, let's do it and do nothing else.
This could be optimized to add the exact methods and avoid MC diff afterwards"
((diff isCodeSubdirectory: aNode)
and: [ version writerClass isValidPackage: fileReference ])
and: [ version includesPackageNamed: currentSegment ])
ifTrue: [ ^ self ensurePackageFromDirectory: fileReference inParentNode: aNode ].

"If I do not represent a package, I may be a file or a directory that may (recursively) contain a method or a package.
Expand Down
Loading