Rev 17: Merge Rob Weir's patch allowing index to index the current branch by default. in http://people.ubuntu.com/~robertc/baz2.0/plugins/search/trunk

Robert Collins robertc at robertcollins.net
Tue Jun 10 08:08:20 BST 2008


At http://people.ubuntu.com/~robertc/baz2.0/plugins/search/trunk

------------------------------------------------------------
revno: 17
revision-id: robertc at robertcollins.net-20080610070818-tjhe1vvf007ayff0
parent: robertc at robertcollins.net-20080609123411-f1c05y8yp00k6y5d
parent: rweir at ertius.org-20080610061503-thvpxrrdkfqhmps3
committer: Robert Collins <robertc at robertcollins.net>
branch nick: trunk
timestamp: Tue 2008-06-10 17:08:18 +1000
message:
  Merge Rob Weir's patch allowing index to index the current branch by default.
modified:
  commands.py                    commands.py-20080608052041-z5bahsl8kwl0uf4x-5
  tests/test_blackbox.py         test_blackbox.py-20080608052041-z5bahsl8kwl0uf4x-9
    ------------------------------------------------------------
    revno: 16.1.3
    revision-id: rweir at ertius.org-20080610061503-thvpxrrdkfqhmps3
    parent: rweir at ertius.org-20080610054829-ij0gwwjgp3t81mi5
    committer: Rob Weir <rweir at ertius.org>
    branch nick: use-pwd
    timestamp: Tue 2008-06-10 16:15:03 +1000
    message:
      check if the index was really created (suggested by Robert).
    modified:
      tests/test_blackbox.py         test_blackbox.py-20080608052041-z5bahsl8kwl0uf4x-9
    ------------------------------------------------------------
    revno: 16.1.2
    revision-id: rweir at ertius.org-20080610054829-ij0gwwjgp3t81mi5
    parent: rweir at ertius.org-20080610054806-35qdjedft3kertzb
    committer: Rob Weir <rweir at ertius.org>
    branch nick: use-pwd
    timestamp: Tue 2008-06-10 15:48:29 +1000
    message:
      use . if no branch path is provided.
    modified:
      commands.py                    commands.py-20080608052041-z5bahsl8kwl0uf4x-5
    ------------------------------------------------------------
    revno: 16.1.1
    revision-id: rweir at ertius.org-20080610054806-35qdjedft3kertzb
    parent: robertc at robertcollins.net-20080609123411-f1c05y8yp00k6y5d
    committer: Rob Weir <rweir at ertius.org>
    branch nick: use-pwd
    timestamp: Tue 2008-06-10 15:48:06 +1000
    message:
      add test for implied working directory.
    modified:
      tests/test_blackbox.py         test_blackbox.py-20080608052041-z5bahsl8kwl0uf4x-9
=== modified file 'commands.py'
--- a/commands.py	2008-06-09 12:34:11 +0000
+++ b/commands.py	2008-06-10 05:48:29 +0000
@@ -31,9 +31,11 @@
     """
 
     _see_also = ['search']
-    takes_args = ['url']
+    takes_args = ['url?']
 
-    def run(self, url):
+    def run(self, url=None):
+        if url is None:
+            url = "."
         trans = get_transport(url)
         _mod_index.index_url(trans.base)
 

=== modified file 'tests/test_blackbox.py'
--- a/tests/test_blackbox.py	2008-06-09 12:34:11 +0000
+++ b/tests/test_blackbox.py	2008-06-10 06:15:03 +0000
@@ -78,3 +78,10 @@
 
     def test_index_no_branch(self):
         self.run_bzr_error(['Not a branch'], ['index', '.'])
+
+    def test_index_pwd_branch(self):
+        tree = self.make_branch_and_tree('a-branch')
+        out, error = self.run_bzr(['index'], working_dir='a-branch')
+        self.assertEqual('', error)
+        self.assertEqual('', out)
+        open_index_url(self.get_url('a-branch'))




More information about the bazaar-commits mailing list