diff -Nru bzr-pipeline-1.1+bzr203/check-release.py bzr-pipeline-1.4/check-release.py --- bzr-pipeline-1.1+bzr203/check-release.py 1970-01-01 00:00:00.000000000 +0000 +++ bzr-pipeline-1.4/check-release.py 2012-01-20 01:10:21.000000000 +0000 @@ -0,0 +1,32 @@ +#!/usr/bin/env python +import re +from subprocess import call, PIPE +import sys + +def minigrep(pattern, filename): + setup = open(filename, 'rb') + for line in setup: + match = re.search(pattern, line) + if match is not None: + return match + +version = minigrep("__version__ = '([^']*)'", '__init__.py').group(1) +print "Release: %s" % version + +newsmatch = minigrep('Release %s' % (version), 'NEWS') +if newsmatch is None: + print "NEWS entry missing" + sys.exit(1) +else: + print "NEWS entry found" + +setupmatch = minigrep('version="%s"' % (version), 'setup.py') +if setupmatch is None: + print "setup.py is stale" + sys.exit(1) +else: + print "setup.py is good" + +if call(['bzr', 'diff'], stdout=PIPE) != 0: + print "Please commit before releasing" + sys.exit(1) diff -Nru bzr-pipeline-1.1+bzr203/commands.py bzr-pipeline-1.4/commands.py --- bzr-pipeline-1.1+bzr203/commands.py 2011-03-30 01:29:49.000000000 +0000 +++ bzr-pipeline-1.4/commands.py 2012-01-20 01:10:21.000000000 +0000 @@ -259,7 +259,7 @@ def run(self): checkout, manager = self._get_checkout_manager('.') - manager.store_uncommitted(checkout) + manager.store_uncommitted() class cmd_show_pipeline(PipeCommand): diff -Nru bzr-pipeline-1.1+bzr203/debian/bzr-builddeb.conf bzr-pipeline-1.4/debian/bzr-builddeb.conf --- bzr-pipeline-1.1+bzr203/debian/bzr-builddeb.conf 1970-01-01 00:00:00.000000000 +0000 +++ bzr-pipeline-1.4/debian/bzr-builddeb.conf 2012-01-20 01:23:17.000000000 +0000 @@ -0,0 +1,6 @@ +[BUILDDEB] +upstream-branch = lp:~abentley/bzr-pipeline/stable +export-upstream-revision = tag:release-$UPSTREAM_VERSION + +[HOOKS] +merge-upstream = ./debian/update-deps.py diff -Nru bzr-pipeline-1.1+bzr203/debian/changelog bzr-pipeline-1.4/debian/changelog --- bzr-pipeline-1.1+bzr203/debian/changelog 2011-07-19 21:36:22.000000000 +0000 +++ bzr-pipeline-1.4/debian/changelog 2012-03-11 01:10:51.000000000 +0000 @@ -1,8 +1,22 @@ -bzr-pipeline (1.1+bzr203-1~bazaar1~lucid1) lucid; urgency=low +bzr-pipeline (1.4-1~bazaar1~lucid1) lucid; urgency=low * Rebuild in PPA. - -- Max Bowsher <_@maxb.eu> Tue, 19 Jul 2011 22:36:22 +0100 + -- Max Bowsher <_@maxb.eu> Sun, 11 Mar 2012 01:10:51 +0000 + +bzr-pipeline (1.4-1) unstable; urgency=low + + * New upstream release. + + -- Jelmer Vernooij Fri, 20 Jan 2012 02:23:31 +0100 + +bzr-pipeline (1.1+bzr207-1) unstable; urgency=low + + * Don't depend on bzr, but rather on python-bzrlib. + * Only mark bzr 2.5 as supported, consistent with upstream. + * New upstream snapshot. + + -- Jelmer Vernooij Mon, 16 Jan 2012 23:10:23 +0100 bzr-pipeline (1.1+bzr203-1) unstable; urgency=low diff -Nru bzr-pipeline-1.1+bzr203/debian/control bzr-pipeline-1.4/debian/control --- bzr-pipeline-1.1+bzr203/debian/control 2011-07-19 15:44:07.000000000 +0000 +++ bzr-pipeline-1.4/debian/control 2012-01-20 01:23:32.000000000 +0000 @@ -4,11 +4,7 @@ Maintainer: Debian Bazaar Maintainers Homepage: http://bazaar-vcs.org/BzrPipeline Uploaders: Jelmer Vernooij -Build-Depends: python-bzrlib.tests | bzr (<< 2.4.0~beta1-2), - bzr (<< 2.6~), - bzr (>= 2.2~), - debhelper (>= 7.0.50~), - python (>= 2.6.6-3) +Build-Depends: python-bzrlib.tests | bzr (<< 2.4.0~beta1-2), bzr (<< 2.6~), bzr (>= 2.2~), debhelper (>= 7.0.50~), python (>= 2.6.6-3), python-bzrlib (>= 2.2~), python-bzrlib (<< 2.6.0) Build-Depends-Indep: python-testtools Standards-Version: 3.9.2 X-Python-Version: >= 2.5 @@ -16,7 +12,8 @@ Package: bzr-pipeline Architecture: all -Depends: bzr (<< 2.6~), bzr (>= 2.2~), ${misc:Depends}, ${python:Depends} +Depends: python-bzrlib (<< 2.6.0), python-bzrlib (>= 2.2~), ${misc:Depends}, ${python:Depends} +Recommends: bzr Enhances: bzr Description: Bazaar plugin for managing a pipeline of changes A Bazaar plugin helps you organize your changes into sections called diff -Nru bzr-pipeline-1.1+bzr203/debian/update-deps.py bzr-pipeline-1.4/debian/update-deps.py --- bzr-pipeline-1.1+bzr203/debian/update-deps.py 1970-01-01 00:00:00.000000000 +0000 +++ bzr-pipeline-1.4/debian/update-deps.py 2012-01-16 21:46:24.000000000 +0000 @@ -0,0 +1,50 @@ +#!/usr/bin/python +# Update dependencies based on __init__.py +# Copyright (C) 2010 Jelmer Vernooij +# Licensed under the GNU GPL, version 2 or later. + +from debian.deb822 import Deb822, PkgRelation + +from bzrlib.plugin import _load_plugin_module, PluginImporter +import os +plugin_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "..")) +PluginImporter.specific_paths['bzrlib.plugins.pipeline'] = plugin_path +_load_plugin_module("pipeline", plugin_path) + +from bzrlib.plugins.pipeline import minimum_bzrlib_version, maximum_bzrlib_version + +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, "python-bzrlib", ">=", "%d.%d~" % minimum_bzrlib_version[:2]) + update_relation(bdi, "python-bzrlib", "<<", "%d.%d.0" % (maximum_bzrlib_version[0], maximum_bzrlib_version[1]+1)) + control[field] = PkgRelation.str(bdi) + +update_deps(source, "Build-Depends") + +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() diff -Nru bzr-pipeline-1.1+bzr203/__init__.py bzr-pipeline-1.4/__init__.py --- bzr-pipeline-1.1+bzr203/__init__.py 2011-04-15 02:28:07.000000000 +0000 +++ bzr-pipeline-1.4/__init__.py 2012-01-20 01:10:21.000000000 +0000 @@ -19,11 +19,11 @@ from bzrlib.trace import warning -__version__ = '1.1.0' -version_info = (1, 1, 0) +__version__ = '1.4' +version_info = (1, 4, 0) minimum_bzrlib_version = (2, 2) -maximum_bzrlib_version = (2, 4) +maximum_bzrlib_version = (2, 5) TOO_OLD = 'too_old' diff -Nru bzr-pipeline-1.1+bzr203/NEWS bzr-pipeline-1.4/NEWS --- bzr-pipeline-1.1+bzr203/NEWS 2010-11-11 03:40:34.000000000 +0000 +++ bzr-pipeline-1.4/NEWS 2012-01-20 01:10:21.000000000 +0000 @@ -2,10 +2,50 @@ Pipeline Release Notes ###################### -bzr-pipeline 1.0 -################ +Release 1.4 "Energetic Elbow" (2012-01-19) +############################################# +Fix store command to not prompt. -:1.0.0: 2010-11-10 "Annoying Air-Lock" +Indicate compatibility with bzr 2.5 + +Add release-check script. + +Release 1.3 "Dolorous Drainpipe" (2011-09-26) +############################################# +Fix compatibility with bzr 2.2. + +Update the-kraken settings. + +Release 1.2 "Circular Cistern" (2011-09-26) +########################################### + +Compatibility cleanups. + +Lazy Loading (Jelmer). + +Ignore build directory (Gary van der Mewe) + +Documentation updates + +Changes are unshelved when remove-pipe switches (bug #719178) + +reconfigure-pipeline creates a layout compatible with bzr-colo. + +Versioning now matches bzrtools-style versioning. + +Refactoring. + +Release 1.1 "Bloated Basin" (2011-01-20) +######################################## + +bzr pump supports --show-base, --reprocess and --merge-type. + +Pipes can no longer be accidentally named ":next", etc. + +Pipeline imposes smaller start-up cost when not used. + +Release 1.0.0 "Annoying Air-Lock" (2010-11-10) +############################################## Initial release, compatible with bzr 2.2.0 - 2.3.b4 diff -Nru bzr-pipeline-1.1+bzr203/pipeline.py bzr-pipeline-1.4/pipeline.py --- bzr-pipeline-1.1+bzr203/pipeline.py 2011-03-30 01:29:49.000000000 +0000 +++ bzr-pipeline-1.4/pipeline.py 2012-01-20 01:10:21.000000000 +0000 @@ -103,22 +103,23 @@ def __init__(self, branch): self.branch = branch + def get_sibling(self, prev): + option = 'prev_pipe' if prev else 'next_pipe' + sibling = self.branch.get_config().get_user_option(option) + if sibling == '': + sibling = None + return sibling + def get_next(self): """Return the location of the next pipe.""" - next = self.branch.get_config().get_user_option('next_pipe') - if next == '': - next = None - return next + return self.get_sibling(False) def get_prev(self): """Return the location of the previous pipe.""" - prev = self.branch.get_config().get_user_option('prev_pipe') - if prev == '': - prev = None - return prev + return self.get_sibling(True) - def _sibling_pipe(self, url): - """Return a sibling pipe for a URL.""" + def get_sibling_pipe(self, prev): + url = self.get_sibling(prev) if url is None: return None transports = [self.branch.bzrdir.root_transport] @@ -127,11 +128,11 @@ def get_next_pipe(self): """Return the next pipe.""" - return self._sibling_pipe(self.get_next()) + return self.get_sibling_pipe(False) def get_prev_pipe(self): """Return the previous pipe.""" - return self._sibling_pipe(self.get_prev()) + return self.get_sibling_pipe(True) def _pipe_url(self, url): """Determine the url to use for a pipe. @@ -244,10 +245,7 @@ """ storage = self while True: - if prev: - next_branch = storage.get_prev_pipe() - else: - next_branch = storage.get_next_pipe() + next_branch = storage.get_sibling_pipe(prev) if next_branch is None: return yield next_branch diff -Nru bzr-pipeline-1.1+bzr203/real_init.py bzr-pipeline-1.4/real_init.py --- bzr-pipeline-1.1+bzr203/real_init.py 2011-04-15 02:28:07.000000000 +0000 +++ bzr-pipeline-1.4/real_init.py 2012-01-20 01:10:21.000000000 +0000 @@ -111,10 +111,6 @@ from bzrlib.directory_service import AliasDirectory, directories -__version__ = '1.1.0' -version_info = (1, 1, 0) - - def register(name, aliases=None): if aliases is None: aliases = [] diff -Nru bzr-pipeline-1.1+bzr203/setup.py bzr-pipeline-1.4/setup.py --- bzr-pipeline-1.1+bzr203/setup.py 2011-01-20 20:11:57.000000000 +0000 +++ bzr-pipeline-1.4/setup.py 2012-01-20 01:10:21.000000000 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/env python from distutils.core import setup setup(name="BzrPipeline", - version="1.1.0", + version="1.4", description="Bazaar plugin for working with a sequence of branches.", author="Aaron Bentley", author_email="aaron@aaronbentley.com", diff -Nru bzr-pipeline-1.1+bzr203/tests/__init__.py bzr-pipeline-1.4/tests/__init__.py --- bzr-pipeline-1.1+bzr203/tests/__init__.py 2010-12-03 00:55:12.000000000 +0000 +++ bzr-pipeline-1.4/tests/__init__.py 2012-01-20 01:10:21.000000000 +0000 @@ -53,3 +53,11 @@ self.build_tree_contents([('checkout/foo', other)]) foo.commit('commiting other text') return foo + + +# Compatibility with bzr 2.2 +if getattr(TestCaseWithPipes, 'assertPathExists', None) is None: + TestCaseWithPipes.assertPathExists = TestCaseWithPipes.failUnlessExists + +if getattr(TestCaseWithPipes, 'assertPathDoesNotExist', None) is None: + TestCaseWithPipes.assertPathDoesNotExist = TestCaseWithPipes.failIfExists diff -Nru bzr-pipeline-1.1+bzr203/.the_kraken/config bzr-pipeline-1.4/.the_kraken/config --- bzr-pipeline-1.1+bzr203/.the_kraken/config 2011-01-20 20:11:57.000000000 +0000 +++ bzr-pipeline-1.4/.the_kraken/config 2012-01-20 01:10:21.000000000 +0000 @@ -1,2 +1,4 @@ testing = false require_code_name = true +edit_changelog = true +check_script = ./check-release.py