← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-03-08 14:34:42 UTC
  • mfrom: (1551.2.25 Aaron's mergeable stuff)
  • Revision ID: pqm@pqm.ubuntu.com-20060308143442-fc633cddf3574063
Stop using deprecated methods in merge and revert

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1828
1828
 
1829
1829
                base = [branch, revision[0].in_history(b).revno]
1830
1830
                other = [branch, revision[1].in_history(b).revno]
1831
 
 
 
1831
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
1832
1832
        try:
1833
 
            conflict_count = merge(other, base, check_clean=(not force),
1834
 
                                   merge_type=merge_type, reprocess=reprocess,
1835
 
                                   show_base=show_base, 
1836
 
                                   pb=bzrlib.ui.ui_factory.progress_bar())
 
1833
            try:
 
1834
                conflict_count = merge(other, base, check_clean=(not force),
 
1835
                                       merge_type=merge_type, 
 
1836
                                       reprocess=reprocess,
 
1837
                                       show_base=show_base, 
 
1838
                                       pb=pb)
 
1839
            finally:
 
1840
                pb.finished()
1837
1841
            if conflict_count != 0:
1838
1842
                return 1
1839
1843
            else:
1937
1941
            raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
1938
1942
        else:
1939
1943
            rev_id = revision[0].in_history(tree.branch).rev_id
1940
 
        tree.revert(file_list, tree.branch.repository.revision_tree(rev_id),
1941
 
                    not no_backup, bzrlib.ui.ui_factory.progress_bar())
 
1944
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
 
1945
        try:
 
1946
            tree.revert(file_list, 
 
1947
                        tree.branch.repository.revision_tree(rev_id),
 
1948
                        not no_backup, pb)
 
1949
        finally:
 
1950
            pb.finished()
1942
1951
 
1943
1952
 
1944
1953
class cmd_assert_fail(Command):