From 0d9f11fe77d980ae3b39773d049f17e18cc37c9c Mon Sep 17 00:00:00 2001
From: div0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Wed, 13 Jan 2010 20:32:18 +0000
Subject: [PATCH] Add new Makefile targets to use same commands in git and svn:
 make update make commit make diff make revert FILE=filename make log, logv,
 logupdate, logvupdate also ported

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8497 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/Makefile | 74 ++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 58 insertions(+), 16 deletions(-)

diff --git a/data/Makefile b/data/Makefile
index 105e74ebf..8a32f57a6 100644
--- a/data/Makefile
+++ b/data/Makefile
@@ -1,3 +1,4 @@
+SCM := $(shell if [ -d .svn ]; then echo svn; elif [ -d ../.git ]; then echo git; fi)
 FTEQCC ?= fteqcc
 PERL ?= perl
 PK3NAME ?= `date +../data%Y%m%d.pk3`
@@ -85,26 +86,67 @@ $(PK3NAME): qc
 		$(RM) -r qcsrc common-spog.pk3; \
 		$(ZIP) $$ABSPK3NAME .
 
-.PHONY: log
-log:
+.PHONY: testcase
+testcase:
+	cd qcsrc/testcase && $(FTEQCC) $(FTEQCCFLAGS) $(FTEQCCFLAGS_CSPROGS) -DTESTCASE="$$TESTCASE"
+
+.PHONY: update commit diff log logv logupdate logvupdate revert
+update: $(SCM)-update
+commit: $(SCM)-commit
+diff: $(SCM)-diff
+log: $(SCM)-log
+logv: $(SCM)-logv
+revert: $(SCM)-revert
+logupdate: log update
+logvupdate: logv update
+
+.PHONY: svn-update
+svn-update:
+	cd .. && svn update
+
+.PHONY: svn-commit
+svn-commit:
+	cd .. && svn commit
+
+.PHONY: svn-diff
+svn-diff:
+	cd .. && svn diff
+
+.PHONY: svn-log
+svn-log:
 	cd .. && svn log -r HEAD:BASE
 
-.PHONY: logv
-logv:
+.PHONY: svn-logv
+svn-logv:
 	cd .. && svn log -r HEAD:BASE -v
 
-.PHONY: update
-update:
-	cd .. && svn up
+.PHONY: svn-revert
+svn-revert:
+	svn revert -- $(FILE)
 
-.PHONY: logupdate
-logupdate:
-	cd .. && svn log -r HEAD:BASE && svn up
+.PHONY: git-update
+git-update:
+	git pull origin
 
-.PHONY: logvupdate
-logvupdate:
-	cd .. && svn log -r HEAD:BASE -v && svn up
+.PHONY: git-commit
+git-commit:
+	git commit -a
+	if echo -n 'Also send to server? Hit Enter for yes, ^C for no. '; read -r L; then \
+		git svn dcommit; \
+	fi
 
-.PHONY: testcase
-testcase:
-	cd qcsrc/testcase && $(FTEQCC) $(FTEQCCFLAGS) $(FTEQCCFLAGS_CSPROGS) -DTESTCASE="$$TESTCASE"
+.PHONY: git-diff
+git-diff:
+	git diff; git diff origin/master..HEAD; true
+
+.PHONY: git-log
+git-log:
+	git fetch && git log HEAD..origin/master
+
+.PHONY: git-logv
+git-logv:
+	git fetch && git log -v HEAD..origin/master
+
+.PHONY: git-revert
+git-revert:
+	git checkout -- $(FILE)
-- 
2.39.2