Rev 7: Rename the few modules to 'archive_branch' since it makes more sense. in http://bzr.arbash-meinel.com/plugins/raf
John Arbash Meinel
john at arbash-meinel.com
Wed Jan 14 22:09:55 GMT 2009
At http://bzr.arbash-meinel.com/plugins/raf
------------------------------------------------------------
revno: 7
revision-id: john at arbash-meinel.com-20090114220938-blx2m9fulk5jsyvb
parent: john at arbash-meinel.com-20090114211204-ziw35z3znsjadps8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: raf
timestamp: Wed 2009-01-14 16:09:38 -0600
message:
Rename the few modules to 'archive_branch' since it makes more sense.
-------------- next part --------------
=== modified file '__init__.py'
--- a/__init__.py 2009-01-14 21:12:04 +0000
+++ b/__init__.py 2009-01-14 22:09:38 +0000
@@ -74,15 +74,16 @@
def run(self, url=None, target=None, archive=None, no_check=False):
from bzrlib import missing
- from bzrlib.plugins.raf import raf
-
- b, wt = raf.find_branch_to_archive(url)
-
- archive_trans, archived_url = raf.get_archived_location(b, archive)
+ from bzrlib.plugins.raf import archive_branch
+
+ b, wt = archive_branch.find_branch_to_archive(url)
+
+ archive_trans, archived_url = archive_branch.get_archived_location(b,
+ archive)
if not no_check: # Sorry about the double negative...
possible_trans = [archive_trans, b.bzrdir.transport]
- target_b = raf.get_target_branch(target, possible_trans)
+ target_b = archive_branch.get_target_branch(target, possible_trans)
unmerged_revs, _ = missing.find_unmerged(b, target_b,
restrict='local', include_merges=False, backward=False)
if unmerged_revs:
@@ -97,8 +98,8 @@
suite = loader.suiteClass()
test_files = [__name__ + '.' + x for x in [
- 'test_blackbox_raf',
- 'test_raf',
+ 'test_blackbox_archive_branch',
+ 'test_archive_branch',
]]
suite.addTests(loader.loadTestsFromModuleNames(test_files))
return suite
=== renamed file 'raf.py' => 'archive_branch.py'
--- a/raf.py 2009-01-14 21:12:04 +0000
+++ b/archive_branch.py 2009-01-14 22:09:38 +0000
@@ -105,3 +105,5 @@
return branch.Branch.open(target, possible_transports=possible_transports)
+def archive_branch(b, archive_trans, archived_url):
+ """Move this branch into the archive."""
=== renamed file 'test_raf.py' => 'test_archive_branch.py'
--- a/test_raf.py 2009-01-14 20:53:07 +0000
+++ b/test_archive_branch.py 2009-01-14 22:09:38 +0000
@@ -23,7 +23,7 @@
tests,
)
from bzrlib.plugins.raf import (
- raf,
+ archive_branch,
)
@@ -32,7 +32,7 @@
def test_find_local_working_tree(self):
tree = self.make_branch_and_tree('.')
- b, wt = raf.find_branch_to_archive(None)
+ b, wt = archive_branch.find_branch_to_archive(None)
self.assertIsNot(None, wt)
self.assertEqual(tree.branch.base, b.base)
@@ -44,14 +44,14 @@
# currently in a subdirectory
os.mkdir('subdir')
os.chdir('subdir')
- b, wt = raf.find_branch_to_archive(None)
+ b, wt = archive_branch.find_branch_to_archive(None)
self.assertIsNot(None, wt)
self.assertEqual(tree.branch.base, b.base)
def test_find_just_branch(self):
b = self.make_branch('.')
- found_b, wt = raf.find_branch_to_archive(None)
+ found_b, wt = archive_branch.find_branch_to_archive(None)
self.assertIs(None, wt)
self.assertEqual(b.base, found_b.base)
@@ -61,26 +61,26 @@
os.mkdir('subdir')
os.chdir('subdir')
self.assertRaises(errors.NotBranchError,
- raf.find_branch_to_archive, None)
+ archive_branch.find_branch_to_archive, None)
def test_find_branch_from_url(self):
b = self.make_branch('a_branch')
- found_b, wt = raf.find_branch_to_archive('a_branch')
+ found_b, wt = archive_branch.find_branch_to_archive('a_branch')
self.assertIs(None, wt)
self.assertEqual(b.base, found_b.base)
# b.base is already a URL, so make sure we can find it from that
- found_b, wt = raf.find_branch_to_archive(b.base)
+ found_b, wt = archive_branch.find_branch_to_archive(b.base)
self.assertEqual(b.base, found_b.base)
# No branch exists
self.assertRaises(errors.NotBranchError,
- raf.find_branch_to_archive, 'not_a_branch')
+ archive_branch.find_branch_to_archive, 'not_a_branch')
# Ensure that we get an error if we try to open a branch via a subdir
self.assertRaises(errors.NotBranchError,
- raf.find_branch_to_archive, 'a_branch/subdir')
+ archive_branch.find_branch_to_archive, 'a_branch/subdir')
self.assertRaises(errors.NotBranchError,
- raf.find_branch_to_archive, b.base + '/subdir')
+ archive_branch.find_branch_to_archive, b.base + '/subdir')
def test_find_master_branch(self):
master = self.make_branch('master')
@@ -88,7 +88,7 @@
checkout.branch.bind(master)
os.chdir('checkout')
- b, wt = raf.find_branch_to_archive(None)
+ b, wt = archive_branch.find_branch_to_archive(None)
self.assertEqual(master.base, b.base)
self.assertIsNot(None, wt)
self.assertEqual(wt.basedir, checkout.basedir)
@@ -107,7 +107,7 @@
def assertArchived(self, expected, a_branch, archive=_signet):
if archive is _signet:
archive = self.archive_url
- trans, url = raf.get_archived_location(a_branch, archive)
+ trans, url = archive_branch.get_archived_location(a_branch, archive)
self.assertIsNot(None, trans)
self.assertEqual(expected, url)
@@ -138,9 +138,9 @@
def test_get_direct_target(self):
b = self.make_branch('target')
- target_b = raf.get_target_branch('target')
+ target_b = archive_branch.get_target_branch('target')
self.assertEqual(b.base, target_b.base)
- target_b = raf.get_target_branch(b.base)
+ target_b = archive_branch.get_target_branch(b.base)
self.assertEqual(b.base, target_b.base)
def test_none_uses_default(self):
@@ -150,7 +150,7 @@
try:
plugin_raf.DEFAULT_TARGET_BRANCH = b.base
- target_b = raf.get_target_branch(None)
+ target_b = archive_branch.get_target_branch(None)
self.assertEqual(b.base, target_b.base)
finally:
plugin_raf.DEFAULT_TARGET_BRANCH = orig_default
=== renamed file 'test_blackbox_raf.py' => 'test_blackbox_archive_branch.py'
More information about the bazaar-commits
mailing list