Summary

Allow commit histories that modify the same file more than once

Review Request #7043 — Created March 11, 2015 and submitted March 13, 2015, 1:10 p.m.

Information

Owner

brennie

Repository

Review Board

Branch

dvcs

Bugs

Depends On

Commit

7fbed2e...

Reviewers

Groups

reviewboard

People

Description

Previously, when uploading a commit history to a review request, it was
impossible for your commit history to contain two commits which
modified the same file. This is because the FileDiff processing
checked the repository for the previous revisions of all files. In this
case, the repository would report that the file did not exist at the
given revision and validation would fail.

Now we can check for file existence within our current set of uploaded
DiffCommits. If we are unable to find an ancestor DiffCommit that
contains the file at the correct revision, we fall back to the old
behaviour of querying the repository. This allows linear commit
histories that modify the same file to be validated and uploaded.

NB: The diffviewer will not be able to show the FileDiff for such
DiffSets. This will be addressed in a later patch that will land
before this one.

Testing Done

Ran unit tests.

Posted a review request with commit history that modified the same file
in two different commits; it was successful.

Tried to view the review request's diff in the diff viewer; it was
unsuccesful.

Issues

Description	From	Last Updated
How about using collections.defaultdict(list) here? That way you can skip conditional.	david	March 11, 2015, 3:25 p.m.
In fact, it looks like this has a bug if the commit_id already exists (it doesn't append to the list …	david	March 11, 2015, 3:25 p.m.
This looks unused.	david	March 11, 2015, 3:25 p.m.

Tool: Pyflakes
Processed Files:
    reviewboard/diffviewer/models.py
    reviewboard/diffviewer/managers.py
    reviewboard/diffviewer/tests.py
    reviewboard/diffviewer/diffutils.py



Tool: PEP8 Style Checker
Processed Files:
    reviewboard/diffviewer/models.py
    reviewboard/diffviewer/managers.py
    reviewboard/diffviewer/tests.py
    reviewboard/diffviewer/diffutils.py

reviewboard/diffviewer/models.py (Diff revision 1)

Show all issues

How about using collections.defaultdict(list) here? That way you can skip conditional.

brennie March 11, 2015, 3:26 p.m.
```
See my comment on your next issue.
```

reviewboard/diffviewer/models.py (Diff revision 1)

Show all issues

In fact, it looks like this has a bug if the commit_id already exists (it doesn't append to the list of parents). Using defaultdict would fix this.

brennie March 11, 2015, 3 p.m.

The reason I'm doing it this way is because of the case of commit validation. When we validate a commit, we do not save the new commit to the db so the commit will not show up in the dag (because it won't be in self.files in build_dag). However, when we are doing commit upload, the commit will be in the dag and we don't want to do unnecessary DB queries and have duplicate information in the dag.

brennie March 11, 2015, 3:26 p.m.

I've updated the documentation on the method to make it more clear that this is the desired behaviour.

reviewboard/diffviewer/tests.py (Diff revision 1)
Show all issues
```
This looks unused.
```

Commit:

-	25e4ec31b2d10aee772a172735e559766c06afce
+	7fbed2e9691ba64145efcfa2e21a04e4b748e325

Diff:

Revision 2 (+175 -6)

Show changes

	reviewboard/diffviewer/diffutils.py
	reviewboard/diffviewer/managers.py
	reviewboard/diffviewer/models.py
	reviewboard/diffviewer/tests.py

Tool: Pyflakes
Processed Files:
    reviewboard/diffviewer/models.py
    reviewboard/diffviewer/managers.py
    reviewboard/diffviewer/tests.py
    reviewboard/diffviewer/diffutils.py



Tool: PEP8 Style Checker
Processed Files:
    reviewboard/diffviewer/models.py
    reviewboard/diffviewer/managers.py
    reviewboard/diffviewer/tests.py
    reviewboard/diffviewer/diffutils.py

Ship it!

```
Ship It!
```

Status: Closed (submitted)

Change Summary:

Pushed to dvcs (2131f48)