kallithea Changeset - 0080ffd8aea0

Changeset - 0080ffd8aea0

Parent rev.

Child rev.

[Not reviewed]

default

1 3 1

Thomas De Schampheleire - 7 years ago 2018-11-18 20:02:17
thomas.de_schampheleire@nokia.com

cli: convert 'gearbox repo-scan' into 'kallithea-cli repo-scan'

4 files changed with 22 insertions and 38 deletions:

docs/dev/dbmigrations.rst

kallithea/bin/kallithea_cli.py

kallithea/bin/kallithea_cli_repo.py

setup.py

0 comments (0 inline, 0 general)

docs/dev/dbmigrations.rst

➞

Show inline comments

@@ @@ -28,13 +28,13 @@ changes, you should make a matching Alem @@
 . After every database schema change, recreate the throwaway database
    to test the changes::
     rm temp.db
     gearbox setup-db -c temp.ini --repos=/var/repos --user=doe --email doe@example.com --password=123456 --no-public-access --force-yes
-    gearbox repo-scan -c temp.ini
+    kallithea-cli repo-scan -c temp.ini
 . Once satisfied with the schema changes, auto-generate a draft Alembic
    script using the development database that has *not* been upgraded.
    (The generated script will upgrade the database to match the code.)
    ::

kallithea/bin/kallithea_cli.py

➞

Show inline comments

@@ @@ -15,6 +15,7 @@ @@
 # 'cli' is the main entry point for 'kallithea-cli', specified in setup.py as entry_points console_scripts
 from kallithea.bin.kallithea_cli_base import cli
 # import commands (they will add themselves to the 'cli' object)
 import kallithea.bin.kallithea_cli_config
 import kallithea.bin.kallithea_cli_ishell
 import kallithea.bin.kallithea_cli_repo

kallithea/bin/kallithea_cli_repo.py

➞

Show inline comments

@@ @@ -9,56 +9,40 @@ @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 kallithea.lib.paster_commands.repo_scan
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 repo-scan gearbox command for Kallithea
 This file was forked by the Kallithea project in July 2014.
 This file was forked by the Kallithea project in July 2014 and later moved.
 Original author and date, and relevant copyright and licensing information is below:
 :created_on: Feb 9, 2013
 :author: marcink
 :copyright: (c) 2013 RhodeCode GmbH, and others.
 :license: GPLv3, see LICENSE.md for more details.
 """
 import click
 import kallithea.bin.kallithea_cli_base as cli_base
+from kallithea.lib.utils import repo2db_mapper
 from kallithea.model.scm import ScmModel
 from kallithea.lib.paster_commands.common import BasePasterCommand
 from kallithea.lib.utils import repo2db_mapper
 class Command(BasePasterCommand):
     """Kallithea: Scan file system for repositories
 @cli_base.register_command(config_file_initialize_app=True)
 @click.option('--remove-missing', is_flag=True,
         help='Remove missing repositories from the Kallithea database.')
 def repo_scan(remove_missing):
     """Scan filesystem for repositories.
     Search under the repository root configured in the database,
     all new repositories, and report missing ones with an option of removing them.
     Search the configured repository root for new repositories and add them
     into Kallithea.
     Additionally, report repositories that were previously known to Kallithea
     but are no longer present on the filesystem. If option --remove-missing is
     given, remove the missing repositories from the Kallithea database.
     """
     def take_action(self, args):
         rm_obsolete = args.delete_obsolete
         print 'Now scanning root location for new repos ...'
     click.echo('Now scanning root location for new repos ...')
         added, removed = repo2db_mapper(ScmModel().repo_scan(),
                                         remove_obsolete=rm_obsolete)
         print 'Scan completed.'
                                     remove_obsolete=remove_missing)
     click.echo('Scan completed.')
         if added:
-            print 'Added: %s' % ', '.join(added)
+        click.echo('Added: %s' % ', '.join(added))
         if removed:
             print '%s: %s' % ('Removed' if rm_obsolete else 'Missing',
                               ', '.join(removed))
     def get_parser(self, prog_name):
         parser = super(Command, self).get_parser(prog_name)
         parser.add_argument(
             '--delete-obsolete',
             action='store_true',
             help="Use this flag do delete repositories that are "
                  "present in Kallithea database but not on the filesystem",
+        )
         return parser
         click.echo('%s: %s' % ('Removed' if remove_missing else 'Missing',
                           ', '.join(removed)))

setup.py

➞

Show inline comments

@@ @@ -162,12 +162,11 @@ setuptools.setup( @@
     cache-keys=kallithea.lib.paster_commands.cache_keys:Command
     celeryd=kallithea.lib.paster_commands.celeryd:Command
     cleanup-repos=kallithea.lib.paster_commands.cleanup:Command
     install-iis=kallithea.lib.paster_commands.install_iis:Command
     make-index=kallithea.lib.paster_commands.make_index:Command
     make-rcext=kallithea.lib.paster_commands.make_rcextensions:Command
     repo-scan=kallithea.lib.paster_commands.repo_scan:Command
     setup-db=kallithea.lib.paster_commands.setup_db:Command
     update-repoinfo=kallithea.lib.paster_commands.update_repoinfo:Command
     upgrade-db=kallithea.lib.dbmigrate:UpgradeDb
     """,
+)

0 comments (0 inline, 0 general)