diff -Nru bzr-upload-1.0.0+bzr90/cmds.py bzr-upload-1.1.0/cmds.py --- bzr-upload-1.0.0+bzr90/cmds.py 2011-11-29 09:34:18.000000000 +0000 +++ bzr-upload-1.1.0/cmds.py 2012-03-15 17:24:15.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2011 Canonical Ltd +# Copyright (C) 2011, 2012 Canonical Ltd # # 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 @@ -312,7 +312,7 @@ # --create-prefix option ?) self.tree.lock_read() try: - for relpath, ie in self.tree.inventory.iter_entries(): + for relpath, ie in self.tree.iter_entries_by_dir(): if relpath in ('', '.bzrignore', '.bzrignore-upload'): # skip root ('') # .bzrignore and .bzrignore-upload have no meaning outside diff -Nru bzr-upload-1.0.0+bzr90/debian/changelog bzr-upload-1.1.0/debian/changelog --- bzr-upload-1.0.0+bzr90/debian/changelog 2012-03-11 08:18:21.000000000 +0000 +++ bzr-upload-1.1.0/debian/changelog 2012-07-20 21:03:51.000000000 +0000 @@ -1,8 +1,24 @@ -bzr-upload (1.0.0+bzr90-2~bazaar1~lucid1) lucid; urgency=low +bzr-upload (1.1.0-2~bazaar1~lucid1) lucid; urgency=low * Rebuild in PPA. - -- Max Bowsher <_@maxb.eu> Sun, 11 Mar 2012 08:18:21 +0000 + -- Max Bowsher <_@maxb.eu> Fri, 20 Jul 2012 22:03:51 +0100 + +bzr-upload (1.1.0-2) unstable; urgency=low + + * Orphan package. + + -- Jelmer Vernooij Mon, 28 May 2012 23:25:49 +0200 + +bzr-upload (1.1.0-1) unstable; urgency=low + + * Bump standards version to 3.9.3 (no changes). + * Use machine-parseable copyright file format. + * New upstream release. + * Add build-conflicts: bzr-hg, since it breaks the bzr-upload + testsuite. + + -- Jelmer Vernooij Thu, 22 Mar 2012 04:08:38 +0100 bzr-upload (1.0.0+bzr90-2) unstable; urgency=low diff -Nru bzr-upload-1.0.0+bzr90/debian/control bzr-upload-1.1.0/debian/control --- bzr-upload-1.0.0+bzr90/debian/control 2012-02-27 10:10:51.000000000 +0000 +++ bzr-upload-1.1.0/debian/control 2012-05-28 22:12:57.000000000 +0000 @@ -1,12 +1,12 @@ Source: bzr-upload Section: vcs Priority: optional -Maintainer: Debian Bazaar Maintainers -Uploaders: Jelmer Vernooij +Maintainer: Maintainer: Debian QA Group Homepage: https://launchpad.net/bzr-upload Build-Depends-Indep: python-paramiko, python-testtools +Build-Conflicts: bzr-hg Build-Depends: bzr (<< 2.6.0), bzr (>= 2.2~), debhelper (>= 7.0.50~), python (>= 2.6.6-3), python-bzrlib.tests | bzr (<< 2.4.0~beta1-2) -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 X-Python-Version: >= 2.4 Vcs-Bzr: http://bzr.debian.org/pkg-bazaar/bzr-upload/unstable/ diff -Nru bzr-upload-1.0.0+bzr90/debian/copyright bzr-upload-1.1.0/debian/copyright --- bzr-upload-1.0.0+bzr90/debian/copyright 2011-09-11 21:54:39.000000000 +0000 +++ bzr-upload-1.1.0/debian/copyright 2012-03-15 03:00:02.000000000 +0000 @@ -1,32 +1,52 @@ -This package was debianized by Jelmer Vernooij - on Sa 14. Jun 17:41:27 CEST 2008. - -It was downloaded from http://launchpad.net/bzr-loom -The tarball was created by running: - -bzr export -r44 bzr-upload-0.1.0~bzr44.tar.gz http://launchpad.net/bzr-upload - -Upstream authors: - -Vincent Ladeuil -Martin Albisetti - -Copyright (C) 2008 Canonical Ltd - -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-upload +Upstream-Contact: Vincent Ladeuil +Debianized-By: Jelmer Vernooij +Debianized-Date: Sa 14. Jun 17:41:27 CEST 2008 +Source: http://launchpad.net/bzr-loom + +Files: * +Comment: + Upstream authors: + Vincent Ladeuil + Martin Albisetti +Copyright: 2008 Canonical Ltd +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-2; + 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: debian/* +Copyright: 2008 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-2; + 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-upload-1.0.0+bzr90/debian/patches/01_fix_2.4_compat bzr-upload-1.1.0/debian/patches/01_fix_2.4_compat --- bzr-upload-1.0.0+bzr90/debian/patches/01_fix_2.4_compat 2012-02-27 10:04:29.000000000 +0000 +++ bzr-upload-1.1.0/debian/patches/01_fix_2.4_compat 1970-01-01 00:00:00.000000000 +0000 @@ -1,90 +0,0 @@ -Description: Fix compatibility with bzr 2.4 -Author: Jelmer Vernooij - -=== modified file 'tests/test_upload.py' ---- old/tests/test_upload.py 2011-11-29 09:34:18 +0000 -+++ new/tests/test_upload.py 2011-12-03 14:46:06 +0000 -@@ -30,11 +30,20 @@ - uncommit, - ) - from bzrlib.tests import ( -- features, - per_branch, - per_transport, - stub_sftp, - ) -+try: -+ from bzrlib.tests.features import ( -+ SymlinkFeature, -+ UnicodeFilenameFeature, -+ ) -+except ImportError: # bzr < 2.5 -+ from bzrlib.tests import ( -+ SymlinkFeature, -+ UnicodeFilenameFeature, -+ ) - from bzrlib.transport import ( - ftp, - sftp, -@@ -199,13 +208,13 @@ - self.tree.commit('change %s from file to dir' % path) - - def add_symlink(self, path, target, base=branch_dir): -- self.requireFeature(features.SymlinkFeature) -+ self.requireFeature(SymlinkFeature) - os.symlink(target, osutils.pathjoin(base, path)) - self.tree.add(path) - self.tree.commit('add symlink %s -> %s' % (path, target)) - - def modify_symlink(self, path, target, base=branch_dir): -- self.requireFeature(features.SymlinkFeature) -+ self.requireFeature(SymlinkFeature) - full_path = osutils.pathjoin(base, path) - os.unlink(full_path) - os.symlink(target, full_path) -@@ -255,7 +264,7 @@ - self._test_create_file('hello') - - def test_unicode_create_file(self): -- self.requireFeature(features.UnicodeFilenameFeature) -+ self.requireFeature(UnicodeFilenameFeature) - self._test_create_file(u'hell\u00d8') - - def _test_create_file_in_dir(self, dir_name, file_name): -@@ -276,7 +285,7 @@ - self._test_create_file_in_dir('dir', 'goodbye') - - def test_unicode_create_file_in_dir(self): -- self.requireFeature(features.UnicodeFilenameFeature) -+ self.requireFeature(UnicodeFilenameFeature) - self._test_create_file_in_dir(u'dir\u00d8', u'goodbye\u00d8') - - def test_modify_file(self): -@@ -307,7 +316,7 @@ - self._test_rename_one_file('hello', 'goodbye') - - def test_unicode_rename_one_file(self): -- self.requireFeature(features.UnicodeFilenameFeature) -+ self.requireFeature(UnicodeFilenameFeature) - self._test_rename_one_file(u'hello\u00d8', u'goodbye\u00d8') - - def test_rename_and_change_file(self): -@@ -392,7 +401,7 @@ - self._test_change_file_into_dir('hello') - - def test_unicode_change_file_into_dir(self): -- self.requireFeature(features.UnicodeFilenameFeature) -+ self.requireFeature(UnicodeFilenameFeature) - self._test_change_file_into_dir(u'hello\u00d8') - - def test_change_dir_into_file(self): -@@ -426,7 +435,7 @@ - self._test_make_file_executable('hello') - - def test_unicode_make_file_executable(self): -- self.requireFeature(features.UnicodeFilenameFeature) -+ self.requireFeature(UnicodeFilenameFeature) - self._test_make_file_executable(u'hello\u00d8') - - def test_create_symlink(self): - diff -Nru bzr-upload-1.0.0+bzr90/debian/patches/02_2.5_support bzr-upload-1.1.0/debian/patches/02_2.5_support --- bzr-upload-1.0.0+bzr90/debian/patches/02_2.5_support 2012-02-27 10:08:13.000000000 +0000 +++ bzr-upload-1.1.0/debian/patches/02_2.5_support 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ -Description: Mark as supporting bzr 2.5. -Origin: commit, revision id: jelmer@samba.org-20120227100237-6b2i0wk03jyzs780 -Author: Jelmer Vernooij -Last-Update: 2012-02-27 -Applied-Upstream: no -X-Bzr-Revision-Id: jelmer@samba.org-20120227100237-6b2i0wk03jyzs780 - -=== modified file 'NEWS' ---- old/NEWS 2011-11-29 09:36:13 +0000 -+++ new/NEWS 2012-02-27 10:02:37 +0000 -@@ -35,6 +35,8 @@ - * Fix a typo to avoid crashing when encountering symlinks during - a full upload. (Jonathan Paugh) - -+* Mark as supporting bzr 2.5. (Jelmer Vernooij) -+ - Documentation - ************* - - -=== modified file 'info.py' ---- old/info.py 2011-01-17 01:18:20 +0000 -+++ new/info.py 2012-02-27 10:02:37 +0000 -@@ -23,7 +23,7 @@ - - bzr_commands = ['upload',] - --bzr_compatible_versions = [(2, x, 0) for x in [2, 3, 4,]] -+bzr_compatible_versions = [(2, x, 0) for x in [2, 3, 4, 5]] - - bzr_minimum_version = bzr_compatible_versions[0] - - diff -Nru bzr-upload-1.0.0+bzr90/debian/patches/series bzr-upload-1.1.0/debian/patches/series --- bzr-upload-1.0.0+bzr90/debian/patches/series 2012-02-27 10:08:37.000000000 +0000 +++ bzr-upload-1.1.0/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -01_fix_2.4_compat -02_2.5_support diff -Nru bzr-upload-1.0.0+bzr90/info.py bzr-upload-1.1.0/info.py --- bzr-upload-1.0.0+bzr90/info.py 2011-01-17 01:18:20.000000000 +0000 +++ bzr-upload-1.1.0/info.py 2012-03-15 17:24:44.000000000 +0000 @@ -19,11 +19,11 @@ # versions ending in 'dev' mean development version # versions ending in 'final' mean release (well tested, etc) -bzr_plugin_version = (1, 0, 1, 'dev', 0) +bzr_plugin_version = (1, 1, 0, 'final', 0) bzr_commands = ['upload',] -bzr_compatible_versions = [(2, x, 0) for x in [2, 3, 4,]] +bzr_compatible_versions = [(2, x, 0) for x in [2, 3, 4, 5]] bzr_minimum_version = bzr_compatible_versions[0] diff -Nru bzr-upload-1.0.0+bzr90/MANIFEST.in bzr-upload-1.1.0/MANIFEST.in --- bzr-upload-1.0.0+bzr90/MANIFEST.in 2010-12-10 12:54:24.000000000 +0000 +++ bzr-upload-1.1.0/MANIFEST.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -include COPYING -include NEWS diff -Nru bzr-upload-1.0.0+bzr90/NEWS bzr-upload-1.1.0/NEWS --- bzr-upload-1.0.0+bzr90/NEWS 2011-11-29 09:36:13.000000000 +0000 +++ bzr-upload-1.1.0/NEWS 2012-03-15 17:24:31.000000000 +0000 @@ -5,15 +5,10 @@ .. contents:: List of Releases :depth: 1 -bzr-upload 1.0.1 +bzr-upload 1.1.0 ################ -:1.0.1: NOT RELEASED YET - -External Compatibility Breaks -***************************** - -.. These may require users to change the way they use Bazaar. +:1.1.0: 2012-03-15 New Features ************ @@ -32,36 +27,35 @@ .. Fixes for situations where bzr would previously crash or give incorrect or undesirable results. -* Fix a typo to avoid crashing when encountering symlinks during - a full upload. (Jonathan Paugh) - Documentation ************* .. Improved or updated documentation. -API Changes -*********** +Testing +******* + +* Now requires bzr >= 2.5 for testing. The plugin itself should still work + with previous versions. (Vincent Ladeuil) + +* Avoid deprecation warning with bzr-2.5 by using tree.iter_entries_by_dir + avoiding direct inventory access, this should still be compatible with + older bzr versions. (Vincent Ladeuil) + +bzr-upload 1.0.1 +################ -.. Changes that may require updates in plugins or other code that uses - bzrlib. +:1.0.1: 2012-03-15 -Internals +Bug Fixes ********* -.. Major internal changes, unlikely to be visible to users or plugin - developers, but interesting for bzr developers. +* Fix a typo to avoid crashing when encountering symlinks during + a full upload. (Jonathan Paugh) Testing ******* -.. Fixes and changes that are only relevant to bzr's test framework and - suite. This can include new facilities for writing tests, fixes to - spurious test failures and changes to the way things should be tested. - -* Now requires bzr >= 2.5 for testing. The plugin itself should still work - with previous versions. (Vincent Ladeuil) - * Use assertPathDoesNotExist and assertPathExist instead of failIfExists and failUnlessExists in the test suite. This requires bzr-2.4 to run the tests but doesn't affect the plugin compatibility itself with previous verions diff -Nru bzr-upload-1.0.0+bzr90/PKG-INFO bzr-upload-1.1.0/PKG-INFO --- bzr-upload-1.0.0+bzr90/PKG-INFO 1970-01-01 00:00:00.000000000 +0000 +++ bzr-upload-1.1.0/PKG-INFO 2012-03-15 17:50:42.000000000 +0000 @@ -0,0 +1,18 @@ +Metadata-Version: 1.1 +Name: bzr-upload +Version: 1.1.0 +Summary: Incrementally uploads changes to a dumb server +Home-page: http://launchpad.net/bzr-upload/1.1/1.1.0/bzr-upload-1.1.0.tar.gz +Author: Vincent Ladeuil, Martin Albisetti +Author-email: v.ladeuil@canonical.com +License: GPL +Download-URL: http://launchpad.net/bzr-upload +Description: Web sites are often hosted on servers where bzr can't be + installed. In other cases, the web site must not give access to + its corresponding branch (for security reasons for example). + Finally, web hosting providers often provides only ftp access to + upload sites. This plugin uploads only the relevant changes since + the last upload using ftp or sftp protocols. + +Keywords: plugin bzr upload dumb protocol +Platform: UNKNOWN