aselimov/pubs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for info and warning display in pubs git

Browse Source 
also fixes .git/ presence detection.
This commit is contained in:
Fabien C. Y. Benureau 2019-05-06 08:49:07 +09:00
parent 2ad04e4d13
commit 439b941de6
No known key found for this signature in database
GPG Key ID: C3FB5E831A249A9A
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pubs/plugs/git/git.py
View File

@ -35,7 +35,7 @@ class GitPlugin(PapersPlugin):
def _gitinit(self): def _gitinit(self):
"""Initialize the git repository if necessary.""" """Initialize the git repository if necessary."""
# check that a `.git` directory is present in the pubs dir # check that a `.git` directory is present in the pubs dir
git_path = os.path.join(self.pubsdir, '.git') git_path = os.path.expanduser(os.path.join(self.pubsdir, '.git'))
if not os.path.isdir(git_path): if not os.path.isdir(git_path):
self.shell('init') self.shell('init')
# check that a `.gitignore` file is present # check that a `.gitignore` file is present
@ -46,7 +46,7 @@ class GitPlugin(PapersPlugin):
fd.write(GITIGNORE) fd.write(GITIGNORE)
def update_parser(self, subparsers, conf): def update_parser(self, subparsers, conf):
"""Allow the usage of the pubs git command""" """Allow the usage of the pubs git subcommand"""
git_parser = subparsers.add_parser(self.name, help=self.description) git_parser = subparsers.add_parser(self.name, help=self.description)
# FIXME: there may be some problems here with the -c argument being ambiguous between # FIXME: there may be some problems here with the -c argument being ambiguous between
# pubs and git. # pubs and git.
@ -69,12 +69,13 @@ class GitPlugin(PapersPlugin):
p.wait() p.wait()
if p.returncode != 0: if p.returncode != 0:
msg = ('The git plugin encountered an error when running the git command:\n' + msg = ('The git plugin encountered an error when running the git command:\n' +
'{}\n{}\n'.format(git_cmd, err) + 'You may fix the state of the git ' + '{}\n{}\n'.format(git_cmd, err.decode('utf-8')) +
'repository manually.\nIf relevant, you may submit a bug report at ' + 'You may fix the state of the git repository {} manually.\n'.format(self.pubsdir) +
'If relevant, you may submit a bug report at ' +
'https://github.com/pubs/pubs/issues') 'https://github.com/pubs/pubs/issues')
self.ui.warning(msg) self.ui.warning(msg)
elif not self.quiet: elif not self.quiet:
self.ui.info(output) self.ui.info(output.decode('utf-8'))
return output, err, p.returncode return output, err, p.returncode