← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~henninge/launchpad/devel-sort-sourcedeps-cache into lp:launchpad

 

Henning Eggers has proposed merging lp:~henninge/launchpad/devel-sort-sourcedeps-cache into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~henninge/launchpad/devel-sort-sourcedeps-cache/+merge/74119

= Summary =

Finally sourcedeps.cache changes won't be so noisy!

== Implementation details ==

There is an error in the python documentation about the sort_keys
parameter and its default value that made this solution a bit harder
to discover. But in the end it is obvious ... ;-)

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/devscripts/sourcecode.py
  utilities/sourcedeps.cache

./lib/devscripts/sourcecode.py
     153: E302 expected 2 blank lines, found 3
     338: E302 expected 2 blank lines, found 3
-- 
https://code.launchpad.net/~henninge/launchpad/devel-sort-sourcedeps-cache/+merge/74119
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~henninge/launchpad/devel-sort-sourcedeps-cache into lp:launchpad.
=== modified file 'lib/devscripts/sourcecode.py'
--- lib/devscripts/sourcecode.py	2011-06-07 15:09:14 +0000
+++ lib/devscripts/sourcecode.py	2011-09-05 17:01:31 +0000
@@ -224,7 +224,7 @@
     if cache == old_cache:
         return
     with open(cache_filename, 'wb') as cache_file:
-        json.dump(cache, cache_file, indent=4)
+        json.dump(cache, cache_file, indent=4, sort_keys=True)
     if not quiet:
         print 'Cache updated.  Please commit "%s".' % cache_filename
 

=== modified file 'utilities/sourcedeps.cache'
--- utilities/sourcedeps.cache	2011-09-02 10:28:09 +0000
+++ utilities/sourcedeps.cache	2011-09-05 17:01:31 +0000
@@ -1,70 +1,70 @@
 {
-    "testresources": [
-        16, 
-        "robertc@xxxxxxxxxxxxxxxxx-20050911111209-ee5da49011cf936a"
-    ], 
-    "mailman": [
-        976, 
-        "launchpad@xxxxxxxxxxxxxxxxx-20091021010617-prbs2ay6nhxx515v"
-    ], 
-    "cscvs": [
-        432, 
-        "launchpad@xxxxxxxxxxxxxxxxx-20100414131608-cf6jatd9zk6l6wpk"
-    ], 
-    "pygpgme": [
-        49, 
-        "launchpad@xxxxxxxxxxxxxxxxx-20100325120516-q8to5dx3gga4wlvi"
-    ], 
-    "subvertpy": [
-        2046, 
-        "launchpad@xxxxxxxxxxxxxxxxx-20110810142738-q1w4ukw9r0z8q2nz"
-    ], 
-    "python-debian": [
-        186, 
-        "launchpad@xxxxxxxxxxxxxxxxx-20110329053617-irncjfr14k0m00zp"
-    ], 
-    "pygettextpo": [
-        24, 
-        "launchpad@xxxxxxxxxxxxxxxxx-20100601182722-wo7h2fh0fvyw3aaq"
+    "bzr-builder": [
+        68, 
+        "launchpad@xxxxxxxxxxxxxxxxx-20101123183213-777lz46xgagn1deg"
     ], 
     "bzr-git": [
         259, 
         "launchpad@xxxxxxxxxxxxxxxxx-20110601140035-gl5merbechngjw5s"
     ], 
-    "loggerhead": [
-        456, 
-        "danilo@xxxxxxxxxxxxx-20110902102252-phc11upmjw8tz1mg"
-    ], 
-    "bzr-builder": [
-        68, 
-        "launchpad@xxxxxxxxxxxxxxxxx-20101123183213-777lz46xgagn1deg"
+    "bzr-hg": [
+        290, 
+        "launchpad@xxxxxxxxxxxxxxxxx-20110808175904-4gj24x3y21kxepcj"
     ], 
     "bzr-loom": [
         50, 
         "launchpad@xxxxxxxxxxxxxxxxx-20110722102404-hl1z8uzhhwiol34l"
     ], 
-    "old_xmlplus": [
-        4, 
-        "sinzui-20090526164636-1swugzupwvjgomo4"
+    "bzr-svn": [
+        2717, 
+        "launchpad@xxxxxxxxxxxxxxxxx-20110819140025-1a6tgsdwtjx3plii"
     ], 
-    "lpreview": [
-        23, 
-        "launchpad@xxxxxxxxxxxxxxxxx-20090720061538-euyh68ifavhy0pi8"
+    "cscvs": [
+        432, 
+        "launchpad@xxxxxxxxxxxxxxxxx-20100414131608-cf6jatd9zk6l6wpk"
     ], 
     "difftacular": [
         6, 
         "aaron@xxxxxxxxxxxxxxxx-20100715135013-uoi3q430urx9gwb8"
     ], 
-    "bzr-svn": [
-        2717, 
-        "launchpad@xxxxxxxxxxxxxxxxx-20110819140025-1a6tgsdwtjx3plii"
-    ], 
-    "bzr-hg": [
-        290, 
-        "launchpad@xxxxxxxxxxxxxxxxx-20110808175904-4gj24x3y21kxepcj"
-    ], 
     "dulwich": [
         426, 
         "launchpad@xxxxxxxxxxxxxxxxx-20110520175715-e90dzs8os0kotbm9"
+    ], 
+    "loggerhead": [
+        456, 
+        "danilo@xxxxxxxxxxxxx-20110902102252-phc11upmjw8tz1mg"
+    ], 
+    "lpreview": [
+        23, 
+        "launchpad@xxxxxxxxxxxxxxxxx-20090720061538-euyh68ifavhy0pi8"
+    ], 
+    "mailman": [
+        976, 
+        "launchpad@xxxxxxxxxxxxxxxxx-20091021010617-prbs2ay6nhxx515v"
+    ], 
+    "old_xmlplus": [
+        4, 
+        "sinzui-20090526164636-1swugzupwvjgomo4"
+    ], 
+    "pygettextpo": [
+        24, 
+        "launchpad@xxxxxxxxxxxxxxxxx-20100601182722-wo7h2fh0fvyw3aaq"
+    ], 
+    "pygpgme": [
+        49, 
+        "launchpad@xxxxxxxxxxxxxxxxx-20100325120516-q8to5dx3gga4wlvi"
+    ], 
+    "python-debian": [
+        186, 
+        "launchpad@xxxxxxxxxxxxxxxxx-20110329053617-irncjfr14k0m00zp"
+    ], 
+    "subvertpy": [
+        2046, 
+        "launchpad@xxxxxxxxxxxxxxxxx-20110810142738-q1w4ukw9r0z8q2nz"
+    ], 
+    "testresources": [
+        16, 
+        "robertc@xxxxxxxxxxxxxxxxx-20050911111209-ee5da49011cf936a"
     ]
 }
\ No newline at end of file