← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Lalo Martins
  • Date: 2005-09-08 11:08:13 UTC
  • mto: (1185.1.22)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: lalo@exoweb.net-20050908110811-49e867a4d2c07bf2
getting rid of branch.lookup_revision()

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
199
199
            if len(revision) > 1:
200
200
                raise BzrCommandError('bzr inventory --revision takes'
201
201
                    ' exactly one revision identifier')
202
 
            inv = b.get_revision_inventory(b.lookup_revision(revision[0]))
 
202
            inv = b.get_revision_inventory(RevisionSpec(b, revision[0]).rev_id)
203
203
 
204
204
        for path, entry in inv.entries():
205
205
            if show_ids:
748
748
        if revision == None:
749
749
            tree = b.working_tree()
750
750
        else:
751
 
            tree = b.revision_tree(b.lookup_revision(revision))
 
751
            tree = b.revision_tree(RevisionSpec(b, revision).rev_id)
752
752
 
753
753
        for fp, fc, kind, fid in tree.list_files():
754
754
            if verbose:
1184
1184
            other = [branch, -1]
1185
1185
        else:
1186
1186
            if len(revision) == 1:
1187
 
                other = [branch, revision[0]]
1188
1187
                base = [None, None]
 
1188
                other = [branch, RevisionSpec(branch, revision[0]).revno]
1189
1189
            else:
1190
1190
                assert len(revision) == 2
1191
1191
                if None in revision:
1192
1192
                    raise BzrCommandError(
1193
1193
                        "Merge doesn't permit that revision specifier.")
1194
 
                base = [branch, revision[0]]
1195
 
                other = [branch, revision[1]]
 
1194
                base = [branch, RevisionSpec(branch, revision[0]).revno]
 
1195
                other = [branch, RevisionSpec(branch, revision[1]).revno]
1196
1196
 
1197
1197
        try:
1198
1198
            merge(other, base, check_clean=(not force), merge_type=merge_type)