default is stable stable
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Fri, 07 Oct 2011 16:56:32 +0200
branchstable
changeset 781 a8b1846d54e9
parent 773 a60197bcb652 (current diff)
parent 780 82e5bc11b293 (diff)
child 782 ae25f5dce19a
default is stable
--- a/.hgtags	Wed Jul 27 19:58:53 2011 +0200
+++ b/.hgtags	Fri Oct 07 16:56:32 2011 +0200
@@ -68,3 +68,5 @@
 2a3cc936ae6353fd904dac6262fb035663f331ff apycot-debian-version-2.0.8-1
 4e0f53b3d90a0b17a8cf3c3803ec5b17e24baada apycot-version-2.1.0
 29da7647fd8d7c59e40829bcecdfc01b94b523e2 apycot-debian-version-2.1.0-1
+bd5595577b1b419dd1376fdf127dee617e74481a apycot-version-2.1.1
+6f767ca1279bdde91a09fad1e5bfa8ee6a54f4c8 apycot-debian-version-2.1.1-1
--- a/__pkginfo__.py	Wed Jul 27 19:58:53 2011 +0200
+++ b/__pkginfo__.py	Fri Oct 07 16:56:32 2011 +0200
@@ -4,7 +4,7 @@
 modname = 'apycot'
 distname = 'apycot'
 
-numversion = (2, 1, 0)
+numversion = (2, 1, 1)
 version = '.'.join(str(num) for num in numversion)
 
 license = 'GPL'
--- a/_apycotlib/__init__.py	Wed Jul 27 19:58:53 2011 +0200
+++ b/_apycotlib/__init__.py	Fri Oct 07 16:56:32 2011 +0200
@@ -310,13 +310,15 @@
     def append_output_messages(self, msg, stdout, stderr, unparsed):
         if stdout is not None:
             stdout = unicode(stdout.read(), 'utf8', 'replace')
-            if self.parsed_content == 'merged':
-                msg += u'\noutput:\n%s' % stdout
-            else:
-                msg += u'\nstandard output:\n%s' % stdout
+            if stdout:
+                if self.parsed_content == 'merged':
+                    msg += u'\noutput:\n%s' % stdout
+                else:
+                    msg += u'\nstandard output:\n%s' % stdout
         if stderr is not None:
             stderr = unicode(stderr.read(), 'utf8', 'replace')
-            msg += u'\nerror output:\n%s' % stderr
+            if stderr:
+                msg += u'\nerror output:\n%s' % stderr
         if unparsed:
             msg += u'\nunparsed output:\n%s' % unparsed
         return msg
--- a/_apycotlib/repositories.py	Wed Jul 27 19:58:53 2011 +0200
+++ b/_apycotlib/repositories.py	Fri Oct 07 16:56:32 2011 +0200
@@ -90,8 +90,12 @@
             to_date = localtime(to_date)
         return (from_date, to_date)
 
+    def changeset(self):
+        """return changeset of the working directory"""
+        return None
+
     def revision(self):
-        """return revision of the working directory"""
+        """return revision number of the working directory"""
         return None
 
 
@@ -178,7 +182,7 @@
             return 'hg -R %s up %s' % (self.co_path, self.branch)
         return None
 
-    def revision(self):
+    def changeset(self):
         from logilab.common.hg import get_repository, short
         repo = get_repository(self.co_path)
         try: # hg < 1.0 (?)
@@ -190,5 +194,17 @@
         #assert len(parents) == 0 ?
         return short(parents[0].node())
 
+    def revision(self):
+        from logilab.common.hg import get_repository
+        repo = get_repository(self.co_path)
+        try: # hg < 1.0 (?)
+            ctx = repo.workingctx()
+        except AttributeError:
+            # hg > 1.0
+            ctx = repo[None]
+        parents = ctx.parents()
+        #assert len(parents) == 0 ?
+        return parents[0].rev()
+
 register('repository', HGRepository)
 
--- a/_apycotlib/writer.py	Wed Jul 27 19:58:53 2011 +0200
+++ b/_apycotlib/writer.py	Fri Oct 07 16:56:32 2011 +0200
@@ -199,15 +199,15 @@
         return CheckDataWriter(self._cnxh, self._eid)
 
     def link_to_revision(self, environment, vcsrepo):
-        revision = vcsrepo.revision()
-        if revision is not None:
+        changeset = vcsrepo.changeset()
+        if changeset is not None:
             if not self._cnxh.execute(
                 'SET X using_revision REV '
                 'WHERE X eid %(x)s, REV changeset %(cs)s, '
                 'REV from_repository R, R eid %(r)s',
-                {'x': self._eid, 'cs': revision,
+                {'x': self._eid, 'cs': changeset,
                  'r': environment.repository.eid}):
-                self.raw(repr(vcsrepo), revision, 'revision')
+                self.raw(repr(vcsrepo), changeset, 'revision')
 
     def start(self):
         self.set_exec_status(u'set up')
--- a/debian/changelog	Wed Jul 27 19:58:53 2011 +0200
+++ b/debian/changelog	Fri Oct 07 16:56:32 2011 +0200
@@ -1,3 +1,9 @@
+apycot (2.1.1-1) unstable; urgency=low
+
+  * new upstream release
+
+ -- Sylvain Thénault <sylvain.thenault@logilab.fr>  Fri, 07 Oct 2011 14:30:33 +0200
+
 apycot (2.1.0-1) unstable; urgency=low
 
   * new upstream release
--- a/i18n/en.po	Wed Jul 27 19:58:53 2011 +0200
+++ b/i18n/en.po	Fri Oct 07 16:56:32 2011 +0200
@@ -796,6 +796,9 @@
 msgid "use_recipe_object"
 msgstr "used by"
 
+msgid "users to notify of changes concerning this entity"
+msgstr ""
+
 msgid "using_config"
 msgstr "using configuration"
 
--- a/i18n/fr.po	Wed Jul 27 19:58:53 2011 +0200
+++ b/i18n/fr.po	Fri Oct 07 16:56:32 2011 +0200
@@ -819,6 +819,9 @@
 msgid "use_recipe_object"
 msgstr "utilisé par"
 
+msgid "users to notify of changes concerning this entity"
+msgstr "utilisateurs à notifier des changements de cette entité"
+
 msgid "using_config"
 msgstr "configuration"