/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to __init__.py

  • Committer: Jelmer Vernooij
  • Date: 2008-05-18 14:47:01 UTC
  • mto: (0.441.2 dev) (7406.3.1 rebase)
  • mto: This revision was merged to the branch mainline in revision 7441.
  • Revision ID: jelmer@samba.org-20080518144701-moplzmp1nr504zzc
use cheaper as_revision_id.

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
153
153
            if revision is not None:
154
154
                if len(revision) == 1:
155
155
                    if revision[0] is not None:
156
 
                        stop_revid = revision[0].in_history(wt.branch).rev_id
 
156
                        stop_revid = revision[0].as_revision_id(wt.branch)
157
157
                elif len(revision) == 2:
158
158
                    if revision[0] is not None:
159
 
                        start_revid = revision[0].in_history(wt.branch).rev_id
 
159
                        start_revid = revision[0].as_revision_id(wt.branch)
160
160
                    if revision[1] is not None:
161
 
                        stop_revid = revision[1].in_history(wt.branch).rev_id
 
161
                        stop_revid = revision[1].as_revision_id(wt.branch)
162
162
                else:
163
163
                    raise BzrCommandError(
164
164
                        "--revision takes only one or two arguments")
178
178
                onto = upstream.last_revision()
179
179
            else:
180
180
                rev_spec = RevisionSpec.from_string(onto)
181
 
                onto = rev_spec.in_history(upstream).rev_id
 
181
                onto = rev_spec.as_revision_id(upstream)
182
182
 
183
183
            wt.branch.repository.fetch(upstream_repository, onto)
184
184
 
344
344
        if revision is not None:
345
345
            if len(revision) == 1:
346
346
                if revision[0] is not None:
347
 
                    todo = [revision[0].in_history(from_branch).rev_id]
 
347
                    todo = [revision[0].as_revision_id(from_branch)]
348
348
            elif len(revision) == 2:
349
349
                from_revno, from_revid = revision[0].in_history(from_branch)
350
350
                to_revno, to_revid = revision[1].in_history(from_branch)