Rev 2663: rename "submit" to "send" in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Tue Jul 31 06:11:17 BST 2007
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 2663
revision-id: pqm at pqm.ubuntu.com-20070731051059-q0z19zdpq7t76iex
parent: pqm at pqm.ubuntu.com-20070731031231-iqrudv126086qgsa
parent: aaron.bentley at utoronto.ca-20070731025848-gxj4s1r2d6ixe1ok
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-07-31 06:10:59 +0100
message:
rename "submit" to "send"
renamed:
bzrlib/tests/blackbox/test_submit.py => bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
------------------------------------------------------------
revno: 2659.1.3
merged: aaron.bentley at utoronto.ca-20070731025848-gxj4s1r2d6ixe1ok
parent: abentley at panoramicfeedback.com-20070730135159-pmz8qltpuca9fucn
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr-send
timestamp: Mon 2007-07-30 22:58:48 -0400
message:
Fix test_uses_submit testcase
------------------------------------------------------------
revno: 2659.1.2
merged: abentley at panoramicfeedback.com-20070730135159-pmz8qltpuca9fucn
parent: abentley at panoramicfeedback.com-20070730134909-awx1pvti168z1xr3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Mon 2007-07-30 09:51:59 -0400
message:
Tweak NEWS entry to mention "send"
------------------------------------------------------------
revno: 2659.1.1
merged: abentley at panoramicfeedback.com-20070730134909-awx1pvti168z1xr3
parent: pqm at pqm.ubuntu.com-20070730051419-0jdj7g8fm4iuoz7h
parent: aaron.bentley at utoronto.ca-20070727051706-vc0nlsxj4qxtjo6j
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Mon 2007-07-30 09:49:09 -0400
message:
Merge submit -> send rename
------------------------------------------------------------
revno: 2654.3.1
merged: aaron.bentley at utoronto.ca-20070727051706-vc0nlsxj4qxtjo6j
parent: pqm at pqm.ubuntu.com-20070726223348-t2howycr63c04q7r
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr-send
timestamp: Fri 2007-07-27 01:17:06 -0400
message:
Rename submit to send, make -o required, support -o- for stdout
=== renamed file 'bzrlib/tests/blackbox/test_submit.py' => 'bzrlib/tests/blackbox/test_send.py'
--- a/bzrlib/tests/blackbox/test_submit.py 2007-07-17 13:27:14 +0000
+++ b/bzrlib/tests/blackbox/test_send.py 2007-07-31 02:58:48 +0000
@@ -30,7 +30,7 @@
return serializer.read_bundle(StringIO(md.get_raw_bundle()))
-class TestSubmit(tests.TestCaseWithTransport):
+class TestSend(tests.TestCaseWithTransport):
def make_trees(self):
grandparent_tree = BzrDir.create_standalone_workingtree('grandparent')
@@ -45,10 +45,10 @@
"""Parent location is used as a basis by default"""
self.make_trees()
os.chdir('grandparent')
- errmsg = self.run_bzr('submit', retcode=3)[1]
+ errmsg = self.run_bzr('send -o-', retcode=3)[1]
self.assertContainsRe(errmsg, 'No submit branch known or specified')
os.chdir('../branch')
- stdout, stderr = self.run_bzr('submit')
+ stdout, stderr = self.run_bzr('send -o-')
self.assertEqual(stderr.count('Using saved location'), 1)
br = read_bundle(StringIO(stdout))
self.assertRevisions(br, ['revision3'])
@@ -61,39 +61,39 @@
"""Submit location can be used and set"""
self.make_trees()
os.chdir('branch')
- br = read_bundle(StringIO(self.run_bzr('submit')[0]))
+ br = read_bundle(StringIO(self.run_bzr('send -o-')[0]))
self.assertRevisions(br, ['revision3'])
- br = read_bundle(StringIO(self.run_bzr('submit ../grandparent')[0]))
+ br = read_bundle(StringIO(self.run_bzr('send ../grandparent -o-')[0]))
self.assertRevisions(br, ['revision3', 'revision2'])
# submit location should be auto-remembered
- br = read_bundle(StringIO(self.run_bzr('submit')[0]))
- self.assertRevisions(br, ['revision3', 'revision2'])
- self.run_bzr('submit ../parent')
- br = read_bundle(StringIO(self.run_bzr('bundle')[0]))
- self.assertRevisions(br, ['revision3', 'revision2'])
- self.run_bzr('submit ../parent --remember')
- br = read_bundle(StringIO(self.run_bzr('bundle')[0]))
+ br = read_bundle(StringIO(self.run_bzr('send -o-')[0]))
+ self.assertRevisions(br, ['revision3', 'revision2'])
+ self.run_bzr('send ../parent -o-')
+ br = read_bundle(StringIO(self.run_bzr('send -o-')[0]))
+ self.assertRevisions(br, ['revision3', 'revision2'])
+ self.run_bzr('send ../parent --remember -o-')
+ br = read_bundle(StringIO(self.run_bzr('send -o-')[0]))
self.assertRevisions(br, ['revision3'])
- err = self.run_bzr('submit --remember', retcode=3)[1]
+ err = self.run_bzr('send --remember -o-', retcode=3)[1]
self.assertContainsRe(err,
'--remember requires a branch to be specified.')
def test_revision_branch_interaction(self):
self.make_trees()
os.chdir('branch')
- bi = read_bundle(StringIO(self.run_bzr('bundle ../grandparent')[0]))
+ bi = read_bundle(StringIO(self.run_bzr('send ../grandparent -o-')[0]))
self.assertRevisions(bi, ['revision3', 'revision2'])
- out = StringIO(self.run_bzr('submit ../grandparent -r -2')[0])
+ out = StringIO(self.run_bzr('send ../grandparent -r -2 -o-')[0])
bi = read_bundle(out)
self.assertRevisions(bi, ['revision2'])
- sio = StringIO(self.run_bzr('submit -r -2..-1')[0])
+ sio = StringIO(self.run_bzr('send -r -2..-1 -o-')[0])
md = merge_directive.MergeDirective.from_lines(sio.readlines())
self.assertEqual('revision2', md.base_revision_id)
self.assertEqual('revision3', md.revision_id)
sio.seek(0)
bi = read_bundle(sio)
self.assertRevisions(bi, ['revision2', 'revision3'])
- self.run_bzr('submit ../grandparent -r -2..-1')
+ self.run_bzr('send ../grandparent -r -2..-1 -o-')
def test_output(self):
# check output for consistency
@@ -101,7 +101,7 @@
# which would break patch-based bundles
self.make_trees()
os.chdir('branch')
- stdout = self.run_bzr_subprocess('submit')[0]
+ stdout = self.run_bzr_subprocess('send', '-o-')[0]
br = read_bundle(StringIO(stdout))
self.assertRevisions(br, ['revision3'])
@@ -111,42 +111,48 @@
bar = self.make_branch_and_tree('bar')
bar.commit('rev b')
os.chdir('foo')
- self.run_bzr('submit ../bar')
+ self.run_bzr('send ../bar -o-')
- def submit_directive(self, args):
- sio = StringIO(self.run_bzr(['submit'] + args)[0])
+ def send_directive(self, args):
+ sio = StringIO(self.run_bzr(['send', '-o-'] + args)[0])
return merge_directive.MergeDirective.from_lines(sio.readlines())
def test_content_options(self):
"""--no-patch and --no-bundle should work and be independant"""
self.make_trees()
os.chdir('branch')
- md = self.submit_directive([])
+ md = self.send_directive([])
self.assertIsNot(None, md.bundle)
self.assertIsNot(None, md.patch)
- md = self.submit_directive(['--no-patch'])
+ md = self.send_directive(['--no-patch'])
self.assertIsNot(None, md.bundle)
self.assertIs(None, md.patch)
- md = self.submit_directive(['--no-bundle', '.', '.'])
+ md = self.send_directive(['--no-bundle', '.', '.'])
self.assertIs(None, md.bundle)
self.assertIsNot(None, md.patch)
- md = self.submit_directive(['--no-bundle', '--no-patch', '.', '.'])
+ md = self.send_directive(['--no-bundle', '--no-patch', '.', '.'])
self.assertIs(None, md.bundle)
self.assertIs(None, md.patch)
def test_from_option(self):
self.make_trees()
- self.run_bzr('submit', retcode=3)
- md = self.submit_directive(['--from', 'branch'])
+ self.run_bzr('send', retcode=3)
+ md = self.send_directive(['--from', 'branch'])
self.assertEqual('revision3', md.revision_id)
- md = self.submit_directive(['-f', 'branch'])
+ md = self.send_directive(['-f', 'branch'])
self.assertEqual('revision3', md.revision_id)
def test_output_option(self):
self.make_trees()
- stdout = self.run_bzr('submit -f branch --output file1')[0]
+ stdout = self.run_bzr('send -f branch --output file1')[0]
self.assertEqual('', stdout)
md_file = open('file1', 'rb')
self.addCleanup(md_file.close)
self.assertContainsRe(md_file.read(), 'revision3')
+ stdout = self.run_bzr('send -f branch --output -')[0]
+ self.assertContainsRe(stdout, 'revision3')
+ def test_output_option_required(self):
+ self.make_trees()
+ self.run_bzr_error(('File must be specified with --output',),
+ 'send -f branch')
=== modified file 'NEWS'
--- a/NEWS 2007-07-31 02:07:34 +0000
+++ b/NEWS 2007-07-31 05:10:59 +0000
@@ -79,7 +79,8 @@
(Ian Clatworthy)
* New bundle and merge directive formats are faster to generate, and
- more robust against email mangling. (Aaron Bentley)
+ more robust against email mangling. New `send` command replaces
+ `bundle-revisions` and `merge-directive`. (Aaron Bentley)
* Annotate merge now works when there are local changes. (Aaron Bentley)
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py 2007-07-30 17:05:02 +0000
+++ b/bzrlib/builtins.py 2007-07-31 05:10:59 +0000
@@ -3683,7 +3683,7 @@
s.send_email(message)
-class cmd_submit(Command):
+class cmd_send(Command):
"""Create a merge-directive for submiting changes.
A merge directive provides many things needed for requesting merges:
@@ -3714,6 +3714,7 @@
_see_also = ['merge']
takes_args = ['submit_branch?', 'public_branch?']
+
takes_options = [
Option('no-bundle',
help='Do not include a bundle in the merge directive.'),
@@ -3736,6 +3737,9 @@
**kwargs):
from bzrlib.revision import ensure_null, NULL_REVISION
if output is None:
+ raise errors.BzrCommandError('File must be specified with'
+ ' --output')
+ elif output == '-':
outfile = self.outf
else:
outfile = open(output, 'wb')
@@ -3773,7 +3777,7 @@
base_revision_id = None
if revision is not None:
if len(revision) > 2:
- raise errors.BzrCommandError('bzr submit takes '
+ raise errors.BzrCommandError('bzr send takes '
'at most two one revision identifiers')
revision_id = revision[-1].in_history(branch).rev_id
if len(revision) == 2:
@@ -3792,9 +3796,10 @@
base_revision_id=base_revision_id)
outfile.writelines(directive.to_lines())
finally:
- if output is not None:
+ if output != '-':
outfile.close()
+
class cmd_tag(Command):
"""Create a tag naming a revision.
=== modified file 'bzrlib/tests/blackbox/__init__.py'
--- a/bzrlib/tests/blackbox/__init__.py 2007-07-17 13:27:14 +0000
+++ b/bzrlib/tests/blackbox/__init__.py 2007-07-27 05:17:06 +0000
@@ -92,12 +92,12 @@
'bzrlib.tests.blackbox.test_revision_history',
'bzrlib.tests.blackbox.test_revision_info',
'bzrlib.tests.blackbox.test_selftest',
+ 'bzrlib.tests.blackbox.test_send',
'bzrlib.tests.blackbox.test_serve',
'bzrlib.tests.blackbox.test_shared_repository',
'bzrlib.tests.blackbox.test_sign_my_commits',
'bzrlib.tests.blackbox.test_split',
'bzrlib.tests.blackbox.test_status',
- 'bzrlib.tests.blackbox.test_submit',
'bzrlib.tests.blackbox.test_tags',
'bzrlib.tests.blackbox.test_testament',
'bzrlib.tests.blackbox.test_too_much',
=== modified file 'bzrlib/tests/blackbox/test_merge.py'
--- a/bzrlib/tests/blackbox/test_merge.py 2007-07-17 13:27:14 +0000
+++ b/bzrlib/tests/blackbox/test_merge.py 2007-07-27 05:17:06 +0000
@@ -205,7 +205,7 @@
f.close()
tree_b.commit('message')
os.chdir('branch_b')
- file('../bundle', 'wb').write(self.run_bzr('bundle ../branch_a')[0])
+ self.run_bzr('bundle ../branch_a -o ../bundle')
os.chdir('../branch_a')
self.run_bzr('merge ../bundle', retcode=1)
testament_a = Testament.from_revision(tree_a.branch.repository,
=== modified file 'bzrlib/tests/blackbox/test_pull.py'
--- a/bzrlib/tests/blackbox/test_pull.py 2007-06-28 12:26:11 +0000
+++ b/bzrlib/tests/blackbox/test_pull.py 2007-07-27 05:17:06 +0000
@@ -293,9 +293,7 @@
# Create the bundle for 'b' to pull
os.chdir('branch_a')
- bundle_file = open('../bundle', 'wb')
- bundle_file.write(self.run_bzr('bundle ../branch_b')[0])
- bundle_file.close()
+ self.run_bzr('bundle ../branch_b -o ../bundle')
os.chdir('../branch_b')
out, err = self.run_bzr('pull ../bundle')
More information about the bazaar-commits
mailing list