Merge lp:~jelmer/bzr-builddeb/bzr-2.4-compat-revspec into lp:bzr-builddeb

Proposed by Jelmer Vernooij
Status: Merged
Merged at revision: 664
Proposed branch: lp:~jelmer/bzr-builddeb/bzr-2.4-compat-revspec
Merge into: lp:bzr-builddeb
Diff against target: 27 lines (+9/-2)
1 file modified
revspec.py (+9/-2)
To merge this branch: bzr merge lp:~jelmer/bzr-builddeb/bzr-2.4-compat-revspec
Reviewer Review Type Date Requested Status
Bzr-builddeb-hackers Pending
Review via email: mp+86043@code.launchpad.net

Description of the change

Fix compatibility with bzr 2.4, by retrieving the revision history if necessary in the bzr-builddeb revision specifier.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'revspec.py'
2--- revspec.py 2011-12-03 02:02:54 +0000
3+++ revspec.py 2011-12-16 13:59:24 +0000
4@@ -18,6 +18,7 @@
5 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
6 #
7
8+from bzrlib import version_info as bzrlib_version
9 from bzrlib.errors import NoSuchTag
10 from bzrlib.revisionspec import RevisionSpec, RevisionInfo
11
12@@ -48,7 +49,13 @@
13
14 try:
15 revision_id = branch.tags.lookup_tag(version_spec)
16- return RevisionInfo.from_revision_id(branch,
17- revision_id, revs)
18+ if bzrlib_version < (2, 5):
19+ if revs is None:
20+ revs = branch.revision_history()
21+ return RevisionInfo.from_revision_id(branch,
22+ revision_id, revs)
23+ else:
24+ return RevisionInfo.from_revision_id(
25+ branch, revision_id)
26 except NoSuchTag:
27 raise UnknownVersion(version_spec)

Subscribers

People subscribed via source and target branches