[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
trans-coord/gnun/server/gnun doc/gnun.texi TODO...
From: |
Yavor Doganov |
Subject: |
trans-coord/gnun/server/gnun doc/gnun.texi TODO... |
Date: |
Thu, 06 Aug 2009 14:26:40 +0000 |
CVSROOT: /sources/trans-coord
Module name: trans-coord
Changes by: Yavor Doganov <yavor> 09/08/06 14:26:39
Modified files:
gnun/server/gnun/doc: gnun.texi
gnun/server/gnun: TODO NEWS GNUmakefile.team ChangeLog
Log message:
Add support for Mercurial repositories.
* GNUmakefile.team (HG): New variable.
(REPO): Add a test for Hg.
(update, sync): Add conditional commands for Hg.
* doc/gnun.texi (GNUmakefile.team Variables): Add Mercurial as
supported VCS. Mention that the value of `wwwdir' may be an
absolute path.
* NEWS: Update.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/doc/gnun.texi?cvsroot=trans-coord&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/TODO?cvsroot=trans-coord&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/NEWS?cvsroot=trans-coord&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile.team?cvsroot=trans-coord&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.164&r2=1.165
Patches:
Index: doc/gnun.texi
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/doc/gnun.texi,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- doc/gnun.texi 4 Aug 2009 16:19:30 -0000 1.11
+++ doc/gnun.texi 6 Aug 2009 14:26:39 -0000 1.12
@@ -1428,11 +1428,12 @@
Set this to the language code, like @code{bg} or @code{pt-br}.
@item wwwdir
-The relative path to the working copy of the master `www' repository.
-So if you have checked out your project's Sources repository at
address@hidden/projects/address@hidden and the `www' Web repository at
address@hidden/projects/www}, the value of @code{wwwdir} should be
address@hidden/www/}. Note the slash at the end, it is important.
+The relative or absolute path to the working copy of the master `www'
+repository. So if you have checked out your project's Sources
+repository at @file{~/projects/address@hidden and the `www' Web
+repository at @file{~/projects/www}, the value of @code{wwwdir} should
+be @code{../www/} or @file{/home/@var{user}/projects/www/}. Note the
+slash at the end, it is important.
@end table
Technically speaking, two variants of one language sharing the same
@@ -1455,7 +1456,7 @@
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, @acronym{GNU}
-Bzr and @acronym{GNU} Arch repositories are supported.
+Bzr, @acronym{GNU} Arch and Mercurial (Hg) 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
Index: TODO
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/TODO,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- TODO 25 May 2009 13:55:20 -0000 1.32
+++ TODO 6 Aug 2009 14:26:39 -0000 1.33
@@ -58,7 +58,7 @@
* Non-essential
-** Implement Hg and Git support for GNUmakefile.team.
+** Implement 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: NEWS
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/NEWS,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- NEWS 5 Aug 2009 11:58:49 -0000 1.19
+++ NEWS 6 Aug 2009 14:26:39 -0000 1.20
@@ -15,6 +15,8 @@
installed at $(docdir)/examples
(i.e. /usr/local/share/doc/gnun/examples with the default prefix).
+** GNUmakefile.team supports Mercurial (Hg) repositories.
+
* Changes in GNUnited Nations 0.3.1 (2009-08-02)
** GNUmakefile.team supports GNU Bzr repositories.
Index: GNUmakefile.team
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile.team,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- GNUmakefile.team 25 May 2009 13:55:20 -0000 1.6
+++ GNUmakefile.team 6 Aug 2009 14:26:39 -0000 1.7
@@ -28,6 +28,7 @@
# CVS
# Subversion (if the www-LANG repository is SVN)
# GNU Bzr (if the www-LANG repository is Bzr)
+# Mercurial (if the www-LANG repository is Hg)
# GNU Arch (if the www-LANG repository is Arch)
SHELL = /bin/bash
@@ -35,8 +36,8 @@
# Set this variable to your language code.
TEAM := bg
-# The relative path to the working copy of the master "www"
-# repository; must end with a trailing slash.
+# The relative or absolute path to the working copy of the master
+# "www" repository; must end with a trailing slash.
wwwdir := ../www/
# Adjust these variables if you don't have the programs in your PATH.
@@ -45,6 +46,7 @@
CVS := cvs
SVN := svn
BZR := bzr
+HG := hg
# Baz can be used alternatively; its commands are compatible.
TLA := tla
@@ -53,7 +55,8 @@
# Determine the VCS.
REPO := $(shell (test -d CVS && echo CVS) || (test -d .svn && echo SVN) \
- || (test -d .bzr && echo Bzr) || (test -d \{arch\} && echo Arch))
+ || (test -d .bzr && echo Bzr) || (test -d .hg && echo Hg) \
+ || (test -d \{arch\} && echo Arch))
ifndef REPO
$(error Unsupported Version Control System)
endif
@@ -65,6 +68,7 @@
MSGMERGEVERBOSE := --verbose
ECHO := echo $$file: ;
CVSQUIET :=
+# Also applicable for Hg.
BZRQUIET := --verbose
else
CVSQUIET := -q
@@ -96,6 +100,10 @@
$(svn-update)
else ifeq ($(REPO),Bzr)
$(BZR) pull $(BZRQUIET)
+else ifeq ($(REPO),Hg)
+# The "fetch" extension is not guaranteed to be available, and/or
+# enabled in user's ~/.hgrc.
+ $(HG) pull --update $(BZRQUIET)
else ifeq ($(REPO),Arch)
$(TLA) update
endif
@@ -124,6 +132,8 @@
else \
true; \
fi
+else ifeq ($(REPO),Hg)
+ $(HG) commit $(BZRQUIET) -m $(log) && $(HG) push $(BZRQUIET)
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: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -b -r1.164 -r1.165
--- ChangeLog 5 Aug 2009 11:58:49 -0000 1.164
+++ ChangeLog 6 Aug 2009 14:26:39 -0000 1.165
@@ -1,3 +1,14 @@
+2009-08-06 Yavor Doganov <address@hidden>
+
+ Add support for Mercurial repositories.
+ * GNUmakefile.team (HG): New variable.
+ (REPO): Add a test for Hg.
+ (update, sync): Add conditional commands for Hg.
+ * doc/gnun.texi (GNUmakefile.team Variables): Add Mercurial as
+ supported VCS. Mention that the value of `wwwdir' may be an
+ absolute path.
+ * NEWS: Update.
+
2009-08-05 Yavor Doganov <address@hidden>
Install gnun.mk and GNUmakefile.team as examples.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- trans-coord/gnun/server/gnun doc/gnun.texi TODO...,
Yavor Doganov <=