# HG changeset patch
# User Dhruva Krishnamurthy <dhruvakm@gmail.com>
# Date 1216932255 -7200
# Node ID e30c56f337b1304eae90c53305dc31392a3a629f
# Parent  08d9e0f974d9476ee0a0628f4db28d74574cbe06
convert: use git executable only, with subcommands

The latest GIT has some changes in the way it is installed. Only the 'git'
executable need to be in the path. All other commands are treated as sub
commands of 'git'.

diff -r 08d9e0f974d9 -r e30c56f337b1 hgext/convert/git.py
--- a/hgext/convert/git.py	Wed Jul 23 16:08:20 2008 +0200
+++ b/hgext/convert/git.py	Thu Jul 24 22:44:15 2008 +0200
@@ -32,20 +32,20 @@
         if not os.path.exists(path + "/objects"):
             raise NoRepo("%s does not look like a Git repo" % path)
 
-        checktool('git-rev-parse', 'git')
+        checktool('git', 'git')
 
         self.path = path
 
     def getheads(self):
         if not self.rev:
-            return self.gitcmd('git-rev-parse --branches').read().splitlines()
+            return self.gitcmd('git rev-parse --branches').read().splitlines()
         else:
-            fh = self.gitcmd("git-rev-parse --verify %s" % self.rev)
+            fh = self.gitcmd("git rev-parse --verify %s" % self.rev)
             return [fh.read()[:-1]]
 
     def catfile(self, rev, type):
         if rev == "0" * 40: raise IOError()
-        fh = self.gitcmd("git-cat-file %s %s" % (type, rev))
+        fh = self.gitcmd("git cat-file %s %s" % (type, rev))
         return fh.read()
 
     def getfile(self, name, rev):
@@ -56,7 +56,7 @@
 
     def getchanges(self, version):
         self.modecache = {}
-        fh = self.gitcmd("git-diff-tree --root -m -r %s" % version)
+        fh = self.gitcmd("git diff-tree --root -m -r %s" % version)
         changes = []
         seen = {}
         for l in fh:
@@ -109,7 +109,7 @@
 
     def gettags(self):
         tags = {}
-        fh = self.gitcmd('git-ls-remote --tags "%s"' % self.path)
+        fh = self.gitcmd('git ls-remote --tags "%s"' % self.path)
         prefix = 'refs/tags/'
         for line in fh:
             line = line.strip()
@@ -126,7 +126,7 @@
     def getchangedfiles(self, version, i):
         changes = []
         if i is None:
-            fh = self.gitcmd("git-diff-tree --root -m -r %s" % version)
+            fh = self.gitcmd("git diff-tree --root -m -r %s" % version)
             for l in fh:
                 if "\t" not in l:
                     continue
@@ -134,7 +134,7 @@
                 changes.append(f)
             fh.close()
         else:
-            fh = self.gitcmd('git-diff-tree --name-only --root -r %s "%s^%s" --'
+            fh = self.gitcmd('git diff-tree --name-only --root -r %s "%s^%s" --'
                              % (version, version, i+1))
             changes = [f.rstrip('\n') for f in fh]
             fh.close()