[Pkg-bazaar-commits] ./bzr-rebase/unstable r59: New upstream release.
Jelmer Vernooij
jelmer at samba.org
Thu Aug 20 06:47:47 UTC 2009
------------------------------------------------------------
revno: 59 [merge]
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: unstable
timestamp: Fri 2009-07-17 12:20:46 +0200
message:
New upstream release.
modified:
NEWS
__init__.py
commands.py
debian/changelog
maptree.py
rebase.py
setup.py
test_blackbox.py
test_maptree.py
test_rebase.py
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS 2009-06-18 21:58:17 +0000
+++ b/NEWS 2009-07-13 23:23:22 +0000
@@ -1,3 +1,7 @@
+0.5.2 2009-07-14
+
+ * Mark as compatible with Bazaar 1.17.
+
0.5.1 2009-06-18
BUG FIXES
=== modified file '__init__.py'
--- a/__init__.py 2009-06-18 21:58:17 +0000
+++ b/__init__.py 2009-07-13 23:23:22 +0000
@@ -25,7 +25,7 @@
import bzrlib.api
from bzrlib.commands import plugin_cmds
-version_info = (0, 5, 1, 'final', 0)
+version_info = (0, 5, 2, 'final', 0)
if version_info[3] == 'final':
version_string = '%d.%d.%d' % version_info[:3]
else:
@@ -33,12 +33,12 @@
__version__ = version_string
__author__ = 'Jelmer Vernooij <jelmer at samba.org>'
-COMPATIBLE_BZR_VERSIONS = [(1, 14, 0), (1, 15, 0), (1, 16, 0)]
+COMPATIBLE_BZR_VERSIONS = [(1, 14, 0), (1, 15, 0), (1, 16, 0), (1, 17, 0)]
bzrlib.api.require_any_api(bzrlib, COMPATIBLE_BZR_VERSIONS)
for cmd in ["replay", "rebase", "rebase_abort", "rebase_continue",
- "rebase_todo"]:
+ "rebase_todo", "filter_branch"]:
plugin_cmds.register_lazy("cmd_%s" % cmd, [],
"bzrlib.plugins.rebase.commands")
=== modified file 'commands.py'
--- a/commands.py 2009-05-04 17:29:47 +0000
+++ b/commands.py 2009-07-13 15:42:48 +0000
@@ -88,11 +88,17 @@
from bzrlib.branch import Branch
from bzrlib.revisionspec import RevisionSpec
from bzrlib.workingtree import WorkingTree
- from rebase import (generate_simple_plan, rebase, rebase_plan_exists,
- read_rebase_plan, remove_rebase_plan,
- workingtree_replay, write_rebase_plan,
- regenerate_default_revid,
- rebase_todo)
+ from bzrlib.plugins.rebase.rebase import (
+ generate_simple_plan,
+ rebase,
+ rebase_plan_exists,
+ read_rebase_plan,
+ remove_rebase_plan,
+ workingtree_replay,
+ write_rebase_plan,
+ regenerate_default_revid,
+ rebase_todo,
+ )
if revision is not None and pending_merges:
raise BzrCommandError(
"--revision and --pending-merges are mutually exclusive")
@@ -213,7 +219,11 @@
@display_command
def run(self):
- from rebase import read_rebase_plan, remove_rebase_plan, complete_revert
+ from bzrlib.plugins.rebase.rebase import (
+ read_rebase_plan,
+ remove_rebase_plan,
+ complete_revert,
+ )
from bzrlib.workingtree import WorkingTree
wt = WorkingTree.open_containing('.')[0]
wt.lock_write()
@@ -235,9 +245,15 @@
@display_command
def run(self, merge_type=None):
- from rebase import (commit_rebase, rebase, rebase_plan_exists,
- read_rebase_plan, read_active_rebase_revid,
- remove_rebase_plan, workingtree_replay)
+ from bzrlib.plugins.rebase.rebase import (
+ commit_rebase,
+ rebase,
+ rebase_plan_exists,
+ read_rebase_plan,
+ read_active_rebase_revid,
+ remove_rebase_plan,
+ workingtree_replay,
+ )
from bzrlib.workingtree import WorkingTree
wt = WorkingTree.open_containing('.')[0]
wt.lock_write()
@@ -277,8 +293,11 @@
"""
def run(self):
- from rebase import (rebase_todo, read_rebase_plan,
- read_active_rebase_revid)
+ from bzrlib.plugins.rebase.rebase import (
+ rebase_todo,
+ read_rebase_plan,
+ read_active_rebase_revid,
+ )
from bzrlib.workingtree import WorkingTree
wt = WorkingTree.open_containing('.')[0]
wt.lock_read()
@@ -309,7 +328,10 @@
from bzrlib.branch import Branch
from bzrlib.workingtree import WorkingTree
from bzrlib import ui
- from rebase import regenerate_default_revid, replay_delta_workingtree
+ from bzrlib.plugins.rebase.rebase import (
+ regenerate_default_revid,
+ replay_delta_workingtree,
+ )
from_branch = Branch.open_containing(location)[0]
=== modified file 'debian/changelog'
--- a/debian/changelog 2009-06-18 22:07:33 +0000
+++ b/debian/changelog 2009-07-17 10:20:46 +0000
@@ -1,3 +1,9 @@
+bzr-rebase (0.5.2-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Jelmer Vernooij <jelmer at debian.org> Fri, 17 Jul 2009 12:20:44 +0200
+
bzr-rebase (0.5.1-1) unstable; urgency=low
* New upstream release.
=== modified file 'maptree.py'
--- a/maptree.py 2009-02-21 02:01:58 +0000
+++ b/maptree.py 2009-07-13 15:42:48 +0000
@@ -15,10 +15,12 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""Map Tree."""
+from bzrlib import (
+ osutils,
+ )
from bzrlib.config import Config
from bzrlib.errors import BzrError, NoSuchFile, UnknownFormatError
from bzrlib.generate_ids import gen_revision_id
-from bzrlib import osutils
from bzrlib.revision import NULL_REVISION
from bzrlib.trace import mutter
import bzrlib.ui as ui
=== modified file 'rebase.py'
--- a/rebase.py 2009-06-10 18:36:05 +0000
+++ b/rebase.py 2009-07-13 15:42:48 +0000
@@ -15,20 +15,32 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""Rebase."""
+import os
+
+from bzrlib import (
+ osutils,
+ )
from bzrlib.config import Config
-from bzrlib.errors import (BzrError, NoSuchFile, UnknownFormatError,
- NoCommonAncestor, NoSuchId, UnrelatedBranches)
+from bzrlib.errors import (
+ BzrError,
+ NoSuchFile,
+ UnknownFormatError,
+ NoCommonAncestor,
+ NoSuchId,
+ UnrelatedBranches,
+ )
from bzrlib.generate_ids import gen_revision_id
from bzrlib.graph import FrozenHeadsCache
from bzrlib.merge import Merger
-from bzrlib import osutils
from bzrlib.revision import NULL_REVISION
from bzrlib.trace import mutter
from bzrlib.tsort import topo_sort
import bzrlib.ui as ui
-from maptree import MapTree, map_file_ids
-import os
+from bzrlib.plugins.rebase.maptree import (
+ MapTree,
+ map_file_ids,
+ )
REBASE_PLAN_FILENAME = 'rebase-plan'
REBASE_CURRENT_REVID_FILENAME = 'rebase-current'
=== modified file 'setup.py'
--- a/setup.py 2009-05-20 15:50:30 +0000
+++ b/setup.py 2009-06-18 22:04:45 +0000
@@ -5,7 +5,7 @@
setup(name='bzr-rebase',
description='Rebase plugin for Bazaar',
keywords='plugin bzr rebase',
- version='0.5.1',
+ version='0.5.2',
url='http://bazaar-vcs.org/Rebase',
download_url='http://bazaar-vcs.org/Rebase',
license='GPLv3 or later',
=== modified file 'test_blackbox.py'
--- a/test_blackbox.py 2009-05-13 15:06:43 +0000
+++ b/test_blackbox.py 2009-07-13 15:42:48 +0000
@@ -16,11 +16,11 @@
"""Couple of blackbox tests for the rebase plugin."""
+import os
+
from bzrlib.branch import Branch
from bzrlib.tests.blackbox import ExternalBase
-import os
-
class TestRebaseSimple(ExternalBase):
def make_file(self, name, contents):
=== modified file 'test_maptree.py'
--- a/test_maptree.py 2009-02-21 02:01:58 +0000
+++ b/test_maptree.py 2009-07-13 15:42:48 +0000
@@ -18,7 +18,10 @@
from bzrlib.tests import TestCase, TestCaseWithTransport
from bzrlib.treebuilder import TreeBuilder
-from maptree import MapTree, map_file_ids
+from bzrlib.plugins.rebase.maptree import (
+ MapTree,
+ map_file_ids,
+ )
class EmptyMapTreeTests(TestCaseWithTransport):
=== modified file 'test_rebase.py'
--- a/test_rebase.py 2009-05-08 15:02:45 +0000
+++ b/test_rebase.py 2009-07-13 15:42:48 +0000
@@ -22,16 +22,28 @@
from bzrlib.tests import TestCase, TestCaseWithTransport
from bzrlib.trace import mutter
-from rebase import (marshall_rebase_plan, unmarshall_rebase_plan,
- replay_snapshot, generate_simple_plan,
- generate_transpose_plan, rebase_plan_exists,
- rebase_todo, REBASE_PLAN_FILENAME,
- REBASE_CURRENT_REVID_FILENAME, read_rebase_plan,
- remove_rebase_plan, read_active_rebase_revid,
- write_active_rebase_revid, write_rebase_plan, MapTree,
- ReplaySnapshotError, ReplayParentsInconsistent,
- replay_delta_workingtree, replay_determine_base,
- commit_rebase)
+from bzrlib.plugins.rebase.rebase import (
+ marshall_rebase_plan,
+ unmarshall_rebase_plan,
+ replay_snapshot,
+ generate_simple_plan,
+ generate_transpose_plan,
+ rebase_plan_exists,
+ rebase_todo,
+ REBASE_PLAN_FILENAME,
+ REBASE_CURRENT_REVID_FILENAME,
+ read_rebase_plan,
+ remove_rebase_plan,
+ read_active_rebase_revid,
+ write_active_rebase_revid,
+ write_rebase_plan,
+ MapTree,
+ ReplaySnapshotError,
+ ReplayParentsInconsistent,
+ replay_delta_workingtree,
+ replay_determine_base,
+ commit_rebase,
+ )
class RebasePlanReadWriterTests(TestCase):
More information about the Pkg-bazaar-commits
mailing list