git-si 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5c033e4e7de28be2feb823ec8f1d32db17796b7
-  data.tar.gz: cb102435c9881c6614b06c20a27a67911de50186
+  metadata.gz: 5d8b981e514fb17acde6931c0b798d36a28d0544
+  data.tar.gz: 0cad14a2f7c3a24f52439f731bec169132f42b02
 SHA512:
-  metadata.gz: ad49417b382b982f453ee176e7e54acd424c7fe2a39ac19c208e0ca74634c2ae3d1b93c4cc34715efda4918eb70669f1d155495cfc1c6422c9817073d87ff244
-  data.tar.gz: d5c427755fd6df789324d55e22e37eea8ac2633338c6c63340986a781eae4eb93496f0ce1f0dd422fb6b2d31d8e76bd8312c1a2c857d7bade152d0b4ace0bab9
+  metadata.gz: bba2942db8d9ce95ce755e9eba06f8c437ddf4c4a729e460cfe90f7b207ea95ebef9846baa23b3a315d491df9c5b9477caa1d2ac20c4c7169af389989b82ffc8
+  data.tar.gz: 1f5325dd2baeb1cb95b8d853f78d9de3d53c09cfe29157facef891fe7f95d1021c39e0eefda8d28f9c9f8b9ab3cf7576b344c05d7c28e08b22977e05744e2529

data/README.md

@@ -1,21 +1,46 @@
 # Git::Si
 
-Git Svn Interface: a simple git extention to use git locally with a remote svn repo. It's like a simple version of git-svn which doesn't keep track of history locally.
+Git Svn Interface: a simple git extention to use git locally with a remote svn
+repo. It's like a simple version of git-svn which doesn't keep track of history
+locally.
 
 ## Installation
 
     $ gem install git-si
 
+or locally if you don't have access to the global gem directory:
+
+    $ gem install --user-install git-si
+
 ## Usage
 
-    Commands:
-    git-si add [FILES]     # Perform an svn and a git add on the files.
-    git-si diff [FILES]    # Perform an svn diff piped through a colorizer. Also tests to be sure a rebase is not needed.
-    git-si fetch           # Updates mirror branch to latest svn commit.
-    git-si help [COMMAND]  # Describe available commands or one specific command
-    git-si pull            # Fetch the latest svn commit and rebase the current branch.
-    git-si rebase          # Rebases current branch to mirror branch.
-    git-si status [FILES]  # Perform an svn status.
+To begin, enter a directory versioned by svn and run `git si init`. This will
+set up git, the mirror branch, and a gitignore if you don't have one already.
+
+Use git locally as you would normally, making branches for your features as you
+like. To update your local branch with changes made on the svn server, run `git
+si pull`. (If there are conflicts you can use `git mergetool` to handle them.)
+
+Compare your local copy to the server with `git si diff`. It even colorizes and
+pages the output for you!
+
+When you are ready to push your changes to the svn server, run `git si commit`.
+This will take you into your favorite editor to enter a commit message.
+
+All commands:
+
+    git si add [FILES]     # Perform an svn and a git add on the files.
+    git si blame <FILE>    # Alias for svn blame.
+    git si commit          # Perform an svn commit and update the mirror branch.
+    git si diff [FILES]    # Perform an svn diff piped through a colorizer. Also tests to be sure a rebase is not needed.
+    git si fetch           # Updates mirror branch to latest svn commit.
+    git si help [COMMAND]  # Describe available commands or one specific command
+    git si init            # Initializes git-si in this directory with a gitignore and creates a special mirror branch.
+    git si pull            # Fetch the latest svn commit and rebase the current branch.
+    git si rebase          # Rebases current branch to mirror branch.
+    git si status [FILES]  # Perform an svn status.
+    git si usage           # How does this thing work?
+
 
 ## Contributing
 

data/lib/git/si/version.rb

@@ -1,5 +1,5 @@
 module Git
   module Si
-    VERSION = "0.0.1"
+    VERSION = "0.1.0"
   end
 end

data/lib/git/si.rb

@@ -31,7 +31,7 @@ module Git
 
       desc "usage", "How does this thing work?"
       def usage
-        say "git-si
+        say "git-si #{Git::Si::VERSION}
 
 Git Svn Interface: a simple git extention to use git locally with a remote svn
 repo. It's like a simple version of git-svn which doesn't keep track of history
@@ -131,12 +131,50 @@ use the commands below.
 
       desc "commit", "Perform an svn commit and update the mirror branch."
       def commit
+        mirror_is_updated = false
+
         on_local_branch do
+          local_branch = get_local_branch()
+          if local_branch == 'master'
+            notice_message "Warning: you're using the master branch as working copy. This can
+cause trouble because when your changes are committed and you try to
+rebase on top of them, you may end up with merge errors as you are
+trying to apply patches of previous versions of your code. If you
+continue, it's wise to reset the master branch afterward."
+            return if ask("Do you want to continue with this commit? [Y/n] ", :green) =~ /\s*^n/i
+          end
+
+          git_status = `git status --porcelain`
+          raise GitError.new("There are local changes; please commit them before continuing.") if git_status.match(/^[^\?]/)
+          svn_diff = `svn diff`
+          raise SvnError.new("Failed to get the svn diff. I'm not sure why. Check for any errors above.") if ! $?.success?
+          raise SvnError.new("There are no changes to commit.") if svn_diff.strip.empty?
+
           run_command("svn commit")
           success_message "commit complete!"
-          if yes? "Do you want to update the mirror branch to the latest commit? [y/N] "
+          if yes? "Do you want to update the mirror branch to the latest commit? [y/N] ", :green
             on_mirror_branch do
               fetch
+              mirror_is_updated = true
+            end
+          end
+        end
+
+        if mirror_is_updated
+          local_branch = get_local_branch()
+          if local_branch == 'master'
+            if yes? "Do you want to reset the current branch to the latest commit (losing all git history)? [y/N] ", :green
+              run_command("git checkout #{@@mirror_branch}")
+              run_command("git branch -D '#{local_branch}'")
+              run_command("git checkout -b #{local_branch}")
+              success_message "branch '#{local_branch}' reset!"
+            end
+          else
+            if yes? "Do you want to switch to master and delete the committed branch '#{local_branch}'? [y/N] ", :green
+              run_command("git checkout master")
+              rebase
+              run_command("git branch -D '#{local_branch}'")
+              success_message "branch '#{local_branch}' deleted!"
             end
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-si
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Payton Swick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-29 00:00:00.000000000 Z
+date: 2013-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler