From: Chris Ball Date: Fri, 16 May 2008 19:20:54 +0000 (-0400) Subject: Apply patches from j@oil21.org, Ben Finney, Jelmer Vernooij. X-Git-Tag: 1.0.0~177 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3d72ff8485b1357cac9965425d5c0c9220839d30;p=be.git Apply patches from j@oil21.org, Ben Finney, Jelmer Vernooij. --- 3d72ff8485b1357cac9965425d5c0c9220839d30 diff --cc .be/bugs/00f26f04-9202-4288-8744-b29abc2342d6/comments/4be73baf-e46b-4acb-a58e-4719e57c550b/body index 0000000,0000000,0000000,0000000..ff42ab3 new file mode 100644 --- /dev/null +++ b/.be/bugs/00f26f04-9202-4288-8744-b29abc2342d6/comments/4be73baf-e46b-4acb-a58e-4719e57c550b/body @@@@@ -1,0 -1,0 -1,0 -1,0 +1,8 @@@@@ ++++The FSF offices are no longer at Temple Place, and there is a revised ++++text of the GPLv2 giving the correct address and other textual ++++clean-ups. ++++ ++++The COPYING file should be updated to the new GPLv2 text, and the ++++copyright notices throughout the working tree should be updated for ++++the new boilerplate how-to-use-the-GPL text. ++++ diff --cc .be/bugs/00f26f04-9202-4288-8744-b29abc2342d6/comments/4be73baf-e46b-4acb-a58e-4719e57c550b/values index 0000000,0000000,0000000,0000000..a68a21d new file mode 100644 --- /dev/null +++ b/.be/bugs/00f26f04-9202-4288-8744-b29abc2342d6/comments/4be73baf-e46b-4acb-a58e-4719e57c550b/values @@@@@ -1,0 -1,0 -1,0 -1,0 +1,21 @@@@@ ++++ ++++ ++++ ++++Content-type=text/plain ++++ ++++ ++++ ++++ ++++ ++++ ++++Date=Fri, 18 Apr 2008 11:21:03 +0000 ++++ ++++ ++++ ++++ ++++ ++++ ++++From=benf ++++ ++++ ++++ diff --cc .be/bugs/00f26f04-9202-4288-8744-b29abc2342d6/values index 0000000,0000000,0000000,0000000..05961db new file mode 100644 --- /dev/null +++ b/.be/bugs/00f26f04-9202-4288-8744-b29abc2342d6/values @@@@@ -1,0 -1,0 -1,0 -1,0 +1,42 @@@@@ ++++ ++++ ++++ ++++assigned=Ben Finney ++++ ++++ ++++ ++++ ++++ ++++ ++++creator=benf ++++ ++++ ++++ ++++ ++++ ++++ ++++severity=minor ++++ ++++ ++++ ++++ ++++ ++++ ++++status=closed ++++ ++++ ++++ ++++ ++++ ++++ ++++summary=Address is outdated for FSF offices ++++ ++++ ++++ ++++ ++++ ++++ ++++time=Fri, 18 Apr 2008 11:18:58 +0000 ++++ ++++ ++++ diff --cc .be/bugs/b187fbce-fb10-4819-ace2-c8b0b4a45c57/comments/e757d2ae-085a-4539-99be-096386de5352/body index 0000000,0000000,0000000,0000000..0dedcdd new file mode 100644 --- /dev/null +++ b/.be/bugs/b187fbce-fb10-4819-ace2-c8b0b4a45c57/comments/e757d2ae-085a-4539-99be-096386de5352/body @@@@@ -1,0 -1,0 -1,0 -1,0 +1,3 @@@@@ ++++The 'be' command should have a Unix manpage, describing it like any ++++other command on the system. ++++ diff --cc .be/bugs/b187fbce-fb10-4819-ace2-c8b0b4a45c57/comments/e757d2ae-085a-4539-99be-096386de5352/values index 0000000,0000000,0000000,0000000..b7b289e new file mode 100644 --- /dev/null +++ b/.be/bugs/b187fbce-fb10-4819-ace2-c8b0b4a45c57/comments/e757d2ae-085a-4539-99be-096386de5352/values @@@@@ -1,0 -1,0 -1,0 -1,0 +1,21 @@@@@ ++++ ++++ ++++ ++++Content-type=text/plain ++++ ++++ ++++ ++++ ++++ ++++ ++++Date=Mon, 21 Apr 2008 03:24:11 +0000 ++++ ++++ ++++ ++++ ++++ ++++ ++++From=benf ++++ ++++ ++++ diff --cc .be/bugs/b187fbce-fb10-4819-ace2-c8b0b4a45c57/values index 0000000,0000000,0000000,0000000..ff8a30a new file mode 100644 --- /dev/null +++ b/.be/bugs/b187fbce-fb10-4819-ace2-c8b0b4a45c57/values @@@@@ -1,0 -1,0 -1,0 -1,0 +1,42 @@@@@ ++++ ++++ ++++ ++++assigned=benf ++++ ++++ ++++ ++++ ++++ ++++ ++++creator=benf ++++ ++++ ++++ ++++ ++++ ++++ ++++severity=minor ++++ ++++ ++++ ++++ ++++ ++++ ++++status=closed ++++ ++++ ++++ ++++ ++++ ++++ ++++summary=Manual page for 'be' command ++++ ++++ ++++ ++++ ++++ ++++ ++++time=Mon, 21 Apr 2008 03:21:35 +0000 ++++ ++++ ++++ diff --cc .bzrignore index a051550,a051550,a051550,a051550..c0fddb1 --- a/.bzrignore +++ b/.bzrignore @@@@@ -8,3 -8,3 -8,3 -8,3 +8,4 @@@@@ fte.ds *~ ./.shelf Bugs-Everywhere-Web/devdata.sqlite ++++./doc/*.1 diff --cc Bugs-Everywhere-Web/beweb/config/app.cfg index d37cf67,d37cf67,d37cf67,d37cf67..15555b7 --- a/Bugs-Everywhere-Web/beweb/config/app.cfg +++ b/Bugs-Everywhere-Web/beweb/config/app.cfg @@@@@ -33,6 -33,6 -33,6 -33,6 +33,56 @@@@@ # Set to True if the scheduler should be started # tg.scheduler = False ++++# IDENTITY ++++# General configuration of the TurboGears Identity management module ++++# -------- ++++ ++++# Switch to turn on or off the Identity management module ++++identity.on=True ++++ ++++# [REQUIRED] URL to which CherryPy will internally redirect when an access ++++# control check fails. If Identity management is turned on, a value for this ++++# option must be specified. ++++identity.failure_url="/login" ++++ ++++# identity.provider='sqlobject' ++++ ++++# The names of the fields on the login form containing the visitor's user ID ++++# and password. In addition, the submit button is specified simply so its ++++# existence may be stripped out prior to passing the form data to the target ++++# controller. ++++# identity.form.user_name="user_name" ++++# identity.form.password="password" ++++# identity.form.submit="login" ++++ ++++# What sources should the identity provider consider when determining the ++++# identity associated with a request? Comma separated list of identity sources. ++++# Valid sources: form, visit, http_auth ++++# identity.source="form,http_auth,visit" ++++ ++++# SqlObjectIdentityProvider ++++# Configuration options for the default IdentityProvider ++++# ------------------------- ++++ ++++# The classes you wish to use for your Identity model. Remember to not use reserved ++++# SQL keywords for class names (at least unless you specify a different table ++++# name using sqlmeta). ++++identity.soprovider.model.user="stfa.model.User" ++++identity.soprovider.model.group="stfa.model.Group" ++++identity.soprovider.model.permission="stfa.model.Permission" ++++ ++++# The password encryption algorithm used when comparing passwords against what's ++++# stored in the database. Valid values are 'md5' or 'sha1'. If you do not ++++# specify an encryption algorithm, passwords are expected to be clear text. ++++# The SqlObjectProvider *will* encrypt passwords supplied as part of your login ++++# form. If you set the password through the password property, like: ++++# my_user.password = 'secret' ++++# the password will be encrypted in the database, provided identity is up and ++++# running, or you have loaded the configuration specifying what encryption to ++++# use (in situations where identity may not yet be running, like tests). ++++ ++++# identity.soprovider.encryption_algorithm=None ++++ [/static] static_filter.on = True static_filter.dir = "%(top_level_dir)s/static" diff --cc Bugs-Everywhere-Web/beweb/controllers.py index 358e74a,358e74a,358e74a,358e74a..8def76c --- a/Bugs-Everywhere-Web/beweb/controllers.py +++ b/Bugs-Everywhere-Web/beweb/controllers.py @@@@@ -26,6 -26,6 -26,6 -26,6 +26,7 @@@@@ def comment_url(project, bug, comment, (project, bug, comment), kwargs) class Comment(PrestHandler): ++++ @identity.require( identity.has_permission("editbugs")) @provide_action("action", "New comment") def new_comment(self, comment_data, comment, *args, **kwargs): bug_tree = project_tree(comment_data['project']) @@@@@ -37,6 -37,6 -37,6 -37,6 +38,7 @@@@@ raise cherrypy.HTTPRedirect(comment_url(comment=comment.uuid, **comment_data)) ++++ @identity.require( identity.has_permission("editbugs")) @provide_action("action", "Reply") def reply_comment(self, comment_data, comment, *args, **kwargs): bug_tree = project_tree(comment_data['project']) diff --cc Bugs-Everywhere-Web/beweb/templates/about.kid index 45d0093,45d0093,45d0093,45d0093..fa3548a --- a/Bugs-Everywhere-Web/beweb/templates/about.kid +++ b/Bugs-Everywhere-Web/beweb/templates/about.kid @@@@@ -8,15 -8,15 -8,15 -8,15 +8,13 @@@@@

About Bugs Everywhere

----

Bug Everywhere was designed by Aaron Bentley and implemented by Aaron ---- Bentley and Oleg Romanyshyn. ++++

Bugs Everywhere is a "distributed bugtracker", designed to complement distributed revision control systems.

---- Development is sponsored by ---- Panoramic Feedback. ++++Bugs Everywhere was conceived and written by developers at Panoramic Feedback, primarily Aaron Bentley. Panoramic Feedback is no longer developing BE, and the current maintainer is Chris Ball.

---- Bugs Everywhere web site ++++ Bugs Everywhere web site

Project List diff --cc Bugs-Everywhere-Web/libbe index 6081eee,6081eee,6081eee,6081eee..4e5e17e --- a/Bugs-Everywhere-Web/libbe +++ b/Bugs-Everywhere-Web/libbe @@@@@ -1,1 -1,1 -1,1 -1,1 +1,1 @@@@@ ----../libbe/ ++++../libbe diff --cc Makefile index 0000000,0000000,0000000,c1e6571..47fbbfd mode 000000,000000,000000,100644..100644 --- a/Makefile +++ b/Makefile @@@@@ -1,0 -1,0 -1,0 -1,27 +1,47 @@@@@ +++ #! /usr/bin/make -f -# -*- makefile; coding: utf-8 -*- ++++# :vim: filetype=make : -*- makefile; coding: utf-8; -*- +++ +++ # Makefile +++ # Part of Bugs Everywhere, a distributed bug tracking system. +++ # +++ # Copyright © 2008 Ben Finney +++ # This is free software; you may copy, modify and/or distribute this work +++ # under the terms of the GNU General Public License, version 2 or later. -# No warranty expressed or implied. See the file LICENSE for details. ++++# No warranty expressed or implied. See the file COPYING for details. +++ +++ # Makefile for Bugs Everywhere project +++ +++ SHELL = /bin/bash +++ PATH = /usr/bin:/bin +++ ++++# Directories with semantic meaning ++++DOC_DIR := doc ++++ +++ # Variables that will be extended by module include files +++ GENERATED_FILES := +++ CODE_MODULES := +++ CODE_PROGRAMS := +++ ++++# List of modules (directories) that comprise our 'make' project ++++MODULES += ${DOC_DIR} ++++ +++ RM = rm +++ ++++ ++++.PHONY: all ++++all: build ++++ ++++# Include the make data for each module ++++include $(patsubst %,%/module.mk,${MODULES}) ++++ ++++ ++++.PHONY: build ++++build: ++++ ++++.PHONY: install ++++install: ++++ +++ +++ .PHONY: clean +++ clean: +++ $(RM) -rf ${GENERATED_FILES} diff --cc doc/be.1.sgml index 0000000,0000000,0000000,0000000..5e6efc3 new file mode 100644 --- /dev/null +++ b/doc/be.1.sgml @@@@@ -1,0 -1,0 -1,0 -1,0 +1,247 @@@@@ ++++ manpage.1'. You may view ++++ the manual page with: `docbook-to-man manpage.sgml | nroff -man | ++++ less'. A typical entry in a Makefile or Makefile.am is: ++++ ++++be.1: be.1.sgml ++++ docbook-to-man $< > $@ ++++ ++++ The docbook-to-man binary is found in the docbook-to-man package. ++++ Please remember that if you create the nroff version in one of the ++++ debian/rules file targets (such as build), you will need to include ++++ docbook-to-man in your Build-Depends control field. ++++ ++++ --> ++++ ++++ Ben"> ++++ Finney"> ++++ ++++ 2008-04-21"> ++++ ++++ 1"> ++++ ben+debian@benfinney.id.au"> ++++ ++++ BUGS-EVERYWHERE"> ++++ ++++ ++++ BE"> ++++ ++++ ++++ Debian"> ++++ GNU"> ++++ GPL"> ++++]> ++++ ++++ ++++ ++++
++++ &dhemail; ++++
++++ ++++ &dhfirstname; ++++ &dhsurname; ++++ ++++ ++++ 2008 ++++ &dhusername; ++++ ++++ &dhdate; ++++ ++++ ++++ &uccmdname; ++++ ++++ &dhsection; ++++ ++++ ++++ &cmdname; ++++ ++++ distributed bug tracker ++++ ++++ ++++ ++++ &cmdname; ++++ command ++++ command_options ... ++++ command_args ... ++++ ++++ ++++ &cmdname; help ++++ ++++ ++++ &cmdname; help ++++ command ++++ ++++ ++++ ++++ DESCRIPTION ++++ ++++ This manual page documents briefly the ++++ &cmdname; command, part of the ++++ &pkgfullname; package. ++++ ++++ &cmdname; allows commandline interaction ++++ with the &pkgfullname; database in a project tree. ++++ ++++ ++++ ++++ COMMANDS ++++ ++++ ++++ ++++ assign ++++ ++++ ++++ Assign an individual or group to fix a bug ++++ ++++ ++++ ++++ ++++ close ++++ ++++ ++++ Close a bug ++++ ++++ ++++ ++++ ++++ comment ++++ ++++ ++++ Add a comment to a bug ++++ ++++ ++++ ++++ ++++ diff ++++ ++++ ++++ Compare bug reports with older tree ++++ ++++ ++++ ++++ ++++ help ++++ ++++ ++++ Print help for given subcommand ++++ ++++ ++++ ++++ ++++ inprogress ++++ ++++ ++++ Bug fixing in progress ++++ ++++ ++++ ++++ ++++ list ++++ ++++ ++++ List bugs ++++ ++++ ++++ ++++ ++++ new ++++ ++++ ++++ Create a new bug ++++ ++++ ++++ ++++ ++++ open ++++ ++++ ++++ Re-open a bug ++++ ++++ ++++ ++++ ++++ set ++++ ++++ ++++ Change tree settings ++++ ++++ ++++ ++++ ++++ set-root ++++ ++++ ++++ Assign the root directory for bug tracking ++++ ++++ ++++ ++++ ++++ severity ++++ ++++ ++++ Show or change a bug's severity level ++++ ++++ ++++ ++++ ++++ show ++++ ++++ ++++ Show a particular bug ++++ ++++ ++++ ++++ ++++ target ++++ ++++ ++++ Show or change a bug's target for fixing ++++ ++++ ++++ ++++ ++++ upgrade ++++ ++++ ++++ Upgrade the bugs to the latest format ++++ ++++ ++++ ++++ ++++ ++++ ++++ AUTHOR ++++ ++++ This manual page was written by &dhusername; <&dhemail;> for ++++ the &debian; system (but may be used by others). Permission is ++++ granted to copy, distribute and/or modify this document under ++++ the terms of the &gnu; General Public License, Version 2 or any ++++ later version published by the Free Software Foundation. ++++ ++++ ++++ On Debian systems, the complete text of the GNU General Public ++++ License can be found in /usr/share/common-licenses/GPL. ++++ ++++ ++++ ++++ ++++ ++++ diff --cc doc/module.mk index 0000000,0000000,0000000,0000000..1b365c8 new file mode 100644 --- /dev/null +++ b/doc/module.mk @@@@@ -1,0 -1,0 -1,0 -1,0 +1,31 @@@@@ ++++# :vim: filetype=make : -*- makefile; coding: utf-8; -*- ++++ ++++# doc/module.mk ++++# Part of Bugs Everywhere, a distributed bug tracking system. ++++# ++++# Copyright © 2008 Ben Finney ++++# This is free software; you may copy, modify and/or distribute this work ++++# under the terms of the GNU General Public License, version 2 or later. ++++# No warranty expressed or implied. See the file COPYING for details. ++++ ++++# Makefile module for documentation ++++ ++++MODULE_DIR := doc ++++ ++++MANPAGES = be.1 ++++manpage_files = $(patsubst %,${MODULE_DIR}/%,${MANPAGES}) ++++ ++++GENERATED_FILES += ${manpage_files} ++++ ++++ ++++.PHONY: doc ++++doc: man ++++ ++++build: doc ++++ ++++ ++++.PHONY: man ++++man: ${manpage_files} ++++ ++++%.1: %.1.sgml ++++ docbook-to-man $< > $@ diff --cc setup.py index 7c4c98a,7c4c98a,7c4c98a,7c4c98a..b909f3f mode 100644,100644,100755,100644..100755 --- a/setup.py +++ b/setup.py @@@@@ -9,4 -9,4 -9,4 -9,4 +9,7 @@@@@ setup url='http://panoramicfeedback.com/opensource/', packages=['becommands', 'libbe'], scripts=['be'], ++++ data_files=[ ++++ ('share/man/man1', ['doc/be.1']), ++++ ] )