Rev 2702: pull -v no longer shows deltas, just logs in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Wed Aug 15 06:56:08 BST 2007
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 2702
revision-id: pqm at pqm.ubuntu.com-20070815055603-t0fwzxv6if6sr7c6
parent: pqm at pqm.ubuntu.com-20070815035159-9hn3rewqcmibgvwq
parent: aaron.bentley at utoronto.ca-20070815042748-f01pg9twxi1ru200
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-08-15 06:56:03 +0100
message:
pull -v no longer shows deltas, just logs
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.77.1.6
merged: aaron.bentley at utoronto.ca-20070815042748-f01pg9twxi1ru200
parent: aaron.bentley at utoronto.ca-20070815042627-v11otjh7lgapsbwv
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-08-15 00:27:48 -0400
message:
Update NEWS
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.77.1.5
merged: aaron.bentley at utoronto.ca-20070815042627-v11otjh7lgapsbwv
parent: aaron.bentley at utoronto.ca-20070815042522-g931kxasabvayyvc
parent: pqm at pqm.ubuntu.com-20070815010819-0q50hsyvbvu1qs3k
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-08-15 00:26:27 -0400
message:
merge bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.77.1.4
merged: aaron.bentley at utoronto.ca-20070815042522-g931kxasabvayyvc
parent: abentley at panoramicfeedback.com-20070807234458-nzhkoyza56lan7z5
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-08-15 00:25:22 -0400
message:
Make pull -v description more specific
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.77.1.3
merged: abentley at panoramicfeedback.com-20070807234458-nzhkoyza56lan7z5
parent: abentley at panoramicfeedback.com-20070731163346-623xwcycwij91xen
parent: pqm at pqm.ubuntu.com-20070807225230-7gb6fot3mnsxp7zs
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-08-07 19:44:58 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.77.1.2
merged: abentley at panoramicfeedback.com-20070731163346-623xwcycwij91xen
parent: abentley at panoramicfeedback.com-20070731163129-4t5yoq2wjz3xlj82
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-07-31 12:33:46 -0400
message:
Stop showing deltas in pull -v output
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.77.1.1
merged: abentley at panoramicfeedback.com-20070731163129-4t5yoq2wjz3xlj82
parent: aaron.bentley at utoronto.ca-20070731112050-5x29s1kop4x19s05
parent: pqm at pqm.ubuntu.com-20070731051059-q0z19zdpq7t76iex
parent: pqm at pqm.ubuntu.com-20070731051059-q0z19zdpq7t76iex
parent: pqm at pqm.ubuntu.com-20070731051059-q0z19zdpq7t76iex
parent: pqm at pqm.ubuntu.com-20070731051059-q0z19zdpq7t76iex
parent: pqm at pqm.ubuntu.com-20070731051059-q0z19zdpq7t76iex
parent: pqm at pqm.ubuntu.com-20070731051059-q0z19zdpq7t76iex
parent: pqm at pqm.ubuntu.com-20070731051059-q0z19zdpq7t76iex
parent: pqm at pqm.ubuntu.com-20070731051059-q0z19zdpq7t76iex
parent: pqm at pqm.ubuntu.com-20070731051059-q0z19zdpq7t76iex
parent: pqm at pqm.ubuntu.com-20070731051059-q0z19zdpq7t76iex
parent: pqm at pqm.ubuntu.com-20070731051059-q0z19zdpq7t76iex
parent: pqm at pqm.ubuntu.com-20070731051059-q0z19zdpq7t76iex
parent: pqm at pqm.ubuntu.com-20070731122244-f1jemfecukeevugw
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-07-31 12:31:29 -0400
message:
merge bzr.dev
=== modified file 'NEWS'
--- a/NEWS 2007-08-15 01:11:27 +0000
+++ b/NEWS 2007-08-15 05:56:03 +0000
@@ -2,8 +2,11 @@
IMPROVEMENTS:
- * ``pull`` and ``merge`` are much faster at installing bundle format 4.
- (Aaron Bentley)
+ * ``pull`` and ``merge`` are much faster at installing bundle format 4.
+ (Aaron Bentley)
+
+ * ``pull -v`` no longer includes deltas, making it much faster.
+ (Aaron Bentley)
bzr 0.90rc1 2007-08-14
@@ -124,7 +127,7 @@
* Log errors from the smart server in the trace file, to make debugging
test failures (and live failures!) easier. (Andrew Bennetts)
-
+
* The HTML version of the man page has been superceded by a more
comprehensive manual called the Bazaar User Reference. This manual
is completed generated from the online help topics. As part of this
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py 2007-08-15 03:51:59 +0000
+++ b/bzrlib/builtins.py 2007-08-15 05:56:03 +0000
@@ -568,7 +568,9 @@
"""
_see_also = ['push', 'update', 'status-flags']
- takes_options = ['remember', 'overwrite', 'revision', 'verbose',
+ takes_options = ['remember', 'overwrite', 'revision',
+ Option('verbose', short_name='v',
+ help='Show logs of pulled revisions.'),
Option('directory',
help='Branch to pull into, '
'rather than the one containing the working directory.',
@@ -640,10 +642,9 @@
result.report(self.outf)
if verbose:
- from bzrlib.log import show_changed_revisions
new_rh = branch_to.revision_history()
- show_changed_revisions(branch_to, old_rh, new_rh,
- to_file=self.outf)
+ log.show_changed_revisions(branch_to, old_rh, new_rh,
+ to_file=self.outf)
class cmd_push(Command):
=== modified file 'bzrlib/log.py'
--- a/bzrlib/log.py 2007-07-19 03:40:54 +0000
+++ b/bzrlib/log.py 2007-07-31 16:33:46 +0000
@@ -49,8 +49,6 @@
all the changes since the previous revision that touched hello.c.
"""
-# TODO: option to show delta summaries for merged-in revisions
-
from itertools import izip
import re
@@ -802,7 +800,8 @@
lf.show(revno, rev, delta)
-def show_changed_revisions(branch, old_rh, new_rh, to_file=None, log_format='long'):
+def show_changed_revisions(branch, old_rh, new_rh, to_file=None,
+ log_format='long'):
"""Show the change in revision history comparing the old revision history to the new one.
:param branch: The branch where the revisions exist
@@ -814,7 +813,8 @@
import sys
import codecs
import bzrlib
- to_file = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
+ to_file = codecs.getwriter(bzrlib.user_encoding)(sys.stdout,
+ errors='replace')
lf = log_formatter(log_format,
show_ids=False,
to_file=to_file,
@@ -851,7 +851,7 @@
show_log(branch,
lf,
None,
- verbose=True,
+ verbose=False,
direction='forward',
start_revision=base_idx+1,
end_revision=len(new_rh),
=== modified file 'bzrlib/tests/blackbox/test_pull.py'
--- a/bzrlib/tests/blackbox/test_pull.py 2007-07-27 05:17:06 +0000
+++ b/bzrlib/tests/blackbox/test_pull.py 2007-07-31 16:33:46 +0000
@@ -316,3 +316,15 @@
out, err = self.run_bzr('pull ../bundle')
self.assertEqual(err, '')
self.assertEqual(out, 'No revisions to pull.\n')
+
+ def test_pull_verbose_no_files(self):
+ """Pull --verbose should not list modified files"""
+ tree_a = self.make_branch_and_tree('tree_a')
+ self.build_tree(['tree_a/foo'])
+ tree_a.add('foo')
+ tree_a.commit('bar')
+ tree_b = self.make_branch_and_tree('tree_b')
+ out = self.run_bzr('pull --verbose -d tree_b tree_a')[0]
+ self.assertContainsRe(out, 'bar')
+ self.assertNotContainsRe(out, 'added:')
+ self.assertNotContainsRe(out, 'foo')
=== modified file 'bzrlib/tests/test_log.py'
--- a/bzrlib/tests/test_log.py 2007-07-05 00:29:29 +0000
+++ b/bzrlib/tests/test_log.py 2007-07-31 16:33:46 +0000
@@ -747,3 +747,16 @@
tree = self.create_tree_with_single_merge()
# f3 should be marked as modified by revisions A, B, C, and D
self.assertAllRevisionsForFileID(tree, 'f2-id', ['D', 'C', 'A'])
+
+
+class TestShowChangedRevisions(TestCaseWithTransport):
+
+ def test_show_changed_revisions_verbose(self):
+ tree = self.make_branch_and_tree('tree_a')
+ self.build_tree(['tree_a/foo'])
+ tree.add('foo')
+ tree.commit('bar', rev_id='bar-id')
+ s = StringIO()
+ log.show_changed_revisions(tree.branch, [], ['bar-id'], s)
+ self.assertContainsRe(s.getvalue(), 'bar')
+ self.assertNotContainsRe(s.getvalue(), 'foo')
More information about the bazaar-commits
mailing list