/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 bzrlib/fetch.py

  • Committer: Marius Kruger
  • Date: 2007-08-12 08:15:15 UTC
  • mfrom: (2695 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2979.
  • Revision ID: amanic@gmail.com-20070812081515-vgekipfhohcuj6rn
merge with bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/fetch.py
92
92
        if to_repository.control_files._transport.base == from_repository.control_files._transport.base:
93
93
            # check that last_revision is in 'from' and then return a no-operation.
94
94
            if last_revision not in (None, NULL_REVISION):
95
 
                from_repository.get_revision(last_revision)
 
95
                to_repository.get_revision(last_revision)
96
96
            return
97
97
        self.to_repository = to_repository
98
98
        self.from_repository = from_repository
108
108
        try:
109
109
            self.to_repository.lock_write()
110
110
            try:
111
 
                self.__fetch()
 
111
                self.to_repository.start_write_group()
 
112
                try:
 
113
                    self.__fetch()
 
114
                except:
 
115
                    self.to_repository.abort_write_group()
 
116
                    raise
 
117
                else:
 
118
                    self.to_repository.commit_write_group()
112
119
            finally:
113
120
                if self.nested_pb is not None:
114
121
                    self.nested_pb.finished()