FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Add support for .git-file. by marcusrbrown · Pull Request #89 · gitpython-developers/GitPython · GitHub

  1. gitpython-developers
  2. GitPython

Repository navigation

Add support for .git-file. #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Byron merged 2 commits into from
Nov 19, 2014
Conversation 2 Commits 2 Checks 0 Files changed
Merged

Add support for .git-file. #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5991698
Support repos that use the .git-file mechanism.
marcusrbrown Jan 11, 2013
3621c06
Add tests for .git-file.
marcusrbrown Jan 11, 2013
File filter

Filter by extension

Filter by extension .py  (2) No extension  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
12 changes: 12 additions & 0 deletions git/repo/base.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ class Repo(object):
re_hexsha_shortened = re.compile('^[0-9A-Fa-f]{4,40}$')
re_author_committer_start = re.compile(r'^(author|committer)')
re_tab_full_line = re.compile(r'^\t(.*)$')
re_git_file_gitdir = re.compile('gitdir: (.*)')

# invariants
# represents the configuration level of a configuration file
Expand Down Expand Up @@ -113,6 +114,17 @@ def __init__(self, path=None, odbt = DefaultDBType):
self.git_dir = gitpath
self._working_tree_dir = curpath
break
if isfile(gitpath):
line = open(gitpath, 'r').readline().strip()
match = self.re_git_file_gitdir.match(line)
if match:
gitpath = match.group(1)
if not os.path.isabs(gitpath):
gitpath = os.path.normpath(join(curpath, gitpath))
if is_git_dir(gitpath):
self.git_dir = gitpath
self._working_tree_dir = curpath
break
curpath, dummy = os.path.split(curpath)
if not dummy:
break
Expand Down
1 change: 1 addition & 0 deletions git/test/fixtures/git_file
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
gitdir: ./.real
17 changes: 17 additions & 0 deletions git/test/test_repo.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -594,6 +594,23 @@ def test_repo_odbtype(self):
target_type = GitCmdObjectDB
assert isinstance(self.rorepo.odb, target_type)

@with_rw_repo('HEAD')
def test_git_file(self, rwrepo):
# Move the .git directory to another location and create the .git file.
real_path_abs = os.path.abspath(join_path_native(rwrepo.working_tree_dir, '.real'))
os.rename(rwrepo.git_dir, real_path_abs)
git_file_path = join_path_native(rwrepo.working_tree_dir, '.git')
open(git_file_path, 'wb').write(fixture('git_file'))

# Create a repo and make sure it's pointing to the relocated .git directory.
git_file_repo = Repo(rwrepo.working_tree_dir)
assert os.path.abspath(git_file_repo.git_dir) == real_path_abs

# Test using an absolute gitdir path in the .git file.
open(git_file_path, 'wb').write('gitdir: %s\n' % real_path_abs)
git_file_repo = Repo(rwrepo.working_tree_dir)
assert os.path.abspath(git_file_repo.git_dir) == real_path_abs

def test_submodules(self):
assert len(self.rorepo.submodules) == 1 # non-recursive
assert len(list(self.rorepo.iter_submodules())) >= 2
Expand Down
Back | FazBrowse Home | New Git URL