Updated mercurial to 4.4

.gitignore

@@ -1,2 +1,5 @@
 *.swp
+*.pyc
 pkg/
+*.cache
+.byebug*

.ruby-version

@@ -0,0 +1,2 @@
+2.2.5
+

.travis.yml

@@ -0,0 +1,13 @@
+language: ruby
+env:
+  - TRAVIS_CONFIG_DIR=.travis
+before_install:
+  - cd $TRAVIS_CONFIG_DIR
+  - sh .travis_ssh_setup.sh
+install:
+  - sh .install_multiple_scms.sh
+  - sh .install_dependencies.sh
+  - gem install posix-spawn
+  - gem install nokogiri -v 1.6.8
+before_script:
+  - cd $TRAVIS_BUILD_DIR

.travis/.install_dependencies.sh

@@ -0,0 +1,15 @@
+#/usr/bin/env sh
+
+bazaar_plugins_path=`bzr --version |  awk '/bzrlib:/ {print $2}'`
+
+cd "$bazaar_plugins_path/plugins"
+
+sudo bzr branch lp:bzr-xmloutput
+
+sudo mv bzr-xmloutput xmloutput
+
+gem install 'test-unit' -v '3.2.4'
+
+cd xmloutput
+
+python setup.py build_ext -i

.travis/.install_multiple_scms.sh

@@ -0,0 +1,9 @@
+sudo sh -c 'echo "deb http://opensource.wandisco.com/ubuntu precise svn18" >> /etc/apt/sources.list.d/subversion18.list'
+sudo wget -q http://opensource.wandisco.com/wandisco-debian.gpg -O- | sudo apt-key add -
+sudo apt-add-repository -y ppa:git-core/ppa
+sudo apt-get update
+sudo apt-get install -y git subversion cvs bzr mercurial
+sudo ln -s /usr/bin/cvs /usr/bin/cvsnt
+sudo add-apt-repository -y ppa:mercurial-ppa/releases
+sudo apt-get update
+sudo apt-get install --only-upgrade -y mercurial

.travis/.travis_ssh_setup.sh

@@ -0,0 +1,3 @@
+ssh-keygen -t rsa -f ~/.ssh/id_rsa -N "" -q
+cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
+ssh-keyscan -t rsa `hostname` >> ~/.ssh/known_hosts

README → README.md

@@ -1,4 +1,6 @@
-= Ohloh SCM
+[![Ohloh SCM on Ohloh](https://www.ohloh.net/p/ohloh_scm/widgets/project_partner_badge.gif)](https://www.ohloh.net/p/ohloh_scm) [![Build Status](https://travis-ci.org/blackducksoftware/ohloh_scm.svg?branch=master)](https://travis-ci.org/blackducksoftware/ohloh_scm)
+
+# Ohloh SCM
 
 The Ohloh source control management library
 
@@ -16,7 +18,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-== Overview
+## Overview
 
 Ohloh SCM is an abstraction layer for source control management systems,
 allowing an application to interoperate with various SCMs using a
@@ -25,7 +27,7 @@ single interface.
 It was originally developed at Ohloh, and is used to generate
 the reports at www.ohloh.net.
 
-== System Requirements
+## System Requirements
 
 Ohloh SCM is developed on Mac OS X 10.5 and Ubuntu 6.06 LTS. Other Linux
 environments should also work, but your mileage may vary.
@@ -39,24 +41,63 @@ shell.  In order to pass the unit tests, all three systems must be installed
 and on your path. Ohloh uses the following versions, and other versions are
 totally unsupported at this time:
 
-cvsnt 2.5.03
-svn 1.4.2
-git 1.6.0.4
-hg 1.1.2
+cvsnt 2.5.03  
+svn 1.4.2  
+git 1.8.2.1  
+hg 1.1.2  
 
 If you are using CVS instead of CVSNT, you can potentially try creating
 a shell alias or symlink mapping 'cvsnt' to 'cvs'.
 
-== Running
+Ohloh SCM uses [posix-spawn](https://github.com/rtomayko/posix-spawn) to
+execute commands so ensure *posix-spawn* gem is installed
+
+``gem install posix-spawn``
+
+
+## Usage with Bundler
+
+```
+gem 'ohloh_scm', git: 'https://github.com/blackducksw/ohloh_scm/', require: 'scm'
+gem 'posix-spawn'
+```
+## Running
+
+Ensure that cvsnt, svn, svnadmin, svnsync, git, and hg are all on your path. You'll also need to ensure that you have the xmloutput plugin installed for bazaar.
+
+### Installing The XmlOutput Plugin
+    $ cd ~
+    $ mkdir .bazaar
+    $ cd .bazaar
+    $ mkdir plugins
+    $ cd plugins
+
+Now checkout the latest version of the xmloutput plugin (0.8.8 as of 11/21/2011). 
+
+    $ bzr branch lp:~amujumdar/bzr-xmloutput/emit_authors
+
+The default checkout directory is poorly named and bazaar will complain about this unless it is renamed.
+
+    $ mv emit_authors xmloutput
+
+Now you just need to install the xmloutput plugin
+
+    $ cd xmloutput
+    $ python setup.py build_ext -i
+
+Verify that the plugin was installed correctly
+
+    $ bzr plugins
+
+You should see some text like "xmloutput 0.8.8"
 
-Ensure that cvsnt, svn, svnadmin, svnsync, git, and hg are all on your path.
 Then you can run the unit tests:
 
-$ rake
+    $ rake
 
-You can load the library into your own Ruby application by requiring lib/scm.rb.
+You can load the library into your own Ruby application by requiring lib/ohloh_scm.rb.
 
-= Functionality
+# Functionality
 
 For each tracked repository, Ohloh uses the SCM library to maintain a private
 local mirror. The SCM library hides the differences between source control
@@ -74,27 +115,23 @@ tasks on the local mirror:
 
 1. Pull changes -- From a remote repository URL, pull any changes to the local
 mirror. This step may involve conversion from one system to another.
-
 2. Push changes -- From the local mirror, push any changes to another Ohloh
 server. This is required to create backup copies and perform load balancing on
 the Ohloh cluster, and typically occurs over ssh.
-
 3. Commit log -- Given the last known commit, report the list of new commits,
 if any, including their diffs.
-
 4. Cat file or parent -- Given a commit, return either the contents of a
 single file, or that file's previous contents.
-
 5. Export tree -- Given a commit, export the entire contents of the source tree
 to a specified temp directory.
 
 The adapter must also implement validation routines used to filter user inputs
 and confirm the presence of the remote server.
 
-= Contact Ohloh
+# Contact Ohloh
 
 For more information visit the Ohloh website:
-   http://labs.ohloh.net
+[Ohloh Labs](http://labs.ohloh.net)
 
 You can reach Ohloh via email at:
-   [email protected]
+[[email protected]](mailto:[email protected])

Rakefile

@@ -3,7 +3,7 @@ require 'rake/clean'
 require 'rake/testtask'
 
 require 'rubygems'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 
 spec = Gem::Specification.new do |s|
   s.name = 'ohloh_scm'
@@ -15,14 +15,13 @@ spec = Gem::Specification.new do |s|
   s.summary = 'Ohloh Source Control Management Library'
   s.files = FileList['README', 'COPYING', '{bin,lib,test}/**/*']
   s.require_path = 'lib'
-  s.autorequire = 'scm'
   s.executables = 'ohlog'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README']
   s.test_files = FileList["test/**/*"]
 end
 
-Rake::GemPackageTask.new(spec) do |pkg|
+Gem::PackageTask.new(spec) do |pkg|
   pkg.need_tar = true
   pkg.need_zip = true
 end

bin/ohlog

@@ -1,12 +1,12 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../lib/scm'
+require File.dirname(__FILE__) + '/../lib/ohloh_scm'
 
 # This is a simple command line tool which parses CVS and Subversion logs.
 # It is not used by the main Ohloh system.
 #
 # I use it primarily to help debug Ohloh behavior. It's a convenient way
 # to turn an enormously long CVS log into something readable.
-module Scm::Parsers
+module OhlohScm::Parsers
 	class CommandLine
 		attr_accessor :paths, :writer
 
@@ -26,10 +26,12 @@ Ohloh source control log parser
 [option] can be one of the following:
 
   --cvs             Parse a CVS rlog
+  --git             Parse a Git log (generated with or without --name-status option)
   --svn             Parse a Subversion log
   --svn-xml         Parse a Subversion XML log
   --hg              Parse a Mercurial log
   --bzr             Parse a Bazaar log
+  --bzr-xml         Parse a Bazaar XML log
 
   -h, --human       Output result as a human-readable log (default)
   -x, --xml         Output result as an XML log
@@ -49,13 +51,19 @@ Examples:
 
    bzr log -v | ohlog --bzr
 
+   bzr xmllog -v | ohlog --bzr
+
 HELP
 		end
 
 		def cvs
 			parse CvsParser
 		end
 
+		def git
+			parse GitParser
+		end
+
 		def svn
 			parse SvnParser
 		end
@@ -72,6 +80,10 @@ HELP
 			parse BzrParser
 		end
 
+    def bzr_xml
+      parse BzrXmlParser
+    end
+
 		def parse(parser)
 			self.writer ||= HumanWriter.new(STDOUT)
 
@@ -101,6 +113,8 @@ HELP
 			case option
 			when '--cvs'
 				self.subcommand = :cvs
+			when '--git'
+				self.subcommand = :git
 			when '--svn'
 				self.subcommand = :svn
 			when '--svn-xml'
@@ -109,6 +123,8 @@ HELP
 				self.subcommand = :hg
 			when '--bzr'
 				self.subcommand = :bzr
+			when '--bzr-xml'
+				self.subcommand = :bzr_xml
 			when '-h', '--human'
 				self.writer = HumanWriter.new(STDOUT)
 			when '-x', '--xml'

bin/string_encoder

@@ -0,0 +1,13 @@
+#! /usr/bin/env ruby
+# Replaces invalid utf-8 characters with �.
+#
+# Usage:
+# $ cat some_file | string_encoder
+
+while input = gets
+  if input.to_s.valid_encoding?
+    puts input
+  else
+    puts input.encode('UTF-8', 'binary', invalid: :replace, undef: :replace)
+  end
+end

lib/ohloh_scm.rb

@@ -0,0 +1,38 @@
+module OhlohScm
+end
+
+#require 'rbconfig'
+
+#$: << File.join(File.dirname(__FILE__),"..")
+
+require_relative 'ohloh_scm/shellout'
+require_relative 'ohloh_scm/scratch_dir'
+require_relative 'ohloh_scm/commit'
+require_relative 'ohloh_scm/diff'
+
+require_relative 'ohloh_scm/adapters/abstract_adapter'
+require_relative 'ohloh_scm/adapters/cvs_adapter'
+require_relative 'ohloh_scm/adapters/svn_adapter'
+require_relative 'ohloh_scm/adapters/svn_chain_adapter'
+require_relative 'ohloh_scm/adapters/git_adapter'
+require_relative 'ohloh_scm/adapters/hg_adapter'
+require_relative 'ohloh_scm/adapters/hglib_adapter'
+require_relative 'ohloh_scm/adapters/bzr_adapter'
+require_relative 'ohloh_scm/adapters/bzrlib_adapter'
+require_relative 'ohloh_scm/adapters/factory'
+
+require_relative 'ohloh_scm/parsers/parser'
+require_relative 'ohloh_scm/parsers/branch_number'
+require_relative 'ohloh_scm/parsers/cvs_parser'
+require_relative 'ohloh_scm/parsers/svn_parser'
+require_relative 'ohloh_scm/parsers/svn_xml_parser'
+require_relative 'ohloh_scm/parsers/git_parser'
+require_relative 'ohloh_scm/parsers/git_styled_parser'
+require_relative 'ohloh_scm/parsers/hg_parser'
+require_relative 'ohloh_scm/parsers/hg_styled_parser'
+require_relative 'ohloh_scm/parsers/bzr_xml_parser'
+require_relative 'ohloh_scm/parsers/bzr_parser'
+
+require_relative 'ohloh_scm/parsers/array_writer'
+require_relative 'ohloh_scm/parsers/xml_writer'
+require_relative 'ohloh_scm/parsers/human_writer'

lib/ohloh_scm/adapters/abstract/misc.rb

@@ -0,0 +1,13 @@
+module OhlohScm::Adapters
+  class AbstractAdapter
+
+    def is_merge_commit?(commit)
+      false
+    end
+
+    def tags
+      []
+    end
+
+  end
+end

lib/scm/adapters/abstract/sha1.rb → lib/ohloh_scm/adapters/abstract/sha1.rb

@@ -1,8 +1,8 @@
-require 'sha1'
+require 'digest/sha1'
 
 NULL_SHA1 = '0000000000000000000000000000000000000000' unless defined?(NULL_SHA1)
 
-module Scm::Adapters
+module OhlohScm::Adapters
 	class AbstractAdapter
 
 		# This file provides SHA1 computation helpers for source control systems that
@@ -11,7 +11,7 @@ class AbstractAdapter
 		# that match those generated natively by Git.
 
 		def compute_sha1(blob)
-			blob.to_s == '' ? NULL_SHA1 : SHA1.sha1("blob #{blob.length}\0#{blob}").to_s
+			blob.to_s == '' ? NULL_SHA1 : Digest::SHA1.hexdigest("blob #{blob.length}\0#{blob}")
 		end
 
 		# Populates the SHA1 values for each diff in a commit.