From 25e8707faba5e4566916cafb8c9346e8635cf1a9 Mon Sep 17 00:00:00 2001
From: Robert Bradshaw <robertwb@math.washington.edu>
Date: Tue, 18 Jan 2011 00:48:10 -0800
Subject: [PATCH] Update "make repo" to use git.

---
 MANIFEST.in |  2 +-
 Makefile    | 19 +++++++++----------
 setup.py    | 11 ++---------
 3 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index e79bfd6c..e5123020 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,6 +1,6 @@
 include MANIFEST.in README.txt INSTALL.txt ToDo.txt USAGE.txt
 include COPYING.txt LICENSE.txt Makefile
-include .hgrev
+include .gitrev
 include setup.py
 include setupegg.py
 include bin/*
diff --git a/Makefile b/Makefile
index c0b74e7b..964204fd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,21 @@
 PYTHON?=python
-REPO = http://hg.cython.org/cython-devel
+REPO = git://github.com/cython/cython.git
 
 all:    local 
 
 local:
 	${PYTHON} setup.py build_ext --inplace
 
-.hg: REV := $(shell cat .hgrev)
-.hg: TMPDIR := $(shell mktemp -d tmprepo.XXXXXX)
-.hg: 
-	hg clone --rev $(REV) $(REPO) $(TMPDIR)
-	hg -R $(TMPDIR) update
-	mv $(TMPDIR)/.hg .
-	mv $(TMPDIR)/.hgignore .
-	mv $(TMPDIR)/.hgtags .
+.git: REV := $(shell cat .gitrev)
+.git: TMPDIR := $(shell mktemp -d tmprepo.XXXXXX)
+.git: 
+	git clone $(REPO) $(TMPDIR)
+	cd $(TMPDIR); git checkout -b working $(REV)
+	mv $(TMPDIR)/{.git,.hgtags,.hgignore} .
+	mv $(TMPDIR)/Doc/s5 Doc/s5
 	rm -rf $(TMPDIR)
 
-repo: .hg
+repo: .git
 
 
 clean:
diff --git a/setup.py b/setup.py
index 7be053a7..8bc76151 100644
--- a/setup.py
+++ b/setup.py
@@ -3,15 +3,8 @@ from distutils.sysconfig import get_python_lib
 import os, os.path
 import sys
 
-if 'sdist' in sys.argv and sys.platform != "win32" and sys.version_info >= (2,4):
-    # Record the current revision in .hgrev
-    import subprocess # os.popen is cleaner but deprecated
-    changeset = subprocess.Popen("hg identify --id --rev tip".split(),
-                                 stdout=subprocess.PIPE).stdout.read()
-    rev = changeset.decode('ISO-8859-1').strip()
-    hgrev = open('.hgrev', 'w')
-    hgrev.write(rev)
-    hgrev.close()
+if 'sdist' in sys.argv and sys.platform != "win32":
+    assert os.system("git show-ref -s HEAD > .gitrev") == 0
 
 if sys.platform == "darwin":
     # Don't create resource files on OS X tar.
-- 
2.26.2