Skip to content

fix(longevity) - multiple renames are not handled properly (APP-132) #61

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

Merged
merged 2 commits into from
Nov 10, 2017
Merged

fix(longevity) - multiple renames are not handled properly (APP-132) #61

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38d4766
fix(longevity) - multiple renames are not handled properly (APP-132)
asurkov Nov 8, 2017
c4eb411
add TODO for tests
asurkov Nov 10, 2017
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: 4 additions & 2 deletions src/main/kotlin/app/hashers/CodeLongevity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,8 +332,10 @@ class CodeLongevity(private val serverRepo: Repo,

getDiffsObservable(tail).blockingSubscribe { (commit, diffs) ->
// A step back in commits history. Update the files map according
// to the diff.
for (diff in diffs) {
// to the diff. Traverse the diffs backwards to handle double
// renames properly.
// TODO(alex): cover file renames by tests (see APP-132 issue).
for (diff in diffs.asReversed()) {
val oldPath = diff.getOldPath()
val oldId = diff.getOldId().toObjectId()
val newPath = diff.getNewPath()
Expand Down