diff options
Diffstat (limited to 'linaropy/git/workdir.py')
| -rw-r--r-- | linaropy/git/workdir.py | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/linaropy/git/workdir.py b/linaropy/git/workdir.py index 8de4a81..7b769f9 100644 --- a/linaropy/git/workdir.py +++ b/linaropy/git/workdir.py @@ -7,9 +7,9 @@ import uuid from ..proj import Proj from ..cd import cd -from gitrepo import GitRepo +from .gitrepo import GitRepo -from clone import Clone +from .clone import Clone from sh import git from sh import git_new_workdir @@ -60,13 +60,23 @@ class Workdir(GitRepo): (workdir, track)) # TODO: Do we want to prevalidate that 'track' is a valid branch or tag? # If we don't this will just throw an exception. - git_new_workdir(clone.clonedir(), workdir, track, _err_to_out=True, _out="/dev/null") + git_new_workdir( + clone.clonedir(), + workdir, + track, + _err_to_out=True, + _out="/dev/null") else: logging.info( "Workdir(): Calling git new-workdir for workdir %s, tracking %s" % (workdir, "origin/HEAD")) # Always just checkout HEAD if the track is not specified. - git_new_workdir(clone.clonedir(), workdir, "origin/HEAD", _err_to_out=True, _out="/dev/null") + git_new_workdir( + clone.clonedir(), + workdir, + "origin/HEAD", + _err_to_out=True, + _out="/dev/null") except ErrorReturnCode as exc: # if 'workdir' is None @@ -110,7 +120,7 @@ class TestWorkdir(unittest.TestCase): # be nice to the git server. cls.rnclone = Clone( cls.proj, - remote=u'http://git.linaro.org/toolchain/release-notes.git') + remote='http://git.linaro.org/toolchain/release-notes.git') # OFFLINE: # cls.rnclone=Clone(cls.proj,remote=u'/var/run/media/ryanarn/sidecar/reldir/release-notes') |