Rev 3050: InventoryEntry.diff is now deprecated in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Thu Nov 29 17:31:08 GMT 2007
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3050
revision-id:pqm at pqm.ubuntu.com-20071129173101-z6t1bk0o9uygo0xi
parent: pqm at pqm.ubuntu.com-20071129142155-4yb05lbhm0eiyczd
parent: abentley at panoramicfeedback.com-20071129164423-g5j19vypal235j6p
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-11-29 17:31:01 +0000
message:
InventoryEntry.diff is now deprecated
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
------------------------------------------------------------
revno: 3009.2.32
revision-id:abentley at panoramicfeedback.com-20071129164423-g5j19vypal235j6p
parent: abentley at panoramicfeedback.com-20071129153209-5tozhsbqgf1jj9ck
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: no-inventory
timestamp: Thu 2007-11-29 11:44:23 -0500
message:
InventoryEntry.diff is now deprecated
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
------------------------------------------------------------
revno: 3009.2.31
revision-id:abentley at panoramicfeedback.com-20071129153209-5tozhsbqgf1jj9ck
parent: abentley at panoramicfeedback.com-20071129151145-t65dwtqo2wlwofeb
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: no-inventory
timestamp: Thu 2007-11-29 10:32:09 -0500
message:
Fix deprecation and wrong-format usage
modified:
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
------------------------------------------------------------
revno: 3009.2.30
revision-id:abentley at panoramicfeedback.com-20071129151145-t65dwtqo2wlwofeb
parent: abentley at panoramicfeedback.com-20071127135729-il5et0dxtsu05ceh
parent: pqm at pqm.ubuntu.com-20071129142155-4yb05lbhm0eiyczd
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: no-inventory
timestamp: Thu 2007-11-29 10:11:45 -0500
message:
Merge bzr.dev
renamed:
doc/developers/knitpack.txt => doc/developers/packrepo.txt knitpack.txt-20071023074744-q0g5u8me8gk5zbtb-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/conflicts.py conflicts.py-20051001061850-78ef952ba63d2b42
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lru_cache.py lru_cache.py-20070119165515-tlw203kuwh0id5gv-1
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
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/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_break_lock.py test_break_lock.py-20060504111902-9aae411dbe9aadd2
bzrlib/tests/branch_implementations/test_create_checkout.py test_create_checkout-20070322193723-n2wkp1g03r0404di-1
bzrlib/tests/branch_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-4
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/ftp_server.py ftpserver.py-20071019102346-61jbvdkrr70igauv-1
bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_check.py test_check.py-20070824124512-38g4d135gcqxo4zb-1
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_lru_cache.py test_lru_cache.py-20070119165535-hph6rk4h9rzy4180-1
bzrlib/tests/test_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_revert.py test_revert.py-20060828180832-fqb1v6ecpyvnlitj-1
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
bzrlib/tests/workingtree_implementations/test_break_lock.py test_break_lock.py-20060504115740-233e245df546fd42
bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/util/configobj/configobj.py configobj.py-20051018184548-06992a2246425e3e
bzrlib/util/configobj/docs/BSD-LICENSE.txt BSDLICENSE.txt-20051018184548-29b89ff3102657f5
bzrlib/util/configobj/docs/configobj.txt configobj.txt-20051018184548-4949b5f17e6a19c7
bzrlib/util/configobj/docs/validate.txt validate.txt-20051018184548-9e0e5ad913e258f5
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/performance-contributing.txt performancecontribut-20070621063612-ac4zhhagjzkr21qp-1
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
doc/en/user-guide/setting_up_email.txt setting_up_email.txt-20060314161707-fd242c8944346173
doc/en/user-reference/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
doc/developers/packrepo.txt knitpack.txt-20071023074744-q0g5u8me8gk5zbtb-1
=== modified file 'NEWS'
--- a/NEWS 2007-11-29 14:21:55 +0000
+++ b/NEWS 2007-11-29 16:44:23 +0000
@@ -209,6 +209,8 @@
* New module ``lru_cache`` providing a cache for use by tasks that need
semi-random access to large amounts of data. (John A Meinel)
+ * InventoryEntry.diff is now deprecated. Please use diff.DiffTree instead.
+
TESTING:
=== modified file 'bzrlib/inventory.py'
--- a/bzrlib/inventory.py 2007-11-23 04:19:28 +0000
+++ b/bzrlib/inventory.py 2007-11-29 15:32:09 +0000
@@ -142,6 +142,7 @@
"""
return False, False
+ @deprecated_method(symbol_versioning.zero_ninetythree)
def diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
output_to, reverse=False):
"""Perform a diff from this to to_entry.
=== modified file 'bzrlib/tests/tree_implementations/test_inv.py'
--- a/bzrlib/tests/tree_implementations/test_inv.py 2007-11-01 09:52:45 +0000
+++ b/bzrlib/tests/tree_implementations/test_inv.py 2007-11-29 16:44:23 +0000
@@ -23,7 +23,7 @@
from bzrlib.diff import internal_diff
from bzrlib.mutabletree import MutableTree
from bzrlib.osutils import has_symlinks
-from bzrlib.symbol_versioning import zero_ninetyone
+from bzrlib.symbol_versioning import zero_ninetyone, zero_ninetythree
from bzrlib.tests import SymlinkFeature, TestSkipped
from bzrlib.tests.tree_implementations import TestCaseWithTree
from bzrlib.uncommit import uncommit
@@ -64,10 +64,12 @@
def test_file_diff_deleted(self):
output = StringIO()
- self.file_1.diff(internal_diff,
- "old_label", self.tree_1,
- "/dev/null", None, None,
- output)
+ self.applyDeprecated(zero_ninetythree,
+ self.file_1.diff,
+ internal_diff,
+ "old_label", self.tree_1,
+ "/dev/null", None, None,
+ output)
self.assertEqual(output.getvalue(), "--- old_label\n"
"+++ /dev/null\n"
"@@ -1,1 +0,0 @@\n"
@@ -76,10 +78,12 @@
def test_file_diff_added(self):
output = StringIO()
- self.file_1.diff(internal_diff,
- "new_label", self.tree_1,
- "/dev/null", None, None,
- output, reverse=True)
+ self.applyDeprecated(zero_ninetythree,
+ self.file_1.diff,
+ internal_diff,
+ "new_label", self.tree_1,
+ "/dev/null", None, None,
+ output, reverse=True)
self.assertEqual(output.getvalue(), "--- /dev/null\n"
"+++ new_label\n"
"@@ -0,0 +1,1 @@\n"
@@ -88,10 +92,12 @@
def test_file_diff_changed(self):
output = StringIO()
- self.file_1.diff(internal_diff,
- "/dev/null", self.tree_1,
- "new_label", self.file_2, self.tree_2,
- output)
+ self.applyDeprecated(zero_ninetythree,
+ self.file_1.diff,
+ internal_diff,
+ "/dev/null", self.tree_1,
+ "new_label", self.file_2, self.tree_2,
+ output)
self.assertEqual(output.getvalue(), "--- /dev/null\n"
"+++ new_label\n"
"@@ -1,1 +1,1 @@\n"
@@ -101,40 +107,47 @@
def test_file_diff_binary(self):
output = StringIO()
- self.file_1.diff(internal_diff,
- "/dev/null", self.tree_1,
- "new_label", self.file_2b, self.tree_2,
- output)
+ self.applyDeprecated(zero_ninetythree,
+ self.file_1.diff,
+ internal_diff,
+ "/dev/null", self.tree_1,
+ "new_label", self.file_2b, self.tree_2,
+ output)
self.assertEqual(output.getvalue(),
"Binary files /dev/null and new_label differ\n")
def test_link_diff_deleted(self):
self.requireFeature(SymlinkFeature)
output = StringIO()
- self.link_1.diff(internal_diff,
- "old_label", self.tree_1,
- "/dev/null", None, None,
- output)
+ self.applyDeprecated(zero_ninetythree,
+ self.link_1.diff,
+ internal_diff, "old_label",
+ self.tree_1, "/dev/null", None, None,
+ output)
self.assertEqual(output.getvalue(),
"=== target was 'target1'\n")
def test_link_diff_added(self):
self.requireFeature(SymlinkFeature)
output = StringIO()
- self.link_1.diff(internal_diff,
- "new_label", self.tree_1,
- "/dev/null", None, None,
- output, reverse=True)
+ self.applyDeprecated(zero_ninetythree,
+ self.link_1.diff,
+ internal_diff,
+ "new_label", self.tree_1,
+ "/dev/null", None, None,
+ output, reverse=True)
self.assertEqual(output.getvalue(),
"=== target is 'target1'\n")
def test_link_diff_changed(self):
self.requireFeature(SymlinkFeature)
output = StringIO()
- self.link_1.diff(internal_diff,
- "/dev/null", self.tree_1,
- "new_label", self.link_2, self.tree_2,
- output)
+ self.applyDeprecated(zero_ninetythree,
+ self.link_1.diff,
+ internal_diff,
+ "/dev/null", self.tree_1,
+ "new_label", self.link_2, self.tree_2,
+ output)
self.assertEqual(output.getvalue(),
"=== target changed 'target1' => 'target2'\n")
More information about the bazaar-commits
mailing list