issue with diff method #501

Activity

1. Byron

   added

   waiting for feedback

   on Aug 21, 2016
2. Byron commented on Aug 21, 2016

   

   Byron

   on Aug 21, 2016

   Last edited by Byron

   Member

   More actions

   Unfortunately, I cannot reproduce the issue despite of the fabulous reproduction script. This is what I did:

   • git clone http://git.eclipse.org/gitroot/papyrus/org.eclipse.papyrus.git
   • time python reproduce.py

   The latter produced this output:

   ➜  GitPython git:(master) ✗ time python reproduce.py
   7241
   python reproduce.py  4.97s user 0.66s system 99% cpu 5.670 total
   

   It appears there is something else going on. Maybe you are not using the latest version ? Maybe it's something related to windows particularly. In any case, we will have to dig deeper to find a solution for this one.

   The actual script I ended up using is behind the fold.

   Details

   from git import *
   
   REPO_PATH = "./org.eclipse.papyrus"
   
   BRANCH = "2.0.0"
   
   def main():
       repo = Repo(REPO_PATH, odbt=GitCmdObjectDB)
       reference = [r for r in repo.references if r.name == BRANCH][0]
       for c in repo.iter_commits(rev=reference):
           if c.hexsha == 'f5f817279baa2008450aa32b18e576c2fcda02bb':
               diffs = c.parents[0].diff(c, create_patch=True)
               print str(len(diffs))
               break
   
   if __name__ == "__main__":
       main()

   For completeness, here is the memory usage when trying to show the diff in the WEB-GUI - it took a long time to load as well.
   
3. valeriocos commented on Aug 22, 2016

   

   valeriocos

   on Aug 22, 2016

   Last edited by valeriocos

   Author

   More actions

   I've updated gitpython to the last version (2.0.8), however the problem is still there. As you said, it may depend on Windows-related stuff.
   I found a workaround that seems to work fine, below the code.

   from git import *
   
   REPO_PATH = "./org.eclipse.papyrus"
   
   BRANCH = "2.0.0"
   
   def main():
       diffs = []
       repo = Repo(REPO_PATH, odbt=GitCmdObjectDB)
       reference = [r for r in repo.references if r.name == BRANCH][0]
       for c in repo.iter_commits(rev=reference):
           if c.hexsha == 'f5f817279baa2008450aa32b18e576c2fcda02bb':
               files = repo.git.execute(["git", "diff", "--name-only", c.parents[0].hexsha, c.hexsha]).split('\n')
               for f in files:
                   diff = c.parents[0].diff(c, paths=f, create_patch=True)
                   diffs = diffs + diff
   
   if __name__ == "__main__":
       main()
4. Byron

   removed

   waiting for feedback

   on Aug 23, 2016
5. Byron commented on Aug 23, 2016

   

   Byron

   on Aug 23, 2016

   Member

   More actions

   Thanks for the feedback, and for posting the workaround !
   Given that the project is not tested on Windows anymore, and is supporting Windows only on a 'best-effort' basis, I believe there is nothing that can be done here to fix this particular case.
   Thus I am closing this issue. If you disagree or would like to contribute some sort of fix, please let me know in the comments.
6. Byron

   closed this as completedon Aug 23, 2016
7. ankostis

   added

   acknowledged

   tag.Windows

   tag.leaks

   on Oct 11, 2016
8. ankostis commented on Oct 11, 2016

   

   ankostis

   on Oct 11, 2016

   Contributor

   More actions

   I can definitely reproduce this. git.diff code has been retrofitted on #519 to use threads when reading stream, but STILL I've seen a case where it blocked with particularly big streams.
   Maybe using additionally queues might solve the problem for good. See http://eyalarubas.com/python-subproc-nonblock.html and http://stackoverflow.com/a/4896288/548792
9. ankostis

   reopened this on Oct 11, 2016
10. Byron

    added the

    Bug

    issue type on Jul 20, 2026
11. Byron

    closed this as not plannedon Jul 20, 2026