trans-coord/gnun/server/gnun ChangeLog GNUmakef...

[Yavor Doganov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Yavor Doganov <yavor>   09/05/25 13:55:20

Modified files:
        gnun/server/gnun: ChangeLog GNUmakefile.team NEWS TODO 
        gnun/server/gnun/doc: gnun.texi 

Log message:
        Add support for GNU Bzr repositories.
        * GNUmakefile.team (BZR, BZRQUIET, log): New variables.
        (REPO): Add a test for Bzr.
        (update, sync): Add conditional commands for Bzr.  Update all
        others to use the generic `log' variable.
        * doc/gnun.texi (GNUmakefile.team Variables): Add Bzr as supported
        VCS.
        * NEWS: Update.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.151&r2=1.152
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile.team?cvsroot=trans-coord&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/NEWS?cvsroot=trans-coord&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/TODO?cvsroot=trans-coord&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/doc/gnun.texi?cvsroot=trans-coord&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -b -r1.151 -r1.152
--- ChangeLog   24 May 2009 05:33:52 -0000      1.151
+++ ChangeLog   25 May 2009 13:55:20 -0000      1.152
@@ -1,3 +1,14 @@
+2009-05-25  Yavor Doganov  <address@hidden>
+
+       Add support for GNU Bzr repositories.
+       * GNUmakefile.team (BZR, BZRQUIET, log): New variables.
+       (REPO): Add a test for Bzr.
+       (update, sync): Add conditional commands for Bzr.  Update all
+       others to use the generic `log' variable.
+       * doc/gnun.texi (GNUmakefile.team Variables): Add Bzr as supported
+       VCS.
+       * NEWS: Update.
+
 2009-05-24  Yavor Doganov  <address@hidden>
 
        * NEWS: Release 0.3.

Index: GNUmakefile.team
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile.team,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- GNUmakefile.team    23 May 2009 13:32:15 -0000      1.5
+++ GNUmakefile.team    25 May 2009 13:55:20 -0000      1.6
@@ -27,6 +27,7 @@
 # GNU gettext >= 0.16
 # CVS
 # Subversion (if the www-LANG repository is SVN)
+# GNU Bzr (if the www-LANG repository is Bzr)
 # GNU Arch (if the www-LANG repository is Arch)
 
 SHELL = /bin/bash
@@ -43,14 +44,16 @@
 MSGFMT := msgfmt
 CVS := cvs
 SVN := svn
+BZR := bzr
 # Baz can be used alternatively; its commands are compatible.
 TLA := tla
 
 translations := $(shell find -name '*.$(TEAM).po' | sort)
+log := "Automatic merge from the master repository."
 
 # Determine the VCS.
 REPO := $(shell (test -d CVS && echo CVS) || (test -d .svn && echo SVN) \
-         || (test -d \{arch\} && echo Arch))
+         || (test -d .bzr && echo Bzr) || (test -d \{arch\} && echo Arch))
 ifndef REPO
 $(error Unsupported Version Control System)
 endif
@@ -62,11 +65,12 @@
 MSGMERGEVERBOSE := --verbose
 ECHO := echo $$file: ;
 CVSQUIET :=
+BZRQUIET := --verbose
+else
+CVSQUIET := -q
+BZRQUIET := --quiet
 endif
 
-# If not in VERBOSE mode, suppress the output from cvs/svn.
-CVSQUIET ?= -q
-
 # The command to update the CVS repositories.
 define cvs-update
 $(CVS) $(CVSQUIET) update -d -P
@@ -90,6 +94,8 @@
        $(cvs-update)
 else ifeq ($(REPO),SVN)
        $(svn-update)
+else ifeq ($(REPO),Bzr)
+       $(BZR) pull $(BZRQUIET)
 else ifeq ($(REPO),Arch)
        $(TLA) update
 endif
@@ -107,15 +113,22 @@
        done
 ifeq ($(VCS),yes)
 ifeq ($(REPO),CVS)
-       $(CVS) commit -m "Automatic merge from the master repository."
+       $(CVS) commit -m $(log)
 else ifeq ($(REPO),SVN)
-       $(SVN) commit -m "Automatic merge from the master repository."
+       $(SVN) commit -m $(log)
+else ifeq ($(REPO),Bzr)
+# 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); \
+       else \
+         true; \
+       fi
 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.
 # Fortunately, the exit status of `tla changes' is sane.
-       $(TLA) changes >/dev/null || $(TLA) commit -s \
-         "Automatic merge from the master repository."
+       $(TLA) changes >/dev/null || $(TLA) commit -s $(log)
 endif
 endif
 

Index: NEWS
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/NEWS,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- NEWS        24 May 2009 05:33:52 -0000      1.13
+++ NEWS        25 May 2009 13:55:20 -0000      1.14
@@ -1,5 +1,9 @@
 GNUnited Nations NEWS - User visible changes.
 
+* Changes in GNUnited Nations 0.4 (2009-??-??)
+
+** GNUmakefile.team supports GNU Bzr repositories.
+
 * Changes in GNUnited Nations 0.3 (2009-05-24)
 
 ** GNU gettext >= 0.16 is required for `msgmerge --previous' support.

Index: TODO
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/TODO,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- TODO        23 May 2009 13:32:15 -0000      1.31
+++ TODO        25 May 2009 13:55:20 -0000      1.32
@@ -58,7 +58,7 @@
 
 * Non-essential
 
-** Implement Bzr, Hg and Git support for GNUmakefile.team.
+** Implement Hg and Git support for GNUmakefile.team.
 
 ** Implement a `report' target that would be language specific and will
    output the state of all files for a language team, and extended

Index: doc/gnun.texi
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/doc/gnun.texi,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- doc/gnun.texi       23 May 2009 13:32:16 -0000      1.7
+++ doc/gnun.texi       25 May 2009 13:55:20 -0000      1.8
@@ -1444,8 +1444,8 @@
 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 and
address@hidden Arch repositories are supported.
+determined automatically; currently only CVS, Subversion, @acronym{GNU}
+Bzr and @acronym{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