Merge pull request #218 from samoht/master

Prepare the release

.travis.yml

@@ -2,5 +2,8 @@ language: c
 install: wget https://raw.githubusercontent.com/ocaml/ocaml-travisci-skeleton/master/.travis-opam.sh
 script: bash -ex .travis-opam.sh
 env:
-  - OCAML_VERSION=4.01   EXTRA_DEPS="conf-gmp" ALCOTEST_SHOW_ERRORS=1
-  - OCAML_VERSION=latest EXTRA_DEPS="conf-gmp" ALCOTEST_SHOW_ERRORS=1
+  global:
+  - ALCOTEST_SHOW_ERRORS=1
+  matrix:
+  - OCAML_VERSION=4.01
+  - OCAML_VERSION=4.02

CHANGES.md

@@ -1,4 +1,21 @@
-## 0.9.5
+#### 0.9.6 (2015-07-03)
+
+* Fix the datamodel: it is not possible to store data in intermediate nodes
+  anymore (#209)
+* Fix serialization of slices (#204)
+* Do not fail silently when the synchronisation fails (#202)
+* Fix a race in the HTTP backend between adding a watch and updating the store.
+  In some cases, the watch callback wasn't able to see the first few updates
+  (#198)
+* Fix a race for all the on-disk backends between adding a watch and updating
+  the store. This is fixed by making `Irmin.Private.Watch.listen_dir` and
+  `Irmin.Private.Watch.set_listen_dir_hook` synchronous.
+* Update the tests to use `alcotest >= 0.4`. This removes the dependency towards
+  `OUnit` and `nocrypto` for the tests.
+* Make the file-locking code a bit more robust
+
+### 0.9.5 (2015-06-11)
+
 * Fix `Irmin.export` for the HTTP backend (#196, patch from Alex Zatelepin)
 * Fix a race in `Irmin.export` (#196, patch from Alex Zatelepin)
 * Add `Task.empty` (the empty task) and `Task.none` (the empty task constructor)
@@ -33,7 +50,8 @@
 * By default, explore the full graph when computing the LCAs. The previous
   behavior was to limit the depth of the exploration to be 256 by default.
 
-## 0.9.4
+### 0.9.4 (2015-03-16)
+
 * Ensure that `Irmin.update` and `Irmin.merge` are atomic.
 * Fix `Irmin.clone` of an empty branch
 * Add `Irmin.RW.compare_and_test` that the backends now have to implement
@@ -48,7 +66,8 @@
 * Fix performance of lcas computation (#160)
 * Add `Irmin.Merge.promise` combinators
 
-## 0.9.3
+### 0.9.3 (2015-01-04)
+
 * Fix the invalidation of the view caches (report by @gregtatcam).
   This was causing some confusing issues where views' sub-keys where
   not properly updated to to their new values when the view is merged
@@ -75,7 +94,8 @@
 * Expose `S.lca` to get the least common ancestors
 * Update to ocaml-git 1.4.6
 
-## 0.9.2 (2015-01-19)
+### 0.9.2 (2015-01-19)
+
 * Fix `S.of_head` for the HTTP client (regression introduced in 0.9.0)
 * Fix regression in displaying the store's graph over HTTP introduced by
   0.9.0.
@@ -99,10 +119,12 @@
   the resulting Irmin store will be of type `Path.t`.
 * Fix `irmin init --help`. (#103)
 
-## 0.9.1 (2014-12-26)
+### 0.9.1 (2014-12-26)
+
 * Port to Cohttp 0.14.0+ HTTP interface (#102)
 
-## 0.9.0 (2014-12-20)
+### 0.9.0 (2014-12-20)
+
 * Improve the efficiency of the Git backend
 * Expose a cleaner API for the Unix backends
 * Expose a cleaner public API
@@ -117,7 +139,8 @@
 * Fix writing contents at the root of the store (#73)
 * More efficient synchronization protocol between Irmin stores (#11)
 
-## 0.8.3 (2014-06-25)
+### 0.8.3 (2014-06-25)
+
 * Views now keep track of their parent commits - this makes
   View.merge_path looks like a merge between branches. All the
   view operations are squashed in a unique commit.
@@ -128,7 +151,8 @@
   command-line. `dot` does not like big graphs, but that's
   still useful to have the `.dot` file to analyze it.
 
-## 0.8.2 (2014-06-11)
+### 0.8.2 (2014-06-11)
+
 * Support backend specific protocols for push/pull
 * The Irmin Git backend can now sync with remote Git repositories
 * Simplify the organisation of the libraries: irmin, irmin.backend,
@@ -137,7 +161,8 @@
   at the top of your file and use less functor in your code (again,
   check the examples)
 
-## 0.8.1 (2014-06-02)
+### 0.8.1 (2014-06-02)
+
 * Fix the behavior of `IrminMemory.Make` to return an hanlder to a
   shared datastore instead of creating a fresh one. Add
   `IrminMemory.Fresh` to return a fresh in-memory datastore maker.
@@ -147,7 +172,8 @@
   everything by `refs/heads/` anymore)
 * Partial support for recursive stores (WIP)
 
-## 0.8.0 (2014-05-27)
+### 0.8.0 (2014-05-27)
+
 * Spring clean-ups in the API. Separation in IrminBranch for
   fork/join operations, IrminSnapshot for snapshot/revert
   operations and IrminDump for import/export operations.
@@ -163,7 +189,8 @@
   an already existing branch
 * Fix order of arguments in Irmin.merge
 
-## 0.7.0 (2014-05-02)
+### 0.7.0 (2014-05-02)
+
 * Feature: support for in-memory transactions. They are built
   on top of views.
 * Feature: add support for views: these are temporary stores with
@@ -183,7 +210,8 @@
 * Speed-up IrminValue.Mux
 * Deps: use ocaml-sha instead of cryptokit
 
-## 0.6.0 (2014-04-12)
+### 0.6.0 (2014-04-12)
+
 * Support for user-defined contents (with custom merge operators)
 * Support for merge operations
 * Rename `IrminTree` to `IrminNode` to reflect the fact that we
@@ -193,10 +221,12 @@
   we also support structured contents (as JSON objects)
 * Support for linking the library without linking to camlp4 as well (#23)
 
-## 0.5.1 (2014-03-02)
+### 0.5.1 (2014-03-02)
+
 * Port to use Cohttp 0.10.0 interface.
 
-## 0.5.0
+### 0.5.0 (2014-02-21)
+
 * More consistent support for notifications. `irmin watch` works
   now for all backends.
 * Support for different blob formats on the command-line
@@ -210,7 +240,8 @@
 * Improve the output graph when objects of different kinds might have
   the same SHA1
 
-## 0.4 (2014-01-21)
+### 0.4 (2014-01-21)
+
 * The command-line tool now looks in the environment for the variable
   `IRMIN` to configure its default backend
 * Add a Git backend
@@ -224,13 +255,15 @@
 * Use `mstruct` (mutable buffers on top of `cstruct`) which is now
   released independently
 
-## 0.3 (2013-12-13)
+### 0.3 (2013-12-13)
+
 * Fix a fd leak in the filesystem bakend
 * Functorize the CRUD interface over the HTTP client implementation
 * Use oasis to build the project
 * Use the now released separately `ezjsonm` and `alcotest` libraries
 
-## 0.2 (2013-11-23)
+### 0.2 (2013-11-23)
+
 * Fix the HTTP server responses
 * More high-level tests
 * Add unit-tests for the client CRUD interfaces (over memory and/or filesystem)
@@ -243,7 +276,8 @@
 * Improve and make the CLI easier to use
 * Implement clone/pull/push/snapshot/revert in the CLI
 
-## 0.1 (2013-10-30)
+### 0.1 (2013-10-30)
+
 * Use an HTTP server as a front-end
 * Initial support for in-memory and filesystem backends
 * Simple signature for backends

_oasis

@@ -1,6 +1,6 @@
 OASISFormat: 0.4
 Name:        irmin
-Version:     0.9.5
+Version:     0.9.6
 Synopsis:    A Distributed Version Control Database
 Authors:     Thomas Gazagnaire
 License:     ISC

lib/META

@@ -1,6 +1,6 @@
 # OASIS_START
-# DO NOT EDIT (digest: 9987b3148646a0ceca5f941e0903a980)
-version = "0.9.5"
+# DO NOT EDIT (digest: c8d61dfceb48b825c11fb134c3a11ded)
+version = "0.9.6"
 description = "A Distributed Version Control Database"
 requires =
 "ezjsonm ocamlgraph lwt dolog cstruct tc mstruct uri stringext hex"
@@ -10,7 +10,7 @@ archive(native) = "irmin.cmxa"
 archive(native, plugin) = "irmin.cmxs"
 exists_if = "irmin.cma"
 package "unix" (
- version = "0.9.5"
+ version = "0.9.6"
  description = "A Distributed Version Control Database"
  requires =
  "irmin irmin.mem irmin.git irmin.fs irmin.http git.unix cohttp.lwt"
@@ -22,7 +22,7 @@ package "unix" (
 )
 
 package "mem" (
- version = "0.9.5"
+ version = "0.9.6"
  description = "A Distributed Version Control Database"
  requires = "irmin"
  archive(byte) = "irmin-mem.cma"
@@ -33,7 +33,7 @@ package "mem" (
 )
 
 package "http" (
- version = "0.9.5"
+ version = "0.9.6"
  description = "A Distributed Version Control Database"
  requires = "irmin cohttp.lwt-core ezjsonm.lwt re re.pcre re.perl"
  archive(byte) = "irmin-http.cma"
@@ -44,7 +44,7 @@ package "http" (
 )
 
 package "git" (
- version = "0.9.5"
+ version = "0.9.6"
  description = "A Distributed Version Control Database"
  requires = "irmin git"
  archive(byte) = "irmin-git.cma"
@@ -55,7 +55,7 @@ package "git" (
 )
 
 package "fs" (
- version = "0.9.5"
+ version = "0.9.6"
  description = "A Distributed Version Control Database"
  requires = "irmin"
  archive(byte) = "irmin-fs.cma"

opam

@@ -46,7 +46,6 @@ depopts: [
   "cohttp"
 ]
 conflicts: [
-  "git"    {< "1.4.10"}
   "cohttp" {< "0.14.0"}
   "cohttp" {= "0.16.1"}
   "git"    {<= "1.5.0"}

setup.ml

@@ -1,7 +1,7 @@
 (* setup.ml generated for the first time by OASIS v0.4.2 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 69265efc97028b8ab1e5f3e8b399a1ea) *)
+(* DO NOT EDIT (digest: 2708cfdce49741599332d2eb4fa17f6f) *)
 (*
    Regenerated by OASIS v0.4.5
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -6861,7 +6861,7 @@ let setup_t =
           alpha_features = [];
           beta_features = [];
           name = "irmin";
-          version = "0.9.5";
+          version = "0.9.6";
           license =
             OASISLicense.DEP5License
               (OASISLicense.DEP5Unit
@@ -7618,7 +7618,7 @@ let setup_t =
        };
      oasis_fn = Some "_oasis";
      oasis_version = "0.4.5";
-     oasis_digest = Some "\146!ýfOeJ\016z¼lwÒ0ïâ";
+     oasis_digest = Some "\157ú&t­©\028:ER?\158ðgÌ3";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false