1 |
robbat2 08/10/12 09:40:34 |
2 |
|
3 |
Modified: devguide.xml |
4 |
Log: |
5 |
Update devguide to elevate Git to a first-class overlays SCM, with new instructions similar to git.overlays.gentoo.org. Remove the mention of Stu as project leader, since he retired long ago. |
6 |
|
7 |
Revision Changes Path |
8 |
1.11 xml/htdocs/proj/en/overlays/devguide.xml |
9 |
|
10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/proj/en/overlays/devguide.xml?rev=1.11&view=markup |
11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/proj/en/overlays/devguide.xml?rev=1.11&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/proj/en/overlays/devguide.xml?r1=1.10&r2=1.11 |
13 |
|
14 |
Index: devguide.xml |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo/xml/htdocs/proj/en/overlays/devguide.xml,v |
17 |
retrieving revision 1.10 |
18 |
retrieving revision 1.11 |
19 |
diff -p -w -b -B -u -u -r1.10 -r1.11 |
20 |
--- devguide.xml 12 Oct 2008 09:23:30 -0000 1.10 |
21 |
+++ devguide.xml 12 Oct 2008 09:40:34 -0000 1.11 |
22 |
@@ -5,7 +5,13 @@ |
23 |
<title>Gentoo Overlays: Developers' Guide</title> |
24 |
|
25 |
<author title="Author"> |
26 |
- <mail link="stuart@g.o">Stuart Herbert</mail> |
27 |
+ <mail link="stuart">Stuart Herbert</mail> |
28 |
+</author> |
29 |
+<author title="Author"> |
30 |
+ <mail link="jokey">Markus Ullmann</mail> |
31 |
+</author> |
32 |
+<author title="Author"> |
33 |
+ <mail link="robbat2">Robin H. Johnson</mail> |
34 |
</author> |
35 |
|
36 |
<abstract>This guide helps developers understand how to use the Gentoo |
37 |
@@ -13,8 +19,8 @@ Overlays service.</abstract> |
38 |
|
39 |
<license/> |
40 |
|
41 |
-<version>1.0</version> |
42 |
-<date>2006-07-29</date> |
43 |
+<version>2.0</version> |
44 |
+<date>2008-10-12</date> |
45 |
|
46 |
<chapter> |
47 |
<title>Introduction</title> |
48 |
@@ -51,15 +57,16 @@ overlay.</p> |
49 |
<p>The overlays.gentoo.org service currently provides:</p> |
50 |
<ul> |
51 |
<li><uri link="http://trac.edgewall.com">Trac</uri> (a wiki w/ integrated subversion browser), for quickly creating and maintaining documentation about your overlay</li> |
52 |
-<li><uri link="http://subversion.tigris.org">Subversion</uri> - a centralised version control system (distributed version control systems will be supported in future)</li> |
53 |
+<li><uri link="http://subversion.tigris.org">Subversion</uri> - a centralised version control system</li> |
54 |
<li>Publishing the changelog for your overlay on <uri link="http://overlays.gentoo.org/">the o.g.o homepage</uri>, so that everyone who's interested can see what's going on</li> |
55 |
+<li><uri link="http://git.or.cz">Git</uri> - Fast Version Control System</li> |
56 |
</ul> |
57 |
|
58 |
<p>... all hosted on secure, backed-up Gentoo infrastructure, administered by |
59 |
<uri link="/proj/en/infrastructure">the Gentoo Infrastructure team</uri> (hardware / base OS) and <uri link="/proj/en/overlays">the Gentoo Overlays team</uri> |
60 |
(wiki / VCS / ACLs).</p> |
61 |
|
62 |
-<p>Each overlay has separate authentication lists for Trac and for Subversion. |
63 |
+<p>Each overlay has separate authentication lists for Trac, Subversion and Git. |
64 |
It's no problem at all to give someone write access to just Trac (e.g. for |
65 |
writing documentation) without giving them write access to Subversion.</p> |
66 |
</body> |
67 |
@@ -140,13 +147,17 @@ metastructure document</uri>, which is G |
68 |
lead(s) are responsible for the project overlay, including its contents, and |
69 |
any problems it causes other Gentoo projects and developers.</p> |
70 |
|
71 |
-<p>To request a project overlay, the project's lead just needs to pop into |
72 |
+<p>To request a SVN project overlay, the project's lead just needs to pop into |
73 |
#gentoo-overlays on IRC and ask for an overlay to be created. Or, if he/she |
74 |
prefers, drop an email to overlays@g.o. We'll take care of the rest, |
75 |
including granting write access to all the members of your project (as listed |
76 |
on your project page).</p> |
77 |
|
78 |
-<p>We will:</p> |
79 |
+<p>To request a Git project overlay, just visit the <uri |
80 |
+link="http://git.overlays.gentoo.org">git.overlays</uri> site, and follow the |
81 |
+setup instructions, emailing the completed template as directed.</p> |
82 |
+ |
83 |
+<p>For an SVN request, we will:</p> |
84 |
<ul> |
85 |
<li>create your overlay (trac site + svn)</li> |
86 |
<li>add your overlay's RSS feed to the o.g.o homepage</li> |
87 |
@@ -157,6 +168,18 @@ repository</li> |
88 |
account</li> |
89 |
<li>contact all of the other project members, and sort out their access</li> |
90 |
</ul> |
91 |
+ |
92 |
+<p>For an Git request, we will:</p> |
93 |
+<ul> |
94 |
+<li>create your overlay (git, no trac)</li> |
95 |
+<li>add your overlay's RSS feed to the o.g.o homepage</li> |
96 |
+<li>create an git.o.g.o account for you if you don't already have one</li> |
97 |
+<li>give you write access to your overlays Git repository</li> |
98 |
+<li>give write access to all project members who already have an o.g.o account</li> |
99 |
+<li>contact all of the other project members, and sort out their access</li> |
100 |
+</ul> |
101 |
+ |
102 |
+ |
103 |
</body> |
104 |
</section> |
105 |
|
106 |
@@ -170,11 +193,15 @@ example is <uri link="http://overlays.ge |
107 |
<p>If you have an @gentoo.org email address, and you've passed the ebuild quiz, |
108 |
then you can have your own developer overlay on o.g.o.</p> |
109 |
|
110 |
-<p>To request a developer overlay, just pop into #gentoo-overlays on IRC and ask |
111 |
-for an overlay to be created for you. Or, if you prefer, drop an email to |
112 |
-overlays@g.o.</p> |
113 |
+<p>To request a SVN developer overlay, just pop into #gentoo-overlays on IRC |
114 |
+and ask for an overlay to be created for you. Or, if you prefer, drop an email |
115 |
+to overlays@g.o.</p> |
116 |
+ |
117 |
+<p>To request a Git developer overlay, just visit the <uri |
118 |
+link="http://git.overlays.gentoo.org">git.overlays</uri> site, and follow the |
119 |
+setup instructions, emailing the completed template as directed.</p> |
120 |
|
121 |
-<p>We will:</p> |
122 |
+<p>For an SVN request, we will:</p> |
123 |
<ul> |
124 |
<li>create your overlay (trac site + svn)</li> |
125 |
<li>add your overlay's RSS feed to the o.g.o homepage</li> |
126 |
@@ -182,6 +209,14 @@ overlays@g.o.</p> |
127 |
<li>give you write access to your overlay's Trac wiki and Subversion |
128 |
repository</li> |
129 |
</ul> |
130 |
+ |
131 |
+<p>For an Git request, we will:</p> |
132 |
+<ul> |
133 |
+<li>create your overlay (git, no trac)</li> |
134 |
+<li>add your overlay's RSS feed to the o.g.o homepage</li> |
135 |
+<li>create an git.o.g.o account for you if you don't already have one</li> |
136 |
+<li>give you write access to your overlays Git repository</li> |
137 |
+</ul> |
138 |
</body> |
139 |
</section> |
140 |
|
141 |
@@ -329,17 +364,6 @@ can then use Subversion (or Trac's timel |
142 |
<title>Using git on overlays</title> |
143 |
|
144 |
<section> |
145 |
-<title>Setting up git for committing with webdav</title> |
146 |
-<body> |
147 |
-<pre caption="add to your ~/.netrc"> |
148 |
-machine overlays.gentoo.org |
149 |
-login (your-username) |
150 |
-password (your-password) |
151 |
-</pre> |
152 |
-<p>Source: http://www.kernel.org/pub/software/scm/git/docs/howto/setup-git-server-over-http.txt</p> |
153 |
-</body> |
154 |
-</section> |
155 |
-<section> |
156 |
<title>Initializing your overlay</title> |
157 |
<body> |
158 |
<p>Before uploading you need to locally create a git repository and add all items:</p> |
159 |
@@ -347,16 +371,16 @@ password (your-password) |
160 |
<pre caption="create a new git repo">git init |
161 |
git add . |
162 |
git commit -m "populate overlay"</pre> |
163 |
-<p>Note that this commit was only locally, now we get the server into the game. Be sure to add the trailing /</p> |
164 |
-<pre caption="tell git the url">git-config remote.upload.url http://(your-username)@overlays.gentoo.org/git/(proj or dev)/(name)/</pre> |
165 |
-<pre caption="finally get it up there">git push upload master</pre> |
166 |
+<p>Note that this commit was only locally, now we get the server into the game.</p> |
167 |
+<pre caption="tell git the url">git remote add origin git+ssh://git@×××××××××××××××××××.org/(proj or dev)/(name)</pre> |
168 |
+<pre caption="finally get it up there">git push origin master</pre> |
169 |
<p>Source: http://www.kernel.org/pub/software/scm/git/docs/tutorial.html</p> |
170 |
</body></section> |
171 |
|
172 |
<section> |
173 |
<title>Checking out the overlay with git</title> |
174 |
<body> |
175 |
-<pre caption="clone it!">git clone http://overlays.gentoo.org/git/(proj or dev)/(name)/</pre> |
176 |
+<pre caption="clone it!">git clone git://git@×××××××××××××××××××.org/(proj or dev)/(name)/</pre> |
177 |
</body> |
178 |
</section> |
179 |
</chapter> |
180 |
@@ -519,14 +543,14 @@ arrange for you to have write access, by |
181 |
current staff are mostly in European timezones.</li> |
182 |
<li>A: You can send an email to overlays@g.o. Someone will answer you as |
183 |
soon as possible.</li> |
184 |
-<li>A: You can contact Stuart Herbert (the project leader) directly, via his |
185 |
- email address: stuart@g.o.</li> |
186 |
</ul> |
187 |
|
188 |
<p>Q: Why can't I edit the access control list directly?</p> |
189 |
<ul> |
190 |
-<li>A: The access control list currently lives in htpasswd / htgroup files used |
191 |
+<li>A: (SVN) The access control list currently lives in htpasswd / htgroup files used |
192 |
by Apache. Only o.g.o admin staff have ssh access into the o.g.o box.</li> |
193 |
+<li>A: (Git) The access control list currently lives in the gitosis-admin repository, |
194 |
+ which is writable only by the o.g.o staff.</li> |
195 |
</ul> |
196 |
</body> |
197 |
</section> |