Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commita728b0a

Browse files
committed
fixes from#1202
1 parent5232c89 commita728b0a

File tree

1 file changed

+16
-12
lines changed

1 file changed

+16
-12
lines changed

‎git/repo/base.py

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -268,13 +268,14 @@ def __hash__(self) -> int:
268268

269269
# Description property
270270
def_get_description(self)->str:
271-
filename=osp.join(self.git_dir,'description')ifself.git_direlse""
271+
ifself.git_dir:
272+
filename=osp.join(self.git_dir,'description')
272273
withopen(filename,'rb')asfp:
273274
returnfp.read().rstrip().decode(defenc)
274275

275276
def_set_description(self,descr:str)->None:
276-
277-
filename=osp.join(self.git_dir,'description')ifself.git_direlse""
277+
ifself.git_dir:
278+
filename=osp.join(self.git_dir,'description')
278279
withopen(filename,'wb')asfp:
279280
fp.write((descr+'\n').encode(defenc))
280281

@@ -460,12 +461,11 @@ def _get_config_path(self, config_level: Lit_config_levels) -> str:
460461
elifconfig_level=="global":
461462
returnosp.normpath(osp.expanduser("~/.gitconfig"))
462463
elifconfig_level=="repository":
463-
ifself._common_dir:
464-
returnosp.normpath(osp.join(self._common_dir,"config"))
465-
elifself.git_dir:
466-
returnosp.normpath(osp.join(self.git_dir,"config"))
467-
else:
464+
repo_dir=self._common_dirorself.git_dir
465+
ifnotrepo_dir:
468466
raiseNotADirectoryError
467+
else:
468+
returnosp.normpath(osp.join(repo_dir,"config"))
469469

470470
raiseValueError("Invalid configuration level: %r"%config_level)
471471

@@ -611,11 +611,13 @@ def is_ancestor(self, ancestor_rev: 'Commit', rev: 'Commit') -> bool:
611611
returnTrue
612612

613613
def_get_daemon_export(self)->bool:
614-
filename=osp.join(self.git_dir,self.DAEMON_EXPORT_FILE)ifself.git_direlse""
614+
ifself.git_dir:
615+
filename=osp.join(self.git_dir,self.DAEMON_EXPORT_FILE)
615616
returnosp.exists(filename)
616617

617618
def_set_daemon_export(self,value:object)->None:
618-
filename=osp.join(self.git_dir,self.DAEMON_EXPORT_FILE)ifself.git_direlse""
619+
ifself.git_dir:
620+
filename=osp.join(self.git_dir,self.DAEMON_EXPORT_FILE)
619621
fileexists=osp.exists(filename)
620622
ifvalueandnotfileexists:
621623
touch(filename)
@@ -631,7 +633,8 @@ def _get_alternates(self) -> List[str]:
631633
"""The list of alternates for this repo from which objects can be retrieved
632634
633635
:return: list of strings being pathnames of alternates"""
634-
alternates_path=osp.join(self.git_dir,'objects','info','alternates')ifself.git_direlse""
636+
ifself.git_dir:
637+
alternates_path=osp.join(self.git_dir,'objects','info','alternates')
635638

636639
ifosp.exists(alternates_path):
637640
withopen(alternates_path,'rb')asf:
@@ -1134,7 +1137,8 @@ def currently_rebasing_on(self) -> Union['SymbolicReference', Commit, 'TagObject
11341137
11351138
None if we are not currently rebasing.
11361139
"""
1137-
rebase_head_file=osp.join(self.git_dir,"REBASE_HEAD")ifself.git_direlse""
1140+
ifself.git_dir:
1141+
rebase_head_file=osp.join(self.git_dir,"REBASE_HEAD")
11381142
ifnotosp.isfile(rebase_head_file):
11391143
returnNone
11401144
returnself.commit(open(rebase_head_file,"rt").readline().strip())

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp