The user can modify the git commit message through an input box on
the edit page. The original behavour is preserved by defualting the
input box to the original commit mesage.
This crosses off item 3 from http://codewiz.org/wiki/GeekiGeekiToDo.
Signed-off-by: Joel Stanley <joel.stanley@adelaide.edu.au>
pg = Page(pagename)
if 'save' in form:
if form['file'].value:
pg = Page(pagename)
if 'save' in form:
if form['file'].value:
- pg.save(form['file'].file.read())
+ pg.save(form['file'].file.read(), form['changelog'].value)
- pg.save(form['savetext'].value.replace('\r\n', '\n'))
+ pg.save(form['savetext'].value.replace('\r\n', '\n'), form['changelog'].value)
pg.format()
elif 'cancel' in form:
pg.msg_text = 'Editing canceled'
pg.format()
elif 'cancel' in form:
pg.msg_text = 'Editing canceled'
<input type="submit" name="preview" value="Preview" />
<input type="reset" value="Reset" />
<input type="submit" name="cancel" value="Cancel" />
<input type="submit" name="preview" value="Preview" />
<input type="reset" value="Reset" />
<input type="submit" name="cancel" value="Cancel" />
- <br />
- </form></div>"""
+ <br />"""
+ print "Changelog: <input type=\"input\" name=\"changelog\" value=\"Edit page %s\"/>" % self.page_name
+ print"</form></div>"
print "<p>" + Page('EditingTips').link_to() + "</p>"
if preview:
print "<div class='preview'>"
print "<p>" + Page('EditingTips').link_to() + "</p>"
if preview:
print "<div class='preview'>"
if er.errno != errno.ENOENT: raise er
os.rename(tmp_filename, name)
if er.errno != errno.ENOENT: raise er
os.rename(tmp_filename, name)
- def save(self, newdata):
+ def save(self, newdata, changelog):
if not self.can_write():
self.msg_text = 'Write access denied by ACLs'
self.msg_type = 'error'
if not self.can_write():
self.msg_text = 'Write access denied by ACLs'
self.msg_type = 'error'
cmd = ( post_edit_hook
+ " '" + data_dir + '/' + self.page_name
+ "' '" + remote_user()
cmd = ( post_edit_hook
+ " '" + data_dir + '/' + self.page_name
+ "' '" + remote_user()
- + "' '" + remote_host() + "'"
+ + "' '" + remote_host()
+ + "' '" + changelog + "'"
)
out = os.popen(cmd)
output = out.read()
)
out = os.popen(cmd)
output = out.read()
echo "Usage $0 <path-to-commit> <remote-user> <remote-host>"
exit 1
fi
echo "Usage $0 <path-to-commit> <remote-user> <remote-host>"
exit 1
fi
GIT_COMMITTER_NAME='GeekiGeeki' \
GIT_COMMITTER_EMAIL='webmaster@codewiz.org' \
GIT_COMMITTER_NAME='GeekiGeeki' \
GIT_COMMITTER_EMAIL='webmaster@codewiz.org' \
-git-commit -a -m "Edit page $file" --author="$2 <$2@$3>"
+git commit -a -m "$4" --author="$2 <$2@$3>"