diff -Nru bzr-stats-0.1.0/cmds.py bzr-stats-0.1.0+bzr48/cmds.py --- bzr-stats-0.1.0/cmds.py 2011-02-26 19:23:26.000000000 +0000 +++ bzr-stats-0.1.0+bzr48/cmds.py 2011-03-21 23:27:31.000000000 +0000 @@ -183,9 +183,9 @@ pb = ui.ui_factory.nested_progress_bar() a_repo.lock_read() try: - pb.note('getting ancestry 1') + trace.note('getting ancestry 1') start_ancestry = set(a_repo.get_ancestry(start_rev)) - pb.note('getting ancestry 2') + trace.note('getting ancestry 2') ancestry = a_repo.get_ancestry(end_rev)[1:] ancestry = [rev for rev in ancestry if rev not in start_ancestry] revs, canonical_committer = get_revisions_and_committers(a_repo, ancestry) diff -Nru bzr-stats-0.1.0/debian/bzr-builddeb.conf bzr-stats-0.1.0+bzr48/debian/bzr-builddeb.conf --- bzr-stats-0.1.0/debian/bzr-builddeb.conf 1970-01-01 00:00:00.000000000 +0000 +++ bzr-stats-0.1.0+bzr48/debian/bzr-builddeb.conf 2012-02-28 13:21:38.000000000 +0000 @@ -0,0 +1,3 @@ +[BUILDDEB] +upstream-branch = lp:bzr-stats +export-upstream-revision = tag:$UPSTREAM_VERSION diff -Nru bzr-stats-0.1.0/debian/changelog bzr-stats-0.1.0+bzr48/debian/changelog --- bzr-stats-0.1.0/debian/changelog 2011-07-31 21:42:22.000000000 +0000 +++ bzr-stats-0.1.0+bzr48/debian/changelog 2012-03-11 10:32:24.000000000 +0000 @@ -1,8 +1,18 @@ -bzr-stats (0.1.0-4~bazaar1~natty1) natty; urgency=low +bzr-stats (0.1.0+bzr48-1~bazaar1~oneiric1) oneiric; urgency=low * Rebuild in PPA. - -- Max Bowsher <_@maxb.eu> Sun, 31 Jul 2011 22:42:22 +0100 + -- Max Bowsher <_@maxb.eu> Sun, 11 Mar 2012 10:32:24 +0000 + +bzr-stats (0.1.0+bzr48-1) unstable; urgency=low + + * Add autopkgtest entries. + * Use parseable copyright file format. + * Bump standards version to 3.9.3. + * Break long line in description. + * New upstream snapshot. + + -- Jelmer Vernooij Tue, 28 Feb 2012 14:23:15 +0100 bzr-stats (0.1.0-4) unstable; urgency=low diff -Nru bzr-stats-0.1.0/debian/control bzr-stats-0.1.0+bzr48/debian/control --- bzr-stats-0.1.0/debian/control 2011-05-06 01:50:00.000000000 +0000 +++ bzr-stats-0.1.0+bzr48/debian/control 2012-02-28 13:18:26.000000000 +0000 @@ -8,7 +8,7 @@ python-subunit, python-testtools Build-Depends: debhelper (>= 7.0.50~), python (>= 2.6.6-3) -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 X-Python-Version: >= 2.4 Vcs-Bzr: http://bzr.debian.org/pkg-bazaar/bzr-stats/unstable Homepage: http://launchpad.net/bzr-stats @@ -22,5 +22,5 @@ This is a simple plugin for Bazaar that can list the contributors to a branch and what they worked on. . - It adds two extra subcommands to Bazaar to list the committers by number of commits - and by their type of contribution. + It adds two extra subcommands to Bazaar to list the committers by number of + commits and by their type of contribution. diff -Nru bzr-stats-0.1.0/debian/copyright bzr-stats-0.1.0+bzr48/debian/copyright --- bzr-stats-0.1.0/debian/copyright 2011-05-06 01:49:49.000000000 +0000 +++ bzr-stats-0.1.0+bzr48/debian/copyright 2012-02-28 12:17:10.000000000 +0000 @@ -1,37 +1,56 @@ -This package was debianized by Jelmer Vernooij - on Wed Oct 24 13:31:13 CET 2007. - -It was downloaded from http://launchpad.net/bzr-stats -The tarball was created by running: - -bzr export -r10 bzr-stats-0.0.1~bzr10.tar.gz http://launchpad.net/bzr-stats - -Upstream authors: - -Jelmer Vernooij -John Arbash Meinel -Russ Brown -Lukáš Lalinský -Wesley J. Landaker - -Copyright (C) 2007 Canonical Ltd - -License: - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License with -the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL; -if not, write to the Free Software Foundation, Inc., 51 Franklin St, -Fifth Floor, Boston, MA 02110-1301, USA. - -On Debian systems, the full text of the GPL can be found in -/usr/share/common-licenses/GPL +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: bzr-stats +Upstream-Contact: Bazaar Developers +Source: https://launchpad.net/bzr-stats/ + +Files: debian/* +Comment: + This package was debianized by Jelmer Vernooij on Wed Oct + 24 13:31:13 CET 2007. +Copyright: GPL-2+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License with + the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL; + if not, write to the Free Software Foundation, Inc., 51 Franklin St, + Fifth Floor, Boston, MA 02110-1301, USA. + . + On Debian systems, the full text of the GPL can be found in + /usr/share/common-licenses/GPL-2 + +Files: * +Comment: + Upstream authors: + Jelmer Vernooij + John Arbash Meinel + Russ Brown + Lukáš Lalinský + Wesley J. Landaker +Copyright: 2007-2012 Canonical Ltd +Copyright: 2008-2010 Jelmer Vernooij +License: GPL-2+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License with + the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL; + if not, write to the Free Software Foundation, Inc., 51 Franklin St, + Fifth Floor, Boston, MA 02110-1301, USA. + . + On Debian systems, the full text of the GPL can be found in + /usr/share/common-licenses/GPL-2 diff -Nru bzr-stats-0.1.0/debian/tests/control bzr-stats-0.1.0+bzr48/debian/tests/control --- bzr-stats-0.1.0/debian/tests/control 1970-01-01 00:00:00.000000000 +0000 +++ bzr-stats-0.1.0+bzr48/debian/tests/control 2012-02-28 12:17:10.000000000 +0000 @@ -0,0 +1,3 @@ +Tests: testsuite +Depends: bzr, python-bzrlib.tests +Features: no-build-needed diff -Nru bzr-stats-0.1.0/debian/tests/testsuite bzr-stats-0.1.0+bzr48/debian/tests/testsuite --- bzr-stats-0.1.0/debian/tests/testsuite 1970-01-01 00:00:00.000000000 +0000 +++ bzr-stats-0.1.0+bzr48/debian/tests/testsuite 2012-02-28 12:17:10.000000000 +0000 @@ -0,0 +1,4 @@ +#!/bin/sh +# Note that since the installed version of the package has to be tested, +# there is no mucking about with BZR_PLUGINS_AT. +bzr selftest -s bp.stats -v --parallel=fork diff -Nru bzr-stats-0.1.0/debian/watch bzr-stats-0.1.0+bzr48/debian/watch --- bzr-stats-0.1.0/debian/watch 2011-02-26 19:26:46.000000000 +0000 +++ bzr-stats-0.1.0+bzr48/debian/watch 2012-02-28 13:21:43.000000000 +0000 @@ -1,3 +1,3 @@ version=3 opts="uversionmangle=s/(b(eta)?[0-9]+)$/~\\1/" \ -https://launchpad.net/bzr-stats/+download http://launchpad.net/bzr-stats/.*/bzr-stats-(.*)\.tar\.gz +https://launchpad.net/bzr-stats/+download https://launchpad.net/bzr-stats/.*/bzr-stats-(.*)\.tar\.gz diff -Nru bzr-stats-0.1.0/info.py bzr-stats-0.1.0+bzr48/info.py --- bzr-stats-0.1.0/info.py 2011-02-26 19:23:26.000000000 +0000 +++ bzr-stats-0.1.0+bzr48/info.py 2011-02-26 19:26:00.000000000 +0000 @@ -1,5 +1,5 @@ bzr_plugin_name = 'stats' -bzr_plugin_version = (0, 1, 0, 'final', 0) +bzr_plugin_version = (0, 2, 0, 'dev', 0) bzr_commands = ['credits', 'committer-statistics', 'ancestor-growth'] diff -Nru bzr-stats-0.1.0/__init__.py bzr-stats-0.1.0+bzr48/__init__.py --- bzr-stats-0.1.0/__init__.py 2011-02-26 19:23:26.000000000 +0000 +++ bzr-stats-0.1.0+bzr48/__init__.py 2011-12-18 01:08:30.000000000 +0000 @@ -15,12 +15,22 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA """A Simple bzr plugin to generate statistics about the history.""" +from __future__ import absolute_import + from bzrlib import _format_version_tuple -from info import ( +from bzrlib.plugins.stats.info import ( bzr_plugin_version as version_info, ) +try: + from bzrlib.i18n import load_plugin_translations +except ImportError: # No translations for bzr < 2.5 + gettext = lambda x: x +else: + translation = load_plugin_translations("bzr-stats") + gettext = translation.ugettext + __version__ = _format_version_tuple(version_info) diff -Nru bzr-stats-0.1.0/Makefile bzr-stats-0.1.0+bzr48/Makefile --- bzr-stats-0.1.0/Makefile 1970-01-01 00:00:00.000000000 +0000 +++ bzr-stats-0.1.0+bzr48/Makefile 2011-11-12 04:57:40.000000000 +0000 @@ -0,0 +1,65 @@ +DEBUGGER ?= +BZR ?= $(shell which bzr) +PYTHON ?= $(shell which python) +SETUP ?= ./setup.py +CTAGS ?= ctags +PYLINT ?= pylint +TESTS ?= +DESTDIR ?= + +all:: build + +build:: + $(SETUP) build + +install:: +ifneq ($(DESTDIR),) + $(SETUP) install --root "$(DESTDIR)" +else + $(SETUP) install +endif + +clean:: + $(SETUP) clean + +check:: + BZR_PLUGINS_AT=stats@$(shell pwd) $(DEBUGGER) $(PYTHON) $(BZR) $(BZR_OPTIONS) selftest $(TEST_OPTIONS) --starting-with=bzrlib.plugins.stats $(TESTS) + +check-verbose:: + $(MAKE) check TEST_OPTIONS=-v + +coverage:: + $(MAKE) check BZR_OPTIONS="--coverage coverage" + +check-one:: + $(MAKE) check TEST_OPTIONS=--one + +show-plugins:: + BZR_PLUGINS_AT=stats@$(shell pwd) $(BZR) plugins -v + +lint:: + $(PYLINT) -f parseable *.py */*.py + +tags:: + $(CTAGS) -R . + +ctags:: tags + + + +.PHONY: update-pot po/bzr-stats.pot +update-pot: po/bzr-stats.pot + +TRANSLATABLE_PYFILES:=$(shell find . -name '*.py' \ + | grep -v 'tests/' \ + ) + +po/bzr-stats.pot: $(PYFILES) $(DOCFILES) + BZR_PLUGINS_AT=stats@$(shell pwd) bzr export-pot \ + --plugin=stats > po/bzr-stats.pot + echo $(TRANSLATABLE_PYFILES) | xargs \ + xgettext --package-name "bzr-stats" \ + --msgid-bugs-address "" \ + --copyright-holder "Bazaar Developers " \ + --from-code ISO-8859-1 --sort-by-file --join --add-comments=i18n: \ + -d bzr-stats -p po -o bzr-stats.pot diff -Nru bzr-stats-0.1.0/NEWS bzr-stats-0.1.0+bzr48/NEWS --- bzr-stats-0.1.0/NEWS 2011-02-26 19:23:26.000000000 +0000 +++ bzr-stats-0.1.0+bzr48/NEWS 2011-02-26 19:26:00.000000000 +0000 @@ -1,3 +1,5 @@ +0.2.0 UNRELEASED + 0.1.0 2011-02-24 Initial release. diff -Nru bzr-stats-0.1.0/po/bzr-stats.pot bzr-stats-0.1.0+bzr48/po/bzr-stats.pot --- bzr-stats-0.1.0/po/bzr-stats.pot 1970-01-01 00:00:00.000000000 +0000 +++ bzr-stats-0.1.0+bzr48/po/bzr-stats.pot 2011-11-12 04:57:40.000000000 +0000 @@ -0,0 +1,35 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Bazaar Developers +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: bzr-stats\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-11-12 05:56+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: cmds.py:243 +msgid "Generate statistics for LOCATION." +msgstr "" + +# help of 'show-class' option of 'committer-statistics' command +#: cmds.py:248 +msgid "Show the class of contributions." +msgstr "" + +#: cmds.py:286 +msgid "Figure out the ancestor graph for LOCATION" +msgstr "" + +#: cmds.py:395 +msgid "Determine credits for LOCATION." +msgstr ""