/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: Andrew Bennetts
  • Date: 2008-11-26 11:35:37 UTC
  • mto: This revision was merged to the branch mainline in revision 3981.
  • Revision ID: andrew.bennetts@canonical.com-20081126113537-9vn1v1yo4gkxi05o
TestStacking.test_fetch_copies_from_stacked_on now passes using the VersionedFile.insert_record_stream RPC; lots of debugging cruft needs removal though.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/fetch.py
102
102
            self.pb = pb
103
103
            self.nested_pb = None
104
104
        self.from_repository.lock_read()
105
 
        try:
106
 
            self.to_repository.lock_write()
107
 
            try:
108
 
                self.to_repository.start_write_group()
109
 
                try:
110
 
                    self.__fetch()
111
 
                except:
112
 
                    self.to_repository.abort_write_group(suppress_errors=True)
113
 
                    raise
114
 
                else:
115
 
                    self.to_repository.commit_write_group()
116
 
            finally:
117
 
                try:
118
 
                    if self.nested_pb is not None:
119
 
                        self.nested_pb.finished()
120
 
                finally:
121
 
                    self.to_repository.unlock()
122
 
        finally:
123
 
            self.from_repository.unlock()
 
105
#        try:
 
106
#            self.to_repository.lock_write()
 
107
#            try:
 
108
#                self.to_repository.start_write_group()
 
109
#                try:
 
110
#                    self.__fetch()
 
111
#                except:
 
112
#                    self.to_repository.abort_write_group(suppress_errors=True)
 
113
#                    raise
 
114
#                else:
 
115
#                    self.to_repository.commit_write_group()
 
116
#            finally:
 
117
#                try:
 
118
#                    if self.nested_pb is not None:
 
119
#                        self.nested_pb.finished()
 
120
#                finally:
 
121
#                    self.to_repository.unlock()
 
122
#        finally:
 
123
#            self.from_repository.unlock()
 
124
        self.to_repository.lock_write()
 
125
        self.to_repository.start_write_group()
 
126
        self.__fetch()
 
127
        self.to_repository.commit_write_group()
 
128
        if self.nested_pb is not None:
 
129
            self.nested_pb.finished()
 
130
        self.to_repository.unlock()
 
131
        self.from_repository.unlock()
124
132
 
125
133
    def __fetch(self):
126
134
        """Primary worker function.