Rev 3301: Remove deprecated codepaths from log.py (james_w) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Sun Mar 23 21:39:33 GMT 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3301
revision-id:pqm at pqm.ubuntu.com-20080323213924-jw60nko0lafszdaa
parent: pqm at pqm.ubuntu.com-20080323200233-gaiwmyujgxauj4ve
parent: aaron at aaronbentley.com-20080323200617-0jr1hwcg3p2u32ul
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2008-03-23 21:39:24 +0000
message:
Remove deprecated codepaths from log.py (james_w)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
------------------------------------------------------------
revno: 3299.2.2
revision-id:aaron at aaronbentley.com-20080323200617-0jr1hwcg3p2u32ul
parent: aaron at aaronbentley.com-20080323200343-56d44clo1544kzjy
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: bzr.ab.integration2
timestamp: Sun 2008-03-23 16:06:17 -0400
message:
Cleanups
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
------------------------------------------------------------
revno: 3299.2.1
revision-id:aaron at aaronbentley.com-20080323200343-56d44clo1544kzjy
parent: pqm at pqm.ubuntu.com-20080320180614-grrzhydka050ap3a
parent: jw+debian at jameswestby.net-20080316122554-tllkss9hg512n8o0
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: bzr.ab.integration2
timestamp: Sun 2008-03-23 16:03:43 -0400
message:
Merge deprecated codepath removal
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
------------------------------------------------------------
revno: 3270.2.1
revision-id:jw+debian at jameswestby.net-20080316122554-tllkss9hg512n8o0
parent: pqm at pqm.ubuntu.com-20080313004030-mff9aq1jfg13n0qi
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev
timestamp: Sun 2008-03-16 12:25:54 +0000
message:
Remove deprecated codepaths from log.py.
They have been deprecated since 0.17, so everyone should have moved
by now.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
=== modified file 'NEWS'
--- a/NEWS 2008-03-23 18:26:37 +0000
+++ b/NEWS 2008-03-23 21:39:24 +0000
@@ -50,6 +50,10 @@
API BREAKS:
+ * Log formatters must now provide log_revision instead of
+ show and show_merge_revno methods. The latter had been
+ deprecated since the 0.17 release. (James Westby)
+
TESTING:
INTERNALS:
=== modified file 'bzrlib/log.py'
--- a/bzrlib/log.py 2008-03-09 22:06:47 +0000
+++ b/bzrlib/log.py 2008-03-23 20:06:17 +0000
@@ -63,7 +63,6 @@
config,
lazy_regex,
registry,
- symbol_versioning,
)
from bzrlib.errors import (
BzrCommandError,
@@ -79,10 +78,6 @@
from bzrlib.revisionspec import (
RevisionInfo,
)
-from bzrlib.symbol_versioning import (
- deprecated_method,
- zero_seventeen,
- )
from bzrlib.trace import mutter
from bzrlib.tsort import (
merge_sort,
@@ -222,26 +217,7 @@
if direction == 'reverse':
start_rev_id, end_rev_id = end_rev_id, start_rev_id
- legacy_lf = getattr(lf, 'log_revision', None) is None
- if legacy_lf:
- # pre-0.17 formatters use show for mainline revisions.
- # how should we show merged revisions ?
- # pre-0.11 api: show_merge
- # 0.11-0.16 api: show_merge_revno
- show_merge_revno = getattr(lf, 'show_merge_revno', None)
- show_merge = getattr(lf, 'show_merge', None)
- if show_merge is None and show_merge_revno is None:
- # no merged-revno support
- generate_merge_revisions = False
- else:
- generate_merge_revisions = True
- # tell developers to update their code
- symbol_versioning.warn('LogFormatters should provide log_revision '
- 'instead of show and show_merge_revno since bzr 0.17.',
- DeprecationWarning, stacklevel=3)
- else:
- generate_merge_revisions = getattr(lf, 'supports_merge_revisions',
- False)
+ generate_merge_revisions = getattr(lf, 'supports_merge_revisions', False)
generate_single_revision = False
if ((not generate_merge_revisions)
and ((start_rev_id and (start_rev_id not in rev_nos))
@@ -306,26 +282,9 @@
if not searchRE.search(rev.message):
continue
- if not legacy_lf:
- lr = LogRevision(rev, revno, merge_depth, delta,
- rev_tag_dict.get(rev_id))
- lf.log_revision(lr)
- else:
- # support for legacy (pre-0.17) LogFormatters
- if merge_depth == 0:
- if generate_tags:
- lf.show(revno, rev, delta, rev_tag_dict.get(rev_id))
- else:
- lf.show(revno, rev, delta)
- else:
- if show_merge_revno is None:
- lf.show_merge(rev, merge_depth)
- else:
- if generate_tags:
- lf.show_merge_revno(rev, merge_depth, revno,
- rev_tag_dict.get(rev_id))
- else:
- lf.show_merge_revno(rev, merge_depth, revno)
+ lr = LogRevision(rev, revno, merge_depth, delta,
+ rev_tag_dict.get(rev_id))
+ lf.log_revision(lr)
if limit:
log_count += 1
if log_count >= limit:
@@ -616,10 +575,6 @@
# """
# raise NotImplementedError('not implemented in abstract base')
- @deprecated_method(zero_seventeen)
- def show(self, revno, rev, delta):
- raise NotImplementedError('not implemented in abstract base')
-
def short_committer(self, rev):
name, address = config.parse_username(rev.committer)
if name:
@@ -639,17 +594,6 @@
supports_delta = True
supports_tags = True
- @deprecated_method(zero_seventeen)
- def show(self, revno, rev, delta, tags=None):
- lr = LogRevision(rev, revno, 0, delta, tags)
- return self.log_revision(lr)
-
- @deprecated_method(zero_seventeen)
- def show_merge_revno(self, rev, merge_depth, revno, tags=None):
- """Show a merged revision rev, with merge_depth and a revno."""
- lr = LogRevision(rev, revno, merge_depth, tags=tags)
- return self.log_revision(lr)
-
def log_revision(self, revision):
"""Log a revision, either merged or not."""
indent = ' ' * revision.merge_depth
@@ -695,11 +639,6 @@
supports_delta = True
supports_single_merge_revision = True
- @deprecated_method(zero_seventeen)
- def show(self, revno, rev, delta):
- lr = LogRevision(rev, revno, 0, delta)
- return self.log_revision(lr)
-
def log_revision(self, revision):
to_file = self.to_file
date_str = format_date(revision.rev.timestamp,
@@ -755,11 +694,6 @@
else:
return rev.message
- @deprecated_method(zero_seventeen)
- def show(self, revno, rev, delta):
- self.to_file.write(self.log_string(revno, rev, terminal_width()-1))
- self.to_file.write('\n')
-
def log_revision(self, revision):
self.to_file.write(self.log_string(revision.revno, revision.rev,
self._max_chars))
More information about the bazaar-commits
mailing list