debian/0000755000000000000000000000000012265031737007174 5ustar debian/rules0000755000000000000000000000065112146551042010250 0ustar #!/usr/bin/make -f %: dh --with python2 --buildsystem=python_distutils $* ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) CONCURRENCY = BZR_CONCURRENCY=$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) endif ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) override_dh_auto_test: $(CONCURRENCY) BZR_PLUGINS_AT=bzrtools@$(CURDIR) /usr/bin/bzr selftest \ --parallel=fork -v -s bp.bzrtools endif debian/copyright0000644000000000000000000000320712265030437011125 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: bzrtools Upstream-Contact: Aaron Bentley Source: http://bazaar-vcs.org/BzrTools. Files: * Copyright: 2004-2008 Aaron Bentley 2005-2006 Canonical Limited. 2006 Michael Ellerman 2007 John Arbash Meinel License: GPL-2+ Files: debian/* Copyright: 2005 Jeff Bailey 2007 Gustavo Franco 2007 Arnaud Fontaine 2009 Reinhard Tartler 2008-2009 Adeodato Simó 2008-2011 Jelmer Vernooij 2012 Eric Newberry License: GPL-2+ License: GPL-2+ This package 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 package 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 along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA . On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-2 file. debian/changelog0000644000000000000000000004330212265031714011043 0ustar bzrtools (2.6.0-1) unstable; urgency=medium * New upstream release. * Drop bzr2.6_compat.patch, fixed upstream. * Bump Standards-Version to 3.9.5, no changes needed. * Use the "canonical URI" for Vcs-Bzr field. * DEP-8 tests: remove “Features: no-build-needed”; it's the default now. -- Andrew Starr-Bochicchio Mon, 13 Jan 2014 13:43:22 -0500 bzrtools (2.5+bzr786-6) unstable; urgency=low * Correct the versionized build depends on python-bzrlib (Closes: #719499). -- Andrew Starr-Bochicchio Tue, 13 Aug 2013 20:13:39 -0400 bzrtools (2.5+bzr786-5) unstable; urgency=low * Loosen the versionized dependency on bzr. While bzrtools 2.6 has yet to be released, this snapshot supports bzr 2.6. * Add myself to the uploaders field and run wrap-and-sort over the control file. -- Andrew Starr-Bochicchio Fri, 02 Aug 2013 21:45:58 -0400 bzrtools (2.5+bzr786-4) unstable; urgency=low * Team upload. * bzr2.6_compat.patch: Fix compatibility with bzr 2.6. Repository.get_ancestry has been removed. * Bump Standards-Version to 3.9.4 * Drop Dm-Upload-Allowed field. * Add autopkgtests. -- Andrew Starr-Bochicchio Mon, 20 May 2013 22:07:03 -0400 bzrtools (2.5+bzr786-3) unstable; urgency=low [ Eric Newberry ] * Added Eric Newberry to Uploaders (Closes: #668599) * Removed James Westby and Jelmer Vernooij from Uploaders at the request of Jelmer Vernooij * Added Eric Newberry to debian/copyright for "debian/*" * Corrected lintian "syntax-error-in-dep5-copyright" error in debian/copyright * Changed "http://" to "https://" in debian/watch * Added Vcs-Browser field to where the bzrtools debian repository can viewed online * Changed "-e" on the #! line in debian/preinst to "set -e" on a new line [ Andrew Starr-Bochicchio ] * debian/copyright: Fix duplicate copyright fields. -- Eric Newberry Sun, 25 Nov 2012 17:46:30 -0700 bzrtools (2.5+bzr786-2) unstable; urgency=low * Use rsvg-convert rather than rsvg. Closes: #666472, LP: #971190 * Disable version check to allow use with bzr 2.6. * Remove Arnaud Fontaine and Gustavo Franco from uploaders. * Fix Vcs-Bzr URL. * Add 03_testing: fix test suite run with newer versions of bzr. -- Jelmer Vernooij Fri, 13 Apr 2012 12:06:17 +0200 bzrtools (2.5+bzr786-1) unstable; urgency=low * Bump standards version to 3.9.3 (no changes). * Fix header of copyright file format. * New upstream snapshot. -- Jelmer Vernooij Wed, 21 Mar 2012 11:43:10 +0100 bzrtools (2.5-1) unstable; urgency=low * Use DEP5 for copyright file. * New upstream release. -- Jelmer Vernooij Fri, 20 Jan 2012 03:29:11 +0100 bzrtools (2.4.1-2) unstable; urgency=low * Add 01_revhistory: cope with deprecated Branch.revision_history method in bzr 2.5. -- Jelmer Vernooij Mon, 21 Nov 2011 22:46:09 +0100 bzrtools (2.4.1-1) unstable; urgency=low * New upstream release. -- Jelmer Vernooij Sun, 25 Sep 2011 14:16:05 +0200 bzrtools (2.4.0-1) unstable; urgency=low * New upstream release. -- Jelmer Vernooij Thu, 14 Jul 2011 13:15:52 +0200 bzrtools (2.4.0~bzr769-1) unstable; urgency=low * New upstream snapshot. + Fixes compatibility with newer versions of bzr. Closes: #629682 -- Jelmer Vernooij Wed, 08 Jun 2011 15:52:33 +0100 bzrtools (2.4.0~bzr767-2) unstable; urgency=low * Re-arrange | condition in build deps to make sbuild happy. * Bump standards version to 3.9.2 (no changes). -- Jelmer Vernooij Fri, 06 May 2011 04:15:18 +0200 bzrtools (2.4.0~bzr767-1) unstable; urgency=low [ Jelmer Vernooij ] * New upstream snapshot. * Support running the test suite in parallel. * Switch to dh_python2. Closes: #616770 * Switch to debhelper 7, drop cdbs. [ John Ferlito ] * Remove John Ferlito from Uploaders. [ Jelmer Vernooij ] * Add build dependency on python-bzrlib.tests for compatibility with newer versions of bzr. -- Jelmer Vernooij Sun, 01 May 2011 03:58:07 +0200 bzrtools (2.3.1-1) unstable; urgency=low * Update watch file to use new location on Launchpad. + Fixes compatibility with Python 2.7. LP: #708268 * New upstream release. -- Jelmer Vernooij Wed, 02 Feb 2011 10:08:51 +0100 bzrtools (2.3.0-1) unstable; urgency=low * New upstream release. -- Jelmer Vernooij Tue, 25 Jan 2011 19:03:22 -0800 bzrtools (2.3.0~bzr744-3) unstable; urgency=low * Fix "bzr cdiff --git". Closes: #600191 -- Jelmer Vernooij Sat, 18 Dec 2010 01:19:54 +0100 bzrtools (2.3.0~bzr744-2) unstable; urgency=low * Run testsuite as part of build process. * Remove trailing whitespace from control file. -- Jelmer Vernooij Sat, 06 Nov 2010 20:35:25 +0100 bzrtools (2.3.0~bzr744-1) unstable; urgency=low * New upstream snapshot. + Fixes compatibility with Bazaar 2.3. Closes: #600332 -- Jelmer Vernooij Sat, 16 Oct 2010 14:12:29 +0200 bzrtools (2.2.0-2) unstable; urgency=low * Upload to unstable. * Bump standards version to 3.9.1. -- Jelmer Vernooij Sat, 07 Aug 2010 14:08:02 +0200 bzrtools (2.2.0-1) experimental; urgency=low * New upstream release. -- Jelmer Vernooij Fri, 21 May 2010 22:26:28 +0200 bzrtools (2.1.0-2) unstable; urgency=low * Upload to unstable. -- Jelmer Vernooij Wed, 17 Feb 2010 17:58:10 +0100 bzrtools (2.1.0-1) experimental; urgency=low * New upstream release. * Bump standards version to 3.8.4. * Use source format version 3. -- Jelmer Vernooij Fri, 12 Feb 2010 23:38:38 +0100 bzrtools (2.0.1-1) unstable; urgency=low * New upstream release. * Version problem goes away with new release (Closes: #548444). -- John Francesco Ferlito Sun, 27 Sep 2009 13:02:08 +1000 bzrtools (2.0.0-2) unstable; urgency=low * version.py was stuck in VCS at 1.18.0. Updated to 2.0.0. * Added John Francesco Ferlito to Uploaders. * Removed unused overrides. -- John Francesco Ferlito Fri, 25 Sep 2009 08:43:37 +1000 bzrtools (2.0.0-1) unstable; urgency=low * New upstream release. -- Jelmer Vernooij Tue, 15 Sep 2009 10:49:17 +0200 bzrtools (1.18.0-1) unstable; urgency=low [ James Westby ] * New upstream release. [ Jelmer Vernooij ] * Bump standards version to 3.8.3. * Fix dependency on debhelper 5. -- Jelmer Vernooij Wed, 02 Sep 2009 15:59:00 +0200 bzrtools (1.16.0-1) unstable; urgency=low * New upstream release. -- Jelmer Vernooij Thu, 18 Jun 2009 12:55:45 +0200 bzrtools (1.15.0-1) unstable; urgency=low [ Adeodato Simó ] * Remove myself from uploaders. [ Jelmer Vernooij ] * New upstream release. -- Jelmer Vernooij Fri, 29 May 2009 09:33:56 +0200 bzrtools (1.14.0-1) unstable; urgency=low * New upstream release. * Move to section vcs. * Bump standards version to 3.8.1. -- Jelmer Vernooij Fri, 10 Apr 2009 23:52:41 +0200 bzrtools (1.13.0-1) unstable; urgency=low * New upstream release. -- Jelmer Vernooij Wed, 11 Mar 2009 02:36:45 +0100 bzrtools (1.12.0-1) experimental; urgency=low * New upstream release. * Suggest rather than Recommend graphviz, since graphviz is a heavy dependency but the graph-ancestry command is not commonly used. (LP: #321852) -- Jelmer Vernooij Tue, 10 Feb 2009 21:50:52 +0100 bzrtools (1.11.0-1) experimental; urgency=low * New upstream release. -- Jelmer Vernooij Tue, 13 Jan 2009 16:28:02 +0100 bzrtools (1.10.0-1) experimental; urgency=low * New upstream release. -- Jelmer Vernooij Fri, 28 Nov 2008 16:14:00 +0100 bzrtools (1.9.1-1) experimental; urgency=low * New upstream release. -- Jelmer Vernooij Wed, 05 Nov 2008 15:11:27 +0100 bzrtools (1.9.0-1) experimental; urgency=low * New upstream release. -- Jelmer Vernooij Mon, 03 Nov 2008 19:51:35 +0100 bzrtools (1.8.0-1) experimental; urgency=low * New upstream release. -- Jelmer Vernooij Wed, 08 Oct 2008 13:12:25 +0200 bzrtools (1.7.0-2) experimental; urgency=low * Fix dependency on newer versions of bzr. -- Jelmer Vernooij Tue, 30 Sep 2008 20:37:07 +0200 bzrtools (1.7.0-1) experimental; urgency=low * New upstream release. -- Jelmer Vernooij Wed, 24 Sep 2008 17:18:55 +0200 bzrtools (1.6.0-1) experimental; urgency=low * New upstream release. * Bump standards version to 3.8.0. -- Jelmer Vernooij Sat, 02 Aug 2008 15:05:50 +0200 bzrtools (1.5.0-1) unstable; urgency=low * New upstream release. -- Jelmer Vernooij Mon, 12 May 2008 20:25:35 +0200 bzrtools (1.4.0-1) unstable; urgency=low [ Jelmer Vernooij ] * New upstream release. [ Adeodato Simó ] * Add a Dm-Upload-Allowed: yes header. -- Jelmer Vernooij Sun, 04 May 2008 14:06:26 +0200 bzrtools (1.3.0-2) unstable; urgency=low * Fix dependencies to be installable against bzr 1.3. -- Adeodato Simó Wed, 19 Mar 2008 13:51:20 +0100 bzrtools (1.3.0-1) unstable; urgency=low * New upstream release. -- Reinhard Tartler Wed, 19 Mar 2008 09:28:40 +0100 bzrtools (1.2.0-1) unstable; urgency=low * New upstream release. -- Adeodato Simó Thu, 14 Feb 2008 13:44:56 +0100 bzrtools (1.1.0-1) unstable; urgency=low [ Adeodato Simó ] * New upstream release. [ Arnaud Fontaine ] * New email address. * debian/control: + Update Standards-Version to 3.7.3. No changes needed. -- Adeodato Simó Sat, 12 Jan 2008 11:24:45 +0100 bzrtools (1.0.0-1) unstable; urgency=low [ Adeodato Simó ] * New upstream release. [ Arnaud Fontaine ] * debian/control: + Move Homepage field to the source package (dpkg supports it now). + Rename XS-Vcs-Bzr field to Vcs-Bzr (dpkg supports it now). * debian/copyright: + Update GPL path to GPL-2 as GPL-3 is now the default. -- Adeodato Simó Mon, 03 Dec 2007 14:13:34 +0100 bzrtools (0.92.0-1) unstable; urgency=low * New upstream release. -- Adeodato Simó Fri, 02 Nov 2007 22:30:38 +0100 bzrtools (0.91.0-1) unstable; urgency=low * New upstream release. -- Adeodato Simó Fri, 14 Sep 2007 10:12:12 +0200 bzrtools (0.90.0-1) unstable; urgency=low * New upstream release: + `bzr branches` works against HTTP locations. (Closes: #435110) + `bzr multi-pull` reuses existing connections. (Closes: #435240) + `bzr branches` dies gracefully on connect error. (Closes: #435112) * Drop no_python2.4_shebangs.diff, applied upstream. * Fix download URL in debian/copyright. (Closes: #435108) -- Adeodato Simó Wed, 15 Aug 2007 12:03:21 +0200 bzrtools (0.18.0-1) unstable; urgency=low [ Arnaud Fontaine ] * New upstream release. [ Reinhard Tartler ] * Move graphviz to Recommends (Closes: #423011) [ Adeodato Simó ] * Drop (meaningless) versioning constraints on suggested packages, and rework them a bit: + promote rsync to Recommends. + promote patch to Depends. + drop unneeded python-paramiko. * Move rsync from Build-Depends to Build-Depends-Indep. * Drop version constraints in Build-Depends that are satisfied in etch. * Run the test suite if DEB_BUILD_OPTIONS contains 'test'. * Add patch to loose python2.4-specific shebang lines, and thus a spurious dependency on python2.4 (submitted upstream). * Add *.Shelf and CREDITS to DEB_INSTALL_DOCS_ALL. -- Arnaud Fontaine Tue, 17 Jul 2007 16:07:22 +0000 bzrtools (0.17.1-1) unstable; urgency=low * New upstream release. * Add myself to uploaders. * Do not build-depend on python-dev, but only on python. * Fix description of baz-import not to use Bazaar when it means Baz 1.x. -- Adeodato Simó Fri, 15 Jun 2007 15:56:38 +0100 bzrtools (0.16.1-1) unstable; urgency=low * New upstream release * Place the pkg-bazaar team in the maintainer field, dropping the utnubu team. Rationale: We agreed that we want a dedicated team for maintaining all (core) bzr related packages there * added myself to uploaders * add lintian overrides for modules used by bzrtools but not intended to be called directly -- Reinhard Tartler Tue, 8 May 2007 18:33:39 +0200 bzrtools (0.16.0-1) unstable; urgency=low * New upstream release. * Add debian/watch. * Switch to pycentral because it installs files into the same directory and allow precompiled files to be used. Thanks to Piotr Ożarowski . Closes: #421317. * debian/control: + Add myself as uploaders with maintainer agreement. + Add pkg-bazaar team as uploaders. + Update Depends to bzr >= 0.16~rc1 and bzr << 0.17. + Add Homepage field. * debian/copyright: + Update FSF address. -- Arnaud Fontaine Tue, 08 May 2007 14:22:58 +0200 bzrtools (0.15.4-1) unstable; urgency=low * New upstream release. (Closes: #420440, #407902) * Remove Depends on python-medusa. (Closes: #406398) * Update Depends to bzr >= 0.15 and bzr << 0.16. (Closes: #399650, #406397) * Extend full description to list the plugins included. Thanks Jari Aalto and Arnaud Fontaine. (Closes: #415720, #346251) * Add XS-Vcs-Svn field. -- Gustavo Franco Mon, 23 Apr 2007 02:14:58 -0300 bzrtools (0.11.0-1) unstable; urgency=low * New upstream release. (Closes: #389605) -- Gustavo Franco Tue, 28 Nov 2006 12:21:48 -0200 bzrtools (0.10.0-2) unstable; urgency=low * Revert the previous upload changes by Adeodato. * debian/compat: Set to 5. * Remove debian/pycompat (not needed due to cdbs). * Remove debian/pyversions. * Add XS-Python-Version to debian/control, set to >= 2.4 * debian/preinst: - Added to avoid directory/symlink conflict due to the new Python policy. -- Gustavo Franco Tue, 19 Sep 2006 11:26:02 -0300 bzrtools (0.10.0-1) unstable; urgency=low * Sync from Ubuntu. Thanks for the package, Etienne Goyer. The package does not still use either of pycentral or pysupport, but installs modules in a way compatible with pycentral, so this upload closes: #384905. * Add myself to Uploaders, and make small adjustments here and there: + prevent instalation with bzr !~ 0.10. + drop version requirements in Suggests. + promote rsync and patch to Recommends. -- Adeodato Simó Wed, 13 Sep 2006 20:10:51 +0200 bzrtools (0.9.0-1) unstable; urgency=low [ Mohammed Adnène Trojette ] * New upstream release and resync with Ubuntu. * debian/control: - Add rsync and python-medusa to Build-Depends (necessary for tests). - Adjust dependencies + remove bzr (>= 0.8.1), bzr (<< 0.9). (Closes: #382561) + add bzr (>= 0.9), bzr (<< 0.10). + add pybaz. (Closes: #362587) * Remove debian/dirs. (Closes: #368729) * Use python-support to follow new Python Policy thanks to Arnaud Fontaine + install *.py in python-support directory. * Add preamble to debian/copyright. [ Gustavo Franco ] * Revert Adeodato NMU changes, already in upstream now. (Closes: #382212) * Relax bzr dependency setting to bzr >= 0.9. * debian/rules: Add targets to fit new Python policy needs. * Thanks Mohammed Adnène Trojette and Adeodato Simó. -- Gustavo Franco Wed, 23 Aug 2006 11:46:01 -0300 bzrtools (0.8.1-1.1) unstable; urgency=low * Low threshold NMU. * Add patch to make bzrtools 0.8 not use DEFAULT_IGNORE, which is deprecated in bzr 0.9 (now in the archive), and made bzr print a couple warnings in every operation. -- Adeodato Simó Wed, 9 Aug 2006 18:24:30 +0200 bzrtools (0.8.1-1) unstable; urgency=low * New upstream release. Thanks Arnaud (Closes: #368201) * debian/control: - Set Utnubu Team as Maintainer - Standards-Version bumped up to 3.7.2 - Move cdbs and debhelper to Build-Depends field -- Gustavo Franco Sat, 20 May 2006 11:51:30 -0300 bzrtools (0.7-2) unstable; urgency=low * debian/control: Now suggests python2.4-paramiko -- Gustavo Franco Wed, 8 Feb 2006 17:54:09 -0200 bzrtools (0.7-1) unstable; urgency=low * New upstream release. (Closes: #351079) -- Gustavo Franco Thu, 2 Feb 2006 15:40:46 -0200 bzrtools (0.6.1-2) unstable; urgency=low * debian/control cleanups (Thanks Aaron Bentley) - Standards-Version bumped up to 3.6.2.2 - bzr (<< 0.7) added on Depends - rsync removed from Depends (added to Suggests) - pybaz removed from Recommends (it will added back later) - graphviz, librsvg2-bin, patch added to Suggests -- Gustavo Franco Sun, 8 Jan 2006 12:48:03 -0200 bzrtools (0.6.1-1) unstable; urgency=low * First Debian release. (Closes: #344217) * debian/control - Maintainer field changed - Standards-Version updated to 3.6.2.1 - Depends field cleaned up - Minor changes into Description * debian/copyright - jbailey email address fixed - s/Ubuntu/Debian/ * debian/rules - simple-patchsys line removed -- Gustavo Franco Tue, 20 Dec 2005 18:38:39 -0200 bzrtools (0.6.1-0ubuntu1) UNRELEASED; urgency=low * Snapshot -- Jeff Bailey Thu, 10 Nov 2005 11:54:46 -0500 debian/update-deps.py0000755000000000000000000000241212146551042011755 0ustar #!/usr/bin/python # Update dependencies based on info.py # Copyright (C) 2010 Jelmer Vernooij # Licensed under the GNU GPL, version 2 or later. from debian.deb822 import Deb822, PkgRelation import os, sys sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..")) from version import version_info def update_relation(l, pkg, kind, version): found = False for pr in l: if len(pr) != 1: # only update simple build deps continue e = pr[0] if e["name"] == pkg and e["version"] and e["version"][0] == kind: e["version"] = (kind, version) found = True if not found: l.append([{"version": (kind, version), "name": pkg, "arch": None}]) f = open('debian/control', 'r') source = Deb822(f) def update_deps(control, field): bdi = PkgRelation.parse_relations(control[field]) update_relation(bdi, "bzr", ">=", "%d.%d~" % version_info[:2]) update_relation(bdi, "bzr", "<<", "%d.%d.0" % (version_info[0], version_info[1]+1)) control[field] = PkgRelation.str(bdi) update_deps(source, "Build-Depends-Indep") binary = Deb822(f) update_deps(binary, "Depends") f = open("debian/control", "w+") try: source.dump(f) f.write("\n") binary.dump(f) finally: f.close() debian/preinst0000644000000000000000000000062612146551042010601 0ustar #!/bin/sh set -e #DEBHELPER# # handle problem caused by the new Python policy. The directory being removed needs to # be a symlink now case $1 in install|upgrade) for pyversion in 2.3 2.4 2.5; do test -d /usr/lib/python${pyversion}/site-packages/bzrlib/plugins/bzrtools && \ rm -rf /usr/lib/python${pyversion}/site-packages/bzrlib/plugins/bzrtools || \ true done ;; *) ;; esac debian/watch0000644000000000000000000000023512146551042010217 0ustar version=3 opts="uversionmangle=s/(b(eta)?[0-9]+)$/~\\1/" \ https://launchpad.net/bzrtools/+download https://launchpad.net/bzrtools/.*/bzrtools-(.*)\.tar\.gz debian/compat0000644000000000000000000000000212146551042010364 0ustar 7 debian/install0000644000000000000000000000022612265030437010561 0ustar #debian/overrides/bzrtools usr/share/lintian/overrides/ #tests/*.py usr/lib/python2.4/site-packages/bzrlib/plugins/bzrtools/tests debian/patches/0000755000000000000000000000000012265031737010623 5ustar debian/patches/01_use-rsvg-convert0000644000000000000000000000151512146551042014273 0ustar Description: Use rsvg-convert utility rather than rsvg, which is going to be removed. Origin: commit, revision id: jelmer@samba.org-20120402011629-djysdlb3xaobp4hz Author: Jelmer Vernooij Bug-Debian: http://bugs.debian.org/666472 Bug: https://launchpad.net/bugs/971190 Last-Update: 2012-04-02 Applied-Upstream: no X-Bzr-Revision-Id: jelmer@samba.org-20120402011629-djysdlb3xaobp4hz === modified file 'dotgraph.py' --- old/dotgraph.py 2008-04-11 00:03:51 +0000 +++ new/dotgraph.py 2012-04-02 01:16:29 +0000 @@ -192,7 +192,7 @@ try: temp_file = os.path.join(tempdir, 'temp.svg') invoke_dot(input, temp_file, 'svg') - cmdline = ['rsvg', temp_file, out_file] + cmdline = ['rsvg-convert', temp_file, out_file] try: rsvg_proc = Popen(cmdline) except OSError, e: debian/patches/02_version_check0000644000000000000000000000657212146551042013675 0ustar Description: Disable version checking Author: Jelmer Vernooij === modified file 'command.py' --- old/command.py 2011-04-15 02:33:36 +0000 +++ new/command.py 2012-04-02 01:13:56 +0000 @@ -16,91 +16,4 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -import bzrlib -from bzrlib import commands - -from version import version_info, __version__ - - -_testing = False -# True if we are currently testing commands via the test suite. - -def _stop_testing(): - """Set the _testing flag to indicate we are no longer testing.""" - global _testing - _testing = False - - -class BzrToolsCommand(commands.Command): - - def run_argv_aliases(self, argv, alias_argv=None): - result = check_bzrlib_version(version_info[:2]) - if result is not None: - return result - commands.Command.run_argv_aliases(self, argv, alias_argv) - - -TOO_OLD = 'too_old' -COMPATIBLE = 'compatible' -MAYBE_TOO_NEW = 'maybe_too_new' -TOO_NEW = 'too_new' - - -def check_version_compatibility(bzrlib_version, min_version, max_version): - """Check whether a bzrlib version is compatible with desired version. - - If the bzrlib_version is not less than min_version and not greater than - max_version, it is considered COMPATIBLE. If the version exceeds - max_version by 1 and is not a 'candidate' or 'final' version, it is - considered MAYBE_TOO_NEW. Other values greater than max_version are - considered TOO_NEW, and values lower than min_version are considered - TOO_OLD. - """ - bzrlib_version = bzrlib.version_info[:2] - if bzrlib_version < min_version: - return TOO_OLD - if bzrlib_version <= max_version: - return COMPATIBLE - max_plus = (max_version[0], max_version[1] + 1) - if bzrlib_version == max_plus: - if bzrlib.version_info[3] not in ('final', 'candidate'): - return COMPATIBLE - return MAYBE_TOO_NEW - return TOO_NEW - - -def check_bzrlib_version(desired): - """Check that bzrlib is compatible. - - If version is < bzrtools version, assume incompatible. - If version == bzrtools version, assume completely compatible - If version == bzrtools version + 1, assume compatible, with deprecations - Otherwise, assume incompatible. - """ - global _testing - if _testing: - return - compatibility = check_version_compatibility(bzrlib.version_info, desired, - desired) - if compatibility == COMPATIBLE: - return - try: - from bzrlib.trace import warning - except ImportError: - # get the message out any way we can - from warnings import warn as warning - if compatibility == TOO_OLD: - warning('Bazaar version %s is too old to be used with' - ' plugin "Bzrtools" %s.' % ( - bzrlib.__version__, __version__)) - # Not using BzrNewError, because it may not exist. - return 3 - else: - warning('Plugin "Bzrtools" is not up to date with installed Bazaar' - ' version %s.\n' - 'There should be a newer version of Bzrtools available, e.g.' - ' %i.%i.' - % (bzrlib.__version__, bzrlib.version_info[0], - bzrlib.version_info[1])) - if compatibility == TOO_NEW: - return 3 +from bzrlib.commands import Command as BzrToolsCommand debian/patches/03_testing0000644000000000000000000000161412146551042012521 0ustar === modified file 'tests/blackbox.py' --- old/tests/blackbox.py 2011-09-25 03:13:49 +0000 +++ new/tests/blackbox.py 2012-04-13 10:04:33 +0000 @@ -27,11 +27,6 @@ class TestBzrTools(TestCaseWithTransport): - def setUp(self): - TestCaseWithTransport.setUp(self) - command._testing = True - self.addCleanup(command._stop_testing) - @staticmethod def touch(filename): file(filename, 'wb').write('') === modified file 'tests/shelf_tests.py' --- old/tests/shelf_tests.py 2012-03-20 02:40:57 +0000 +++ new/tests/shelf_tests.py 2012-04-13 10:05:18 +0000 @@ -33,10 +33,6 @@ +hello test world """ - def setUp(self): - bzrlib.tests.TestCaseWithTransport.setUp(self) - command._testing = True - self.addCleanup(command._stop_testing) def _check_diff(self, diff=DIFF_1, filename='test_file'): old_tree = self.tree.basis_tree() debian/patches/series0000644000000000000000000000006012265030747012034 0ustar 01_use-rsvg-convert 02_version_check 03_testing debian/tests/0000755000000000000000000000000012265031737010336 5ustar debian/tests/testsuite0000644000000000000000000000007712146552771012322 0ustar #!/bin/sh /usr/bin/bzr selftest -s bp.bzrtools --parallel=fork debian/tests/control0000644000000000000000000000010112265031562011725 0ustar Tests: testsuite Depends: @, python-bzrlib.tests, python-subunit debian/control0000644000000000000000000000326312265031413010572 0ustar Source: bzrtools Section: vcs Priority: optional Maintainer: Debian Bazaar Maintainers Uploaders: Eric Newberry , Andrew Starr-Bochicchio Build-Depends: debhelper (>> 7.0.50~), python (>= 2.6.6-3) Build-Depends-Indep: bzr, python-bzrlib (<< 2.7.0), python-bzrlib (>= 2.6~), python-bzrlib.tests, python-subunit, rsync Vcs-Bzr: http://anonscm.debian.org/bzr/pkg-bazaar/bzrtools/unstable Vcs-Browser: http://anonscm.debian.org/loggerhead/pkg-bazaar/bzrtools/unstable Homepage: http://bazaar-vcs.org/BzrTools Standards-Version: 3.9.5 X-Python-Version: >= 2.4 XS-Testsuite: autopkgtest Package: bzrtools Architecture: all Depends: bzr (<< 2.7.0), bzr (>= 2.6~), patch, ${misc:Depends}, ${python:Depends} Recommends: rsync Suggests: graphviz, librsvg2-bin Breaks: ${python:Breaks} Description: Collection of tools for bzr This package contains a collection of plugins for bzr - a distributed version control system. Some of these tools may work their way into bzr itself at some point, and some are just convenient addons useful for day to day operations. . bzrtools actually includes: * rspush: Push local changes to a remote server using rsync instead sftp. * graph-ancestry: Use graphviz to produce graphs of branch ancestry. * shell: Start up a command interpreter that run bzr natively, providing autocompletion. * patch: Apply a specified patch to your tree, that can be a file or URL. * heads: Show all revisions in a repository not having descendants. debian/docs0000644000000000000000000000005312146551042010037 0ustar CREDITS NEWS.Shelf README.Shelf TODO.Shelf debian/source/0000755000000000000000000000000012265031737010474 5ustar debian/source/format0000644000000000000000000000001412146551042011674 0ustar 3.0 (quilt)