braid 1.0.22 → 1.1.0

data/lib/braid/operations.rb

@@ -247,21 +247,6 @@ module Braid
         true
       end
 
-      # Implies no commit.
-      def merge_ours(opt)
-        invoke(:merge, '--allow-unrelated-histories -s ours --no-commit', opt)
-        true
-      end
-
-      # Implies no commit.
-      def merge_subtree(opt)
-        # TODO which options are needed?
-        invoke(:merge, '-s subtree --no-commit --no-ff', opt)
-        true
-      rescue ShellExecutionError => error
-        raise MergeError, error.out
-      end
-
       # Merge three trees (local_treeish should match the current state of the
       # index) and update the index and working tree.
       #
@@ -282,17 +267,56 @@ module Braid
         invoke('ls-files', prefix)
       end
 
-      # Read tree into the index and working tree.
-      def read_tree_prefix_u(treeish, prefix)
-        invoke(:read_tree, "--prefix=#{prefix}/ -u", treeish)
-        true
+      class BlobWithMode
+        def initialize(hash, mode)
+          @hash = hash
+          @mode = mode
+        end
+        attr_reader :hash, :mode
+      end
+      # Allow the class to be referenced as `git.BlobWithMode`.
+      def BlobWithMode
+        Git::BlobWithMode
       end
 
-      # Read tree into the index, regardless of the state of the working tree.
-      # Most useful with a temporary index file.
-      def read_tree_prefix_i(treeish, prefix)
-        invoke(:read_tree, "--prefix=#{prefix}/ -i", treeish)
-        true
+      # Get the item at the given path in the given tree.  If it's a tree, just
+      # return its hash; if it's a blob, return a BlobWithMode object.  (This is
+      # how we remember the mode for single-file mirrors.)
+      def get_tree_item(tree, path)
+        if path.nil? || path == ''
+          tree
+        else
+          m = /^([^ ]*) ([^ ]*) ([^\t]*)\t.*$/.match(invoke(:ls_tree, tree, path))
+          mode = m[1]
+          type = m[2]
+          hash = m[3]
+          if type == 'tree'
+            hash
+          elsif type == 'blob'
+            return BlobWithMode.new(hash, mode)
+          else
+            raise ShellExecutionError, 'Tree item is not a tree or a blob'
+          end
+        end
+      end
+
+      # Add the item (as returned by get_tree_item) to the index at the given
+      # path.  If update_worktree is true, then update the worktree, otherwise
+      # disregard the state of the worktree (most useful with a temporary index
+      # file).
+      def add_item_to_index(item, path, update_worktree)
+        if item.is_a?(BlobWithMode)
+          # Our minimum git version is 1.6.0 and the new --cacheinfo syntax
+          # wasn't added until 2.0.0.
+          invoke(:update_index, '--add', '--cacheinfo', item.mode, item.hash, path)
+          if update_worktree
+            # XXX If this fails, we've already updated the index.
+            invoke(:checkout_index, path)
+          end
+        else
+          # Yes, if path == '', "git read-tree --prefix=/" works. :/
+          invoke(:read_tree, "--prefix=#{path}/", update_worktree ? '-u' : '-i', item)
+        end
       end
 
       # Read tree into the root of the index.  This may not be the preferred way
@@ -317,14 +341,13 @@ module Braid
         end
       end
 
-      def make_tree_with_subtree(main_content, subtree_path, subtree_content)
+      def make_tree_with_item(main_content, item_path, item)
         with_temporary_index do
           if main_content
             read_tree_im(main_content)
-            rm_r_cached(subtree_path)
+            rm_r_cached(item_path)
           end
-          # Yes, if subtree_path == '', "git read-tree --prefix=/" works. :/
-          read_tree_prefix_i(subtree_content, subtree_path)
+          add_item_to_index(item, item_path, false)
           write_tree
         end
       end
@@ -349,13 +372,6 @@ module Braid
         out.split[2]
       end
 
-      def diff_tree(src_tree, dst_tree, prefix = nil)
-        cmd = "git diff-tree -p --binary #{src_tree} #{dst_tree}"
-        cmd << " --src-prefix=a/#{prefix}/ --dst-prefix=b/#{prefix}/" if prefix
-        status, out, err = exec!(cmd)
-        out
-      end
-
       def diff_to_stdout(*args)
         # For now, ignore the exit code.  It can be 141 (SIGPIPE) if the user
         # quits the pager before reading all the output.

data/lib/braid/version.rb

@@ -1,3 +1,3 @@
 module Braid
-  VERSION = '1.0.22'.freeze
+  VERSION = '1.1.0'.freeze
 end

data/spec/config_spec.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/test_helper'
 
 describe 'Braid::Config, when empty' do
   before(:each) do
-    @config = Braid::Config.new('tmp.yml')
+    @config = Braid::Config.new({'config_file' => 'tmp.yml'})
   end
 
   after(:each) do
@@ -23,7 +23,7 @@ end
 
 describe 'Braid::Config, with one mirror' do
   before(:each) do
-    @config = Braid::Config.new('tmp.yml')
+    @config = Braid::Config.new({'config_file' => 'tmp.yml'})
     @mirror = build_mirror
     @config.add(@mirror)
   end

data/spec/fixtures/shiny-conf-1.0.9-lock/.braids.json

@@ -0,0 +1,10 @@
+{
+  "skit1": {
+    "url": "file:///path/to/braid/spec/fixtures/skit1",
+    "remote": "master/braid/skit1",
+    "branch": "master",
+    "squashed": true,
+    "revision": "6d3aeac08f9f4f9689d367fc771f5f1c90496176",
+    "lock": "6d3aeac08f9f4f9689d367fc771f5f1c90496176"
+  }
+}

data/spec/fixtures/shiny-conf-1.0.9-lock/expected.braids.json

@@ -0,0 +1,9 @@
+{
+  "config_version": 1,
+  "mirrors": {
+    "skit1": {
+      "url": "file:///path/to/braid/spec/fixtures/skit1",
+      "revision": "6d3aeac08f9f4f9689d367fc771f5f1c90496176"
+    }
+  }
+}

data/spec/fixtures/shiny-conf-1.0.9-lock/skit1/layouts/layout.liquid

@@ -0,0 +1,219 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+{{ '/feed/atom.xml' | assign_to: 'global_feed' }}
+{{ '/feed/all_comments.xml' | assign_to: 'global_comments_feed' }}
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>
+  {{ site.title }}
+  {% if site.current_section %}
+    - {{ site.current_section.name }}
+  {% endif %}
+  {% if article %}
+    - {{ article.title }}
+  {% endif %}
+</title>
+<link rel="alternate" type="application/atom+xml" title="{{ site.title }} feed" href="{{ global_feed }}"/>
+<link rel="alternate" type="application/atom+xml" title="{{ site.title }} comments feed" href="{{ global_comments_feed }}"/>
+{{ 'base' | stylesheet }}
+{{ 'app' | javascript }}
+<!--[if IE]>
+{{ 'base_ie' | stylesheet }}
+<![endif]-->
+</head>
+
+<body class="fixed orange">
+<script type="text/javascript">loadPreferences()</script>
+
+<div id="wrapper">
+
+<div id="header" class="clearfix">
+<div id="title" class="clearfix">
+  <h1><a href="/">{{ site.title }}</a></h1>
+</div>
+<h2>Sections</h2>
+<ul id="menu">
+{% for section in site.sections %}
+  {% if section.articles_count > 0 %}
+  {% if section.is_home  %}
+    <li{% if section.current %} class="selected"{% endif %}>{{ section | link_to_section }}</li>
+  {% else %}
+    {% if section.is_paged  %}
+    <li{% if section.current %} class="selected"{% endif %}>{{ section | link_to_section }}</li>
+    {% endif %}
+  {% endif %}
+  {% endif %}
+{% endfor %}
+</ul>
+</div>
+
+<div id="contentwrapper" class="clearfix">
+
+<div id="content">
+
+  <div id="innerwrapper">
+
+<div class="article">
+  <div class="body">
+  <h2>Skittlish Tips'n'Tricks</h2>
+  <ul>
+    <li>Change the classes for the body tag to set your default site style. also change these in the app.js file (line 66).</li>
+    <li>Remove the scripts and the #options div if you don't want the option switcher.</li>
+    <li>The top menu shows the home section and the sections that are not blogs.</li>
+    <li>Email me at <a href="mailto:evil@che.lu">evil@che.lu</a> if you have any questions.</li>
+    <li>Happy hacking!</li>
+  </ul>
+  </div>
+</div>
+
+{{ content_for_layout }}
+
+  </div>
+
+</div>
+
+<div id="sidebar">
+
+<div class="boxy short">
+<h3>boxy short</h3>
+
+<p>You can have, boxes with a short, tall or no background shade, just change the class of the containing div.</p>
+
+<p>Have boxes with smaller text with the class "minor". See the "Recent" boxy below.</p>
+
+</div>
+
+<div id="search" class="boxy short">
+  <h3>Search</h3>
+  <form method="get" action="/search">
+    <fieldset>
+      <input class="text" type="text" id="q" value="" name="q"/>
+    </fieldset>
+  </form>
+</div>
+
+<div class="boxy tall minor">
+  <h3>Recent</h3>
+
+<dl>
+<dt>Articles <a class="feed" href="{{ global_feed }}"><span>feed</span></a></dt>
+<dd>
+  <ul>
+  {% for article in site.latest_articles %}
+    <li>{{ article | link_to_article }} <em>({{ article.published_at | format_date: 'stub', true }})</em></li>
+  {% endfor %}
+  </ul>
+</dd>
+
+<dt>Comments <a class="feed" href="{{ global_comments_feed }}"><span>feed</span></a></dt>
+<dd>
+  <ul>
+  {% for comment in site.latest_comments %}
+    <li>{{ comment.author_link }} on <a href="{{ comment.url }}#comment-{{ comment.id }}">{{ comment.title }}</a></li>
+  {% endfor %}
+  </ul>
+</dd>
+</dl>
+</div>
+
+<div class="boxy short">
+  <h3>Archives</h3>
+  <p>This would be much nicer with jamis' month_drop thingy.</p>
+  {{ '' | section | months | assign_to: 'home_section' }}
+  <ul>
+  {% for month in home_section.months %}
+    {{ home_section | monthly_articles: month | size | assign_to: 'articles_count' }}
+    {% if articles_count > 0 %}
+    <li>{{ home_section | link_to_month: month }} ({{ articles_count }})</li>
+    {% endif %}
+  {% endfor %}
+  </ul>
+</div>
+
+{% if site.blog_sections.size > 1 %}
+<div class="boxy short">
+<h3>Categories</h3>
+<p>Lists only blog type categories with at least one article.</p>
+<p>This list uses an ul. You could use a dl with only dd's in it for the same effect. Wouldn't be semantic tho.</p>
+<ul class="sections">
+{% for section in site.blog_sections %}
+  {% if section.articles_count > 0 %}
+  {% unless section.is_home %}
+  <li>{{ section | link_to_section }} ({{ section.articles_count }})</li>
+  {% endunless %}
+  {% endif %}
+{% endfor %}
+</ul>
+</div>
+
+{% endif %}
+{% unless site.tags == empty %}
+<div class="boxy short">
+  <p>This would be nicer if we could get the number of articles for each tag.</p>
+  <h3>tags: </h3>
+  <ul>
+  {% for tag in site.tags %}
+    <li>{{ tag | link_to_tag }}</li>
+  {% endfor %}
+  </ul>
+</div>
+
+{% endunless %}
+<div class="boxy tall">
+<h3>boxy tall</h3>
+<p>When using a tall box, make sure it's got plenty of content or that it's immediately followed by a short boxy. It might look a bit chopped off otherwise.</p>
+<dl>
+  <dt>thing 1</dt>
+  <dd><a href="#">value 1</a></dd>
+  <dd><a href="#">value 2</a></dd>
+  <dd><a href="#">value 3</a></dd>
+  <dd><a href="#">value 4</a></dd>
+  <dd><a href="#">value 5</a></dd>
+  <dd><a href="#">value 6</a></dd>
+  <dd><a href="#">value 6</a></dd>
+
+  <dt>thing 1</dt>
+  <dd><a href="#">value 1</a></dd>
+  <dd><a href="#">value 2</a></dd>
+  <dd><a href="#">value 3</a></dd>
+  <dd>value 4</dd>
+  <dd>value 5</dd>
+  <dd><a href="#">value 6</a></dd>
+  <dd><a href="#">value 6</a></dd>
+
+</dl>
+</div>
+
+</div>
+
+</div>
+
+<div id="options">
+  <h2>Options:</h2>
+  <h3>Size</h3>
+  <ul id="option_size">
+    <li id="option_size_fixed"   class="fixed" ><a><span>fixed </span></a></li>
+    <li id="option_size_fluid"   class="fluid" ><a><span>fluid </span></a></li>
+  </ul>
+  <h3>Colors</h3>
+  <ul id="option_color">
+    <li id="option_color_orange" class="orange"><a><span>orange</span></a></li>
+    <li id="option_color_blue"   class="blue"  ><a><span>blue  </span></a></li>
+    <li id="option_color_green"  class="green" ><a><span>green </span></a></li>
+    <li id="option_color_pink"   class="pink"  ><a><span>pink  </span></a></li>
+    <li id="option_color_cyan"   class="cyan"  ><a><span>cyan  </span></a></li>
+    <li id="option_color_red"    class="red"   ><a><span>red   </span></a></li>
+    <li id="option_color_violet" class="violet"><a><span>violet</span></a></li>
+  </ul>
+</div>
+
+<div id="footer">
+<p>Copyright &copy; 2006, Your Name. Valid <a href="http://validator.w3.org/check/referer">XHTML</a> and <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a>.</p>
+<p>Using <a href="http://evil.che.lu/projects/skittlish">skittlish</a> on <a href="http://publishwithimpunity.com/">mephisto</a>.</p>
+</div>
+
+</div>
+
+</body>
+
+</html>

data/spec/fixtures/shiny-conf-breaking-changes/.braids

@@ -0,0 +1,14 @@
+--- !ruby/object:Hash
+Spoon-Knife: !ruby/object:Hash
+  remote: master/braid/Spoon-Knife
+  revision: 18
+  squashed: true
+  type: svn
+  url: https://github.com/octocat/Spoon-Knife.git/trunk
+skit1: !ruby/object:Hash
+  branch: master
+  remote: master/braid/skit1
+  revision: 6d3aeac08f9f4f9689d367fc771f5f1c90496176
+  squashed: false
+  type: git
+  url: file:///path/to/braid/spec/fixtures/skit1/.git

data/spec/fixtures/shiny-conf-breaking-changes/Spoon-Knife/README.md

@@ -0,0 +1,9 @@
+### Well hello there!
+
+This repository is meant to provide an example for *forking* a repository on GitHub.
+
+Creating a *fork* is producing a personal copy of someone else's project. Forks act as a sort of bridge between the original repository and your personal copy. You can submit *Pull Requests* to help make other people's projects better by offering your changes up to the original project. Forking is at the core of social coding at GitHub.
+
+After forking this repository, you can make some changes to the project, and submit [a Pull Request](https://github.com/octocat/Spoon-Knife/pulls) as practice.
+
+For some more information on how to fork a repository, [check out our guide, "Forking Projects""](http://guides.github.com/overviews/forking/). Thanks! :sparkling_heart:

data/spec/fixtures/shiny-conf-breaking-changes/Spoon-Knife/index.html

@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+
+<html>
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+  <title>Spoon-Knife</title>
+  <LINK href="styles.css" rel="stylesheet" type="text/css">
+</head>
+
+<body>
+
+<img src="forkit.gif" id="octocat" alt="" />
+
+<!-- Feel free to change this text here -->
+<p>
+  Fork me? Fork you, @octocat!
+</p>
+
+</body>
+</html>

data/spec/fixtures/shiny-conf-breaking-changes/Spoon-Knife/styles.css

@@ -0,0 +1,17 @@
+* {
+  margin:0px;
+  padding:0px;
+}
+
+#octocat {
+  display: block;
+  width:384px;
+  margin: 50px auto;
+}
+
+p {
+  display: block;
+  width: 400px;
+  margin: 50px auto;
+  font: 30px Monaco,"Courier New","DejaVu Sans Mono","Bitstream Vera Sans Mono",monospace;
+}