At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3890
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Canonical.com Patch Queue Manager <[EMAIL PROTECTED]>
branch nick: +trunk
timestamp: Wed 2008-12-10 08:28:22 +0000
message:
support -d in revision-info (Michael Hudson)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_revision_info.py
test_revision_info.py-20050917162600-21dab3877aa348d7
------------------------------------------------------------
revno: 3889.1.1
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ian Clatworthy <[EMAIL PROTECTED]>
branch nick: ianc-integration
timestamp: Wed 2008-12-10 16:47:20 +1000
message:
support -d in revision-info (Michael Hudson)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_revision_info.py
test_revision_info.py-20050917162600-21dab3877aa348d7
------------------------------------------------------------
revno: 3886.1.1
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Michael Hudson <[EMAIL PROTECTED]>
branch nick: revision-info-takes--d
timestamp: Wed 2008-12-10 15:05:30 +1300
message:
support -d in the revision-info command
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_revision_info.py
test_revision_info.py-20050917162600-21dab3877aa348d7
=== modified file 'NEWS'
--- a/NEWS 2008-12-10 05:12:50 +0000
+++ b/NEWS 2008-12-10 06:47:20 +0000
@@ -10,17 +10,21 @@
CHANGES:
- * ``LRUCache(after_cleanup_size)`` was renamed to
- ``after_cleanup_count`` and the old name deprecated. The new name is
- used for clarity, and to avoid confusion with
- ``LRUSizeCache(after_cleanup_size)``. (John Arbash Meinel)
+ * ``LRUCache(after_cleanup_size)`` was renamed to
+ ``after_cleanup_count`` and the old name deprecated. The new name is
+ used for clarity, and to avoid confusion with
+ ``LRUSizeCache(after_cleanup_size)``. (John Arbash Meinel)
NEW FEATURES:
IMPROVEMENTS:
+
* Add trailing slash to directories in all output of ``bzr ls``, except
``bzr ls --null``. (Gordon P. Hemsley, #306424)
+ * ``bzr revision-info`` now supports a -d option to specify an
+ alternative branch. (Michael Hudson)
+
BUG FIXES:
* Allow BzrDir implementation to implement backing up of
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py 2008-12-09 20:52:58 +0000
+++ b/bzrlib/builtins.py 2008-12-10 02:05:30 +0000
@@ -392,10 +392,18 @@
"""
hidden = True
takes_args = ['revision_info*']
- takes_options = ['revision']
+ takes_options = [
+ 'revision',
+ Option('directory',
+ help='Branch to examine, '
+ 'rather than the one containing the working directory.',
+ short_name='d',
+ type=unicode,
+ ),
+ ]
@display_command
- def run(self, revision=None, revision_info_list=[]):
+ def run(self, revision=None, directory=u'.', revision_info_list=[]):
revs = []
if revision is not None:
@@ -404,7 +412,7 @@
for rev in revision_info_list:
revs.append(RevisionSpec.from_string(rev))
- b = Branch.open_containing(u'.')[0]
+ b = Branch.open_containing(directory)[0]
if len(revs) == 0:
revs.append(RevisionSpec.from_string('-1'))
=== modified file 'bzrlib/tests/blackbox/test_revision_info.py'
--- a/bzrlib/tests/blackbox/test_revision_info.py 2007-06-27 19:13:50
+0000
+++ b/bzrlib/tests/blackbox/test_revision_info.py 2008-12-10 02:05:30
+0000
@@ -79,3 +79,10 @@
self.check_output(values['1'], 'revision-info -r revid:[EMAIL
PROTECTED]')
self.check_output(values['1.1.1'],
'revision-info --revision revid:[EMAIL PROTECTED]')
+
+ def test_revision_info_explicit_branch_dir(self):
+ """Test that 'bzr revision-info' honors the '-d' option."""
+ wt = self.make_branch_and_tree('branch')
+
+ wt.commit('Commit one', rev_id='[EMAIL PROTECTED]')
+ self.check_output(' 1 [EMAIL PROTECTED]', 'revision-info -d branch')
--
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
