Rev 2557: Revert the intrusive run_bzr('commit') rewritings. in file:///v/home/vila/src/cleanup/run_bzr/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Thu Jun 28 13:26:13 BST 2007
At file:///v/home/vila/src/cleanup/run_bzr/
------------------------------------------------------------
revno: 2557
revision-id: v.ladeuil+lp at free.fr-20070628122611-0suhzl7o6aep1ibz
parent: v.ladeuil+lp at free.fr-20070627191350-8ktbl3ac9gdi6hpr
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: run_bzr
timestamp: Thu 2007-06-28 14:26:11 +0200
message:
Revert the intrusive run_bzr('commit') rewritings.
* bzrlib/tests/test_smart_add.py:
(TestSmartAdd.test_add_dry_run,
TestSmartAdd.test_returns_and_ignores): Delete useless import.
modified:
bzrlib/tests/blackbox/test_added.py test_added.py-20060119085008-6b8b90369d42a26c
bzrlib/tests/blackbox/test_bound_branches.py test_bound_branches.py-20051109215527-2373188ad566c205
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/blackbox/test_versioning.py versioning.py-20050622071821-3ddf5e2e5e93c602
bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
-------------- next part --------------
=== modified file 'bzrlib/tests/blackbox/test_added.py'
--- a/bzrlib/tests/blackbox/test_added.py 2007-06-27 19:13:50 +0000
+++ b/bzrlib/tests/blackbox/test_added.py 2007-06-28 12:26:11 +0000
@@ -52,5 +52,5 @@
check_added('a\n')
# after commit, now no longer listed
- bzr('commit -m add_a')
+ bzr(['commit', '-m', 'add a'])
check_added('')
=== modified file 'bzrlib/tests/blackbox/test_bound_branches.py'
--- a/bzrlib/tests/blackbox/test_bound_branches.py 2007-06-26 20:32:49 +0000
+++ b/bzrlib/tests/blackbox/test_bound_branches.py 2007-06-28 12:26:11 +0000
@@ -294,9 +294,9 @@
# Check and make sure it also works if parent is ahead multiple
os.chdir('../base')
- bzr('commit -m base_3 --unchanged')
- bzr('commit -m base_4 --unchanged')
- bzr('commit -m base_5 --unchanged')
+ bzr(['commit', '-m', 'base 3', '--unchanged'])
+ bzr(['commit', '-m', 'base 4', '--unchanged'])
+ bzr(['commit', '-m', 'base 5', '--unchanged'])
self.check_revno(5)
os.chdir('../child')
@@ -322,9 +322,9 @@
# Check and make sure it also works if child is ahead multiple
bzr('unbind')
- bzr('commit -m child_3 --unchanged')
- bzr('commit -m child_4 --unchanged')
- bzr('commit -m child_5 --unchanged')
+ bzr(['commit', '-m', 'child 3', '--unchanged'])
+ bzr(['commit', '-m', 'child 4', '--unchanged'])
+ bzr(['commit', '-m', 'child 5', '--unchanged'])
self.check_revno(5)
self.check_revno(1, '../base')
@@ -345,7 +345,7 @@
os.chdir('other')
open('c', 'wb').write('file c\n')
bzr('add c')
- bzr('commit -m adding_c')
+ bzr(['commit', '-m', 'adding c'])
new_rev_id = bzr('revision-history')[0].strip().split('\n')[-1]
os.chdir('../child')
@@ -365,7 +365,7 @@
# Commit should succeed, and cause merged revisions to
# be pulled into base
os.chdir('../child')
- bzr('commit -m merge_other')
+ bzr(['commit', '-m', 'merge other'])
self.check_revno(2)
@@ -383,18 +383,18 @@
os.chdir('other')
open('a', 'wb').write('new contents\n')
- bzr('commit -m changed_a')
+ bzr(['commit', '-m', 'changed a'])
self.check_revno(2)
open('a', 'ab').write('and then some\n')
- bzr('commit -m another_a')
+ bzr(['commit', '-m', 'another a'])
self.check_revno(3)
open('a', 'ab').write('and some more\n')
- bzr('commit -m yet_another_a')
+ bzr(['commit', '-m', 'yet another a'])
self.check_revno(4)
os.chdir('../child')
open('a', 'wb').write('also changed a\n')
- bzr('commit -m child_modified_a')
+ bzr(['commit', '-m', 'child modified a'])
self.check_revno(2)
self.check_revno(2, '../base')
=== modified file 'bzrlib/tests/blackbox/test_commit.py'
--- a/bzrlib/tests/blackbox/test_commit.py 2007-06-27 19:13:50 +0000
+++ b/bzrlib/tests/blackbox/test_commit.py 2007-06-28 12:26:11 +0000
@@ -58,20 +58,20 @@
self.run_bzr('init a')
self.build_tree(['a/a_file'])
self.run_bzr('add a/a_file')
- self.run_bzr('commit -m first-commit a')
+ self.run_bzr(['commit', '-m', 'first commit', 'a'])
self.run_bzr('branch a b')
self.build_tree_contents([('b/a_file', 'changes in b')])
- self.run_bzr('commit -m first-commit-in-b b')
+ self.run_bzr(['commit', '-m', 'first commit in b', 'b'])
self.build_tree_contents([('a/a_file', 'new contents')])
- self.run_bzr('commit -m change-in-a a')
+ self.run_bzr(['commit', '-m', 'change in a', 'a'])
os.chdir('b')
self.run_bzr('merge ../a', retcode=1) # will conflict
os.chdir('..')
self.run_bzr('resolved b/a_file')
- self.run_bzr('commit -m merge-into-b b')
+ self.run_bzr(['commit', '-m', 'merge into b', 'b'])
def test_10_verbose_commit(self):
=== modified file 'bzrlib/tests/blackbox/test_log.py'
--- a/bzrlib/tests/blackbox/test_log.py 2007-06-27 19:13:50 +0000
+++ b/bzrlib/tests/blackbox/test_log.py 2007-06-28 12:26:11 +0000
@@ -144,7 +144,7 @@
self.run_bzr('tag tag1')
os.chdir('../branch2')
self.run_bzr('merge ../branch1')
- self.run_bzr('commit -m merge_branch_1')
+ self.run_bzr(['commit', '-m', 'merge branch 1'])
log = self.run_bzr("log -r-1")[0]
self.assertContainsRe(log, r' tags: tag1')
@@ -160,18 +160,19 @@
def test_merges_are_indented_by_level(self):
self.build_tree(['parent/'])
- self.run_bzr('init parent')
- self.run_bzr('commit -m first_post --unchanged parent')
- self.run_bzr('branch parent child')
- self.run_bzr('commit -m branch_1 --unchanged child')
- self.run_bzr('branch child smallerchild')
- self.run_bzr('commit -m branch_2 --unchanged smallerchild')
+ self.run_bzr('init', 'parent')
+ self.run_bzr(['commit', '-m', 'first post', '--unchanged', 'parent'])
+ self.run_bzr('branch', 'parent', 'child')
+ self.run_bzr(['commit', '-m', 'branch 1', '--unchanged', 'child'])
+ self.run_bzr('branch', 'child', 'smallerchild')
+ self.run_bzr(['commit', '-m', 'branch 2', '--unchanged',
+ 'smallerchild'])
os.chdir('child')
- self.run_bzr('merge ../smallerchild')
- self.run_bzr('commit -m merge_branch_2')
+ self.run_bzr('merge', '../smallerchild')
+ self.run_bzr(['commit', '-m', 'merge branch 2'])
os.chdir('../parent')
- self.run_bzr('merge ../child')
- self.run_bzr('commit -m merge_branch_1')
+ self.run_bzr('merge', '../child')
+ self.run_bzr(['commit', '-m', 'merge branch 1'])
out,err = self.run_bzr('log')
# the log will look something like:
# self.assertEqual("""\
@@ -218,15 +219,15 @@
# we check for the indenting of the commit message and the
# revision numbers
self.assertTrue('revno: 2' in out)
- self.assertTrue(' merge_branch_1' in out)
+ self.assertTrue(' merge branch 1' in out)
self.assertTrue(' revno: 1.1.2' in out)
- self.assertTrue(' merge_branch_2' in out)
+ self.assertTrue(' merge branch 2' in out)
self.assertTrue(' revno: 1.1.1.1' in out)
- self.assertTrue(' branch_2' in out)
+ self.assertTrue(' branch 2' in out)
self.assertTrue(' revno: 1.1.1' in out)
- self.assertTrue(' branch_1' in out)
+ self.assertTrue(' branch 1' in out)
self.assertTrue('revno: 1' in out)
- self.assertTrue(' first_post' in out)
+ self.assertTrue(' first post' in out)
self.assertEqual('', err)
@@ -352,26 +353,26 @@
tree.commit('add file2')
tree.add('file3')
tree.commit('add file3')
- self.run_bzr('branch parent child')
+ self.run_bzr('branch', 'parent', 'child')
print >> file('child/file2', 'wb'), 'hello'
- self.run_bzr('commit -m branch_1 child')
+ self.run_bzr(['commit', '-m', 'branch 1', 'child'])
os.chdir('parent')
- self.run_bzr('merge ../child')
- self.run_bzr('commit -m merge_child_branch')
+ self.run_bzr('merge', '../child')
+ self.run_bzr(['commit', '-m', 'merge child branch'])
- log = self.run_bzr('log file1')[0]
+ log = self.run_bzr('log', 'file1')[0]
self.assertContainsRe(log, 'revno: 1\n')
self.assertNotContainsRe(log, 'revno: 2\n')
self.assertNotContainsRe(log, 'revno: 3\n')
self.assertNotContainsRe(log, 'revno: 3.1.1\n')
self.assertNotContainsRe(log, 'revno: 4\n')
- log = self.run_bzr('log file2')[0]
+ log = self.run_bzr('log', 'file2')[0]
self.assertNotContainsRe(log, 'revno: 1\n')
self.assertContainsRe(log, 'revno: 2\n')
self.assertNotContainsRe(log, 'revno: 3\n')
self.assertContainsRe(log, 'revno: 3.1.1\n')
self.assertContainsRe(log, 'revno: 4\n')
- log = self.run_bzr('log file3')[0]
+ log = self.run_bzr('log', 'file3')[0]
self.assertNotContainsRe(log, 'revno: 1\n')
self.assertNotContainsRe(log, 'revno: 2\n')
self.assertContainsRe(log, 'revno: 3\n')
=== modified file 'bzrlib/tests/blackbox/test_pull.py'
--- a/bzrlib/tests/blackbox/test_pull.py 2007-06-27 19:13:50 +0000
+++ b/bzrlib/tests/blackbox/test_pull.py 2007-06-28 12:26:11 +0000
@@ -154,17 +154,17 @@
bzr('init')
open('foo', 'wb').write('original\n')
bzr('add foo')
- bzr('commit -m initial_commit')
+ bzr(['commit', '-m', 'initial commit'])
os.chdir('..')
bzr('branch a b')
os.chdir('a')
open('foo', 'wb').write('changed\n')
- bzr('commit -m later_change')
+ bzr(['commit', '-m', 'later change'])
open('foo', 'wb').write('another\n')
- bzr('commit -m a_third_change')
+ bzr(['commit', '-m', 'a third change'])
rev_history_a = get_rh(3)
@@ -196,17 +196,17 @@
bzr('init')
open('foo', 'wb').write('original\n')
bzr('add foo')
- bzr('commit -m initial_commit')
+ bzr(['commit', '-m', 'initial commit'])
os.chdir('..')
bzr('branch a b')
os.chdir('a')
open('foo', 'wb').write('changed\n')
- bzr('commit -m later_change')
+ bzr(['commit', '-m', 'later change'])
open('foo', 'wb').write('another\n')
- bzr('commit -m a_third_change')
+ bzr(['commit', '-m', 'a third change'])
rev_history_a = get_rh(3)
@@ -218,7 +218,7 @@
os.chdir('../a')
open('foo', 'wb').write('a fourth change\n')
- bzr('commit -m a_fourth_change')
+ bzr(['commit', '-m', 'a fourth change'])
rev_history_a = get_rh(4)
=== modified file 'bzrlib/tests/blackbox/test_versioning.py'
--- a/bzrlib/tests/blackbox/test_versioning.py 2007-06-27 19:13:50 +0000
+++ b/bzrlib/tests/blackbox/test_versioning.py 2007-06-28 12:26:11 +0000
@@ -138,13 +138,13 @@
file(fn, 'w').write('old contents')
run_bzr('add')
- run_bzr('commit -m first_revision')
+ run_bzr(['commit', '-m', 'first revision'])
for fn in ('a/one', 'b/two', 'top'):
file(fn, 'w').write('new contents')
mutter('start selective subdir commit')
- run_bzr('commit a -m commit_a_only')
+ run_bzr(['commit', 'a', '-m', 'commit a only'])
old = b.repository.revision_tree(b.get_rev_id(1))
new = b.repository.revision_tree(b.get_rev_id(2))
@@ -155,14 +155,14 @@
os.chdir('a')
# commit from here should do nothing
- run_bzr('commit . -m commit_subdir_only --unchanged')
+ run_bzr(['commit', '.', '-m', 'commit subdir only', '--unchanged'])
v3 = b.repository.revision_tree(b.get_rev_id(3))
eq(v3.get_file_by_path('b/two').read(), 'old contents')
eq(v3.get_file_by_path('top').read(), 'old contents')
eq(v3.get_file_by_path('a/one').read(), 'new contents')
# commit in subdirectory commits whole tree
- run_bzr('commit -m commit_whole_tree_from_subdir')
+ run_bzr(['commit', '-m', 'commit whole tree from subdir'])
v4 = b.repository.revision_tree(b.get_rev_id(4))
eq(v4.get_file_by_path('b/two').read(), 'new contents')
eq(v4.get_file_by_path('top').read(), 'new contents')
=== modified file 'bzrlib/tests/test_smart_add.py'
--- a/bzrlib/tests/test_smart_add.py 2007-06-27 19:13:50 +0000
+++ b/bzrlib/tests/test_smart_add.py 2007-06-28 12:26:11 +0000
@@ -110,7 +110,6 @@
def test_add_dry_run(self):
"""Test a dry run add, make sure nothing is added."""
- from bzrlib.commands import run_bzr
eq = self.assertEqual
wt = self.make_branch_and_tree('.')
self.build_tree(['inertiatic/', 'inertiatic/esp'])
@@ -126,7 +125,6 @@
def test_returns_and_ignores(self):
"""Correctly returns added/ignored files"""
- from bzrlib.commands import run_bzr
wt = self.make_branch_and_tree('.')
# The default ignore list includes '*.py[co]', but not CVS
ignores._set_user_ignores(['*.py[co]'])
More information about the bazaar-commits
mailing list