bzr-grep

Merge lp:~andrewsomething/bzr-grep/bzr2.6compat into lp:bzr-grep

  1. bzr2.6compat
  2. Merge into trunk
Proposed by Andrew Starr-Bochicchio on 2012-09-27
Status: Needs review
Proposed branch: lp:~andrewsomething/bzr-grep/bzr2.6compat
Merge into: lp:bzr-grep
Diff against target: 15 lines (+4/-1)
1 file modified
grep.py (+4/-1)
To merge this branch: bzr merge lp:~andrewsomething/bzr-grep/bzr2.6compat
Reviewer Review Type Date Requested Status
Bazaar Developers 2012-09-27 Pending
Review via email: mp+126596@code.launchpad.net

Description of the Change

Update to use 'graph.iter_lefthand_ancestry' instead of
'repo.iter_reverse_revision_history' making compatible with bzr 2.6

To post a comment you must log in.
Jelmer Vernooij (jelmer) wrote :

Note that bzr-grep has been merged into bzr core in newer versions of bzr.

Reply

Unmerged revisions

148. By Andrew Starr-Bochicchio on 2012-09-27

Make compatible with bzr 2.6

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'grep.py'
2--- grep.py 2011-12-20 15:39:20 +0000
3+++ grep.py 2012-09-27 03:50:24 +0000
4@@ -67,7 +67,10 @@
5 def _linear_view_revisions(branch, start_rev_id, end_rev_id):
6 # requires that start is older than end
7 repo = branch.repository
8- for revision_id in repo.iter_reverse_revision_history(end_rev_id):
9+ graph = repo.get_graph()
10+ rev_sequence = graph.iter_lefthand_ancestry(end_rev_id,
11+ (_mod_revision.NULL_REVISION,))
12+ for revision_id in rev_sequence:
13 revno = branch.revision_id_to_dotted_revno(revision_id)
14 revno_str = '.'.join(str(n) for n in revno)
15 if revision_id == start_rev_id:

Subscribers

People subscribed via source and target branches