/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/plugins/git/object_store.py

  • Committer: Jelmer Vernooij
  • Date: 2018-05-13 22:54:28 UTC
  • mto: This revision was merged to the branch mainline in revision 6968.
  • Revision ID: jelmer@jelmer.uk-20180513225428-5ysu0bs9rtk7045h
Initial work to support brz-git on python3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/git/object_store.py
200
200
    if not allow_empty and len(tree) == 0:
201
201
        # Only the root can be an empty tree
202
202
        if empty_file_name is not None:
203
 
            tree.add(empty_file_name, stat.S_IFREG | 0644, Blob().id)
 
203
            tree.add(empty_file_name, stat.S_IFREG | 0o644, Blob().id)
204
204
        else:
205
205
            return None
206
206
    return tree
527
527
            b = self._create_fileid_map_blob(tree)
528
528
            if b is not None:
529
529
                root_tree[self.mapping.BZR_FILE_IDS_FILE] = (
530
 
                    (stat.S_IFREG | 0644), b.id)
 
530
                    (stat.S_IFREG | 0o644), b.id)
531
531
                yield self.mapping.BZR_FILE_IDS_FILE, b
532
532
        if add_cache_entry is not None:
533
533
            add_cache_entry(root_tree, root_key_data, "")
632
632
            b = self._create_fileid_map_blob(bzr_tree)
633
633
            # If this is the root tree, add the file ids
634
634
            tree[self.mapping.BZR_FILE_IDS_FILE] = (
635
 
                (stat.S_IFREG | 0644), b.id)
 
635
                (stat.S_IFREG | 0o644), b.id)
636
636
        if tree is not None:
637
637
            _check_expected_sha(expected_sha, tree)
638
638
        return tree