Skip to content

Commit 6c53eec

Browse files
author
Peter Degen-Portnoy
committed
Update library to run on Ruby 1.9
1 parent 4d46a00 commit 6c53eec

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+140
-140
lines changed

lib/scm.rb

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
module Scm
22
end
33

4-
require 'rbconfig'
4+
#require 'rbconfig'
55

6-
$: << File.join(File.dirname(__FILE__),"..")
6+
#$: << File.join(File.dirname(__FILE__),"..")
77

8-
require 'lib/scm/shellout'
9-
require 'lib/scm/scratch_dir'
10-
require 'lib/scm/commit'
11-
require 'lib/scm/diff'
8+
require_relative 'scm/shellout'
9+
require_relative 'scm/scratch_dir'
10+
require_relative 'scm/commit'
11+
require_relative 'scm/diff'
1212

13-
require 'lib/scm/adapters/abstract_adapter'
14-
require 'lib/scm/adapters/cvs_adapter'
15-
require 'lib/scm/adapters/svn_adapter'
16-
require 'lib/scm/adapters/svn_chain_adapter'
17-
require 'lib/scm/adapters/git_adapter'
18-
require 'lib/scm/adapters/hg_adapter'
19-
require 'lib/scm/adapters/hglib_adapter'
20-
require 'lib/scm/adapters/bzr_adapter'
21-
require 'lib/scm/adapters/bzrlib_adapter'
22-
require 'lib/scm/adapters/factory'
13+
require_relative 'scm/adapters/abstract_adapter'
14+
require_relative 'scm/adapters/cvs_adapter'
15+
require_relative 'scm/adapters/svn_adapter'
16+
require_relative 'scm/adapters/svn_chain_adapter'
17+
require_relative 'scm/adapters/git_adapter'
18+
require_relative 'scm/adapters/hg_adapter'
19+
require_relative 'scm/adapters/hglib_adapter'
20+
require_relative 'scm/adapters/bzr_adapter'
21+
require_relative 'scm/adapters/bzrlib_adapter'
22+
require_relative 'scm/adapters/factory'
2323

24-
require 'lib/scm/parsers/parser'
25-
require 'lib/scm/parsers/branch_number'
26-
require 'lib/scm/parsers/cvs_parser'
27-
require 'lib/scm/parsers/svn_parser'
28-
require 'lib/scm/parsers/svn_xml_parser'
29-
require 'lib/scm/parsers/git_parser'
30-
require 'lib/scm/parsers/git_styled_parser'
31-
require 'lib/scm/parsers/hg_parser'
32-
require 'lib/scm/parsers/hg_styled_parser'
33-
require 'lib/scm/parsers/bzr_xml_parser'
34-
require 'lib/scm/parsers/bzr_parser'
24+
require_relative 'scm/parsers/parser'
25+
require_relative 'scm/parsers/branch_number'
26+
require_relative 'scm/parsers/cvs_parser'
27+
require_relative 'scm/parsers/svn_parser'
28+
require_relative 'scm/parsers/svn_xml_parser'
29+
require_relative 'scm/parsers/git_parser'
30+
require_relative 'scm/parsers/git_styled_parser'
31+
require_relative 'scm/parsers/hg_parser'
32+
require_relative 'scm/parsers/hg_styled_parser'
33+
require_relative 'scm/parsers/bzr_xml_parser'
34+
require_relative 'scm/parsers/bzr_parser'
3535

36-
require 'lib/scm/parsers/array_writer'
37-
require 'lib/scm/parsers/xml_writer'
38-
require 'lib/scm/parsers/human_writer'
36+
require_relative 'scm/parsers/array_writer'
37+
require_relative 'scm/parsers/xml_writer'
38+
require_relative 'scm/parsers/human_writer'

lib/scm/adapters/abstract_adapter.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class << self
1616
end
1717
end
1818

19-
require 'lib/scm/adapters/abstract/system'
20-
require 'lib/scm/adapters/abstract/validation'
21-
require 'lib/scm/adapters/abstract/sha1'
22-
require 'lib/scm/adapters/abstract/misc'
19+
require_relative 'abstract/system'
20+
require_relative 'abstract/validation'
21+
require_relative 'abstract/sha1'
22+
require_relative 'abstract/misc'

lib/scm/adapters/bzr_adapter.rb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ def english_name
66
end
77
end
88

9-
require 'lib/scm/adapters/bzr/validation'
10-
require 'lib/scm/adapters/bzr/commits'
11-
require 'lib/scm/adapters/bzr/head'
12-
require 'lib/scm/adapters/bzr/cat_file'
13-
require 'lib/scm/adapters/bzr/misc'
14-
require 'lib/scm/adapters/bzr/pull'
15-
require 'lib/scm/adapters/bzr/push'
9+
require_relative 'bzr/validation'
10+
require_relative 'bzr/commits'
11+
require_relative 'bzr/head'
12+
require_relative 'bzr/cat_file'
13+
require_relative 'bzr/misc'
14+
require_relative 'bzr/pull'
15+
require_relative 'bzr/push'

lib/scm/adapters/bzrlib_adapter.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
require 'rubygems'
22

3-
require 'lib/scm/adapters/bzrlib/bzrlib_pipe_client'
3+
require_relative 'bzrlib/bzrlib_pipe_client'
44
module Scm::Adapters
55
class BzrlibAdapter < BzrAdapter
66

@@ -21,5 +21,5 @@ def cleanup
2121
end
2222
end
2323

24-
require 'lib/scm/adapters/bzrlib/head'
25-
require 'lib/scm/adapters/bzrlib/cat_file'
24+
require_relative 'bzrlib/head'
25+
require_relative 'bzrlib/cat_file'

lib/scm/adapters/cvs_adapter.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ def initialize(params={})
1313
end
1414
end
1515

16-
require 'lib/scm/adapters/cvs/validation'
17-
require 'lib/scm/adapters/cvs/commits'
18-
require 'lib/scm/adapters/cvs/misc'
16+
require_relative 'cvs/validation'
17+
require_relative 'cvs/commits'
18+
require_relative 'cvs/misc'

lib/scm/adapters/git_adapter.rb

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ def english_name
66
end
77
end
88

9-
require 'lib/scm/adapters/git/validation'
10-
require 'lib/scm/adapters/git/cat_file'
11-
require 'lib/scm/adapters/git/commits'
12-
require 'lib/scm/adapters/git/commit_all'
13-
require 'lib/scm/adapters/git/token'
14-
require 'lib/scm/adapters/git/push'
15-
require 'lib/scm/adapters/git/pull'
16-
require 'lib/scm/adapters/git/head'
17-
require 'lib/scm/adapters/git/misc'
18-
require 'lib/scm/adapters/git/patch'
9+
require_relative 'git/validation'
10+
require_relative 'git/cat_file'
11+
require_relative 'git/commits'
12+
require_relative 'git/commit_all'
13+
require_relative 'git/token'
14+
require_relative 'git/push'
15+
require_relative 'git/pull'
16+
require_relative 'git/head'
17+
require_relative 'git/misc'
18+
require_relative 'git/patch'

lib/scm/adapters/hg_adapter.rb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ def english_name
66
end
77
end
88

9-
require 'lib/scm/adapters/hg/validation'
10-
require 'lib/scm/adapters/hg/cat_file'
11-
require 'lib/scm/adapters/hg/commits'
12-
require 'lib/scm/adapters/hg/misc'
13-
require 'lib/scm/adapters/hg/pull'
14-
require 'lib/scm/adapters/hg/push'
15-
require 'lib/scm/adapters/hg/head'
16-
require 'lib/scm/adapters/hg/patch'
9+
require_relative 'hg/validation'
10+
require_relative 'hg/cat_file'
11+
require_relative 'hg/commits'
12+
require_relative 'hg/misc'
13+
require_relative 'hg/pull'
14+
require_relative 'hg/push'
15+
require_relative 'hg/head'
16+
require_relative 'hg/patch'

lib/scm/adapters/hglib_adapter.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
require 'rubygems'
2-
require 'lib/scm/adapters/hglib/client'
2+
require_relative 'hglib/client'
33

44
module Scm::Adapters
55
class HglibAdapter < HgAdapter
@@ -21,5 +21,5 @@ def cleanup
2121
end
2222
end
2323

24-
require 'lib/scm/adapters/hglib/cat_file'
25-
require 'lib/scm/adapters/hglib/head'
24+
require_relative 'hglib/cat_file'
25+
require_relative 'hglib/head'

lib/scm/adapters/svn_adapter.rb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ def english_name
66
end
77
end
88

9-
require 'lib/scm/adapters/svn/validation'
10-
require 'lib/scm/adapters/svn/cat_file'
11-
require 'lib/scm/adapters/svn/commits'
12-
require 'lib/scm/adapters/svn/push'
13-
require 'lib/scm/adapters/svn/pull'
14-
require 'lib/scm/adapters/svn/head'
15-
require 'lib/scm/adapters/svn/misc'
16-
require 'lib/scm/adapters/svn/patch'
9+
require_relative 'svn/validation'
10+
require_relative 'svn/cat_file'
11+
require_relative 'svn/commits'
12+
require_relative 'svn/push'
13+
require_relative 'svn/pull'
14+
require_relative 'svn/head'
15+
require_relative 'svn/misc'
16+
require_relative 'svn/patch'
1717

lib/scm/adapters/svn_chain_adapter.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ class SvnChainAdapter < SvnAdapter
3939
end
4040
end
4141

42-
require 'lib/scm/adapters/svn_chain/chain'
43-
require 'lib/scm/adapters/svn_chain/commits'
44-
require 'lib/scm/adapters/svn_chain/cat_file'
42+
require_relative 'svn_chain/chain'
43+
require_relative 'svn_chain/commits'
44+
require_relative 'svn_chain/cat_file'

0 commit comments

Comments
 (0)