/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 breezy/workingtree.py

  • Committer: Jelmer Vernooij
  • Date: 2018-03-24 17:48:04 UTC
  • mfrom: (6921 work)
  • mto: This revision was merged to the branch mainline in revision 6923.
  • Revision ID: jelmer@jelmer.uk-20180324174804-xf22o05byoj12x1q
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/workingtree.py
386
386
        return (file_obj, stat_value)
387
387
 
388
388
    def get_file_text(self, path, file_id=None, filtered=True):
389
 
        with self.get_file(path, file_id, filtered=filtered) as my_file:
 
389
        my_file = self.get_file(path, file_id, filtered=filtered)
 
390
        try:
390
391
            return my_file.read()
 
392
        finally:
 
393
            my_file.close()
391
394
 
392
395
    def get_file_lines(self, path, file_id=None, filtered=True):
393
396
        """See Tree.get_file_lines()"""
394
 
        with self.get_file(path, file_id, filtered=filtered) as file:
 
397
        file = self.get_file(path, file_id, filtered=filtered)
 
398
        try:
395
399
            return file.readlines()
 
400
        finally:
 
401
            file.close()
396
402
 
397
403
    def get_parent_ids(self):
398
404
        """See Tree.get_parent_ids.
584
590
 
585
591
    def _set_merges_from_parent_ids(self, parent_ids):
586
592
        merges = parent_ids[1:]
587
 
        self._transport.put_bytes('pending-merges', b'\n'.join(merges),
 
593
        self._transport.put_bytes('pending-merges', '\n'.join(merges),
588
594
            mode=self.controldir._get_file_mode())
589
595
 
590
596
    def _filter_parent_ids_by_ancestry(self, revision_ids):
906
912
 
907
913
    def put_file_bytes_non_atomic(self, path, bytes, file_id=None):
908
914
        """See MutableTree.put_file_bytes_non_atomic."""
909
 
        with self.lock_write(), file(self.abspath(path), 'wb') as stream:
 
915
        with self.lock_write():
 
916
            stream = open(self.abspath(path), 'wb')
 
917
            try:
910
918
                stream.write(bytes)
 
919
            finally:
 
920
                stream.close()
911
921
 
912
922
    def extras(self):
913
923
        """Yield all unversioned files in this WorkingTree.
1292
1302
                    self.kind(path, conflict.file_id) != 'file'):
1293
1303
                    un_resolved.append(conflict)
1294
1304
                    continue
1295
 
                with open(self.abspath(path), 'rb') as my_file:
 
1305
                my_file = open(self.abspath(path), 'rb')
 
1306
                try:
1296
1307
                    for line in my_file:
1297
1308
                        if conflict_re.search(line):
1298
1309
                            un_resolved.append(conflict)
1299
1310
                            break
1300
1311
                    else:
1301
1312
                        resolved.append(conflict)
 
1313
                finally:
 
1314
                    my_file.close()
1302
1315
            resolved.remove_files(self)
1303
1316
            self.set_conflicts(un_resolved)
1304
1317
            return un_resolved, resolved