From 7b40abfa2f2d3bbddfafd4c2136b946e2587d21a Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Thu, 1 May 2014 08:14:40 -0700
Subject: [PATCH] more features and some refactoring

---
 xwords4/android/scripts/mygit.py | 93 ++++++++++++++++++++++----------
 1 file changed, 66 insertions(+), 27 deletions(-)

diff --git a/xwords4/android/scripts/mygit.py b/xwords4/android/scripts/mygit.py
index 2805ebfb5..98d745474 100755
--- a/xwords4/android/scripts/mygit.py
+++ b/xwords4/android/scripts/mygit.py
@@ -3,6 +3,8 @@
 import logging, os, subprocess, sys
 import xwconfig
 
+DEBUG = False
+
 logging.basicConfig(level=logging.DEBUG
         ,format='%(asctime)s [[%(levelname)s]] %(message)s'
         ,datefmt='%d %b %y %H:%M'
@@ -17,20 +19,21 @@ class GitRepo:
         logging.debug( '__init__(%s)' % path )
         while True:
             gitdir = path + '/' + '.git'
-            print 'looking for', gitdir
+            # print 'looking for', gitdir
             if os.path.exists( gitdir ) and os.path.isdir( gitdir ): break
             elif path == '/': 
                 self.__error( '.git never found (starting from %s)' % startPath )
+            oldPath = path
             path = os.path.dirname(path)
+            if oldPath == path: 
+                self.__error( '.git never found (starting from %s)' % startPath )
 
-        print 'startdir:', path
+        if DEBUG: print 'startdir:', path
         self.gitRoot = path
-        print 'self.gitRoot:', self.gitRoot
+        if DEBUG: print 'self.gitRoot:', self.gitRoot
 
     def status(self):
-        process = subprocess.Popen(['git', 'status'], shell=False, \
-                                       stdout=subprocess.PIPE, cwd=self.gitRoot)
-        out, err = process.communicate()
+        out, err = self.__doProcess(['git', 'status'])
         if out: 
             return out
 
@@ -40,9 +43,7 @@ class GitRepo:
         path2 = self.__gitPath(path, rev2)
         if path1 and path2:
             params = [ 'git', 'diff', '--no-ext-diff', rev1 + '..' + rev2, '--', path1 ]
-            process = subprocess.Popen(params, shell=False, stdout=subprocess.PIPE, \
-                                           cwd = self.gitRoot)
-            out, err = process.communicate()
+            out, err = self.__doProcess(params)
             if err: self.__error( 'git diff failed' )
             result = 0 == len(out)
         elif not path1 and not path2:
@@ -56,16 +57,32 @@ class GitRepo:
         path = self.__gitPath(path, rev)
         if path:
             params = [ 'git', 'show', rev + ':' + path ]
-            print params
-            process = subprocess.Popen(params, shell = False, \
-                                           stdout = subprocess.PIPE, \
-                                           cwd = self.gitRoot)
-            out, err = process.communicate()
+            out, err = self.__doProcess(params)
             if out: result = out
         else:
             print 'cat: no path'
         return result
 
+    def getRevsBetween( self, newRev, oldRev, path = None ):
+        params = [ 'git', 'rev-list', newRev ]
+        if path:
+            path = self.__gitPath( path, newRev )
+            if path: params = params + ['--', path]
+        out, err = self.__doProcess( params )
+        if err: self.__error('error from getRevsBetween')
+        result = None
+        if out:
+            saving = []
+            for rev in out.splitlines():
+                saving.append(rev)
+                if rev == oldRev or newRev == oldRev:
+                    result = saving
+                    break
+        return result;
+
+    def getHeadRev( self ):
+        return self.getRevsBetween( 'HEAD', 'HEAD' )[0]
+
     ######################################################################
     # private methods
     ######################################################################
@@ -73,6 +90,12 @@ class GitRepo:
         print msg
         sys.exit(1)
 
+    def __doProcess(self, params):
+        process = subprocess.Popen(params, shell = False, \
+                                   stdout = subprocess.PIPE, \
+                                   cwd = self.gitRoot)
+        return process.communicate()
+
     # return full_path if exists for rev and is unique, None otherwise
     def __gitPath(self, path, rev):
         logging.debug('__gitPath(path=%s, rev=%s)' % (path, rev))
@@ -94,22 +117,38 @@ class GitRepo:
 
 # test function
 def main():
-    mydir = os.path.dirname(sys.argv[0])
+    mydir = os.path.dirname(os.path.abspath('.'))
     repo = GitRepo(mydir)
     # print repo.status()
 
-    file ='GamesListDelegate.java'
-    print repo.filesSame( file, '4279457471defd66e9e21974772f59944e043db7', \
-                          'd463ea3f30909e85acdd7d0e24f00dea15fce81d' )
-    print repo.filesSame( file, 'a7c4730eb55f311e20cd406d4b2b819f0cd1edfe', \
-                          'd463ea3f30909e85acdd7d0e24f00dea15fce81d' )
-    file = 'XWords4/archive/R.java'
-    cat = repo.cat( file, '33a83b0e2fcf062f4f640ccab0785b2d2b439542' )
-    if cat:
-        print 'first line of file %s:' % (file)
-        print cat.splitlines()[0]
-    else:
-        print 'cat(%s) failed' % (file)
+    # file ='GamesListDelegate.java'
+    # print repo.filesSame( file, '4279457471defd66e9e21974772f59944e043db7', \
+    #                       'd463ea3f30909e85acdd7d0e24f00dea15fce81d' )
+    # print repo.filesSame( file, 'a7c4730eb55f311e20cd406d4b2b819f0cd1edfe', \
+    #                       'd463ea3f30909e85acdd7d0e24f00dea15fce81d' )
+    # file = 'XWords4/archive/R.java'
+    # cat = repo.cat( file, '33a83b0e2fcf062f4f640ccab0785b2d2b439542' )
+    # if cat:
+    #     print 'first line of file %s:' % (file)
+    #     print cat.splitlines()[0]
+    # else:
+    #     print 'cat(%s) failed' % (file)
+
+    # print repo.getRevsBetween( 'a7c4730eb55f311e20cd406d4b2b819f0cd1edfe', \
+    #                            '4279457471defd66e9e21974772f59944e043db7', \
+    #                            os.path.basename(sys.argv[0] ) )
+    hash = 'e643e9d5c064e7572d6132687987c604c61f5cc9'
+    print 'looking for', hash
+    rJavaRevs = repo.getRevsBetween( 'HEAD', hash, 'R.java')
+    print 'rJavaRevs', rJavaRevs
+    if 2 < len(rJavaRevs): prev = rJavaRevs[len(rJavaRevs)-2]
+    else: prev = None
+    print 'first rev before', hash, 'was', prev
+    print 'everything between the two:,' 
+    print repo.getRevsBetween( prev, hash )
+
+    print 'head:', repo.getHeadRev()
+
 
 ##############################################################################
 if __name__ == '__main__':