Commit 4fd4a4a6 authored by Philippe Mouchel's avatar Philippe Mouchel
Browse files

Merge branch 'feature/repository-check-discrimination' into '2.x' 

Remove untouched repositories from git.check_status to reduce noise

Fix Redmine#102624

Untouched repositories: 

* "master repository" (the actual solution using Drupalizer)
* Drupalizer's repository

See merge request !30
parents 25fd4ae6 2aba55d5

git.py

+9 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ def check_status(): 


def is_git_dirty():

    repos = local('find ' + path.normpath(env.workspace) + ' -name ".git"', capture=True).splitlines()

    repos = _remove_untouched_repository(repos)



    nbWarnings = 0

    for repo in repos:

        repoLocalPath = path.normpath(path.join(repo, '..'))
@@ -42,6 +44,13 @@ def is_git_dirty(): 
    # - attention aux conflits, faire un pull d'abord et valider la fusion automatique





def _remove_untouched_repository(repos):

    repos.remove(path.normpath(path.join(env.workspace, '.git')))

    repos.remove(path.normpath(path.join(env.workspace, 'fabfile', '.git')))



    return repos





def _check_repo(repoLocalPath):

    nbWarnings = 0

    with h.fab_cd('local', repoLocalPath):