Merge branch 'diffs' of https://bitbucket.org/yackob03/quay into diffs

endpoints/registry.py

@@ -339,9 +339,12 @@ def process_image_changes(namespace, repository, image_id):
 
   image_diffs_path = store.image_file_diffs_path(namespace, repository,
                                                  image_id)
+  image_trie_path = store.image_file_trie_path(namespace, repository,
+                                               image_id)
+
   if store.exists(image_diffs_path):
     logger.debug('Diffs already exist for image: %s' % image_id)
-    return
+    return image_trie_path
 
   image = model.get_image_by_id(namespace, repository, image_id)
   parents = model.get_parent_images(image)
@@ -370,8 +373,7 @@ def process_image_changes(namespace, repository, image_id):
   (new_trie, added, changed, removed) = new_metadata
 
   # Write out the new trie
-  new_trie_path = store.image_file_trie_path(namespace, repository, image_id)
+  store.put_content(image_trie_path, new_trie.tobytes())
-  store.put_content(new_trie_path, new_trie.tobytes())
 
   # Write out the diffs
   diffs = {}
@@ -381,4 +383,4 @@ def process_image_changes(namespace, repository, image_id):
     diffs[section].sort()
   store.put_content(image_diffs_path, json.dumps(diffs, indent=2))
 
-  return new_trie_path
+  return image_trie_path

initdb.py

@@ -4,7 +4,7 @@ import shutil
 import os
 import hashlib
 
-from datetime import datetime
+from datetime import datetime, timedelta
 
 import storage
 
@@ -18,11 +18,10 @@ store = storage.load()
 logging.basicConfig(**app.config['LOGGING_CONFIG'])
 
 
-SAMPLE_DIFFS = [
+SAMPLE_DIFFS = ['test/data/sample/diffs/diffs%s.json' % i
-  'test/data/sample/diffs/diffs.json',
+                for i in range(1, 10)]
-  'test/data/sample/diffs/diffs2.json',
+
-  'test/data/sample/diffs/diffs3.json',
+REFERENCE_DATE = datetime(2013, 6, 23)
-]
 
 
 def __gen_checksum(image_id):
@@ -30,35 +29,37 @@ def __gen_checksum(image_id):
   return 'tarsum+sha256:' + h.hexdigest()
 
 
-global_image_num = [0]
+def __gen_image_id(repo, image_num):
-def __gen_image_id(repo):
+  str_to_hash = "%s/%s/%s" % (repo.namespace, repo.name, image_num)
-  str_to_hash = "%s/%s/%s" % (repo.namespace, repo.name, global_image_num[0])
-  global_image_num[0] += 1
 
   h = hashlib.md5(str_to_hash)
   return h.hexdigest()
 
 
+global_image_num = [0]
 def create_subtree(repo, structure, parent):
   num_nodes, subtrees, last_node_tags = structure
 
   # create the nodes
   for i in range(num_nodes):
-    docker_image_id = __gen_image_id(repo)
+    image_num = global_image_num[0]
+    global_image_num[0] += 1
+    docker_image_id = __gen_image_id(repo, image_num)
     logger.debug('new docker id: %s' % docker_image_id)
     checksum = __gen_checksum(docker_image_id)
 
     new_image = model.create_image(docker_image_id, repo)
     model.set_image_checksum(docker_image_id, repo, checksum)
 
+    creation_time = REFERENCE_DATE + timedelta(days=image_num)
     new_image = model.set_image_metadata(docker_image_id, repo.namespace,
-                                         repo.name, str(datetime.now()),
+                                         repo.name, str(creation_time),
                                          'no comment', parent)
 
     # Populate the diff file
     diff_path = store.image_file_diffs_path(repo.namespace, repo.name,
-                                          docker_image_id)
+                                            docker_image_id)
-    source_diff = SAMPLE_DIFFS[i % len(SAMPLE_DIFFS)]
+    source_diff = SAMPLE_DIFFS[image_num % len(SAMPLE_DIFFS)]
 
     with open(source_diff, 'r') as source_file:
       store.stream_write(diff_path, source_file)

test/data/registry/images/devtable/complex/d3acf10ce5ad8b208ba38e626ced2946/diffs.json

@@ -1,16 +1,85 @@
 {
-  "removed": [], 
+  "removed": [
-  "added": [
+    "/opt/elasticsearch-0.90.5/LICENSE.txt", 
-    "/dev/kmsg", 
+    "/opt/elasticsearch-0.90.5/NOTICE.txt", 
-    "/root/.bash_history", 
+    "/opt/elasticsearch-0.90.5/README.textile", 
-    "/usr/sbin/policy-rc.d"
+    "/opt/elasticsearch-0.90.5/bin/elasticsearch", 
+    "/opt/elasticsearch-0.90.5/bin/elasticsearch.in.sh", 
+    "/opt/elasticsearch-0.90.5/bin/plugin", 
+    "/opt/elasticsearch-0.90.5/config/elasticsearch.yml", 
+    "/opt/elasticsearch-0.90.5/config/logging.yml", 
+    "/opt/elasticsearch-0.90.5/lib/elasticsearch-0.90.5.jar", 
+    "/opt/elasticsearch-0.90.5/lib/jna-3.3.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/jts-1.12.jar", 
+    "/opt/elasticsearch-0.90.5/lib/log4j-1.2.17.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-analyzers-common-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-codecs-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-core-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-grouping-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-highlighter-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-join-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-memory-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-misc-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-queries-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-queryparser-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-sandbox-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-spatial-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-suggest-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-freebsd-6.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-linux.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-solaris.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-ia64-linux.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc-solaris.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc64-solaris.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal-macosx.dylib", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal64-macosx.dylib", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-5.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-6.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-linux.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-solaris.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/sigar-1.6.4.jar", 
+    "/opt/elasticsearch-0.90.5/lib/spatial4j-0.3.jar"
   ], 
-  "changed": [
+  "added": [
-    "/.", 
+    "/opt/elasticsearch/LICENSE.txt", 
-    "/dev", 
+    "/opt/elasticsearch/NOTICE.txt", 
-    "/root", 
+    "/opt/elasticsearch/README.textile", 
-    "/tmp", 
+    "/opt/elasticsearch/bin/elasticsearch", 
-    "/usr", 
+    "/opt/elasticsearch/bin/elasticsearch.in.sh", 
-    "/usr/sbin"
+    "/opt/elasticsearch/bin/plugin", 
-  ]
+    "/opt/elasticsearch/config/elasticsearch.yml", 
+    "/opt/elasticsearch/config/logging.yml", 
+    "/opt/elasticsearch/lib/elasticsearch-0.90.5.jar", 
+    "/opt/elasticsearch/lib/jna-3.3.0.jar", 
+    "/opt/elasticsearch/lib/jts-1.12.jar", 
+    "/opt/elasticsearch/lib/log4j-1.2.17.jar", 
+    "/opt/elasticsearch/lib/lucene-analyzers-common-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-codecs-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-core-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-grouping-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-highlighter-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-join-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-memory-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-misc-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-queries-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-queryparser-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-sandbox-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-spatial-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-suggest-4.4.0.jar", 
+    "/opt/elasticsearch/lib/sigar/libsigar-amd64-freebsd-6.so", 
+    "/opt/elasticsearch/lib/sigar/libsigar-amd64-linux.so", 
+    "/opt/elasticsearch/lib/sigar/libsigar-amd64-solaris.so", 
+    "/opt/elasticsearch/lib/sigar/libsigar-ia64-linux.so", 
+    "/opt/elasticsearch/lib/sigar/libsigar-sparc-solaris.so", 
+    "/opt/elasticsearch/lib/sigar/libsigar-sparc64-solaris.so", 
+    "/opt/elasticsearch/lib/sigar/libsigar-universal-macosx.dylib", 
+    "/opt/elasticsearch/lib/sigar/libsigar-universal64-macosx.dylib", 
+    "/opt/elasticsearch/lib/sigar/libsigar-x86-freebsd-5.so", 
+    "/opt/elasticsearch/lib/sigar/libsigar-x86-freebsd-6.so", 
+    "/opt/elasticsearch/lib/sigar/libsigar-x86-linux.so", 
+    "/opt/elasticsearch/lib/sigar/libsigar-x86-solaris.so", 
+    "/opt/elasticsearch/lib/sigar/sigar-1.6.4.jar", 
+    "/opt/elasticsearch/lib/spatial4j-0.3.jar"
+  ], 
+  "changed": []
 }

test/data/registry/images/devtable/gargantuan/0ccb6d859cbdf08f5c71132707e144fc/diffs.json

@@ -1,16 +1,85 @@
 {
-  "removed": [], 
+  "removed": [
-  "added": [
+    "/opt/elasticsearch-0.90.5/LICENSE.txt", 
-    "/dev/kmsg", 
+    "/opt/elasticsearch-0.90.5/NOTICE.txt", 
-    "/root/.bash_history", 
+    "/opt/elasticsearch-0.90.5/README.textile", 
-    "/usr/sbin/policy-rc.d"
+    "/opt/elasticsearch-0.90.5/bin/elasticsearch", 
+    "/opt/elasticsearch-0.90.5/bin/elasticsearch.in.sh", 
+    "/opt/elasticsearch-0.90.5/bin/plugin", 
+    "/opt/elasticsearch-0.90.5/config/elasticsearch.yml", 
+    "/opt/elasticsearch-0.90.5/config/logging.yml", 
+    "/opt/elasticsearch-0.90.5/lib/elasticsearch-0.90.5.jar", 
+    "/opt/elasticsearch-0.90.5/lib/jna-3.3.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/jts-1.12.jar", 
+    "/opt/elasticsearch-0.90.5/lib/log4j-1.2.17.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-analyzers-common-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-codecs-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-core-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-grouping-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-highlighter-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-join-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-memory-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-misc-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-queries-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-queryparser-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-sandbox-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-spatial-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-suggest-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-freebsd-6.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-linux.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-solaris.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-ia64-linux.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc-solaris.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc64-solaris.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal-macosx.dylib", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal64-macosx.dylib", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-5.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-6.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-linux.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-solaris.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/sigar-1.6.4.jar", 
+    "/opt/elasticsearch-0.90.5/lib/spatial4j-0.3.jar"
   ], 
-  "changed": [
+  "added": [
-    "/.", 
+    "/opt/elasticsearch/LICENSE.txt", 
-    "/dev", 
+    "/opt/elasticsearch/NOTICE.txt", 
-    "/root", 
+    "/opt/elasticsearch/README.textile", 
-    "/tmp", 
+    "/opt/elasticsearch/bin/elasticsearch", 
-    "/usr", 
+    "/opt/elasticsearch/bin/elasticsearch.in.sh", 
-    "/usr/sbin"
+    "/opt/elasticsearch/bin/plugin", 
-  ]
+    "/opt/elasticsearch/config/elasticsearch.yml", 
+    "/opt/elasticsearch/config/logging.yml", 
+    "/opt/elasticsearch/lib/elasticsearch-0.90.5.jar", 
+    "/opt/elasticsearch/lib/jna-3.3.0.jar", 
+    "/opt/elasticsearch/lib/jts-1.12.jar", 
+    "/opt/elasticsearch/lib/log4j-1.2.17.jar", 
+    "/opt/elasticsearch/lib/lucene-analyzers-common-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-codecs-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-core-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-grouping-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-highlighter-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-join-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-memory-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-misc-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-queries-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-queryparser-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-sandbox-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-spatial-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-suggest-4.4.0.jar", 
+    "/opt/elasticsearch/lib/sigar/libsigar-amd64-freebsd-6.so", 
+    "/opt/elasticsearch/lib/sigar/libsigar-amd64-linux.so", 
+    "/opt/elasticsearch/lib/sigar/libsigar-amd64-solaris.so", 
+    "/opt/elasticsearch/lib/sigar/libsigar-ia64-linux.so", 
+    "/opt/elasticsearch/lib/sigar/libsigar-sparc-solaris.so", 
+    "/opt/elasticsearch/lib/sigar/libsigar-sparc64-solaris.so", 
+    "/opt/elasticsearch/lib/sigar/libsigar-universal-macosx.dylib", 
+    "/opt/elasticsearch/lib/sigar/libsigar-universal64-macosx.dylib", 
+    "/opt/elasticsearch/lib/sigar/libsigar-x86-freebsd-5.so", 
+    "/opt/elasticsearch/lib/sigar/libsigar-x86-freebsd-6.so", 
+    "/opt/elasticsearch/lib/sigar/libsigar-x86-linux.so", 
+    "/opt/elasticsearch/lib/sigar/libsigar-x86-solaris.so", 
+    "/opt/elasticsearch/lib/sigar/sigar-1.6.4.jar", 
+    "/opt/elasticsearch/lib/spatial4j-0.3.jar"
+  ], 
+  "changed": []
 }

test/data/registry/images/devtable/gargantuan/1dcf485dfbdf2ee735d39f74d4ec9132/diffs.json

@@ -1,16 +1,7 @@
 {
   "removed": [], 
   "added": [
-    "/dev/kmsg", 
+    "/elasticsearch-0.90.5.tar.gz"
-    "/root/.bash_history", 
-    "/usr/sbin/policy-rc.d"
   ], 
-  "changed": [
+  "changed": []
-    "/.", 
-    "/dev", 
-    "/root", 
-    "/tmp", 
-    "/usr", 
-    "/usr/sbin"
-  ]
 }

test/data/registry/images/devtable/gargantuan/2561f1d3a276103635c2cde5a7dc7759/diffs.json

@@ -1,16 +1,85 @@
 {
-  "removed": [], 
+  "removed": [
-  "added": [
+    "/opt/elasticsearch-0.90.5/LICENSE.txt", 
-    "/dev/kmsg", 
+    "/opt/elasticsearch-0.90.5/NOTICE.txt", 
-    "/root/.bash_history", 
+    "/opt/elasticsearch-0.90.5/README.textile", 
-    "/usr/sbin/policy-rc.d"
+    "/opt/elasticsearch-0.90.5/bin/elasticsearch", 
+    "/opt/elasticsearch-0.90.5/bin/elasticsearch.in.sh", 
+    "/opt/elasticsearch-0.90.5/bin/plugin", 
+    "/opt/elasticsearch-0.90.5/config/elasticsearch.yml", 
+    "/opt/elasticsearch-0.90.5/config/logging.yml", 
+    "/opt/elasticsearch-0.90.5/lib/elasticsearch-0.90.5.jar", 
+    "/opt/elasticsearch-0.90.5/lib/jna-3.3.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/jts-1.12.jar", 
+    "/opt/elasticsearch-0.90.5/lib/log4j-1.2.17.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-analyzers-common-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-codecs-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-core-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-grouping-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-highlighter-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-join-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-memory-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-misc-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-queries-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-queryparser-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-sandbox-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-spatial-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-suggest-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-freebsd-6.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-linux.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-solaris.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-ia64-linux.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc-solaris.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc64-solaris.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal-macosx.dylib", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal64-macosx.dylib", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-5.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-6.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-linux.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-solaris.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/sigar-1.6.4.jar", 
+    "/opt/elasticsearch-0.90.5/lib/spatial4j-0.3.jar"
   ], 
-  "changed": [
+  "added": [
-    "/.", 
+    "/opt/elasticsearch/LICENSE.txt", 
-    "/dev", 
+    "/opt/elasticsearch/NOTICE.txt", 
-    "/root", 
+    "/opt/elasticsearch/README.textile", 
-    "/tmp", 
+    "/opt/elasticsearch/bin/elasticsearch", 
-    "/usr", 
+    "/opt/elasticsearch/bin/elasticsearch.in.sh", 
-    "/usr/sbin"
+    "/opt/elasticsearch/bin/plugin", 
-  ]
+    "/opt/elasticsearch/config/elasticsearch.yml", 
+    "/opt/elasticsearch/config/logging.yml", 
+    "/opt/elasticsearch/lib/elasticsearch-0.90.5.jar", 
+    "/opt/elasticsearch/lib/jna-3.3.0.jar", 
+    "/opt/elasticsearch/lib/jts-1.12.jar", 
+    "/opt/elasticsearch/lib/log4j-1.2.17.jar", 
+    "/opt/elasticsearch/lib/lucene-analyzers-common-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-codecs-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-core-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-grouping-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-highlighter-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-join-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-memory-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-misc-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-queries-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-queryparser-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-sandbox-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-spatial-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-suggest-4.4.0.jar", 
+    "/opt/elasticsearch/lib/sigar/libsigar-amd64-freebsd-6.so", 
+    "/opt/elasticsearch/lib/sigar/libsigar-amd64-linux.so", 
+    "/opt/elasticsearch/lib/sigar/libsigar-amd64-solaris.so", 
+    "/opt/elasticsearch/lib/sigar/libsigar-ia64-linux.so", 
+    "/opt/elasticsearch/lib/sigar/libsigar-sparc-solaris.so", 
+    "/opt/elasticsearch/lib/sigar/libsigar-sparc64-solaris.so", 
+    "/opt/elasticsearch/lib/sigar/libsigar-universal-macosx.dylib", 
+    "/opt/elasticsearch/lib/sigar/libsigar-universal64-macosx.dylib", 
+    "/opt/elasticsearch/lib/sigar/libsigar-x86-freebsd-5.so", 
+    "/opt/elasticsearch/lib/sigar/libsigar-x86-freebsd-6.so", 
+    "/opt/elasticsearch/lib/sigar/libsigar-x86-linux.so", 
+    "/opt/elasticsearch/lib/sigar/libsigar-x86-solaris.so", 
+    "/opt/elasticsearch/lib/sigar/sigar-1.6.4.jar", 
+    "/opt/elasticsearch/lib/spatial4j-0.3.jar"
+  ], 
+  "changed": []
 }

test/data/registry/images/devtable/gargantuan/8324a62cde97d7a0ebfc011068186a05/diffs.json

@@ -1,16 +1,7 @@
 {
   "removed": [], 
   "added": [
-    "/dev/kmsg", 
+    "/elasticsearch-0.90.5.tar.gz"
-    "/root/.bash_history", 
-    "/usr/sbin/policy-rc.d"
   ], 
-  "changed": [
+  "changed": []
-    "/.", 
-    "/dev", 
-    "/root", 
-    "/tmp", 
-    "/usr", 
-    "/usr/sbin"
-  ]
 }

test/data/registry/images/devtable/shared/fb820a41a1b0f94cf779305c2e23d4d1/diffs.json

@@ -1,16 +1,85 @@
 {
-  "removed": [], 
+  "removed": [
-  "added": [
+    "/opt/elasticsearch-0.90.5/LICENSE.txt", 
-    "/dev/kmsg", 
+    "/opt/elasticsearch-0.90.5/NOTICE.txt", 
-    "/root/.bash_history", 
+    "/opt/elasticsearch-0.90.5/README.textile", 
-    "/usr/sbin/policy-rc.d"
+    "/opt/elasticsearch-0.90.5/bin/elasticsearch", 
+    "/opt/elasticsearch-0.90.5/bin/elasticsearch.in.sh", 
+    "/opt/elasticsearch-0.90.5/bin/plugin", 
+    "/opt/elasticsearch-0.90.5/config/elasticsearch.yml", 
+    "/opt/elasticsearch-0.90.5/config/logging.yml", 
+    "/opt/elasticsearch-0.90.5/lib/elasticsearch-0.90.5.jar", 
+    "/opt/elasticsearch-0.90.5/lib/jna-3.3.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/jts-1.12.jar", 
+    "/opt/elasticsearch-0.90.5/lib/log4j-1.2.17.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-analyzers-common-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-codecs-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-core-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-grouping-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-highlighter-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-join-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-memory-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-misc-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-queries-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-queryparser-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-sandbox-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-spatial-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-suggest-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-freebsd-6.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-linux.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-solaris.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-ia64-linux.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc-solaris.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc64-solaris.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal-macosx.dylib", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal64-macosx.dylib", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-5.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-6.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-linux.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-solaris.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/sigar-1.6.4.jar", 
+    "/opt/elasticsearch-0.90.5/lib/spatial4j-0.3.jar"
   ], 
-  "changed": [
+  "added": [
-    "/.", 
+    "/opt/elasticsearch/LICENSE.txt", 
-    "/dev", 
+    "/opt/elasticsearch/NOTICE.txt", 
-    "/root", 
+    "/opt/elasticsearch/README.textile", 
-    "/tmp", 
+    "/opt/elasticsearch/bin/elasticsearch", 
-    "/usr", 
+    "/opt/elasticsearch/bin/elasticsearch.in.sh", 
-    "/usr/sbin"
+    "/opt/elasticsearch/bin/plugin", 
-  ]
+    "/opt/elasticsearch/config/elasticsearch.yml", 
+    "/opt/elasticsearch/config/logging.yml", 
+    "/opt/elasticsearch/lib/elasticsearch-0.90.5.jar", 
+    "/opt/elasticsearch/lib/jna-3.3.0.jar", 
+    "/opt/elasticsearch/lib/jts-1.12.jar", 
+    "/opt/elasticsearch/lib/log4j-1.2.17.jar", 
+    "/opt/elasticsearch/lib/lucene-analyzers-common-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-codecs-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-core-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-grouping-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-highlighter-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-join-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-memory-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-misc-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-queries-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-queryparser-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-sandbox-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-spatial-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-suggest-4.4.0.jar", 
+    "/opt/elasticsearch/lib/sigar/libsigar-amd64-freebsd-6.so", 
+    "/opt/elasticsearch/lib/sigar/libsigar-amd64-linux.so", 
+    "/opt/elasticsearch/lib/sigar/libsigar-amd64-solaris.so", 
+    "/opt/elasticsearch/lib/sigar/libsigar-ia64-linux.so", 
+    "/opt/elasticsearch/lib/sigar/libsigar-sparc-solaris.so", 
+    "/opt/elasticsearch/lib/sigar/libsigar-sparc64-solaris.so", 
+    "/opt/elasticsearch/lib/sigar/libsigar-universal-macosx.dylib", 
+    "/opt/elasticsearch/lib/sigar/libsigar-universal64-macosx.dylib", 
+    "/opt/elasticsearch/lib/sigar/libsigar-x86-freebsd-5.so", 
+    "/opt/elasticsearch/lib/sigar/libsigar-x86-freebsd-6.so", 
+    "/opt/elasticsearch/lib/sigar/libsigar-x86-linux.so", 
+    "/opt/elasticsearch/lib/sigar/libsigar-x86-solaris.so", 
+    "/opt/elasticsearch/lib/sigar/sigar-1.6.4.jar", 
+    "/opt/elasticsearch/lib/spatial4j-0.3.jar"
+  ], 
+  "changed": []
 }

test/data/registry/images/public/publicrepo/030581d6f421978b637479b73f862b63/diffs.json

@@ -1,16 +1,45 @@
 {
   "removed": [], 
   "added": [
-    "/dev/kmsg", 
+    "/opt/elasticsearch-0.90.5/LICENSE.txt", 
-    "/root/.bash_history", 
+    "/opt/elasticsearch-0.90.5/NOTICE.txt", 
-    "/usr/sbin/policy-rc.d"
+    "/opt/elasticsearch-0.90.5/README.textile", 
+    "/opt/elasticsearch-0.90.5/bin/elasticsearch", 
+    "/opt/elasticsearch-0.90.5/bin/elasticsearch.in.sh", 
+    "/opt/elasticsearch-0.90.5/bin/plugin", 
+    "/opt/elasticsearch-0.90.5/config/elasticsearch.yml", 
+    "/opt/elasticsearch-0.90.5/config/logging.yml", 
+    "/opt/elasticsearch-0.90.5/lib/elasticsearch-0.90.5.jar", 
+    "/opt/elasticsearch-0.90.5/lib/jna-3.3.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/jts-1.12.jar", 
+    "/opt/elasticsearch-0.90.5/lib/log4j-1.2.17.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-analyzers-common-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-codecs-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-core-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-grouping-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-highlighter-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-join-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-memory-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-misc-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-queries-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-queryparser-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-sandbox-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-spatial-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-suggest-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-freebsd-6.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-linux.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-solaris.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-ia64-linux.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc-solaris.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc64-solaris.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal-macosx.dylib", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal64-macosx.dylib", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-5.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-6.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-linux.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-solaris.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/sigar-1.6.4.jar", 
+    "/opt/elasticsearch-0.90.5/lib/spatial4j-0.3.jar"
   ], 
-  "changed": [
+  "changed": []
-    "/.", 
-    "/dev", 
-    "/root", 
-    "/tmp", 
-    "/usr", 
-    "/usr/sbin"
-  ]
 }

test/data/registry/images/public/publicrepo/1b4bc84b74c71ac837ff19eae76e76c0/diffs.json

@@ -1,16 +1,38 @@
 {
   "removed": [], 
   "added": [
-    "/dev/kmsg", 
+    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_Release", 
-    "/root/.bash_history", 
+    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_Release.gpg", 
-    "/usr/sbin/policy-rc.d"
+    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_main_binary-amd64_Packages", 
+    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_main_i18n_Translation-en", 
+    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_main_source_Sources", 
+    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_multiverse_binary-amd64_Packages", 
+    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_multiverse_i18n_Translation-en", 
+    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_multiverse_source_Sources", 
+    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_restricted_binary-amd64_Packages", 
+    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_restricted_i18n_Translation-en", 
+    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_restricted_source_Sources", 
+    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_universe_binary-amd64_Packages", 
+    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_universe_i18n_Translation-en", 
+    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_universe_source_Sources", 
+    "/var/lib/apt/lists/lock", 
+    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_Release", 
+    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_Release.gpg", 
+    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_main_binary-amd64_Packages", 
+    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_main_i18n_Translation-en", 
+    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_main_source_Sources", 
+    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_multiverse_binary-amd64_Packages", 
+    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_multiverse_i18n_Translation-en", 
+    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_multiverse_source_Sources", 
+    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_restricted_binary-amd64_Packages", 
+    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_restricted_i18n_Translation-en", 
+    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_restricted_source_Sources", 
+    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_universe_binary-amd64_Packages", 
+    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_universe_i18n_Translation-en", 
+    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_universe_source_Sources"
   ], 
   "changed": [
-    "/.", 
+    "/var/cache/apt/pkgcache.bin", 
-    "/dev", 
+    "/var/cache/apt/srcpkgcache.bin"
-    "/root", 
-    "/tmp", 
-    "/usr", 
-    "/usr/sbin"
   ]
 }

test/data/registry/images/public/publicrepo/7025cb49ee8cd5da3054e4b69210fdbe/diffs.json

@@ -1,16 +1,8 @@
 {
   "removed": [], 
   "added": [
-    "/dev/kmsg", 
     "/root/.bash_history", 
     "/usr/sbin/policy-rc.d"
   ], 
-  "changed": [
+  "changed": []
-    "/.", 
-    "/dev", 
-    "/root", 
-    "/tmp", 
-    "/usr", 
-    "/usr/sbin"
-  ]
 }

test/data/sample/diffs/diffs0.json

@@ -0,0 +1,5 @@
+{
+  "removed": [], 
+  "added": [], 
+  "changed": []
+}

test/data/sample/diffs/diffs5.json

@@ -0,0 +1,45 @@
+{
+  "removed": [], 
+  "added": [
+    "/opt/elasticsearch-0.90.5/LICENSE.txt", 
+    "/opt/elasticsearch-0.90.5/NOTICE.txt", 
+    "/opt/elasticsearch-0.90.5/README.textile", 
+    "/opt/elasticsearch-0.90.5/bin/elasticsearch", 
+    "/opt/elasticsearch-0.90.5/bin/elasticsearch.in.sh", 
+    "/opt/elasticsearch-0.90.5/bin/plugin", 
+    "/opt/elasticsearch-0.90.5/config/elasticsearch.yml", 
+    "/opt/elasticsearch-0.90.5/config/logging.yml", 
+    "/opt/elasticsearch-0.90.5/lib/elasticsearch-0.90.5.jar", 
+    "/opt/elasticsearch-0.90.5/lib/jna-3.3.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/jts-1.12.jar", 
+    "/opt/elasticsearch-0.90.5/lib/log4j-1.2.17.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-analyzers-common-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-codecs-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-core-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-grouping-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-highlighter-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-join-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-memory-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-misc-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-queries-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-queryparser-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-sandbox-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-spatial-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-suggest-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-freebsd-6.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-linux.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-solaris.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-ia64-linux.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc-solaris.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc64-solaris.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal-macosx.dylib", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal64-macosx.dylib", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-5.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-6.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-linux.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-solaris.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/sigar-1.6.4.jar", 
+    "/opt/elasticsearch-0.90.5/lib/spatial4j-0.3.jar"
+  ], 
+  "changed": []
+}

test/data/sample/diffs/diffs6.json

@@ -0,0 +1,5 @@
+{
+  "removed": [], 
+  "added": [], 
+  "changed": []
+}

test/data/sample/diffs/diffs7.json

@@ -0,0 +1,7 @@
+{
+  "removed": [], 
+  "added": [
+    "/elasticsearch-0.90.5.tar.gz"
+  ], 
+  "changed": []
+}

test/data/sample/diffs/diffs8.json

@@ -0,0 +1,8 @@
+{
+  "removed": [], 
+  "added": [
+    "/root/.bash_history", 
+    "/usr/sbin/policy-rc.d"
+  ], 
+  "changed": []
+}

test/data/sample/diffs/diffs9.json

@@ -0,0 +1,85 @@
+{
+  "removed": [
+    "/opt/elasticsearch-0.90.5/LICENSE.txt", 
+    "/opt/elasticsearch-0.90.5/NOTICE.txt", 
+    "/opt/elasticsearch-0.90.5/README.textile", 
+    "/opt/elasticsearch-0.90.5/bin/elasticsearch", 
+    "/opt/elasticsearch-0.90.5/bin/elasticsearch.in.sh", 
+    "/opt/elasticsearch-0.90.5/bin/plugin", 
+    "/opt/elasticsearch-0.90.5/config/elasticsearch.yml", 
+    "/opt/elasticsearch-0.90.5/config/logging.yml", 
+    "/opt/elasticsearch-0.90.5/lib/elasticsearch-0.90.5.jar", 
+    "/opt/elasticsearch-0.90.5/lib/jna-3.3.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/jts-1.12.jar", 
+    "/opt/elasticsearch-0.90.5/lib/log4j-1.2.17.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-analyzers-common-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-codecs-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-core-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-grouping-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-highlighter-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-join-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-memory-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-misc-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-queries-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-queryparser-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-sandbox-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-spatial-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-suggest-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-freebsd-6.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-linux.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-solaris.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-ia64-linux.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc-solaris.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc64-solaris.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal-macosx.dylib", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal64-macosx.dylib", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-5.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-6.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-linux.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-solaris.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/sigar-1.6.4.jar", 
+    "/opt/elasticsearch-0.90.5/lib/spatial4j-0.3.jar"
+  ], 
+  "added": [
+    "/opt/elasticsearch/LICENSE.txt", 
+    "/opt/elasticsearch/NOTICE.txt", 
+    "/opt/elasticsearch/README.textile", 
+    "/opt/elasticsearch/bin/elasticsearch", 
+    "/opt/elasticsearch/bin/elasticsearch.in.sh", 
+    "/opt/elasticsearch/bin/plugin", 
+    "/opt/elasticsearch/config/elasticsearch.yml", 
+    "/opt/elasticsearch/config/logging.yml", 
+    "/opt/elasticsearch/lib/elasticsearch-0.90.5.jar", 
+    "/opt/elasticsearch/lib/jna-3.3.0.jar", 
+    "/opt/elasticsearch/lib/jts-1.12.jar", 
+    "/opt/elasticsearch/lib/log4j-1.2.17.jar", 
+    "/opt/elasticsearch/lib/lucene-analyzers-common-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-codecs-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-core-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-grouping-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-highlighter-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-join-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-memory-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-misc-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-queries-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-queryparser-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-sandbox-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-spatial-4.4.0.jar", 
+    "/opt/elasticsearch/lib/lucene-suggest-4.4.0.jar", 
+    "/opt/elasticsearch/lib/sigar/libsigar-amd64-freebsd-6.so", 
+    "/opt/elasticsearch/lib/sigar/libsigar-amd64-linux.so", 
+    "/opt/elasticsearch/lib/sigar/libsigar-amd64-solaris.so", 
+    "/opt/elasticsearch/lib/sigar/libsigar-ia64-linux.so", 
+    "/opt/elasticsearch/lib/sigar/libsigar-sparc-solaris.so", 
+    "/opt/elasticsearch/lib/sigar/libsigar-sparc64-solaris.so", 
+    "/opt/elasticsearch/lib/sigar/libsigar-universal-macosx.dylib", 
+    "/opt/elasticsearch/lib/sigar/libsigar-universal64-macosx.dylib", 
+    "/opt/elasticsearch/lib/sigar/libsigar-x86-freebsd-5.so", 
+    "/opt/elasticsearch/lib/sigar/libsigar-x86-freebsd-6.so", 
+    "/opt/elasticsearch/lib/sigar/libsigar-x86-linux.so", 
+    "/opt/elasticsearch/lib/sigar/libsigar-x86-solaris.so", 
+    "/opt/elasticsearch/lib/sigar/sigar-1.6.4.jar", 
+    "/opt/elasticsearch/lib/spatial4j-0.3.jar"
+  ], 
+  "changed": []
+}

util/changes.py

@@ -8,26 +8,31 @@ AUFS_METADATA = u'.wh..wh.'
 AUFS_WHITEOUT = u'.wh.'
 AUFS_WHITEOUT_PREFIX_LENGTH = len(AUFS_WHITEOUT)
 
+ALLOWED_TYPES = {tarfile.REGTYPE, tarfile.AREGTYPE}
+
 
 def files_and_dirs_from_tar(source_stream, removed_prefix_collector):
   tar_stream = tarfile.open(mode='r|*', fileobj=source_stream)
   
   for tar_info in tar_stream:
-    absolute = os.path.relpath(unicode(tar_info.name), './')
+    absolute = os.path.relpath(tar_info.name.decode('utf-8'), './')
+    dirname = os.path.dirname(absolute)
     filename = os.path.basename(absolute)
 
+    # Skip directories and metadata
     if (filename.startswith(AUFS_METADATA) or
         absolute.startswith(AUFS_METADATA)):
       # Skip
       continue
 
     elif filename.startswith(AUFS_WHITEOUT):
-      filename = filename[AUFS_WHITEOUT_PREFIX_LENGTH:]
+      removed_filename = filename[AUFS_WHITEOUT_PREFIX_LENGTH:]
-      removed_prefix_collector.add(absolute)
+      removed_prefix = os.path.join('/', dirname, removed_filename)
+      removed_prefix_collector.add(removed_prefix)
       continue
 
-    else:
+    elif tar_info.type in ALLOWED_TYPES:
-      yield "/" + absolute
+      yield '/' + absolute
 
 
 def __compute_removed(base_trie, removed_prefixes):