Skip to content

detect renames in "git diff --raw" output #62

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.

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
Jun 16, 2012

Conversation

Pfiver
Copy link

@Pfiver Pfiver commented Jun 15, 2012

potentially fixes #36

@Byron
Copy link
Member

Byron commented Jun 16, 2012

Thank you.
Can you please add/update the test suite to verify it is working ?

@Pfiver
Copy link
Author

Pfiver commented Jun 16, 2012

The tests are passing. However, I had to temporarily add

   @classmethod
   def setup_class(cls):
           cls.setUpAll()

to the TestDiff class. Otherwise I get an
"AttributeError: 'TestDiff' object has no attribute 'rorepo'" for every test
Any clues on that? What version of nose are you using? I'm using nose 1.1.2 atm.

@Byron
Copy link
Member

Byron commented Jun 16, 2012

I use nosetests version 1.0.0, but I would wonder why they change the API in such a manner that causes tests to break.
Can you also add a diff output containing a rename, and add it to the test suite ?

@Pfiver
Copy link
Author

Pfiver commented Jun 16, 2012

I have added https://github.com/P2000/GitPython/blob/p2000/git/test/fixtures/diff_rename_raw
and https://github.com/P2000/GitPython/blob/p2000/git/test/fixtures/diff_rename
has been already there. Both are in use in git.test.test_diff.TestDiff

Not sure what you mean otherwise?

The nosetest incompatibilites are probably based on different python versions then.
I have been using cpython 2.7 before and now tried with 2.6.
Some tests are still failing but most work now.
What python version are you using?

"$ nosetests": http://sprunge.us/WZYB
"$ nosetests git/test/test_diff.py": http://sprunge.us/GcSf

@Byron
Copy link
Member

Byron commented Jun 16, 2012

I am using python 2.4 to 2.6, these are the versions I am testing with at least.
Besides that, you can ignore the errors I believe, as they relate to a package you have not installed. Of course, these tests should detect that and be skipped automatically, but its not related to this issue.

The master branch is heavily WIP, even though its stale for a while now. Branch 0.3 is the one most people would be using, I wouldn't think that master is in any way ready for production, at least I am not using it in production either.

As there already seem to be rename tests, it should be okay to just merge it in.
Thanks for your effort !

Byron added a commit that referenced this pull request Jun 16, 2012
detect renames in "git diff --raw" output
@Byron Byron merged commit 864cf1a into gitpython-developers:master Jun 16, 2012
@Pfiver
Copy link
Author

Pfiver commented Jun 16, 2012

thanks for merging!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

Do diffs detect renamed files properly?
2 participants