launchpad-reviewers team mailing list archive

[Aaron Bentley <aaron@xxxxxxxxxxxxx>]

Aaron Bentley has proposed merging lp:~abentley/launchpad/support-mustache into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #874206 in Launchpad itself: "Launchpad should provide for identical rendering server-side or client-side."
  https://bugs.launchpad.net/launchpad/+bug/874206

For more details, see:
https://code.launchpad.net/~abentley/launchpad/support-mustache/+merge/79404

= Summary =
Fix bug #874206: Launchpad should provide for identical rendering server-side or client-side.

== Proposed fix ==
Support Mustache in Python and JavaScript, using pystache and mustache.js

== Pre-implementation notes ==
Discussed with Deryck.  Mustache originally suggested by allenap at Thunderdome.

== Implementation details ==
Both versions of mustache are provided as external code.  pystache is provided as an egg, and mustache.js is provided in sourcecode/, with a symlink in lib/lp/contrib/javascript.

"make lint" was traversing the symlink and linting mustache.js, even though that code is not part of the tree.  It makes little sense to lint code we do not control.  Also, symlinks rarely change, so if we should be linting external code, we would not be doing it often enough.  Therefore, I've changed it to ignore symlink changes, with Curtis' help & agreement.

== Tests ==
None

== Demo and Q/A ==
None

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  versions.cfg
  setup.py
  utilities/find-changed-files.sh
  utilities/sourcedeps.conf
  utilities/sourcedeps.cache
-- 
https://code.launchpad.net/~abentley/launchpad/support-mustache/+merge/79404
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~abentley/launchpad/support-mustache into lp:launchpad.

=== added symlink 'lib/lp/contrib/javascript/mustache.js'
=== target is u'../../../../sourcecode/mustache.js/mustache.js'
=== modified file 'setup.py'
--- setup.py	2011-09-27 09:25:31 +0000
+++ setup.py	2011-10-14 14:28:25 +0000
@@ -66,6 +66,7 @@
         'python-memcached',
         'pyasn1',
         'pydkim',
+        'pystache',
         'python-openid',
         'pytz',
         'rabbitfixture',

=== modified file 'utilities/find-changed-files.sh'
--- utilities/find-changed-files.sh	2010-09-27 11:50:51 +0000
+++ utilities/find-changed-files.sh	2011-10-14 14:28:25 +0000
@@ -37,9 +37,9 @@
     # bzr diff failed
     exit 1
 fi
-# Extract filename from status line.  Strip the @ that mark symlinks.
+# Extract filename from status line.  Skip symlinks.
 files=`bzr st --short $rev_option |
-    sed -e '/^.[MN]/!d; s/.* //' -e 's/@$//'`
+    sed -e '/^.[MN]/!d; s/.* //' -e '/@$/d'`
 
 echo $files
 

=== modified file 'utilities/sourcedeps.cache'
--- utilities/sourcedeps.cache	2011-10-11 01:06:52 +0000
+++ utilities/sourcedeps.cache	2011-10-14 14:28:25 +0000
@@ -43,6 +43,10 @@
         976, 
         "launchpad@xxxxxxxxxxxxxxxxx-20091021010617-prbs2ay6nhxx515v"
     ], 
+    "mustache.js": [
+        166, 
+        "git-v1:d87d274d4c37e3eb9ec28c2a5775d79bef4328c7"
+    ], 
     "old_xmlplus": [
         4, 
         "sinzui-20090526164636-1swugzupwvjgomo4"

=== modified file 'utilities/sourcedeps.conf'
--- utilities/sourcedeps.conf	2011-10-11 01:06:52 +0000
+++ utilities/sourcedeps.conf	2011-10-14 14:28:25 +0000
@@ -9,6 +9,7 @@
 loggerhead lp:~loggerhead-team/loggerhead/trunk-rich;revno=456
 lpreview lp:~launchpad-pqm/bzr-lpreview/devel;revno=23
 mailman lp:~launchpad-pqm/mailman/2.1;revno=976
+mustache.js lp:mustache.js;revno=166
 old_xmlplus lp:~launchpad-pqm/dtdparser/trunk;revno=4
 pygettextpo lp:~launchpad-pqm/pygettextpo/trunk;revno=24
 subvertpy lp:~launchpad-pqm/subvertpy/trunk;revno=2048

=== modified file 'versions.cfg'
--- versions.cfg	2011-10-12 01:10:38 +0000
+++ versions.cfg	2011-10-14 14:28:25 +0000
@@ -63,11 +63,12 @@
 pyasn1 = 0.0.9a
 pycrypto = 2.0.1
 pydkim = 0.3-mbp-r7
-# Unreleased Pygments trunk which includes fixes for issues 618 and 697 (LP bug
-# 834427).  Can be replaced with Pygments 1.5 once it is released.
+# Unreleased Pygments trunk which includes fixes for issues 618 and 697 (LP
+# bug 834427).  Can be replaced with Pygments 1.5 once it is released.
 Pygments = 1.4dev-20111007
 pygpgme = 0.2
 pyOpenSSL = 0.10
+pystache = 0.3.1
 python-memcached = 1.45
 # 2.2.1 with the one-liner Expect: 100-continue fix from
 # lp:~wgrant/python-openid/python-openid-2.2.1-fix676372.