Rev 2767: 'send' and 'bundle' now handle partial ranges correctly (#61685) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2767
revision-id: pqm at pqm.ubuntu.com-20070829161516-le0ppkanxngkjg69
parent: pqm at pqm.ubuntu.com-20070829094547-qm9ntd7pd95r7w8c
parent: abentley at panoramicfeedback.com-20070829150711-avbihsktyi2w70b2
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-08-29 17:15:16 +0100
message:
  'send' and 'bundle' now handle partial ranges correctly (#61685)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
    ------------------------------------------------------------
    revno: 2747.3.2
    merged: abentley at panoramicfeedback.com-20070829150711-avbihsktyi2w70b2
    parent: abentley at panoramicfeedback.com-20070824203251-rsbqb1zfn84kydta
    parent: pqm at pqm.ubuntu.com-20070829094547-qm9ntd7pd95r7w8c
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's integration
    timestamp: Wed 2007-08-29 11:07:11 -0400
    message:
      Merge bzr.dev
    ------------------------------------------------------------
    revno: 2747.3.1
    merged: abentley at panoramicfeedback.com-20070824203251-rsbqb1zfn84kydta
    parent: pqm at pqm.ubuntu.com-20070824133750-r25v5g25g1flggy6
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's integration
    timestamp: Fri 2007-08-24 16:32:51 -0400
    message:
      'send' and 'bundle' now handle partial ranges correctly (#61685)
=== modified file 'NEWS'
--- a/NEWS	2007-08-29 08:18:22 +0000
+++ b/NEWS	2007-08-29 15:07:11 +0000
@@ -70,6 +70,9 @@
       current encoding is used in the commit message.  (Daniel Watkins,
       #116143)
 
+    * bzr send uses default values for ranges when only half of an elipsis
+      is specified ("-r..5" or "-r5..").  (#61685, Aaron Bentley)
+
   IMPROVEMENTS:
 
     * ``pull`` and ``merge`` are much faster at installing bundle format 4.

=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2007-08-29 01:16:53 +0000
+++ b/bzrlib/builtins.py	2007-08-29 15:07:11 +0000
@@ -3909,6 +3909,7 @@
                 raise errors.BzrCommandError('No public branch specified or'
                                              ' known')
             base_revision_id = None
+            revision_id = None
             if revision is not None:
                 if len(revision) > 2:
                     raise errors.BzrCommandError('bzr send takes '
@@ -3916,10 +3917,8 @@
                 revision_id = revision[-1].in_history(branch).rev_id
                 if len(revision) == 2:
                     base_revision_id = revision[0].in_history(branch).rev_id
-                    base_revision_id = ensure_null(base_revision_id)
-            else:
+            if revision_id is None:
                 revision_id = branch.last_revision()
-            revision_id = ensure_null(revision_id)
             if revision_id == NULL_REVISION:
                 raise errors.BzrCommandError('No revisions to submit.')
             if format == '4':

=== modified file 'bzrlib/tests/blackbox/test_send.py'
--- a/bzrlib/tests/blackbox/test_send.py	2007-08-21 01:32:29 +0000
+++ b/bzrlib/tests/blackbox/test_send.py	2007-08-24 20:32:51 +0000
@@ -225,3 +225,13 @@
         self.assertIs(None, md.message)
         md = self.send_directive(['--from', 'branch', '-m', 'my message'])
         self.assertEqual('my message', md.message)
+
+    def test_omitted_revision(self):
+        self.make_trees()
+        md = self.send_directive(['-r-2..', '--from', 'branch'])
+        self.assertEqual('revision2', md.base_revision_id)
+        self.assertEqual('revision3', md.revision_id)
+        md = self.send_directive(['-r..3', '--from', 'branch',
+                                 'grandparent'])
+        self.assertEqual('revision1', md.base_revision_id)
+        self.assertEqual('revision3', md.revision_id)