[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
trans-coord/gnun/server/gnun ChangeLog GNUmakef... [sr-hr]
From: |
Yavor Doganov |
Subject: |
trans-coord/gnun/server/gnun ChangeLog GNUmakef... [sr-hr] |
Date: |
Mon, 09 Aug 2010 15:53:18 +0000 |
CVSROOT: /sources/trans-coord
Module name: trans-coord
Branch: sr-hr
Changes by: Yavor Doganov <yavor> 10/08/09 15:53:18
Modified files:
gnun/server/gnun: ChangeLog GNUmakefile.team NEWS
gnun/server/gnun/doc: gnun.texi
Log message:
Add support for Git repositories.
* GNUmakefile.team (GIT): New variable.
(REPO): Add a test for Git.
(BZRQUIET): Rename to...
(QUIET): ...as it is getting more and more confusing. All uses
updated.
(update, sync): Add commands for Git.
* doc/gnun.texi (GNUmakefile.team Variables) <VCS>: Document that
Git is a supported VCS.
* NEWS: Update.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&only_with_tag=sr-hr&r1=1.157.2.25&r2=1.157.2.26
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile.team?cvsroot=trans-coord&only_with_tag=sr-hr&r1=1.6.2.4&r2=1.6.2.5
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/NEWS?cvsroot=trans-coord&only_with_tag=sr-hr&r1=1.15.2.11&r2=1.15.2.12
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/doc/gnun.texi?cvsroot=trans-coord&only_with_tag=sr-hr&r1=1.9.2.14&r2=1.9.2.15
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.157.2.25
retrieving revision 1.157.2.26
diff -u -b -r1.157.2.25 -r1.157.2.26
--- ChangeLog 5 Aug 2010 16:14:23 -0000 1.157.2.25
+++ ChangeLog 9 Aug 2010 15:53:18 -0000 1.157.2.26
@@ -1,3 +1,16 @@
+2010-08-06 Yavor Doganov <address@hidden>
+
+ Add support for Git repositories.
+ * GNUmakefile.team (GIT): New variable.
+ (REPO): Add a test for Git.
+ (BZRQUIET): Rename to...
+ (QUIET): ...as it is getting more and more confusing. All uses
+ updated.
+ (update, sync): Add commands for Git.
+ * doc/gnun.texi (GNUmakefile.team Variables) <VCS>: Document that
+ Git is a supported VCS.
+ * NEWS: Update.
+
2010-08-04 Yavor Doganov <address@hidden>
triggers: Fix inadvertent *.hook-ann deletion.
Index: GNUmakefile.team
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile.team,v
retrieving revision 1.6.2.4
retrieving revision 1.6.2.5
diff -u -b -r1.6.2.4 -r1.6.2.5
--- GNUmakefile.team 1 Jul 2010 15:06:08 -0000 1.6.2.4
+++ GNUmakefile.team 9 Aug 2010 15:53:18 -0000 1.6.2.5
@@ -28,6 +28,7 @@
# CVS
# Subversion (if the www-LANG repository is SVN)
# GNU Bzr (if the www-LANG repository is Bzr)
+# Git (if the www-LANG repository is Git)
# Mercurial (if the www-LANG repository is Hg)
# GNU Arch (if the www-LANG repository is Arch)
@@ -47,6 +48,7 @@
CVS := cvs
SVN := svn
BZR := bzr
+GIT := git
HG := hg
# Baz can be used alternatively; its commands are compatible.
TLA := tla
@@ -59,8 +61,8 @@
# Determine the VCS.
REPO := $(shell (test -d CVS && echo CVS) || (test -d .svn && echo SVN) \
- || (test -d .bzr && echo Bzr) || (test -d .hg && echo Hg) \
- || (test -d \{arch\} && echo Arch))
+ || (test -d .bzr && echo Bzr) || (test -d .git && echo Git) \
+ || (test -d .hg && echo Hg) || (test -d \{arch\} && echo Arch))
ifndef REPO
$(error Unsupported Version Control System)
endif
@@ -72,11 +74,11 @@
MSGMERGEVERBOSE := --verbose
ECHO := echo $$file: ;
CVSQUIET :=
-# Also applicable for Hg.
-BZRQUIET := --verbose
+# Applicable for Bzr, Git and Hg.
+QUIET := --verbose
else
CVSQUIET := -q
-BZRQUIET := --quiet
+QUIET := --quiet
endif
# The command to update the CVS repositories.
@@ -103,11 +105,13 @@
else ifeq ($(REPO),SVN)
$(svn-update)
else ifeq ($(REPO),Bzr)
- $(BZR) pull $(BZRQUIET)
+ $(BZR) pull $(QUIET)
+else ifeq ($(REPO),Git)
+ $(GIT) pull $(QUIET)
else ifeq ($(REPO),Hg)
# The "fetch" extension is not guaranteed to be available, and/or
# enabled in user's ~/.hgrc.
- $(HG) pull --update $(BZRQUIET)
+ $(HG) pull --update $(QUIET)
else ifeq ($(REPO),Arch)
$(TLA) update
endif
@@ -137,12 +141,18 @@
# The behavior of `bzr commit' is not very script-friendly: it will
# exit with an error if there are no changes to commit.
if $(BZR) status --versioned --short | grep --quiet '^ M'; then \
- $(BZR) commit $(BZRQUIET) -m $(log) && $(BZR) push $(BZRQUIET); \
+ $(BZR) commit $(QUIET) -m $(log) && $(BZR) push $(QUIET); \
else \
true; \
fi
+else ifeq ($(REPO),Git)
+# Git (`git commit', to be precise) will exit with an error if there
+# are only untracked files present (a common situation). Sadly, there
+# doesn't seem to be a decent workaround, so exit status is ignored.
+ -$(GIT) commit --all $(QUIET) -m $(log)
+ $(GIT) push $(QUIET)
else ifeq ($(REPO),Hg)
- $(HG) commit $(BZRQUIET) -m $(log) && $(HG) push $(BZRQUIET)
+ $(HG) commit $(QUIET) -m $(log) && $(HG) push $(QUIET)
else ifeq ($(REPO),Arch)
# Arch is so dumb that it will do a bogus commit (adding another
# absolutely useless revision) even if there are no changes.
Index: NEWS
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/NEWS,v
retrieving revision 1.15.2.11
retrieving revision 1.15.2.12
diff -u -b -r1.15.2.11 -r1.15.2.12
--- NEWS 3 Aug 2010 15:41:00 -0000 1.15.2.11
+++ NEWS 9 Aug 2010 15:53:18 -0000 1.15.2.12
@@ -5,6 +5,8 @@
** New GNUmakefile.team targets: format, publish, clean.
Please refer to the manual for details.
+** GNUmakefile.team supports Git repositories.
+
** New configuration file: gnun.conf.
The definitions of the `*-addr' variables are moved to this file,
which is installed in sysconfdir.
Index: doc/gnun.texi
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/doc/gnun.texi,v
retrieving revision 1.9.2.14
retrieving revision 1.9.2.15
diff -u -b -r1.9.2.14 -r1.9.2.15
--- doc/gnun.texi 3 Aug 2010 15:41:00 -0000 1.9.2.14
+++ doc/gnun.texi 9 Aug 2010 15:53:18 -0000 1.9.2.15
@@ -1508,11 +1508,11 @@
defined to any string, it will have the same effect.
@item VCS=yes
-Update both `www' and address@hidden' repositories, then commit the
-merged PO files in the latter repository. By default, there is no VCS
-interaction. The VCS of the translation project repository is
-determined automatically; currently only CVS, Subversion, GNU Bzr, GNU
-Arch and Mercurial (Hg) repositories are supported.
+Update both @samp{www} and @address@hidden repositories, then
+commit the merged PO files in the latter repository. By default, there
+is no VCS interaction. The VCS of the translation project repository is
+determined automatically; currently only CVS, Subversion, GNU Bzr, Git,
+Mercurial (Hg) and GNU Arch repositories are supported.
@strong{Caution:} The makefile rule will commit all local changes, not
only those that resulted from running @command{msgmerge}. Thus, it is