Git - store version number and session id in commit log

sonic-pi-net · Jul 30, 2015 · 8f15697 · 8f15697
1 parent 61a2261
commit 8f15697
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/server/sonicpi/lib/sonicpi/gitsave.rb b/app/server/sonicpi/lib/sonicpi/gitsave.rb
@@ -26,7 +26,7 @@ def initialize(path)
       end
     end
 
-    def save!(filename, content)
+    def save!(filename, content, msgpre="")
       puts "saving: #{filename}"
       oid = @repo.write(content, :blob)
       index = @repo.index
@@ -38,7 +38,7 @@ def save!(filename, content)
 
       options[:author] = { :email => "autosave@sonic-pi.net", :name => 'Sonic Pi Autosave', :time => Time.now }
       options[:committer] = { :email => "autosave@sonic-pi.net", :name => 'Sonic Pi Autosave', :time => Time.now }
-      options[:message] ||= "Autosave Workspace #{filename}"
+      options[:message] ||= "#{msgpre} :~: Autosave Workspace #{filename}"
       options[:parents] = @repo.empty? ? [] : [ @repo.head.target ].compact
       options[:update_ref] = 'HEAD'
 

diff --git a/app/server/sonicpi/lib/sonicpi/spider.rb b/app/server/sonicpi/lib/sonicpi/spider.rb
@@ -599,7 +599,7 @@ def __save_buffer(id, content)
       content = filter_for_save(content)
       File.open(path, 'w') {|f| f.write(content) }
       begin
-        @gitsave.save!(filename, content)
+        @gitsave.save!(filename, content, "#{@version} -- #{@session_id} -- ")
       rescue Exception => e
         ##TODO: remove this and ensure that git saving actually works
         ##instead of cowardly hiding the issue!