git-topic 0.2.6.1 → 0.2.7

data/Gemfile.lock

@@ -10,7 +10,7 @@ GEM
     gemcutter (0.5.0)
       json_pure
     git (1.2.5)
-    git-topic (0.2.6.1)
+    git-topic (0.2.7)
       activesupport (~> 3.0)
       git-topic
       trollop

data/History.rdoc

@@ -1,3 +1,10 @@
+===   0.2.7
+
+* issues closed
+  - 28  git comments <my-review-branch> would fail to show any comments.
+  - 25  git work-on <rejected-topic> would fail if done from a HEAD downstream
+        of origin/master, e.g. a different topic.
+
 ===   0.2.6
 
 * issues closed

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 2
-:patch: 6
-:build: "1"
+:patch: 7
+:build: 

data/lib/git_topic/naming.rb

@@ -187,7 +187,6 @@ module GitTopic::Naming
         namespace_ut[:review]   ||= {}
         namespace_ut[:rejected] ||= {}
 
-        namespace_ut[:review].reject!{|k,v| k == user}
         namespace_ut
       )
     end

data/lib/git_topic.rb

@@ -61,7 +61,7 @@ module GitTopic
         if remote_branches.include? "origin/#{b}"
           git [
             "reset --hard origin/#{b}",
-            "push origin :refs/heads/#{b} HEAD:refs/heads/#{wb}",
+            "push origin :refs/heads/#{b} +HEAD:refs/heads/#{wb}",
           ]
         end
       end
@@ -162,7 +162,8 @@ module GitTopic
 
       sb = ''
       rb = remote_branches_organized
-      review_ut   = rb[:review]
+      # Only others' branche should appear as ‘topics you can review’
+      review_ut   = rb[:review].select{ |u, t| u != user }
       rejected_ut = rb[:rejected]
 
       unless review_ut.empty?

data/spec/git_topic_comments_spec.rb

@@ -33,6 +33,19 @@ describe GitTopic do
         GitTopic.comments "rejected/#{@user}/krakens"
       end
 
+      it "should list comments for a user's review branches, if requested" do
+        GitTopic.work_on  'krakens'
+        GitTopic.done
+        git_remote_branches.should            include "review/#{@user}/krakens"
+        GitTopic.should_receive( :git ) do |cmd|
+          cmd.should =~ /log/
+          cmd.should =~ %r{origin/master\.\.}
+          cmd.should =~ /--no-standard-notes/
+          cmd.should =~ %r{--show-notes=refs/notes/reviews/#{@user}/krakens}
+        end
+        GitTopic.comments "krakens"
+      end
+
       it "should strip partially qualified namespaces" do
         git_branch.should                     == 'master'
         GitTopic.should_receive( :git ) do |cmd|

data/spec/git_topic_work_on_spec.rb

@@ -142,6 +142,22 @@ describe GitTopic do
         ).should                          == '44ffd9c9c8b52b201659e3ad318cdad6ec836b46'
       end
 
+      it "should work when HEAD points to a commit downstream of master" do
+        GitTopic.work_on  'new-topic'
+        dirty_branch!
+        system "git add . && git commit -q -a -m 'Non-FF' "
+
+        git_remote_branches.should        include( "rejected/#{@user}/krakens" )
+        GitTopic.work_on    'krakens'
+        git_branch.should                 == "wip/#{@user}/krakens"
+        git_remote_branches.should_not    include( "rejected/#{@user}/krakens" )
+        git_remote_branches.should        include( "wip/#{@user}/krakens" )
+        git_head.should                   == '44ffd9c9c8b52b201659e3ad318cdad6ec836b46'
+        git_remote(
+          "wip/#{@user}/krakens"
+        ).should                          == '44ffd9c9c8b52b201659e3ad318cdad6ec836b46'
+      end
+
       it "
         should report the presence of comments to the user, when the topic has
         been rejected.

data/spec/spec_helper.rb

@@ -163,7 +163,9 @@ def git_head  suffix=nil
 end
 
 def git_remote  branch
-  `git rev-parse #{branch}`.chomp
+  ref = branch
+  ref = "origin/#{ref}" unless ref =~ %r{^origin}
+  `git rev-parse #{ref}`.chomp
 end
 
 def git_origin_master

data/spec/template/origin/config

@@ -3,5 +3,3 @@
 	filemode = true
 	bare = true
 	sharedrepository = 1
-[receive]
-	denyNonFastforwards = true

metadata

@@ -5,9 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 6
-  - 1
-  version: 0.2.6.1
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - David J. Hamilton
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-20 00:00:00 -07:00
+date: 2010-10-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency