Commit3eb497b

authored

Merge pull requestgitpython-developers#664 from Horgix/path_expansion

util: move expand_path from repo/base and use it in Git class init

2 parents2dca537 +a2d6787 commit3eb497bCopy full SHA for 3eb497b

File tree

4 files changed

+14

-10

lines changed

AUTHORS
git
- cmd.py
- repo
  - base.py
- util.py

4 files changed

+14

-10

lines changed

`‎AUTHORS`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,5 +19,6 @@ Contributors are:`
`19`	`19`	`-Timothy B. Hartman <tbhartman _at_ gmail.com>`
`20`	`20`	`-Konstantin Popov <konstantin.popov.89 _at_ yandex.ru>`
`21`	`21`	`-Peter Jones <pjones _at_ redhat.com>`
	`22`	`+-Alexis Horgix Chotard`
`22`	`23`
`23`	`24`	`Portions derived from other open source works and are clearly marked.`

`‎git/cmd.py`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`)`
`32`	`32`	`fromgit.excimportCommandError`
`33`	`33`	`fromgit.odictimportOrderedDict`
`34`		`-fromgit.utilimportis_cygwin_git,cygpath`
	`34`	`+fromgit.utilimportis_cygwin_git,cygpath,expand_path`
`35`	`35`
`36`	`36`	`from .excimport (`
`37`	`37`	`GitCommandError,`
`@@ -405,7 +405,7 @@ def __init__(self, working_dir=None):`
`405`	`405`	`It is meant to be the working tree directory if available, or the`
`406`	`406`	`.git directory in case of bare repositories."""`
`407`	`407`	`super(Git,self).__init__()`
`408`		`-self._working_dir=working_dir`
	`408`	`+self._working_dir=expand_path(working_dir)`
`409`	`409`	`self._git_options= ()`
`410`	`410`	`self._persistent_git_options= []`
`411`	`411`

`‎git/repo/base.py`

Lines changed: 4 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`fromgit.objectsimportSubmodule,RootModule,Commit`
`30`	`30`	`fromgit.refsimportHEAD,Head,Reference,TagReference`
`31`	`31`	`fromgit.remoteimportRemote,add_progress,to_progress_instance`
`32`		`-fromgit.utilimportActor,finalize_process,decygpath,hex_to_bin`
	`32`	`+fromgit.utilimportActor,finalize_process,decygpath,hex_to_bin,expand_path`
`33`	`33`	`importos.pathasosp`
`34`	`34`
`35`	`35`	`from .funimportrev_parse,is_git_dir,find_submodule_git_dir,touch,find_worktree_git_dir`
`@@ -50,10 +50,6 @@`
`50`	`50`	`__all__= ('Repo',)`
`51`	`51`
`52`	`52`
`53`		`-def_expand_path(p):`
`54`		`-returnosp.normpath(osp.abspath(osp.expandvars(osp.expanduser(p))))`
`55`		`-`
`56`		`-`
`57`	`53`	`classRepo(object):`
`58`	`54`	`"""Represents a git repository and allows you to query references,`
`59`	`55`	`gather commit information, generate diffs, create and clone repositories query`
`@@ -121,7 +117,7 @@ def __init__(self, path=None, odbt=DefaultDBType, search_parent_directories=Fals`
`121`	`117`	`epath=os.getcwd()`
`122`	`118`	`ifGit.is_cygwin():`
`123`	`119`	`epath=decygpath(epath)`
`124`		`-epath=_expand_path(epathorpathoros.getcwd())`
	`120`	`+epath=expand_path(epathorpathoros.getcwd())`
`125`	`121`	`ifnotos.path.exists(epath):`
`126`	`122`	`raiseNoSuchPathError(epath)`
`127`	`123`
`@@ -148,7 +144,7 @@ def __init__(self, path=None, odbt=DefaultDBType, search_parent_directories=Fals`
`148`	`144`	`sm_gitpath=find_worktree_git_dir(dotgit)`
`149`	`145`
`150`	`146`	`ifsm_gitpathisnotNone:`
`151`		`-self.git_dir=_expand_path(sm_gitpath)`
	`147`	`+self.git_dir=expand_path(sm_gitpath)`
`152`	`148`	`self._working_tree_dir=curpath`
`153`	`149`	`break`
`154`	`150`
`@@ -867,7 +863,7 @@ def init(cls, path=None, mkdir=True, odbt=DefaultDBType, **kwargs):`
`867`	`863`
`868`	`864`	:return: ``git.Repo`` (the newly created repo)"""
`869`	`865`	`ifpath:`
`870`		`-path=_expand_path(path)`
	`866`	`+path=expand_path(path)`
`871`	`867`	`ifmkdirandpathandnotosp.exists(path):`
`872`	`868`	`os.makedirs(path,0o755)`
`873`	`869`

`‎git/util.py`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -340,6 +340,13 @@ def finalize_process(proc, **kwargs):`
`340`	`340`	`## TODO: No close proc-streams??`
`341`	`341`	`proc.wait(**kwargs)`
`342`	`342`
	`343`	`+`
	`344`	`+defexpand_path(p):`
	`345`	`+try:`
	`346`	`+returnosp.normpath(osp.abspath(osp.expandvars(osp.expanduser(p))))`
	`347`	`+except:`
	`348`	`+returnNone`
	`349`	`+`
`343`	`350`	`#} END utilities`
`344`	`351`
`345`	`352`	`#{ Classes`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit3eb497b

File tree

4 files changed

4 files changed

`‎AUTHORS`

`‎git/cmd.py`

`‎git/repo/base.py`

`‎git/util.py`

0 commit comments