au 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c887e57c864ce6b7ba438d75b02abcff5fac7ec169fe620cbd9b0cbcde97fb0
-  data.tar.gz: 5274a3ae886c455de17b72ec24d7ff4a158ea77e2364ad13963dc02a4a10ef7f
+  metadata.gz: e7ea421673dfacd4c6379ebf129019ad69c89e5d464c64e3b71e4856fea168e8
+  data.tar.gz: 02aaf3aec6ce229206bde2d97541718a996ab33a38274c7a7027c3077aef86d1
 SHA512:
-  metadata.gz: 3bd410ab8f4d26920750423c2d4808fd26eac8cc75ccf7f79adebe14d3537b780a75f0068d06cf19e550a39b2af733f4ea175c4361e7decfaea83734ba88e602
-  data.tar.gz: b7612b9814730869872fa9b20c249ee16eb41d76fd3c79e2660d1478ecd8ab47012a3d67f9fa3b2d52865c5c7e0d88e198f37fbf2b08e7e3ac32eba5bfd2f897
+  metadata.gz: cc34e78c8ebf418f4f6ee07ca3318d33b23f13743671d090b88fba621c73279f3b417ef236a64c38710462b0aab201463a392a054bcca506c6359c6b9fc7b57b
+  data.tar.gz: 9cf08469aafac200c35c01679e84cb5700023bfe49a20983f87acd8a9e8df6662e80d0a02dfe5425b674bd785644d13d42610ebecc92a00f598edbac42329de1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    au (0.2.3)
+    au (0.3.0)
       colorize
       thor
 

data/bin/au

@@ -118,11 +118,15 @@ module Au
     desc "commit", "Commit staged files"
     option :m
     def commit
-      created_commit_id = Repository.instance.commit(options[:m])
-      if created_commit_id
-        puts "Created commit #{created_commit_id}"
-      else
-        puts 'Please stage your changes first.'
+      begin
+        created_commit_id = Repository.instance.commit(options[:m])
+        if created_commit_id
+          puts "Created commit #{created_commit_id}"
+        else
+          puts 'Please stage your changes first.'
+        end
+      rescue => e
+        puts e.message
       end
     end
 

data/lib/au/models/commit.rb

@@ -21,7 +21,7 @@ module Au
 
     def self.list
       db.transaction(true) do
-        puts db.roots
+        db.roots
       end
     end
 
@@ -49,6 +49,21 @@ module Au
       parent_commit = find(parent_commit_id)
       new_doc_diff_ids = {}
 
+      # Check if this commit exists somewhere in the repository already
+      if Commit.list.any?
+        Commit.list.each do |commit|
+          same = true
+          other_commit = find(commit)
+          if other_commit.doc_diff_ids.length == staged_file_paths.length
+            Document.find(staged_file_paths).each do |doc|
+              # pass in the diff id for this doc from parent commit, if present
+              same = ((doc.diff(other_commit ? other_commit.doc_diff_ids[doc.path] : nil) == '') ? same : false)
+            end
+            raise ('Error: Duplicate commit with ' + commit) if same
+          end
+        end
+      end
+
       Document.find(staged_file_paths).each do |doc|
         # pass in the diff id for this doc from parent commit, if present
         diff_id = doc.create_diff(parent_commit ? parent_commit.doc_diff_ids[doc.path] : nil)

data/lib/au/models/document.rb

@@ -38,6 +38,10 @@ module Au
       file_in_other_state = content_from(other_diff_id)
       diff3_args = "#{abs_path} #{file_in_ancestor_state.path} #{file_in_other_state.path}"
 
+      # diff3 has issue when this file and other file are identical, but ancestor is different,
+      # so we need a special case for identical files
+      return if (`diff -c #{abs_path} #{file_in_other_state.path}` == '')
+
       has_conflict = !`diff3 -x #{diff3_args}`.empty?
       merged_content = `diff3 --merge #{diff3_args}`
       File.open(abs_path, 'w'){ |f| f.write(merged_content) }

data/lib/au/version.rb

@@ -1,3 +1,3 @@
 module Au
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: au
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Edward Du
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-07 00:00:00.000000000 Z
+date: 2018-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor