Merge lp:~jelmer/bzr-builder/revtime into lp:bzr-builder

[Jelmer Vernooij]

Add {revtime}, {revdate} substitution variables.

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 06/10/2011 02:31 PM, Jelmer Vernooij wrote:
> Jelmer Vernooij has proposed merging lp:~jelmer/bzr-builder/revtime into lp:bzr-builder.
>
> Requested reviews:
> bzr-builder developers (bzr-builder-devs)
> Related bugs:
> Bug #793072 in bzr-builder: "Provide deb-version variables for revision commit time/date"
> https://bugs.launchpad.net/bzr-builder/+bug/793072
>
> For more details, see:
> https://code.launchpad.net/~jelmer/bzr-builder/revtime/+merge/64169
>
> Add {revtime}, {revdate} substitution variables.

It seems like dates are often spelled out as %Y-%m-%d rather than
%Y%m%d. I don't know where this would explicitly matter, but the former
is always obviously a date, while the latter can sometimes just be a
number, or something else.

Just a thought,
John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk3yK/4ACgkQJdeBCYSNAAMivwCglVryPsEbWTimiGQL/MlbMkmH
llUAnjyjHa1dAvmfC4pCXKgheporT7NH
=i2bI
-----END PGP SIGNATURE-----

[Jelmer Vernooij (jelmer)]

On 06/10/2011 04:36 PM, John Arbash Meinel wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> On 06/10/2011 02:31 PM, Jelmer Vernooij wrote:
>> Jelmer Vernooij has proposed merging lp:~jelmer/bzr-builder/revtime into lp:bzr-builder.
>>
>> Requested reviews:
>> bzr-builder developers (bzr-builder-devs)
>> Related bugs:
>> Bug #793072 in bzr-builder: "Provide deb-version variables for revision commit time/date"
>> https://bugs.launchpad.net/bzr-builder/+bug/793072
>>
>> For more details, see:
>> https://code.launchpad.net/~jelmer/bzr-builder/revtime/+merge/64169
>>
>> Add {revtime}, {revdate} substitution variables.
> It seems like dates are often spelled out as %Y-%m-%d rather than
> %Y%m%d. I don't know where this would explicitly matter, but the former
> is always obviously a date, while the latter can sometimes just be a
> number, or something else.
>
"-" has special meaning in Debian versions, so we usually try to avoid
it. %Y%m is consistent with the existing {time} and {date} substitution
variables.

That said, I think timestamps should generally be avoided as they can be
ambiguous (which of the 5 commits that date was built?).

Cheers,

Jelmer

[James Westby (james-w)]

Hi,

Perhaps a base class would be useful here as the only difference
is the format string?

Thanks,

James

review: Approve

=== modified file 'recipe.py'
--- recipe.py	2011-06-09 12:47:24 +0000
+++ recipe.py	2011-06-10 12:32:59 +0000
@@ -16,6 +16,7 @@
 import os
 import signal
 import subprocess
+import time
 
 from bzrlib import (
     branch,
@@ -220,6 +221,34 @@
         return revno
 
 
+class RevtimeVariable(BranchSubstitutionVariable):
+
+    basename = "revtime"
+
+    def __init__(self, branch_name, branch, revid):
+        super(RevtimeVariable, self).__init__(branch_name)
+        self.branch = branch
+        self.revid = revid
+
+    def get(self):
+        rev = self.branch.repository.get_revision(self.revid)
+        return time.strftime("%Y%m%d%H%M", time.gmtime(rev.timestamp))
+
+
+class RevdateVariable(BranchSubstitutionVariable):
+
+    basename = "revdate"
+
+    def __init__(self, branch_name, branch, revid):
+        super(RevdateVariable, self).__init__(branch_name)
+        self.branch = branch
+        self.revid = revid
+
+    def get(self):
+        rev = self.branch.repository.get_revision(self.revid)
+        return time.strftime("%Y%m%d", time.gmtime(rev.timestamp))
+
+
 def extract_svn_revnum(rev):
     try:
         foreign_revid = rev.foreign_revid
@@ -321,7 +350,8 @@
 simple_vars = [TimeVariable.name, DateVariable.name, RevnoVariable.name,
     SubversionRevnumVariable.name, DebUpstreamVariable.name,
     DebUpstreamBaseVariable.name, GitCommitVariable.name,
-    LatestTagVariable.name, DebVersionVariable.name]
+    LatestTagVariable.name, DebVersionVariable.name, RevdateVariable.name,
+    RevtimeVariable.name]
 
 
 def check_expanded_deb_version(base_branch):
@@ -944,6 +974,10 @@
         self.deb_version = git_commit_var.replace(self.deb_version)
         latest_tag_var = LatestTagVariable(branch_name, branch, revid)
         self.deb_version = latest_tag_var.replace(self.deb_version)
+        revdate_var = RevdateVariable(branch_name, branch, revid)
+        self.deb_version = revdate_var.replace(self.deb_version)
+        revtime_var = RevtimeVariable(branch_name, branch, revid)
+        self.deb_version = revtime_var.replace(self.deb_version)
 
     def substitute_time(self, time):
         """Substitute the time in to deb_version if needed.

=== modified file 'tests/test_recipe.py'
--- tests/test_recipe.py	2011-06-05 13:56:06 +0000
+++ tests/test_recipe.py	2011-06-10 12:32:59 +0000
@@ -1121,6 +1121,24 @@
         self.assertTrue(str(e).startswith("No tags set on branch None mainline"),
             e)
 
+    def test_substitute_revdate(self):
+        br = self.make_branch("source")
+        source = br.create_checkout("checkout")
+        source.commit("one")
+        source.commit("two", timestamp=1307708628, timezone=0)
+        branch1 = BaseRecipeBranch("source", "foo-{revdate}", 0.2)
+        resolve_revisions(branch1)
+        self.assertEqual("foo-20110610", branch1.deb_version)
+
+    def test_substitute_revtime(self):
+        br = self.make_branch("source")
+        source = br.create_checkout("checkout")
+        source.commit("one")
+        source.commit("two", timestamp=1307708628, timezone=0)
+        branch1 = BaseRecipeBranch("source", "foo-{revtime}", 0.2)
+        resolve_revisions(branch1)
+        self.assertEqual("foo-201106101223", branch1.deb_version)
+
 
 class StringifyTests(TestCaseInTempDir):