tetra 0.48.0 → 0.49.0

data/README.md

@@ -93,7 +93,7 @@ and cloned with:
 
 Are you using `tetra` or even just reading this? Let's get in touch!
 
-    smoioli at suse dot de
+    moio at suse dot de
 
 ## License
 

data/SPECIAL_CASES.md

@@ -41,7 +41,7 @@ Note that the kit packages is only needed at build time by OBS, no end user shou
 
 ## Gotchas
 
-* `tetra` internally uses `git` to keep track of files, any tetra project is actually also a `git` repo. Feel free to navigate it, you can commit, push and pull as long as the `tetra` tags are preserved. You can also delete commits and tags, effectively rewinding tetra history (just make sure to delete all tags pointing to a certain commit when you discard it);
+* `tetra` internally uses `git` to keep track of files, any tetra project is actually also a `git` repo. Feel free to use it as any ordinary git repo, including pushing to a remote repo, rebasing, merging or using GitHub's pull requests. Just make sure any `tetra: ` comments are preserved;
 * some Maven plugins like the Eclipse Project ones ([Tycho](https://www.eclipse.org/tycho/)) will save data in `/tmp` downloaded from the Internet and will produce errors if this data is not there during offline builds. One way to work around that is to force Java to use a kit subdirectory as `/tmp`. Add the following option to `tetra mvn` during your build:
 
     -Djava.io.tmpdir=<full path to project>/kit/tmp

data/lib/tetra/facades/git.rb

@@ -2,7 +2,6 @@
 
 module Tetra
   # facade to git, currently implemented with calls to the git command
-  # prefixes all tags with "tetra_"
   class Git
     include Logging
     include ProcessRunner
@@ -24,87 +23,72 @@ module Tetra
       end
     end
 
-    # returns a list of filenames that changed in the repo
-    # since the specified tag
-    def changed_files_since(tag)
-      changed_files_between(tag, nil, ".")
+    # returns the id of the most recent commit
+    # that has the specified comment prefix in its message
+    # returns nil if such commit does not exist
+    def latest_id(comment_prefix)
+      Dir.chdir(@directory) do
+        result = run("git rev-list --max-count=1 --grep=\"#{comment_prefix}\" --fixed-strings HEAD")
+        result.strip if result != ""
+      end
+    end
+
+    # returns the comment of the most recent commit
+    # that has the specified comment prefix in its message
+    # returns nil if such commit does not exist
+    def latest_comment(comment_prefix)
+      Dir.chdir(@directory) do
+        id = latest_id(comment_prefix)
+        run("git rev-list --max-count=1 --format=%B #{id}") unless id.nil?
+      end
     end
 
     # returns a list of filenames that changed in the repo
-    # between specified tags, in a certain directory
-    def changed_files_between(start_tag, end_tag, directory)
+    # between specified ids, in a certain directory
+    def changed_files_between(start_id, end_id, directory)
       Dir.chdir(@directory) do
-        prefixed_start_tag = "tetra_#{start_tag}"
-        prefixed_end_tag = (
-          if end_tag
-            "tetra_#{end_tag}"
-          else
-            "HEAD"
-          end
-        )
         run("git diff-tree \
               --no-commit-id \
               --name-only \
-              -r #{prefixed_start_tag} #{prefixed_end_tag}\
+              -r #{start_id} #{end_id}\
               -- #{directory}"
         ).split("\n")
       end
     end
 
-    # adds all files in the current directory, removes
-    # all files not in the current directory, commits
-    # and tags with prefix
-    def commit_whole_directory(message, tag, tag_message = nil)
+    # adds all files in the current directory,
+    # removes all files not in the current directory,
+    # commits with message
+    def commit_whole_directory(message)
       Dir.chdir(@directory) do
         log.debug "committing with message: #{message}"
 
         run("git rm -r --cached --ignore-unmatch .")
         run("git add .")
-        run("git commit -m \"#{message}\"", false, false)
-
-        if !tag_message.nil?
-          run("git tag tetra_#{tag} -m \"#{tag_message}\"")
-        else
-          run("git tag tetra_#{tag}")
-        end
+        run("git commit --allow-empty -m \"#{message}\"")
       end
     end
 
-    # commits and tags one single file
-    # if tag is given, commit is also tagged
-    def commit_file(path, message, tag)
+    # commits one single file
+    def commit_file(path, message)
       Dir.chdir(@directory) do
         log.debug "committing path #{path} with message: #{message}"
         run("git add #{path}")
-        run("git commit -m \"#{message}\"", false, false)
-        run("git tag tetra_#{tag}")
+        run("git commit --allow-empty -m \"#{message}\"")
       end
     end
 
-    # returns the highest suffix found in tags with the given prefix
-    def get_tag_maximum_suffix(prefix)
-      Dir.chdir(@directory) do
-        run("git tag").split.map do |tag|
-          if tag =~ /^tetra_#{prefix}_([0-9]+)$/
-            Regexp.last_match[1].to_i
-          else
-            0
-          end
-        end.max || 0
-      end
-    end
-
-    # reverts path contents as per specified tag
-    def revert_whole_directory(path, tag)
+    # reverts path contents as per specified id
+    def revert_whole_directory(path, id)
       Dir.chdir(@directory) do
         # reverts added and modified files, both in index and working tree
-        run("git checkout -f tetra_#{tag} -- #{path}")
+        run("git checkout -f #{id} -- #{path}")
 
         # compute the list of deleted files
-        files_in_tag = run("git ls-tree --name-only -r tetra_#{tag} -- #{path}").split("\n")
+        files_in_commit = run("git ls-tree --name-only -r #{id} -- #{path}").split("\n")
         files_in_head = run("git ls-tree --name-only -r HEAD -- #{path}").split("\n")
         files_added_after_head = run("git ls-files -o -- #{path}").split("\n")
-        files_to_delete = files_in_head - files_in_tag + files_added_after_head
+        files_to_delete = files_in_head - files_in_commit + files_added_after_head
 
         files_to_delete.each do |file|
           FileUtils.rm_rf(file)
@@ -112,33 +96,38 @@ module Tetra
       end
     end
 
-    # 3-way merges the git file at path with the one in new_path
-    # assuming they have a common ancestor at the specified tag
-    # returns the conflict count
-    def merge_with_tag(path, new_path, tag)
+    # reverts the whole repo to the last commit while
+    # leaving changes in the working directory
+    def undo_last_commit
       Dir.chdir(@directory) do
-        run("git show tetra_#{tag}:#{path} > #{path}.old_version")
-        run("git merge-file #{path} #{path}.old_version #{new_path} \
-              -L \"newly generated\" \
-              -L \"previously generated\" \
-              -L \"user edited\"")
-        conflict_count = $CHILD_STATUS.exitstatus
-        File.delete("#{path}.old_version")
-        return conflict_count
+        run("git reset HEAD~")
       end
     end
 
-    # deletes a tag
-    def delete_tag(tag)
+    # 3-way merges the git file at path with the one in new_path
+    # assuming they have a common ancestor at the specified id
+    # returns the conflict count
+    def merge_with_id(path, new_path, id)
       Dir.chdir(@directory) do
-        run("git tag -d tetra_#{tag}")
+        run("git show #{id}:#{path} > #{path}.old_version")
+
+        conflict_count = 0
+        begin
+          run("git merge-file #{path} #{path}.old_version #{new_path} \
+                -L \"newly generated\" \
+                -L \"previously generated\" \
+                -L \"user edited\"")
+        rescue ExecutionFailed => e
+          if e.status > 0
+            conflict_count = e.status
+          else
+            raise e
+          end
+        end
+        File.delete("#{path}.old_version")
+        conflict_count
       end
     end
-
-    # returns the tag message
-    def get_message(tag)
-      run("git cat-file tag tetra_#{tag}").split.last
-    end
   end
 
   class GitAlreadyInitedError < StandardError