[Pkg-bazaar-commits] r179 ./bzr-builddeb/trunk: Use None instead of [] to revert all files.

[James Westby]

------------------------------------------------------------
revno: 179
committer: James Westby <jw+debian at jameswestby.net>
branch nick: trunk
timestamp: Mon 2007-09-17 18:15:01 +0100
message:
  Use None instead of [] to revert all files.
  
  The latter is deprecated in 0.91. This requires a bump of the version of
  bzr required.
modified:
  debian/changelog
  debian/control
  import_dsc.py
  merge_upstream.py
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2007-09-12 20:57:04 +0000
+++ b/debian/changelog	2007-09-17 17:15:01 +0000
@@ -12,8 +12,10 @@
   * Add version_info attribute so that bzrlib can find out the version of
     the plugin. Please try and remember to update it when releasing (set
     the word to 'final').
+  * Use None instead of [] to revert all files as the latter is deprecated
+    in bzr 0.91. Bump the required version accordingly.
 
- -- James Westby <jw+debian at jameswestby.net>  Wed, 12 Sep 2007 21:55:54 +0100
+ -- James Westby <jw+debian at jameswestby.net>  Mon, 17 Sep 2007 18:14:21 +0100
 
 bzr-builddeb (0.90) unstable; urgency=low
 

=== modified file 'debian/control'
--- a/debian/control	2007-08-13 21:12:10 +0000
+++ b/debian/control	2007-09-17 17:15:01 +0000
@@ -4,13 +4,13 @@
 Maintainer: Debian Bazaar Maintainers <pkg-bazaar-maint at lists.alioth.debian.org>
 Uploaders: Reinhard Tartler <siretart at tauware.de>, James Westby <jw+debian at jameswestby.net>
 Build-Depends: debhelper (>= 5.0.37.2), python-all-dev (>= 2.3.5-11)
-Build-Depends-Indep: bzr (>= 0.18~), python-central (>= 0.5.8), python-docutils, python-debian (>= 0.1.4), bzrtools (>= 0.18), patchutils
+Build-Depends-Indep: bzr (>= 0.91~), python-central (>= 0.5.8), python-docutils, python-debian (>= 0.1.4), bzrtools (>= 0.18), patchutils
 XS-Python-Version: >= 2.4
 Standards-Version: 3.7.2
 
 Package: bzr-builddeb
 Architecture: all
-Depends: bzr (>= 0.18~), python-debian (>= 0.1.4), ${python:Depends}, dpkg-dev, fakeroot, bzrtools (>= 0.18), devscripts, patchutils
+Depends: bzr (>= 0.91~), python-debian (>= 0.1.4), ${python:Depends}, dpkg-dev, fakeroot, bzrtools (>= 0.18), devscripts, patchutils
 Provides: bzr-buildpackage
 XB-Python-Version: ${python:Versions}
 Description: bzr plugin for Debian package management

=== modified file 'import_dsc.py'
--- a/import_dsc.py	2007-09-04 21:30:33 +0000
+++ b/import_dsc.py	2007-09-17 17:15:01 +0000
@@ -235,7 +235,7 @@
         dangling_tree = tree.branch.repository.revision_tree(dangling_revid)
         old_upstream_revid = tree.branch.tags.lookup_tag(
                                  make_upstream_tag(last_upstream))
-        tree.revert([],
+        tree.revert(None,
                     tree.branch.repository.revision_tree(old_upstream_revid))
       import_tar(tree, f, file_ids_from=dangling_tree)
       if last_upstream is not None:
@@ -265,7 +265,7 @@
         if old_upstream_revid != tree.branch.last_revision():
           dangling_revid = tree.branch.last_revision()
           dangling_tree = tree.branch.repository.revision_tree(dangling_revid)
-        tree.revert([],
+        tree.revert(None,
                     tree.branch.repository.revision_tree(old_upstream_revid))
       import_tar(tree, f, file_ids_from=dangling_tree)
       if last_upstream is not None:
@@ -399,7 +399,7 @@
     else:
       current_revid = dangling_revid
     current_tree = tree.branch.repository.revision_tree(current_revid)
-    tree.revert([], tree.branch.repository.revision_tree(up_revid))
+    tree.revert(None, tree.branch.repository.revision_tree(up_revid))
     f = open_file(diffname, transport, base_dir=base_dir)[0]
     f = gzip.GzipFile(fileobj=f)
     try:

=== modified file 'merge_upstream.py'
--- a/merge_upstream.py	2007-07-10 19:47:58 +0000
+++ b/merge_upstream.py	2007-09-17 17:15:01 +0000
@@ -117,7 +117,7 @@
       current_revision = tree.last_revision()
       rev_id = lookup_tag(tree)
       if rev_id != tree.branch.last_revision():
-        tree.revert([], tree.branch.repository.revision_tree(rev_id))
+        tree.revert(None, tree.branch.repository.revision_tree(rev_id))
         if os.path.isdir(source):
           s = StringIO(source)
           s.seek(0)