git-topic 0.2.3.3 → 0.2.4

data/.gvimrc

@@ -1,7 +1,5 @@
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Setup tabs and vimproject
-
-Project .vimproject
+" Setup tabs
 
 tabnew
 tabnew
@@ -13,11 +11,11 @@ tabnew
 tabnew
 tabnew
 
-tabdo Project
-tabdo wincmd l
 tabdo wincmd n
+tabdo wincmd =
 
 1tabn
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
 winpos 433 25
+

data/History.txt

@@ -1,4 +1,8 @@
-=== 1.0.0 / 2010-03-05
+=== 0.2.3.4
+
+* issue 10 closed (comments did not survive rebase).
+
+=== 0.1.0 / 2010-03-05
 
 * 1 major enhancement
 

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 2
-:patch: 3
-:build: "3"
+:patch: 4
+:build: 

data/lib/git_topic.rb

@@ -325,11 +325,22 @@ module GitTopic
 
     # Setup .git/config.
     #
-    # This amounts to setting up refspecs for origin fetching for review
-    # comments.
+    # This means setting up:
+    #   1. refspecs for origin fetching for review comments.
+    #   2. notes.rewriteRef for copying review comments on rebase.
+    #
     def setup( opts={} )
-      return if has_setup_refspec?
-      git "config --add remote.origin.fetch refs/notes/reviews/*:refs/notes/reviews/*"
+      cmds = []
+
+      cmds <<(
+        "config --add remote.origin.fetch refs/notes/reviews/*:refs/notes/reviews/*"
+      ) unless has_setup_refspec?
+
+      cmds <<(
+        "config --add notes.rewriteRef refs/notes/reviews/*"
+      ) unless has_setup_notes_rewrite?
+
+      git cmds.compact
     end
 
     def install_aliases( opts={} )
@@ -378,18 +389,26 @@ module GitTopic
       suppress_whine = `git config topic.checkForNotesRef`.chomp == "false"
       return if suppress_whine
 
-      unless has_setup_refspec?
+      unless has_setup_refspec? && has_setup_notes_rewrite?
         STDERR.puts "
           Warning: git repository is not set up for git topic.  Review comments
-          will not automatically be pulled on git fetch.  You have two options
-          for suppressing this message:
+          will not automatically be pulled on git fetch and will not be copied
+          on a rebase.  You have two options for suppressing this message:
+
+          1.  Run git-topic setup to setup fetch refspecs for origin and
+              comments copying on rebase.
 
-          1.  Run git-topic setup to setup fetch refspecs for origin.
           2.  Run git config topic.checkForNotesRef false.
               If you do this, you can manually fetch reviewers' comments with
               the following command
 
                   git fetch origin refs/notes/reviews/*:refs/notes/reviews/*
+
+              Similarly, you can ensure your comments are not lost on rebase by running
+
+                GIT_NOTES_REWRITE_REF=refs/notes/reviews/* git rebase
+
+              instead of `git rebase`
         ".cleanup
       end
     end
@@ -401,6 +420,13 @@ module GitTopic
       end
     end
 
+    def has_setup_notes_rewrite?
+      notes_rewrites = capture_git( "config --get-all notes.rewriteRef" ).split( "\n" )
+      notes_rewrites.any? do |refs|
+        refs == "refs/notes/reviews/*"
+      end
+    end
+
   end
 end
 

data/spec/comment_spec.rb

@@ -394,3 +394,4 @@ describe GitTopic::Comment do
   end
 
 end
+

data/spec/git_topic_setup_spec.rb

@@ -9,14 +9,45 @@ describe GitTopic do
 
     it "should install reviews refspec for origin" do
 
-     %x{ 
+      %x{ 
         git config --get-all remote.origin.fetch
       }.should_not                            =~ %r{refs/notes}
 
       GitTopic.setup
+
+      %x{ 
+        git config --get-all remote.origin.fetch
+       }.should                                =~ %r{refs/notes}
+    end
+
+    it "should configure notes.rewriteRef" do
+
      %x{ 
+        git config --get-all notes.rewriteRef
+      }.should_not                            =~ %r{refs/notes}
+
+      GitTopic.setup
+
+      %x{ 
+         git config --get-all notes.rewriteRef
+       }.should                                =~ %r{refs/notes}
+    end
+
+    it "should configure notes.rewriteRef even if refspecs are already set up" do
+
+      system "git config --add remote.origin.fetch refs/notes/reviews/*:refs/notes/reviews/*"
+      GitTopic.setup
+      %x{ 
+         git config --get-all notes.rewriteRef
+       }.should                                =~ %r{refs/notes}
+    end
+
+    it "should configure refspecs even if notes.rewriteRef is already set up" do
+      system "git config --add notes.rewriteRef refs/notes/reviews/*"
+      GitTopic.setup
+      %x{ 
         git config --get-all remote.origin.fetch
-      }.should                                =~ %r{refs/notes}
+       }.should                                =~ %r{refs/notes}
     end
 
     it "should be idempotent" do
@@ -57,10 +88,31 @@ describe GitTopic do
       end
     end
 
+    describe "
+      when in a git repository that is set up for fetching, but not rewriting
+      notes
+    ".oneline do
+
+      before( :each ) { use_repo 'in-progress' }
+
+      it "should ask the user to #setup or configure no-whine" do
+
+        system "git config --add remote.origin.fetch refs/notes/reviews/*:refs/notes/reviews/*"
+
+        with_argv( [] ) do
+          GitTopic.run
+          @err.should                       =~ /setup/
+        end
+      end
+    end
+
     describe "when in a git repository configured for nowhining" do
       before( :each ) { use_repo 'in-progress' }
 
-      it "should not whine, even when refs are not set up" do
+      it "
+        should not whine, even when refs are not set up and notes.rewriteRef is
+        not setup
+      ".oneline do
         system "git config topic.checkForNotesRef false > /dev/null 2> /dev/null"
         GitTopic.run
         @err.should_not                         =~ /setup/

metadata

@@ -5,9 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 3
-  - 3
-  version: 0.2.3.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - David J. Hamilton
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-30 00:00:00 -07:00
+date: 2010-08-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency