Rev 3884: Pull -v respects log_format config var (abentley) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Tue Dec 9 15:51:30 GMT 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3884
revision-id: pqm at pqm.ubuntu.com-20081209155126-st6whj38jx3nl0ft
parent: pqm at pqm.ubuntu.com-20081209023452-12dbzcwzxrt1xee3
parent: aaron at aaronbentley.com-20081209151508-nd1jb1vv2z22llwm
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-12-09 15:51:26 +0000
message:
Pull -v respects log_format config var (abentley)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
------------------------------------------------------------
revno: 3848.1.5
revision-id: aaron at aaronbentley.com-20081209151508-nd1jb1vv2z22llwm
parent: aaron at aaronbentley.com-20081209033614-3zjvk6v47u039uzd
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: pull-log
timestamp: Tue 2008-12-09 07:15:08 -0800
message:
Updates from review
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
------------------------------------------------------------
revno: 3848.1.4
revision-id: aaron at aaronbentley.com-20081209033614-3zjvk6v47u039uzd
parent: aaron at aaronbentley.com-20081209033407-zrrszq9wddwln1y2
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: pull-log
timestamp: Mon 2008-12-08 19:36:14 -0800
message:
Add NEWS entry
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3848.1.3
revision-id: aaron at aaronbentley.com-20081209033407-zrrszq9wddwln1y2
parent: aaron at aaronbentley.com-20081209014107-w3v6jg9302mewvd0
parent: pqm at pqm.ubuntu.com-20081209023452-12dbzcwzxrt1xee3
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: pull-log
timestamp: Mon 2008-12-08 19:34:07 -0800
message:
Merge bzr.dev into pull-log.
added:
bzrlib/foreign.py foreign.py-20081112170002-olsxmandkk8qyfuq-1
bzrlib/tests/test_foreign.py test_foreign.py-20081125004048-ywb901edgp9lluxo-1
contrib/convert_to_1.9.py convert_to_dev2.py-20081014130524-z1ydl3mq9b4ehlvv-1
tools/win32/build_release.py build_release.py-20081105204355-2ghh5cv01v1x4rzz-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/_patiencediff_c.c _patiencediff_c.c-20070721205602-q3imkipwlgagp3cy-1
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
bzrlib/bugtracker.py bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/registry.py lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/commands/test_commit.py test_commit.py-20070913161801-ydrx2k5gmv7k7eiu-1
bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/per_repository/test_revision.py testrevprops.py-20051013073044-92bc3c68302ce1bf
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
------------------------------------------------------------
revno: 3848.1.2
revision-id: aaron at aaronbentley.com-20081209014107-w3v6jg9302mewvd0
parent: aaron at aaronbentley.com-20081209013728-43v0yz6mo2jfexqv
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: pull-log
timestamp: Mon 2008-12-08 17:41:07 -0800
message:
Make test stricter
modified:
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
------------------------------------------------------------
revno: 3848.1.1
revision-id: aaron at aaronbentley.com-20081209013728-43v0yz6mo2jfexqv
parent: pqm at pqm.ubuntu.com-20081125021810-2dhu9lqkn6nh5bhn
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: pull-log
timestamp: Mon 2008-12-08 17:37:28 -0800
message:
Use default log format in pull -v
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
=== modified file 'NEWS'
--- a/NEWS 2008-12-09 00:51:25 +0000
+++ b/NEWS 2008-12-09 03:36:14 +0000
@@ -34,6 +34,9 @@
work better with how it splits its requests.
(John Arbash Meinel, #303538)
+ * ``pull -v`` now respects the log_format configuration variable.
+ (Aaron Bentley)
+
DOCUMENTATION:
API CHANGES:
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py 2008-11-28 02:32:40 +0000
+++ b/bzrlib/builtins.py 2008-12-09 15:15:08 +0000
@@ -798,8 +798,10 @@
result.old_revid))
old_rh.reverse()
new_rh = branch_to.revision_history()
+ log_format = branch_to.get_config().log_format()
log.show_changed_revisions(branch_to, old_rh, new_rh,
- to_file=self.outf)
+ to_file=self.outf,
+ log_format=log_format)
finally:
branch_to.unlock()
=== modified file 'bzrlib/tests/blackbox/test_pull.py'
--- a/bzrlib/tests/blackbox/test_pull.py 2008-03-25 05:40:55 +0000
+++ b/bzrlib/tests/blackbox/test_pull.py 2008-12-09 15:15:08 +0000
@@ -340,3 +340,21 @@
self.addCleanup(lambda: directories.remove('foo:'))
self.run_bzr('pull foo:bar -d target')
self.assertEqual(source_last, target.last_revision())
+
+ def test_pull_verbose_defaults_to_long(self):
+ tree = self.example_branch('source')
+ target = self.make_branch_and_tree('target')
+ out = self.run_bzr('pull -v source -d target')[0]
+ self.assertContainsRe(out,
+ r'revno: 1\ncommitter: .*\nbranch nick: source')
+ self.assertNotContainsRe(out, r'\n {4}1 .*\n {6}setup\n')
+
+ def test_pull_verbose_uses_default_log(self):
+ tree = self.example_branch('source')
+ target = self.make_branch_and_tree('target')
+ target_config = target.branch.get_config()
+ target_config.set_user_option('log_format', 'short')
+ out = self.run_bzr('pull -v source -d target')[0]
+ self.assertContainsRe(out, r'\n {4}1 .*\n {6}setup\n')
+ self.assertNotContainsRe(
+ out, r'revno: 1\ncommitter: .*\nbranch nick: source')
More information about the bazaar-commits
mailing list