diff options
Diffstat (limited to 'pym/repoman/modules/vcs/git/status.py')
| -rw-r--r-- | pym/repoman/modules/vcs/git/status.py | 33 |
1 files changed, 29 insertions, 4 deletions
diff --git a/pym/repoman/modules/vcs/git/status.py b/pym/repoman/modules/vcs/git/status.py index 5ab5f946f..963abf615 100644 --- a/pym/repoman/modules/vcs/git/status.py +++ b/pym/repoman/modules/vcs/git/status.py @@ -1,3 +1,6 @@ +''' +Git module Status class submodule +''' import re @@ -7,12 +10,25 @@ from repoman._subprocess import repoman_popen, repoman_getstatusoutput class Status(object): + '''Performs status checks on the svn repository''' def __init__(self, qatracker, eadded): + '''Class init + + @param qatracker: QATracker class instance + @param eadded: list + ''' self.qatracker = qatracker self.eadded = eadded def check(self, checkdir, checkdir_relative, xpkg): + '''Perform the svn status check + + @param checkdir: string of the directory being checked + @param checkdir_relative: string of the relative directory being checked + @param xpkg: string of the package being checked + @returns: boolean + ''' myf = repoman_popen( "git ls-files --others %s" % (portage._shell_quote(checkdir_relative),)) @@ -25,7 +41,20 @@ class Status(object): return True @staticmethod + def detect_conflicts(options): + '''Are there any merge conflicts present in the VCS tracking system + + @param options: command line options + @returns: Boolean + ''' + return False + + @staticmethod def supports_gpg_sign(): + '''Does this vcs system support gpg commit signatures + + @returns: Boolean + ''' status, cmd_output = \ repoman_getstatusoutput("git --version") cmd_output = cmd_output.split() @@ -40,10 +69,6 @@ class Status(object): return False @staticmethod - def detect_conflicts(options): - return False - - @staticmethod def isVcsDir(dirname): return dirname in [".git"] |