Permalink
Browse files

Mirroring

  • Loading branch information...
1 parent c8b5743 commit c2e77d14e1233b7ec8aac717b5616e479cf9f5aa Michael Edgar committed Dec 15, 2009
Showing with 13,325 additions and 13,134 deletions.
  1. +1 −1 AUTHORS
  2. +1 −2 Rakefile
  3. +66 −149 TODO.markdown
  4. +3 −3 ampfile.rb
  5. +1 −1 ext/amp/bz2/extconf.rb
  6. +0 −29 ext/amp/bz2/mkmf.log
  7. +3 −2 ext/amp/mercurial_patch/mpatch.c
  8. +82 −61 lib/amp.rb
  9. +6 −5 lib/amp/commands/command.rb
  10. +1 −1 lib/amp/commands/commands/init.rb
  11. +6 −4 lib/amp/commands/commands/templates.rb
  12. +3 −3 lib/amp/commands/commands/workflows/hg/bundle.rb
  13. +2 −2 lib/amp/commands/commands/workflows/hg/clone.rb
  14. +1 −0 lib/amp/commands/commands/workflows/hg/copy.rb
  15. +1 −1 lib/amp/commands/commands/workflows/hg/debug/index.rb
  16. +1 −1 lib/amp/commands/commands/workflows/hg/import.rb
  17. +1 −1 lib/amp/commands/commands/workflows/hg/incoming.rb
  18. +6 −7 lib/amp/commands/commands/workflows/hg/push.rb
  19. +1 −1 lib/amp/commands/commands/workflows/hg/resolve.rb
  20. +2 −2 lib/amp/commands/commands/workflows/hg/tag.rb
  21. +13 −3 lib/amp/commands/commands/workflows/hg/verify.rb
  22. +3 −5 lib/amp/commands/dispatch.rb
  23. +2 −1 lib/amp/dependencies/python_config.rb
  24. +0 −378 lib/amp/encoding/mercurial_diff.rb
  25. +0 −1 lib/amp/encoding/mercurial_patch.rb
  26. +0 −292 lib/amp/encoding/patch.rb
  27. +0 −123 lib/amp/encoding/pure_ruby/ruby_mercurial_patch.rb
  28. +2 −1 lib/amp/graphs/ancestor.rb
  29. +236 −233 lib/amp/graphs/copies.rb
  30. +0 −164 lib/amp/merges/merge_state.rb
  31. +0 −322 lib/amp/merges/merge_ui.rb
  32. +0 −450 lib/amp/merges/simple_merge.rb
  33. +90 −0 lib/amp/repository/abstract/abstract_local_repo.rb
  34. +68 −0 lib/amp/repository/abstract/abstract_staging_area.rb
  35. +0 −234 lib/amp/repository/branch_manager.rb
  36. +0 −950 lib/amp/repository/dir_state.rb
  37. +69 −0 lib/amp/repository/generic_repo_picker.rb
  38. +0 −207 lib/amp/repository/journal.rb
  39. +0 −207 lib/amp/repository/lock.rb
  40. +381 −0 lib/amp/repository/mercurial/encoding/mercurial_diff.rb
  41. +1 −0 lib/amp/repository/mercurial/encoding/mercurial_patch.rb
  42. +294 −0 lib/amp/repository/mercurial/encoding/patch.rb
  43. +124 −0 lib/amp/repository/mercurial/encoding/pure_ruby/ruby_mercurial_patch.rb
  44. +327 −0 lib/amp/repository/mercurial/merging/merge_ui.rb
  45. +452 −0 lib/amp/repository/mercurial/merging/simple_merge.rb
  46. +237 −0 lib/amp/repository/mercurial/repo_format/branch_manager.rb
  47. +952 −0 lib/amp/repository/mercurial/repo_format/dir_state.rb
  48. +210 −0 lib/amp/repository/mercurial/repo_format/journal.rb
  49. +210 −0 lib/amp/repository/mercurial/repo_format/lock.rb
  50. +166 −0 lib/amp/repository/mercurial/repo_format/merge_state.rb
  51. +487 −0 lib/amp/repository/mercurial/repo_format/store.rb
  52. +322 −0 lib/amp/repository/mercurial/repo_format/tag_manager.rb
  53. +535 −0 lib/amp/repository/mercurial/repo_format/updatable.rb
  54. +434 −0 lib/amp/repository/mercurial/repo_format/verification.rb
  55. +216 −0 lib/amp/repository/mercurial/repositories/bundle_repository.rb
  56. +386 −0 lib/amp/repository/mercurial/repositories/http_repository.rb
  57. +2,646 −0 lib/amp/repository/mercurial/repositories/local_repository.rb
  58. +116 −0 lib/amp/repository/mercurial/repository.rb
  59. +249 −0 lib/amp/repository/mercurial/revlogs/bundle_revlogs.rb
  60. +217 −0 lib/amp/repository/mercurial/revlogs/changegroup.rb
  61. +338 −0 lib/amp/repository/mercurial/revlogs/changelog.rb
  62. +523 −0 lib/amp/repository/mercurial/revlogs/changeset.rb
  63. +166 −0 lib/amp/repository/mercurial/revlogs/file_log.rb
  64. +497 −0 lib/amp/repository/mercurial/revlogs/index.rb
  65. +196 −0 lib/amp/repository/mercurial/revlogs/manifest.rb
  66. +20 −0 lib/amp/repository/mercurial/revlogs/node.rb
  67. +1,036 −0 lib/amp/repository/mercurial/revlogs/revlog.rb
  68. +129 −0 lib/amp/repository/mercurial/revlogs/revlog_support.rb
  69. +476 −0 lib/amp/repository/mercurial/revlogs/versioned_file.rb
  70. +0 −214 lib/amp/repository/repositories/bundle_repository.rb
  71. +0 −377 lib/amp/repository/repositories/http_repository.rb
  72. +0 −2,644 lib/amp/repository/repositories/local_repository.rb
  73. +20 −86 lib/amp/repository/repository.rb
  74. +0 −485 lib/amp/repository/store.rb
  75. +0 −319 lib/amp/repository/tag_manager.rb
  76. +0 −532 lib/amp/repository/updatable.rb
  77. +0 −431 lib/amp/repository/verification.rb
  78. +0 −475 lib/amp/repository/versioned_file.rb
  79. +0 −246 lib/amp/revlogs/bundle_revlogs.rb
  80. +0 −217 lib/amp/revlogs/changegroup.rb
  81. +0 −338 lib/amp/revlogs/changelog.rb
  82. +0 −521 lib/amp/revlogs/changeset.rb
  83. +0 −165 lib/amp/revlogs/file_log.rb
  84. +0 −493 lib/amp/revlogs/index.rb
  85. +0 −195 lib/amp/revlogs/manifest.rb
  86. +0 −18 lib/amp/revlogs/node.rb
  87. +0 −1,050 lib/amp/revlogs/revlog.rb
  88. +0 −126 lib/amp/revlogs/revlog_support.rb
  89. +3 −3 lib/amp/server/extension/amp_extension.rb
  90. +1 −2 lib/amp/support/amp_ui.rb
  91. +0 −144 lib/amp/support/ignore.rb
  92. +10 −16 lib/amp/support/logger.rb
  93. +1 −1 lib/amp/support/match.rb
  94. +146 −0 lib/amp/support/mercurial/ignore.rb
  95. +15 −12 lib/amp/support/support.rb
  96. 0 lib/amp/templates/{ → mercurial}/blank.commit.erb
  97. 0 lib/amp/templates/{ → mercurial}/blank.log.erb
  98. 0 lib/amp/templates/{ → mercurial}/default.commit.erb
  99. 0 lib/amp/templates/{ → mercurial}/default.log.erb
  100. +16 −15 lib/amp/templates/template.rb
  101. +1 −1 site/src/index.haml
  102. +0 −9 tasks/stats.rake
  103. +1 −50 tasks/yard.rake
  104. +6 −6 test/dirstate_tests/test_dir_state.rb
  105. +15 −15 test/functional_tests/test_functional.rb
  106. +50 −55 test/localrepo_tests/test_local_repo.rb
  107. +1 −1 test/manifest_tests/test_manifest.rb
  108. +1 −1 test/merge_tests/test_merge.rb
  109. +3 −3 test/revlog_tests/test_revlog.rb
  110. +17 −17 test/store_tests/test_fncache_store.rb
  111. +2 −2 test/test_journal.rb
  112. +1 −1 test/test_mdiff.rb
  113. +1 −1 test/test_mpatch.rb
View
@@ -1,2 +1,2 @@
Ari Brown
-Michael Edgar
+Michael Edgar
View
@@ -31,7 +31,6 @@ Hoe.spec "amp" do
"ext/amp/support/extconf.rb",
"ext/amp/bz2/extconf.rb"]}
self.need_rdoc = false
- self.flog_threshold = 50000
self.summary = "Version Control in Ruby. Mercurial Compatible. Big Ideas."
end
@@ -48,7 +47,7 @@ end
remove_task 'test_deps', 'publish_docs', 'post_blog',
- 'deps:fetch', 'deps:list', 'deps:email', 'flay', 'clean', 'test'
+ 'deps:fetch', 'deps:list', 'deps:email', 'flay', 'clean', 'test', 'flog'
load 'tasks/yard.rake'
load 'tasks/stats.rake'
View
@@ -1,149 +1,66 @@
-Amp::Patch::Patch
-=================
-
-Amp::Patch::Patch#hash\_lines
------------------------------
- -
-
-Amp::Patch::Patch#hash=
------------------------
- -
-
-Amp::Patch::Patch#find\_lines
------------------------------
- -
-
-Amp::Patch::Patch#hash
-----------------------
- -
-
-Amp::Patch::Patch#hunks=
-------------------------
- -
-
-Amp::Patch::Patch#hunks
------------------------
- -
-
-Amp::Patch::Patch#offset=
--------------------------
- -
-
-Amp::Patch::Patch#lines=
-------------------------
- -
-
-Amp::Patch::Patch#offset
-------------------------
- -
-
-Amp::Patch::Patch#lines
------------------------
- -
-
-
-Amp::Support::Template
-======================
-
-Amp::Support::Template#render
------------------------------
- -
-
-
-Amp::Repositories::HTTPRepository
-=================================
-
-Amp::Repositories::HTTPRepository#changegroup
----------------------------------------------
- -
-
-
-Amp::RevlogSupport::IndexInlineNG
-=================================
-
-Amp::RevlogSupport::IndexInlineNG#parse\_file
----------------------------------------------
- -
-
-
-File
-====
-
-File.amp\_find\_executable
---------------------------
- -
-
-File.amp\_set\_executable
--------------------------
- -
-
-File.amp\_lookup\_reg
----------------------
- -
-
-
-Amp::Revlog
-===========
-
-Amp::Revlog#check\_inline\_size
--------------------------------
- -
- -
-
-
-Amp::ChangeLog
-==============
-
-Amp::ChangeLog#add
-------------------
- -
-
-Amp::ChangeLog#read
--------------------
- -
-
-
-Amp::Repositories::DirState
-===========================
-
-Amp::Repositories::DirState#normalize
--------------------------------------
- -
-
-Amp::Repositories::DirState#write
----------------------------------
- -
-
-
-Amp::Repositories::LocalRepository
-==================================
-
-Amp::Repositories::LocalRepository#push\_add\_changegroup
----------------------------------------------------------
- -
-
-Amp::Repositories::LocalRepository#push\_unbundle
--------------------------------------------------
- -
-
-Amp::Repositories::Updatable#update
------------------------------------
- -
-
-Amp::Repositories::LocalRepository#changegroup\_info
-----------------------------------------------------
- -
-
-Amp::Repositories::TagManager#read\_tags
-----------------------------------------
- -
-
-Amp::Repositories::Updatable#apply\_updates
--------------------------------------------
- -
-
-Amp::Repositories::LocalRepository#pre\_push
---------------------------------------------
- -
-
-
+Here are the things we'd like to do. If you're looking to help out, read on.
+We put them into several categories to trick^H^H^H^H^Hencourage you to help.
+
+== Maintenance
+
+= Dependencies
+We need these down to zero. Currently we DO need YARD, but flay and flog? We
+haven't used these at all yet. Either remove these from the code (well, really
+the Rakefiles) or add a way to fail gracefully.
+
+= Multitude of Tests
+Tests. We need them. Moar and moar of them. We want every command to be tested
+(at least generally), although if every option were also tested that'd be
+superb.
+
+= Organization of Tests
+We currently have a gigantic test_functional.rb file that has most of the good
+tests. However, if there's a failure in the very beginning, the rest of the
+tests won't be run. It's true – some of the tests are dependent on each other,
+but perjaps there's a way to split them up into clusters that make sense and
+can be run independently.
+
+= Code Cleaning
+We have ugly code. We try to mark it with comments, we try to eliminate it in
+the first place, but seriously, when it comes to programming or doing some
+World Religions homework, I'm going to get the homework done first. And then
+some girl will have IMed me, and, well, you get the point. If you see ugly
+code, kill it. Hopefully it won't require any major architectural changes.
+
+== Expansion
+
+= Faster Bit Structs
+We experimented with using bitstructs to represent objects in files. Although
+this worked, it was MUCH slower than we could bear. We need a faster form of
+a bitstruct. A bitstruct is a standard C struct. If has a format, it has fields
+with names, and you can easily read and write them to and from files. Writing
+this alone is a task big enough for a young adult. We need these tested and
+benchmarked against not using bitstructs. Also, try to keep these pure ruby if
+you can.
+
+= Incorporating Bit Structs
+Take the bitstructs of the previous paragraph and incorporate them into
+everything. If you can, fix up the revlog API to make it suck a little less.
+
+= hg Extensions
+Start porting over the Mercurial extensions. 'Nuff said.
+
+= Expanding `amp serve`
+We'd like it to be more like BitBucket and GitHub. Go crazy. One thing you
+could do is implement other methods for storing users besides memory. There
+are incomplete frameworks for Sequel and DataMapper storage that need TLC.
+
+== Documentation
+
+= User guide
+We need a guide that will tell new users how to install and use amp. It should
+explain what to do if you get a bug.
+
+= Inline documentation
+Go through to big ugly methods (or any method, no matter how dumb) and add
+inline comments explaining what the method does and HOW IT INTERACTS WITH
+THE REST OF THE SYSTEM. Comments should be formatted according to YARD
+documentation format (http://yardoc.org).
+
+= Wiki
+We need to expand out BitBucket wiki so that it is more appeasing and useful
View
@@ -16,9 +16,9 @@
c.desc "tell you how silly you are"
end
-command :push do |c|
- c.before { system "hg verify" }
-end
+#command :push do |c|
+# c.before { system "hg verify" }
+#end
template :silly, <<-EOF
<%= change_node.inspect %> <%= revision %>
View
@@ -19,7 +19,7 @@
dir_config('bz2')
if !have_library('bz2', 'BZ2_bzWriteOpen')
- raise "libz2 not found"
+ raise "bzip2 headers not found. If you are on Linux, install the libbz2-dev package. If you are on Mac OS X, you should not see this error."
end
if enable_config("shared", true)
View
@@ -1,29 +0,0 @@
-have_library: checking for BZ2_bzWriteOpen() in -lbz2... -------------------- yes
-
-"gcc -o conftest -I. -I/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/universal-darwin10.0 -I/Users/michaeledgar/mygems/amp/ext/amp/bz2 -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -arch i386 -arch x86_64 -g -Os -pipe -fno-common -DENABLE_DTRACE -fno-common -pipe -fno-common conftest.c -L. -L/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib -L. -arch i386 -arch x86_64 -lruby -lbz2 -lpthread -ldl "
-conftest.c: In function ‘t’:
-conftest.c:3: error: ‘BZ2_bzWriteOpen’ undeclared (first use in this function)
-conftest.c:3: error: (Each undeclared identifier is reported only once
-conftest.c:3: error: for each function it appears in.)
-conftest.c: In function ‘t’:
-conftest.c:3: error: ‘BZ2_bzWriteOpen’ undeclared (first use in this function)
-conftest.c:3: error: (Each undeclared identifier is reported only once
-conftest.c:3: error: for each function it appears in.)
-lipo: can't figure out the architecture type of: /var/folders/zy/zyqc-SWsGjeyuLdp+7qPO++++TI/-Tmp-//cczltxYY.out
-checked program was:
-/* begin */
-1: /*top*/
-2: int main() { return 0; }
-3: int t() { void ((*volatile p)()); p = (void ((*)()))BZ2_bzWriteOpen; return 0; }
-/* end */
-
-"gcc -o conftest -I. -I/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/universal-darwin10.0 -I/Users/michaeledgar/mygems/amp/ext/amp/bz2 -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -arch i386 -arch x86_64 -g -Os -pipe -fno-common -DENABLE_DTRACE -fno-common -pipe -fno-common conftest.c -L. -L/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib -L. -arch i386 -arch x86_64 -lruby -lbz2 -lpthread -ldl "
-checked program was:
-/* begin */
-1: /*top*/
-2: int main() { return 0; }
-3: int t() { BZ2_bzWriteOpen(); return 0; }
-/* end */
-
---------------------
-
@@ -33,7 +33,7 @@ static uint32_t ntohl(uint32_t x)
#endif
-VALUE rb_mAmp, rb_mDiffs, rb_mMercurialPatch;
+VALUE rb_mAmp, rb_mMercurial, rb_mDiffs, rb_mMercurialPatch;
struct frag {
@@ -398,7 +398,8 @@ void Init_MercurialPatch() {
rb_mAmp = rb_define_module("Amp");
rb_mDiffs = rb_define_module_under(rb_mAmp, "Diffs");
- rb_mMercurialPatch = rb_define_module_under(rb_mDiffs, "MercurialPatch");
+ rb_mMercurial = rb_define_module_under(rb_mDiffs, "Mercurial");
+ rb_mMercurialPatch = rb_define_module_under(rb_mMercurial, "MercurialPatch");
rb_define_singleton_method(rb_mMercurialPatch, "patched_size", amp_mpatch_patched_size, 2);
rb_define_singleton_method(rb_mMercurialPatch, "apply_patches", amp_mpatch_apply_patches, 2);
Oops, something went wrong.

0 comments on commit c2e77d1

Please sign in to comment.