- PDF Free Download

Size: px

Start display at page:

Download ""

Herbert Ryan
5 years ago
Views:

1 Version Control Revolution

2 Justin Love

3 I am a Mercurial User

4 THIS should not matter

5 Manifesto We want a piece of software that: 1 Is Free of religious devotion to one VCS

6 Overview What is Amp? Why Amp? What will Amp do for me? How do I use Amp? How can I help?

7 My VCS Journey

8 College VCS

9 VSS

10 SVN

11 Interface git hg arcane clean 2007

12 Documentation git hg 2007

13 Portabillity git hg windows! 2007

14 HG

15 github: 2008

16 What Is

17 Interfaces Repositories git.git hg.hg??

18 Full Mercurial Suppport hg.hg

19 Flexible Commands Written in Ruby

20 Michael adgar Edgar Ari seydar Brown

21 Back in the day, someone pointed out that Rails is slang for cocaine. So, obviously, we needed to name it after a drug. Ari Brown

22 Ruby On Rails?

23 We looked online for nicknames for meth, and chose amp because it was short (3 letters) and wasn't blatantly drug related. Ari Brown

24 $ amp clone hg amp

25 Existing Implementation in a Dynamic Language

26 Mercurial (GPL) Amp (GPL)

27 Long story short: Amp kicks ass and you should use it. It's still growing and not bug-free. If you're on Ruby 1.9, beware of Unicode Michael Edgar

28 John Locke Amp

30 changeset: 661:7dbef9c17c2e user: seydar date: Sun Aug summary: updated bug 24's...

31 $ amp pull git $ amp merge

32 changeset: 662:c6fb001fb520 user: Justin Love date: Tue Aug summary: use ruby format...

33 RubyConf CFP Close

34 A funny thing happened on the way to RubyConf...

35 changeset: 661:7dbef9c17c2e user: seydar date: Sun Aug summary: updated bug 24's...

36 404

37 We're happy to let you know that your proposal, "AMP: Cross-repo version control in Ruby.", has been selected for inclusion in the program. David A. Black

38 changeset: 661:7dbef9c17c2e user: seydar date: Sun Aug summary: updated bug 24's...

39 amp-redux?

40 $ amp pull git requesting all changes adding changesets adding manifests adding file changes transaction abort! interrupted!

41 FUN FACT! Getting git to play right is much more complicated than whatever that! law is that says everything is super complicated. Ari Brown

42 amp hg

43 amp git hg

44 HG focuses on the implementation (filelogs, changelogs, indexes/indices), and we wanted to focus on changesets, repositories, and stuff like that Ari Brown

45 It's like an old car that needs to get scrapped. it got us hundreds of thousands of miles. Ari Brown

46 Manifesto We want a piece of software that: 6 We want to discover where the limits are on Ruby for use in large applications. Where is the language slow? Where is it fast? What techniques are effective?

47 plan to throw one away; you will, anyhow. Fred Brooks The Mythical Man-Month

48 Redux

49 Not backed by code

50 I'm learning a shitton about software design and engineering which will pay back Amp in spades. Michael Edgar

51 Interface Implementation

52 Modular

53 Amp Front

54 Amp Core

55 Amp-hg Amp-git

56 Why

57 git C

58 Mercurial Python

59 Bazaar Python

60 Darcs Haskell

61 Monotone C++

62 SVN C

63 SVK Perl

64 C/++ 3 Python 2 Perl 1 Haskell 1 Ruby?

65 Comparison_of_revision_control_software!-F (Find) Ruby

66 Manifesto We want a piece of software that: 5 We want to prove ruby is viable for large-scale applications, not just web frameworks. Can you think of any non-trivial actual applications written in ruby?

67 Do we really need another VCS?

68 Ruby Ruby Logo 2006, Yukihiro Matsumoto

71 Rubinius

73 Sinatra

74 merb

75 3

76 VSS SVN Mercurial

77 CVS SVN Git

78 There Will Be a Next Thing

79 How will help me?

80 Mercurial Repos

82 $ amp

83 require amp

84 git.git hg.hg??

85 git.git.hg?

86 .git hg.hg

87 n 2.git hg.hg

88 git n+m.git hg.hg??

89 MySQL Rails Active Record Postgres??

90 .git git.hg?

91 Manifesto We want a piece of software that: 2 Lets us customize how we interact with it. If we want git's commands because I used it the longest, let us use them with a mercurial repo.

92 git hg.git?

93 Mix and Match

94 railties actionmailer actionpack activemodel activerecord activeresource activesupport Rails 3

95 Redux amp-front amp-core amp-hg amp-git

96 git.git hg.hg?

97 git.git hg.hg?

98 Manifesto We want a piece of software that: 3 We want the extension we wrote for HG to work on my github project too. Because they're both DVCS, damnit.

99 git.git hg.hg? extensions?

100 How do I use

101 $ gem install amp

102 $ amp help $ amp add $ amp commit $ amp push

103 Manifesto We want a piece of software that: 4 We want to be able to directly modify the commands they give us. Git's remove command is `git rm`. It should be dead simple to make `git remove` map directly to that, and we mean less than 1 minute of thought/work.

104 ampfile.rb

105 One huge feature is open commands: the same syntax for creating a command will re-open an existing one, just like classes in Ruby. Michael Edgar

106 command :log do c c.workflow :hg c.desc "Prints the commit history." c.opt :verbose, "Verbose output", {:short => "-v"} c.opt :limit, "Limit how many revisions to show", {:short => "-l", :type => :integer, :default => -1} c.opt :template, "Which template to use while printing", {:short => "-t", :type => :string, :default => "default"} c.opt :no_output, "Doesn't print output (useful for benchmarking)" c.on_run do options, args repo = options[:repository] limit = options[:limit] limit = repo.size if limit == -1 start = repo.size - 1 stop = start - limit + 1 options.merge! :template_type => :log start.downto stop do x puts repo[x].to_templated_s(options) unless options[:no_output] end end end

107 command :log do c

108 c.workflow :hg

109 c.desc "Prints the commit history."

110 c.opt :verbose, "Verbose output", {:short => "-v"} c.opt :limit, "Limit how many revisions to show", {:short => "-l", :type => :integer, :default => -1} c.opt :template, "Which template to use while printing", {:short => "-t", :type => :string, :default => "default"} c.opt :no_output, "Doesn't print output (useful for benchmarking)"

111 Trollop

112 c.on_run do options, args repo = options[:repository] limit = options[:limit] limit = repo.size if limit == -1 start = repo.size - 1 stop = start - limit + 1 options.merge! :template_type => :log start.downto stop do x puts repo[x].to_templated_s(options) unless options[:no_output] end end

113 c.on_run do options, args repo = options[:repository] limit = options[:limit] limit = repo.size if limit == -1 start = repo.size - 1 stop = start - limit + 1 options.merge! :template_type => :log start.downto stop do x puts repo[x].to_templated_s(options) unless options[:no_output] end end

114 c.on_run do options, args repo = options[:repository] limit = options[:limit] limit = repo.size if limit == -1 start = repo.size - 1 stop = start - limit + 1 options.merge! :template_type => :log start.downto stop do x puts repo[x].to_templated_s(options) unless options[:no_output] end end

115 User Command: Billing Time

116 $ amp billing --limit

117 $ amp help billing Estimate time spent --limit, -l <i>: --rate, -r <i>: --help, -h: Limit how many revisions to show Billing Rate Show this message

118 ... archive billing bisect Create... Estimate... subdivision......

119 command :billing do c c.desc "Estimate time spent" c.opt :limit, "Limit how many revisions to show", {:short => "-l", :type => :integer} c.opt :rate, "Billing Rate", {:type => :integer} c.on_run do options, args # boilerplate repo = options[:repository] limit = options[:limit] repo.size rate = options[:rate] 1 last = repo.size - 1 first = last - limit + 1 # calculate time hours = repo.to_a[first,last].each_cons(2).map(&billingtime.method(:new)) # daily summary days = Hash.new(0) hours.each { b days[b.date] += b.billable} puts days.keys.sort.reverse.map { k "#{k} #{days[k]}"} # total bills = hours.map { b b.billable * rate} puts bills.inject { a,b a + b} end end

120 command :billing do c c.desc "Estimate time spent"

121 c.opt :limit, "Limit how many revisions to show", {:short => "-l", :type => :integer} c.opt :rate, "Billing Rate", {:type => :integer}

122 c.on_run do options, args # boilerplate repo = options[:repository] limit = options[:limit] repo.size rate = options[:rate] 1 last = repo.size - 1 first = last - limit + 1

123 # calculate time hours = repo[first..last]. each_cons(2). map(&billingtime.method(:new))

124 # daily summary days = Hash.new(0) hours.each { b days[b.date] += b.billable} puts days.keys.sort.reverse. map { k "#{k} #{days[k]}"}

125 # total bills = hours.map { b b.billable * rate} puts bills.inject { a,b a + b}

126 How can I help

127 Manifesto We want a piece of software that: 7 We want to be an example of proper documentation.

128

129 MANIFESTO

130 STYLE

131 TODO

132 Amp-front

133 Option Parsing

134 Help

135 command == class

136 Amp-core

137 Plugins

138 Generic Repository

139 Amp-hg

140 GPL

141 Amp-git

142 Multiple Backends?

143 Command line wrapper

144 Amp-grit?

145 Pure Ruby

146 Amp-git-C?

147 Review

148 $ gem install amp

149 Manifesto We want a piece of software that: 1 Is Free of religious devotion to one VCS

150 Manifesto We want a piece of software that: 2 Lets us customize how we interact with it. If we want git's commands because I used it the longest, let us use them with a mercurial repo.

151 Manifesto We want a piece of software that: 3 We want the extension we wrote for HG to work on my github project too. Because they're both DVCS, damnit.

152 Manifesto We want a piece of software that: 4 We want to be able to directly modify the commands they give us. Git's remove command is `git rm`. It should be dead simple to make `git remove` map directly to that, and we mean less than 1 minute of thought/work.

153 Manifesto We want a piece of software that: 5 We want to prove ruby is viable for large-scale applications, not just web frameworks. Can you think of any non-trivial actual applications written in ruby?

154 Manifesto We want a piece of software that: 6 We want to discover where the limits are on Ruby for use in large applications. Where is the language slow? Where is it fast? What techniques are effective?

155 Manifesto We want a piece of software that: 7 We want to be an example of proper documentation.

156 These are our goals

157 These are our tools Ruby RSpec Ruby Logo 2006, Yukihiro Matsumoto

158 Now is the time.

159

160 Justin Love

Version control CSE 403

Version control CSE 403 Goals of a version control system Keep a history of your work Explain the purpose of each change Checkpoint specific versions (known good state) Recover specific state (fix bugs,