[Pkg-bazaar-commits] ./bzr-git/unstable r39: merge new trunk (relicense everything to GPLv2)

[Jelmer Vernooij]

------------------------------------------------------------
revno: 39
committer: Jelmer Vernooij <jelmer at debian.org>
branch nick: debian
timestamp: Sat 2009-03-21 17:28:50 +0100
message:
  merge new trunk (relicense everything to GPLv2)
modified:
  debian/changelog
  foreign/__init__.py
  foreign/test_versionedfiles.py
  foreign/upgrade.py
  foreign/versionedfiles.py
    ------------------------------------------------------------
    revno: 0.1.44
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Thu 2009-03-19 17:43:56 +0100
    message:
      Fix formatting.
    modified:
      __init__.py
      test_versionedfiles.py
      upgrade.py
      versionedfiles.py
    ------------------------------------------------------------
    revno: 17.1.258
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Sat 2009-03-21 17:24:22 +0100
    message:
      merge new bzr-foreign.
    modified:
      foreign/__init__.py
      foreign/test_versionedfiles.py
      foreign/upgrade.py
      foreign/versionedfiles.py
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2009-03-21 16:22:51 +0000
+++ b/debian/changelog	2009-03-21 16:28:50 +0000
@@ -1,4 +1,4 @@
-bzr-git (0.1.0+bzr274-1) experimental; urgency=low
+bzr-git (0.1.0+bzr275-1) experimental; urgency=low
 
   * Initial release. (Closes: #489169)
 

=== modified file 'foreign/__init__.py'
--- a/foreign/__init__.py	2009-03-14 18:18:10 +0000
+++ b/foreign/__init__.py	2009-03-21 16:24:22 +0000
@@ -16,9 +16,16 @@
 
 """Foreign branch utilities."""
 
-from bzrlib import errors
-from bzrlib.branch import Branch
-from bzrlib.commands import Command, Option
+from bzrlib import (
+    errors,
+    )
+from bzrlib.branch import (
+    Branch,
+    )
+from bzrlib.commands import (
+    Command,
+    Option,
+    )
 
 
 class ForeignBranch(Branch):

=== modified file 'foreign/test_versionedfiles.py'
--- a/foreign/test_versionedfiles.py	2009-02-01 04:08:46 +0000
+++ b/foreign/test_versionedfiles.py	2009-03-19 16:43:56 +0000
@@ -2,7 +2,7 @@
  
 # 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 3 of the License, or
+# 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,
@@ -13,14 +13,22 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from bzrlib import osutils
-from bzrlib.tests import TestCase
+from bzrlib import (
+    osutils,
+    )
+from bzrlib.tests import (
+    TestCase,
+    )
 
-from versionedfiles import (VirtualRevisionTexts, VirtualInventoryTexts, 
-                            VirtualSignatureTexts)
+from versionedfiles import (
+    VirtualInventoryTexts,
+    VirtualRevisionTexts,
+    VirtualSignatureTexts,
+    )
 
 
 class BasicTextsTests:
+
     def test_add_lines(self):
         self.assertRaises(NotImplementedError, 
                 self.texts.add_lines, "foo", [], [])
@@ -38,6 +46,7 @@
 
 
 class VirtualRevisionTextsTests(TestCase, BasicTextsTests):
+
     def _make_parents_provider(self):
         return self
 
@@ -49,6 +58,7 @@
 
 
 class VirtualInventoryTextsTests(TestCase, BasicTextsTests):
+
     def _make_parents_provider(self):
         return self
 
@@ -66,6 +76,7 @@
 
 
 class VirtualSignatureTextsTests(TestCase, BasicTextsTests):
+
     def _make_parents_provider(self):
         return self
 

=== modified file 'foreign/upgrade.py'
--- a/foreign/upgrade.py	2009-02-15 01:34:16 +0000
+++ b/foreign/upgrade.py	2009-03-19 16:43:56 +0000
@@ -15,14 +15,16 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """Upgrading revisions made with older versions of the mapping."""
 
-from bzrlib import ui
+from bzrlib import (
+    trace,
+    ui,
+    )
 from bzrlib.errors import (
     DependencyNotPresent,
     BzrError,
     InvalidRevisionId,
     NoSuchRevision,
     )
-from bzrlib.trace import info
 
 import itertools
 
@@ -325,7 +327,7 @@
                                                     allow_changes=allow_changes)
         if verbose:
             for revid in rebase_todo(repository, plan):
-                info("%s -> %s" % (revid, plan[revid][0]))
+                trace.info("%s -> %s" % (revid, plan[revid][0]))
         rebase(repository, plan, replay_snapshot)
         return revid_renames
     finally:

=== modified file 'foreign/versionedfiles.py'
--- a/foreign/versionedfiles.py	2009-03-14 18:17:35 +0000
+++ b/foreign/versionedfiles.py	2009-03-19 16:43:56 +0000
@@ -2,7 +2,7 @@
  
 # 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 3 of the License, or
+# 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,
@@ -13,10 +13,16 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from bzrlib import osutils
-from bzrlib.versionedfile import VirtualVersionedFiles
+from bzrlib import (
+    osutils,
+    )
+from bzrlib.versionedfile import (
+    VirtualVersionedFiles,
+    )
 
-from bzrlib.errors import NoSuchRevision
+from bzrlib.errors import (
+    NoSuchRevision,
+    )
 
 
 class VirtualRevisionTexts(VirtualVersionedFiles):