New stable release needed

[filerz-ml at yahoo.com]

Hi,
 I had earlier posted a problem in converting a git repo to mercurial using the latest GIT. The git executable is in the path but the other git commands are in a different folder. The git executable knows where to look for and invoke the correct command. I do not think it has made it to the hg source base. Here is the diff of the changes I have made to make it work (trivial):

diff --git a/hgext/convert/git.py b/hgext/convert/git.py
--- a/hgext/convert/git.py
+++ b/hgext/convert/git.py
@@ -32,20 +32,20 @@ class convert_git(converter_source):
         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 @@ class convert_git(converter_source):

     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 @@ class convert_git(converter_source):

     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 @@ class convert_git(converter_source):
     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 @@ class convert_git(converter_source):
                 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()


-dhruva



----- Original Message ----
> From: Dirkjan Ochtman <dirkjan at ochtman.nl>
> To: mercurial-devel at selenic.com
> Sent: Thursday, 24 July, 2008 12:55:43 PM
> Subject: Re: New stable release needed
> 
> Matt Mackall selenic.com> writes:
> > Would someone care to write some release notes for 1.0.2 and put them
> > here:
> > 
> > http://www.selenic.com/mercurial/wiki/index.cgi/UpcomingReleaseNotes
> 
> tonfa, pmezard and I all worked on the release notes a bit, I think they're in
> good shape now for a release (although it would be nice to include a better
> error message for issue1175).
> 
> Cheers,
> 
> Dirkjan
> 
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel



      Explore your hobbies and interests. Go to http://in.promos.yahoo.com/groups/