Skip to content

adding patch property to Commit class #1416

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

Closed
wants to merge 1 commit into from
Closed

adding patch property to Commit class #1416

wants to merge 1 commit into from

Conversation

dduraipandian
Copy link

  • added patch property to Commit class
  • added relevant test cases and tested it.

Copy link
Member

@Byron Byron left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks a lot for contributing, I think it's nearly there.

There are a few comments, please take a look.

For changes, please don't force-push but instead create new commits which makes reviewing changes much easier. Thank you.

@@ -149,6 +149,81 @@ def check_entries(d):
self.assertEqual(commit.committer_tz_offset, 14400, commit.committer_tz_offset)
self.assertEqual(commit.message, "initial project\n")

def test_patch_with_parent(self):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this is a patch with parent, I think it should be easy to find a patch with is much smaller. If there truly is no way, the expected value could be read from a file.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for reviewing it. I will try to get commit with a smaller patch.

"""
commit = self.rorepo.commit('c0740570b31f0f0fe499bf4fc5abbf89feb1757d')
patch = commit.patch
self.assertEqual(patch[:200], expected_path_result[:200])
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand why it would slice the result into lines like this. This also means it would possibly only test for equivalence on a subset of lines, missing some lines behind the 600 mark, for example.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't test with whole patch text. I have to set maxDiff = None to disable limit and test. For test_with_parent, I will try to get a commit with smaller patch. For test_with_no_parent, which is first commit, I will save patch text to file and set maxDiff in setup and test it.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then I think it would be important to make clear how maxDiff works in the property's documentation so callers know how to deal with it. To me for instance it wasn't clear this exists.

Or said differently, if there is a technical limitation there is less of a need to work around it from my side, as long as it can be made clear in the docs how to handle it.

+# W504"""
commit = self.rorepo.commit('33ebe7acec14b25c5f84f35a664803fcab2f7781')
patch = commit.patch
self.assertEqual(patch[:200], expected_path_result[:200])
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As above, I don't think the slice syntax should be necessary here. If it is, a description on why that is would be necessary, it could be passed as third argument to assertEqual I believe.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

have to set maxDiff = None to disable limit and test. I will do the change and test it.

@@ -315,6 +315,18 @@ def stats(self) -> Stats:
text = self.repo.git.diff(self.parents[0].hexsha, self.hexsha, '--', numstat=True)
return Stats._list_from_string(self.repo, text)

@property
def patch(self) -> str:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It probably would be worth describing that this method can fail if the processed bytes aren't in the encoding that python expects (as it returns str and not bytes). Hence this method can throw an exception and from my experience it's more than likely that this happens to some.

This also means that at some point in the future and if there is demand one could provide a variant of this method that returns bytes instead.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for this note. I will check to see if i can return bytes than string and leave the choice to users to convert them to string. Is that okay?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That would be okay, yes. If it doesn't work with returning bytes right now then the possibility of decoding errors could be highlighted in the documentation specifically.

@Byron
Copy link
Member

Byron commented Aug 30, 2022

Closed due to inactivity.

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.

2 participants