/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 dir.py

Implement GitRepository.revision_graph_can_have_wrong_parents().

Show diffs side-by-side

added added

removed removed

Lines of Context:
dir.py
78
78
        return True
79
79
 
80
80
    def cloning_metadir(self, stacked=False):
81
 
        return get_rich_root_format()
 
81
        return get_rich_root_format(stacked)
82
82
 
83
83
 
84
84
class LocalGitDir(GitDir):
95
95
        else:
96
96
            self.transport = transport.clone('.git')
97
97
        self._lockfiles = lockfiles
 
98
        self._mode_check_done = None
 
99
 
 
100
    def is_control_filename(self, filename):
 
101
        return filename == '.git' or filename.startswith('.git/')
98
102
 
99
103
    def get_branch_transport(self, branch_format):
100
104
        if branch_format is None:
109
113
    def open_branch(self, ignore_fallbacks=None):
110
114
        """'create' a branch for this dir."""
111
115
        repo = self.open_repository()
112
 
        return branch.LocalGitBranch(self, repo, "HEAD", repo._git.head(),
113
 
            self._lockfiles)
 
116
        return branch.LocalGitBranch(self, repo, "HEAD", self._lockfiles)
114
117
 
115
118
    def open_repository(self, shared=False):
116
119
        """'open' a repository for this dir."""
117
120
        return self._gitrepository_class(self, self._lockfiles)
118
121
 
119
122
    def open_workingtree(self, recommend_upgrade=True):
 
123
        if not self._git.bare and self._git.has_index():
 
124
            return workingtree.GitWorkingTree(self, self.open_repository(), 
 
125
                                                  self.open_branch())
120
126
        loc = urlutils.unescape_for_display(self.root_transport.base, 'ascii')
121
127
        raise errors.bzr_errors.NoWorkingTree(loc)
122
 
        if (not self._git.bare and 
123
 
            os.path.exists(os.path.join(self._git.controldir(), "index"))):
124
 
            return workingtree.GitWorkingTree(self, self.open_repository(), 
125
 
                                                  self.open_branch())
126
128
 
127
129
    def create_repository(self, shared=False):
128
130
        return self.open_repository()
129
131
 
130
132
    def create_branch(self):
131
133
        return self.open_branch()
 
134
 
 
135
    def backup_bzrdir(self):
 
136
        if self._git.bare:
 
137
            self.root_transport.copy_tree(".git", ".git.backup")
 
138
            return (self.root_transport.abspath(".git"),
 
139
                    self.root_transport.abspath(".git.backup"))
 
140
        else:
 
141
            raise errors.bzr_errors.BzrError("Unable to backup bare repositories")
 
142
 
 
143
    def create_workingtree(self, revision_id=None, from_branch=None,
 
144
        accelerator_tree=None, hardlink=False):
 
145
        if self._git.bare:
 
146
            raise errors.bzr_errors.BzrError("Can't create working tree in a bare repo")
 
147
        from dulwich.index import write_index
 
148
        write_index(self.root_transport.abspath(".git/index"), [])
 
149
        return self.open_workingtree()