Merge pull request #6 from codinuum/develop

Develop

Author: codinuum

README.md

@@ -58,8 +58,7 @@ You can run both Diff/AST and DiffViewer by the following line.
 
 * GNU make
 * [OCaml](http://ocaml.org/) (>=4.11.1)
-* [OPAM](https://opam.ocaml.org/) (for installing the following packages: camlzip, cryptokit, csv, git-unix, menhir, ocamlnet, pxp, ulex, uuidm.)
-* [Volt](https://github.com/codinuum/volt)
+* [OPAM](https://opam.ocaml.org/) (for installing camlzip, cryptokit, csv, git-unix, menhir, ocamlnet, pxp, ulex, uuidm, and volt.)
 
 ### Compilation
 

src/ast/analyzing/common/edit_base.ml

@@ -1357,11 +1357,12 @@ class ['node_t, 'tree_t] seq_base options = object (self : 'edits)
 
 	  | Relabel(movrel, (uid1, info1, excludes1), (uid2, info2, excludes2)) ->
               let ok =
+                !movrel ||
                 not minimal ||
                 let n1 = Info.get_node info1 in
                 let n2 = Info.get_node info2 in
                 n1#data#is_named_orig && n2#data#is_named_orig ||
-                (not n1#data#is_named || not n2#data#is_named) ||
+                (not n1#data#is_named && n2#data#is_named || n1#data#is_named && not n2#data#is_named) ||
                 n1#data#more_anonymized_label <> n2#data#more_anonymized_label
               in
               if ok then begin

src/ast/analyzing/engine/edit.ml

@@ -44,7 +44,7 @@ class formatters
 
 class seq options = object (self)
   inherit [node_t, tree_t] seq_base options as super
-
+(*
   method dump_diff_simple_ch ?(line_align=[]) (tree1 : 'tree_t) (tree2 : 'tree_t) =
     let formatters =
       new formatters
@@ -324,7 +324,7 @@ class seq options = object (self)
     Printf.fprintf ch "%s" footer
 
   (* end of method dump_diff_ch *)
-
+*)
   method dump_delta
       ?(extra_ns_decls=[])
       (tree1 : 'tree_t)

src/ast/analyzing/git_storage.ml

@@ -297,6 +297,7 @@ module F (S: Git.S) = struct
 
   end (* of class Git_storage.F.tree *)
 
+  let opt_to_str = Xoption.to_string (fun x -> x)
 
   let dump_value sha1 = function
     | Git.Value.Commit commit -> begin
@@ -305,7 +306,7 @@ module F (S: Git.S) = struct
           (String.concat " " (List.map Hash.to_hex (Commit.parents commit)));
         printf "  AUTHOR: \"%s\"\n" (Commit.author commit).User.name;
         printf "  COMMITTER: \"%s\"\n" (Commit.committer commit).User.name;
-        printf "  MESSAGE: \"%s\"\n" (Commit.message commit);
+        printf "  MESSAGE: \"%s\"\n" (opt_to_str (Commit.message commit));
         printf "  TREE: %s\n" (Hash.to_hex (Commit.tree commit))
     end
     | Git.Value.Blob blob -> begin
@@ -320,7 +321,7 @@ module F (S: Git.S) = struct
           | Git.Tag.Tree -> "Tree");
         printf "  TAGGER: \"%s\"\n"
           (match Tag.tagger tag with None -> "" | Some u -> u.User.name);
-        printf "  MESSAGE: \"%s\"\n" (Tag.message tag);
+        printf "  MESSAGE: \"%s\"\n" (opt_to_str (Tag.message tag));
     end
     | Tree tree -> begin
         printf "TREE:%s\n" (Hash.to_hex sha1);