git_bpf 0.0.2 → 1.0.0

data/README.md

@@ -63,6 +63,9 @@ git_bpf is packaged as a Ruby Gem and hosted on [RubyGems]
  - If <target-repository> is not provided, <target-repository> defaults to your current directory (will fail if current directory is not a git repository).
  - The script requires the <target-repository> to have a remote named 'origin'.
 
+## Upgrading
+
+Upgrading from older development versions of these scripts is a little bit sketchy. The steps possible steps involved are detailed [here](https://gist.github.com/tnightingale/59f44847526e1cc20bf7). Read through the document and run the steps that apply to you.
 
 [Branch-per-Feature]: https://github.com/affinitybridge/git-bpf/wiki/Branch-per-feature-process
 [RubyGems]: http://rubygems.org/

data/lib/git_bpf/commands/init.rb

@@ -1,6 +1,7 @@
 require 'git_bpf/lib/gitflow'
 require 'git_bpf/lib/git-helpers'
 require 'git_bpf/lib/repository'
+require 'Find'
 
 #
 # init: 
@@ -29,16 +30,63 @@ class Init < GitFlow/'init'
     ]
   end
 
+  # Removes all aliases to git-bpf commands.
+  def removeCommandAliases(repo)
+    config = repo.config(true, '--list').lines.each do |line|
+      next unless line.start_with? 'alias.' and line.match /\!_git\-bpf/
+      a = /alias\.([a-zA-Z0-9\-_]+)\=(.)*/.match(line)[1]
+      repo.config(true, '--unset', "alias.#{a}")
+    end
+  end
+
+  # Removes all symlinks to targets within source_location that are found
+  # within path.
+  def rmSymlinks(path, source_location)
+    targets_to_check = [source_location]
+    all_targets = []
+
+    # Find all symlink targets that represent a path within source_location.
+    while targets_to_check.length > 0
+      git_bpf_target = targets_to_check.pop
+      Find.find(path) do |p|
+        if File.symlink?(p)
+          target =  File.readlink(p)
+          if target.include? git_bpf_target and not targets_to_check.include? p
+            targets_to_check.push p
+          end
+        end
+      end
+      all_targets.push git_bpf_target
+    end
+
+    # Now delete any symlink whose target path includes any of the paths we
+    # have identified.
+    Find.find(path) do |p|
+      if File.symlink? p
+        target = File.readlink p
+        all_targets.each do |t|
+          if target.include? t
+            File.unlink p
+            break
+          end
+        end
+      end
+    end
+  end
+
   def execute(opts, argv)
     if argv.length > 1
       run 'init', '--help'
       terminate
     end
 
-    # TODO: There's likely a better way to do this.
-    source_path = File.join File.dirname(__FILE__), '..'
+    source_path = File.expand_path("..", File.dirname(__FILE__))
     target = Repository.new(argv.length == 1 ? argv.pop : Dir.getwd)
 
+    # Perform some cleanup in case this repo was previously initalized.
+    target.config(true, '--remove-section', 'gitbpf') rescue nil
+    removeCommandAliases target
+    rmSymlinks(target.git_dir, source_path)
 
     #
     # 1. Link source scripts directory.
@@ -80,11 +128,13 @@ class Init < GitFlow/'init'
     target.config(true, "rerere.enabled", "true")
     target.config(true, "rerere.autoupdate", "true")
 
+    target.config(true, "gitbpf.remotename", opts.remote_name)
+
     rerere_path = File.join(target.git_dir, 'rr-cache')
     target_remote_url = target.remoteUrl(opts.remote_name)
 
     if not File.directory? rerere_path
-      rerere = Repository::clone target_remote_url, rerere_path
+      rerere = Repository::clone target_remote_url, rerere_path, opts.remote_name
     elsif not File.directory? File.join(rerere_path, '.git')
       opoo "Rerere cache directory already exists; Initializing repository in existing rr-cache directory."
       rerere = Repository.init rerere_path
@@ -115,7 +165,7 @@ class Init < GitFlow/'init'
     #
     hooks_dir = File.join(target.git_dir, "hooks")
     hooks = [
-      'post-merge',
+      'post-commit',
       'post-checkout'
     ]
 

data/lib/git_bpf/commands/recreate-branch.rb

@@ -30,6 +30,13 @@ class RecreateBranch < GitFlow/'recreate-branch'
       ['-l', '--list',
         "Process source branch for merge commits and list them. Will not make any changes to any branches.",
         lambda { |n| opts.list = true }],
+      ['-d', '--discard',
+        "Discard the existing local source branch and checkout a new source branch from the remote if one exists. If no remote is specified with -r, gitbpf will use the configured remote, or origin if none is configured.",
+        lambda { |n| opts.discard = true }],
+      ['-r', '--remote NAME',
+        "Specify the remote repository to work with. Only works with the -d option.",
+        lambda { |n| opts.remote = n }],
+
     ]
   end
 
@@ -44,6 +51,28 @@ class RecreateBranch < GitFlow/'recreate-branch'
     # If no new branch name provided, replace the source branch.
     opts.branch = source if opts.branch == nil
 
+    if not refExists? opts.base
+      terminate "Cannot find reference '#{opts.base}' to use as a base for new branch: #{opts.branch}."
+    end
+
+    if opts.discard
+      unless opts.remote
+        repo = Repository.new(Dir.getwd)
+        remote_name = repo.config(true, "--get", "gitbpf.remotename").chomp
+        opts.remote = remote_name.empty? ? 'origin' : remote_name
+      end
+      git('fetch', opts.remote)
+      if branchExists?(source, opts.remote)
+        opoo "This will delete your local '#{source}' branch if it exists and create it afresh from the #{opts.remote} remote."
+        if not promptYN "Continue?"
+          terminate "Aborting."
+        end
+        git('checkout', opts.base)
+        git('branch', '-D', source) if branchExists? source
+        git('checkout', source)
+      end
+    end
+
     # Perform some validation.
     if not branchExists? source
       terminate "Cannot recreate branch #{source} as it doesn't exist."
@@ -53,10 +82,6 @@ class RecreateBranch < GitFlow/'recreate-branch'
       terminate "Cannot create branch #{opts.branch} as it already exists."
     end
 
-    if not refExists? opts.base
-      terminate "Cannot find reference '#{opts.base}' to use as a base for new branch: #{opts.branch}."
-    end
-
     #
     # 1. Compile a list of merged branches from source branch.
     #
@@ -169,7 +194,13 @@ class RecreateBranch < GitFlow/'recreate-branch'
         alt_base = git('name-rev', base, '--name-only').strip
         remote_heads = /remote\/\w+\/HEAD/
         unless name.include? source or name.include? alt_base or name.match remote_heads
-          branches.push name
+          # Make sure not to include the tilde part of a branch name (e.g. '~2')
+          # as this signifies a commit that's behind the head of the branch but
+          # we want to merge in the head of the branch.
+          name = name.partition('~')[0]
+          # This can lead to duplicate branches, because the name may have only
+          # differed in the tilde portion ('mybranch~1', 'mybranch~2', etc.)
+          branches.push name unless branches.include? name
         end
       end
     end

data/lib/git_bpf/hooks/post-checkout.rb

@@ -1,4 +1,9 @@
 #!/usr/bin/env ruby
 
 # Pull latest conflict resolutions.
-`git share-rerere pull`
+remote_name = `git config --get gitbpf.remotename`.chomp
+if remote_name.empty?
+  STDERR.puts "You have not configured the remote repository to be used by git-bpf. This is needed for rerere sharing. To use the 'origin' remote, run \n \`git config gitbpf.remotename 'origin'\`\n You can specify a remote name of your choosing."
+  exit 1
+end
+`git share-rerere pull -r #{remote_name}`

data/lib/git_bpf/hooks/post-commit.rb

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+
+parents = `git rev-list -n 1 --parents HEAD`.split("\s")
+
+# Shift off the last commit.
+last = parents.shift
+
+if parents.length >= 2
+  remote_name = `git config --get gitbpf.remotename`.chomp
+  if remote_name.empty?
+    STDERR.puts "You have not configured the remote repository to be used by git-bpf. This is needed for rerere sharing. To use the 'origin' remote, run \n \`git config gitbpf.remotename 'origin'\`\n You can specify a remote name of your choosing."
+    exit 1
+  end
+  `git share-rerere pull -r #{remote_name}`
+  `git share-rerere push -r #{remote_name}`
+end

data/lib/git_bpf/lib/git-helpers.rb

@@ -83,8 +83,12 @@ module GitHelpersMixin
     return params + args
   end
 
-  def branchExists?(branch)
-    ref = (branch.include? "refs/heads/") ? branch : "refs/heads/#{branch}"
+  def branchExists?(branch, remote = nil)
+    if remote
+      ref = "refs/remotes/#{remote}/#{branch}"
+    else
+      ref = (branch.include? "refs/heads/") ? branch : "refs/heads/#{branch}"
+    end
     begin
       git('show-ref', '--verify', '--quiet', ref)
     rescue

data/lib/git_bpf/lib/repository.rb

@@ -86,8 +86,8 @@ class Repository
     return true
   end
 
-  def self.clone(url, dest)
-    git('clone', url, dest)
+  def self.clone(url, dest, name = 'origin')
+    git('clone', '-o', name, url, dest)
     Repository.new dest
   end
 

data/lib/git_bpf/version.rb

@@ -1,3 +1,3 @@
 module GitBpf
-  VERSION = "0.0.2"
+  VERSION = "1.0.0"
 end

metadata

@@ -3,10 +3,10 @@ name: git_bpf
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
+  - 1
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  version: 1.0.0
 platform: ruby
 authors: 
 - tnightingale
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-25 00:00:00 -07:00
+date: 2013-09-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,7 +66,7 @@ files:
 - lib/git_bpf/commands/recreate-branch.rb
 - lib/git_bpf/commands/share-rerere-cache.rb
 - lib/git_bpf/hooks/post-checkout.rb
-- lib/git_bpf/hooks/post-merge.rb
+- lib/git_bpf/hooks/post-commit.rb
 - lib/git_bpf/lib/git-helpers.rb
 - lib/git_bpf/lib/gitflow.rb
 - lib/git_bpf/lib/repository.rb

data/lib/git_bpf/hooks/post-merge.rb

@@ -1,11 +0,0 @@
-#!/usr/bin/env ruby
-
-parents = `git rev-list -n 1 --parents HEAD`.split("\s")
-
-# Shift off the last commit.
-last = parents.shift
-
-if parents.length >= 2
-  `git share-rerere pull`
-  `git share-rerere push`
-end