[nexuiz-commits] r8497 - trunk/data

[DONOTREPLY at icculus.org]

Author: div0
Date: 2010-01-13 15:32:18 -0500 (Wed, 13 Jan 2010)
New Revision: 8497

Modified:
   trunk/data/Makefile
Log:
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

Modified: trunk/data/Makefile
===================================================================
--- trunk/data/Makefile	2010-01-11 17:42:56 UTC (rev 8496)
+++ trunk/data/Makefile	2010-01-13 20:32:18 UTC (rev 8497)
@@ -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 @@
 		$(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)