Merge pull request #120 from jonhoo/deterministic-manifest

Write out manifest.in entries deterministically

src/generator.rs

@@ -3,6 +3,7 @@ use super::Tarballer;
 use crate::compression::CompressionFormats;
 use crate::util::*;
 use anyhow::{bail, format_err, Context, Result};
+use std::collections::BTreeSet;
 use std::io::Write;
 use std::path::Path;
 
@@ -121,13 +122,14 @@ impl Generator {
 
 /// Copies the `src` directory recursively to `dst`, writing `manifest.in` too.
 fn copy_and_manifest(src: &Path, dst: &Path, bulk_dirs: &str) -> Result<()> {
-    let manifest = create_new_file(dst.join("manifest.in"))?;
+    let mut manifest = create_new_file(dst.join("manifest.in"))?;
     let bulk_dirs: Vec<_> = bulk_dirs
         .split(',')
         .filter(|s| !s.is_empty())
         .map(Path::new)
         .collect();
 
+    let mut paths = BTreeSet::new();
     copy_with_callback(src, dst, |path, file_type| {
         // We need paths to be compatible with both Unix and Windows.
         if path
@@ -157,14 +159,20 @@ fn copy_and_manifest(src: &Path, dst: &Path, bulk_dirs: &str) -> Result<()> {
         if file_type.is_dir() {
             // Only manifest directories that are explicitly bulk.
             if bulk_dirs.contains(&path) {
-                writeln!(&manifest, "dir:{}", string)?;
+                paths.insert(format!("dir:{}\n", string));
             }
         } else {
             // Only manifest files that aren't under bulk directories.
             if !bulk_dirs.iter().any(|d| path.starts_with(d)) {
-                writeln!(&manifest, "file:{}", string)?;
+                paths.insert(format!("file:{}\n", string));
             }
         }
         Ok(())
-    })
+    })?;
+
+    for path in paths {
+        manifest.write_all(path.as_bytes())?;
+    }
+
+    Ok(())
 }