@@ -4,14 +4,14 @@
* pushing repo from web interface
= CHACON IDEAS
- * inter-branch links
* tagging
* file attachments
+ * inter-branch links
* merge conflict resolution
- * cherry-picked branches (read-tree/write-tree)
* git-less version (read-only)
* track which branched from which
* push?
+ * cherry-picked branches (read-tree/write-tree)
* users (email/name/ip - use for commits)
= LATER/MAYBE
TODO
@@ -5,7 +5,11 @@ class Page
@name = name
@rev = rev
@filename = File.join(GIT_REPO, @name)
- @attach_dir = File.join(GIT_REPO, '_attachments', @name)
+ @attach_dir = File.join(GIT_REPO, '_attachments', unwiki(@name))
+ end
+
+ def unwiki(string)
+ string.downcase
end
def body
@@ -43,11 +47,7 @@ class Page
end
def tracked?
- begin
- $repo.gtree('HEAD').children.keys.include?(@name)
- rescue
- false
- end
+ $repo.ls_files.keys.include?(@name)
end
def history
@@ -97,7 +97,7 @@ class Page
else
filename = file[:filename]
end
- File.makedirs(@attach_dir) if !File.exists?(@attach_dir)
+ FileUtils.mkdir_p(@attach_dir) if !File.exists?(@attach_dir)
new_file = File.join(@attach_dir, filename)
f = File.new(new_file, 'w')
@@ -131,7 +131,7 @@ class Page
def attachments
if File.exists?(@attach_dir)
- return Dir.glob(File.join(@attach_dir, '*')).map { |f| Attachment.new(f, self.name) }
+ return Dir.glob(File.join(@attach_dir, '*')).map { |f| Attachment.new(f, unwiki(@name)) }
else
false
end
page.rb
@@ -21,7 +21,10 @@
<label for="name">name</label>
<input type="text" name="branch" />
<br />
+
+ <input type="hidden" name="type" value="derive" />
+ <!--
<label for="derive_radio">copy this branch</label>
<input type="radio" name="type" value="derive" />
<br />
@@ -29,7 +32,8 @@
<label for="blank_radio">empty branch</label>
<input type="radio" name="type" value="blank" />
<br />
-
+ -->
+
<label for="submit"></label>
<input type="submit" value="create" class="submit" />
</form>
views/branches.erb
@@ -34,7 +34,7 @@
<% if @page.next_commit %>
• <a href="/h/<%= @page.name %>/<%= @page.next_commit %>" class="nav_link">newer</a>
<% end %>
-
+
<div class="sub_nav details">
<script type="text/javascript">
document.write(time_ago_in_words(<%= @page.updated_at.for_time_ago_in_words %>) + ' ago');
@@ -42,6 +42,7 @@
<br />
<%= $repo.current_branch %> branch
</div>
+
</div>
<div class="content edit_area"><%= @page.body %></div>
\ No newline at end of file
views/show.erb
d294bebf8a4b9364727d472560fb8cf7bf553c47
Scott Chacon
schacon@gmail.com
http://github.com/al3x/git-wiki/commit/a34c1151386501b52161ef02b548e68ac422fd50
a34c1151386501b52161ef02b548e68ac422fd50
2008-04-20T18:25:51-07:00
2008-04-20T18:24:26-07:00
removed the bare branch deal because it was confusing
3a56db6f48876df8a83d579ee8800b48f3c26214
Scott Chacon
schacon@gmail.com