58
def validate_token(self, token):
62
45
class GitLockableFiles(lockable_files.LockableFiles):
63
46
"""Git specific lockable files abstraction."""
65
def __init__(self, transport, lock):
48
def __init__(self, lock):
67
50
self._transaction = None
68
51
self._lock_mode = None
69
52
self._lock_count = 0
70
self._transport = transport
73
55
class GitDir(bzrdir.BzrDir):
74
56
"""An adapter to the '.git' dir used by git."""
76
def is_supported(self):
79
def cloning_metadir(self, stacked=False):
80
return bzrlib.bzrdir.format_registry.make_bzrdir("1.9-rich-root")
83
class LocalGitDir(GitDir):
84
"""An adapter to the '.git' dir used by git."""
86
_gitrepository_class = repository.LocalGitRepository
88
def __init__(self, transport, lockfiles, gitrepo, format):
58
def __init__(self, transport, lockfiles, format):
89
59
self._format = format
90
60
self.root_transport = transport
93
self.transport = transport
95
self.transport = transport.clone('.git')
61
self.transport = transport.clone('.git')
96
62
self._lockfiles = lockfiles
98
64
def get_branch_transport(self, branch_format):
99
65
if branch_format is None:
100
66
return self.transport
101
if isinstance(branch_format, LocalGitBzrDirFormat):
67
if isinstance(branch_format, GitBzrDirFormat):
102
68
return self.transport
103
raise errors.bzr_errors.IncompatibleFormat(branch_format, self._format)
69
raise errors.IncompatibleFormat(branch_format, self._format)
105
71
get_repository_transport = get_branch_transport
106
72
get_workingtree_transport = get_branch_transport
74
def is_supported(self):
108
77
def open_branch(self, ignored=None):
109
"""'create' a branch for this dir."""
110
repo = self.open_repository()
111
return branch.LocalGitBranch(self, repo, "HEAD", repo._git.head(), self._lockfiles)
78
"""'crate' a branch for this dir."""
79
return git_branch.GitBranch(self, self._lockfiles)
113
81
def open_repository(self, shared=False):
114
82
"""'open' a repository for this dir."""
115
return self._gitrepository_class(self, self._lockfiles)
83
return git_repository.GitRepository(self, self._lockfiles)
117
def open_workingtree(self, recommend_upgrade=True):
118
if (not self._git.bare and
119
os.path.exists(os.path.join(self._git.controldir(), "index"))):
120
return workingtree.GitWorkingTree(self, self.open_repository(),
85
def open_workingtree(self):
122
86
loc = urlutils.unescape_for_display(self.root_transport.base, 'ascii')
123
raise errors.bzr_errors.NoWorkingTree(loc)
125
def create_repository(self, shared=False):
126
return self.open_repository()
87
raise errors.NoWorkingTree(loc)
90
class GitBzrDirFormat(bzrdir.BzrDirFormat):
91
"""The .git directory control format."""
94
def _known_formats(self):
95
return set([GitBzrDirFormat()])
97
def open(self, transport, _create=False, _found=None):
98
"""Open this directory.
100
:param _create: create the git dir on the fly. private to GitDirFormat.
102
# we dont grok readonly - git isn't integrated with transport.
104
if url.startswith('readonly+'):
105
url = url[len('readonly+'):]
106
path = urlutils.local_path_from_url(url)
107
if not transport.has('.git'):
108
raise errors.NotBranchError(path=transport.base)
109
lockfiles = GitLockableFiles(GitLock())
110
return GitDir(transport, lockfiles, self)
113
def probe_transport(klass, transport):
114
"""Our format is present if the transport ends in '.not/'."""
115
# little ugly, but works
117
# delegate to the main opening code. This pays a double rtt cost at the
118
# moment, so perhaps we want probe_transport to return the opened thing
119
# rather than an openener ? or we could return a curried thing with the
120
# dir to open already instantiated ? Needs more thought.
122
format.open(transport)
125
raise errors.NotBranchError(path=transport.base)
126
raise errors.NotBranchError(path=transport.base)
129
bzrdir.BzrDirFormat.register_control_format(GitBzrDirFormat)
added
removed
gitlib/git_dir.py
