Changeset 494 in tailor

Timestamp:

08/05/05 02:38:11 (8 years ago)

Author:

lele@…

Hash name:

20050805003811-97f81-1f41174ab3613c3f047128c8281b48f4d3cb9106

Message:

Old configuration definitively gone
Now, invoking tailor in the old way, ie without --configfile but with
--verbose, it emits an equivalent configuration template that you can
redirect to a file. It does perform the action only with --debug.

File:

• vcpx/tailor.py (modified) (1 diff)

vcpx/tailor.py

@@ -273 +273 @@
     if options.interactive:
         interactive(options, args)
-    elif options.configfile:
+    else:
         defaults = {}
         for k,v in options.__dict__.items():
-            defaults[k.replace('_', '-')] = v
-
-        config = Config(open(options.configfile), defaults)
-
-        if not args:
-            args = config.projects()
-
-        for projname in args:
-            project = config[projname]
-            tailorizer = Tailorizer(project)
-            tailorizer(options)
-    else:
-        # Good (?) old way
-
-        config = None
-
-        base = getcwd()
-
-        if len(args) == 0:
-            args.append(base)
-
-        while args:
-            chdir(base)
-
-            proj = args.pop(0)
-            root = abspath(proj)
-
-            if options.bootstrap:
-                if exists(join(root, STATUS_FILENAME)):
-                    raise ExistingProjectError(
-                        "Project %r cannot be bootstrapped twice" % proj)
-
-                if not options.source_repository:
-                    raise InvocationError('Need a repository to bootstrap %r' %
-                                          proj)
+            if k not in ['interactive', 'bootstrap', 'configfile']:
+                defaults[k.replace('_', '-')] = v
+
+        if options.configfile:
+            config = Config(open(options.configfile), defaults)
+
+            if not args:
+                args = config.projects()
+
+            for projname in args:
+                project = config[projname]
+                tailorizer = Tailorizer(project)
+                tailorizer(options)
+        else:
+            config = Config(None, defaults)
+
+            config.add_section('project')
+            source = options.source_kind + ':source'
+            config.set('project', 'source', source)
+            target = options.target_kind + ':target'
+            config.set('project', 'target', target)
+            config.set('project', 'root', getcwd())
+            config.set('project', 'subdir', options.subdir or '.')
+            config.set('project', 'state-file', 'tailor.state')
+            config.set('project', 'start-revision', options.start_revision)
+
+            config.add_section(source)
+            if options.bootstrap and not options.source_repository:
+                raise InvocationError('Need a source repository to bootstrap')
+
+            config.set(source, 'repository', options.source_repository)
+            if options.source_module:
+                config.set(source, 'module', options.source_module)
+
+            config.add_section(target)
+            if options.target_repository:
+                config.set(target, 'repository', options.target_repository)
+            if options.target_module:
+                config.set(target, 'module', options.target_module)
+
+            if options.verbose:
+                import sys
+
+                sys.stderr.write("You should put the following configuration "
+                                 "in some file, adjust it as needed\n"
+                                 "and use --configfile option with that "
+                                 "file as argument:\n")
+                config.write(sys.stdout)
+
+            if not options.debug:
+                project = config['project']
+                tailorizer = Tailorizer(project)
+                tailorizer(options)
             else:
-                if not exists(proj):
-                    raise UnknownProjectError("Project %r does not exist" %
-                                              proj)
-
-                if not exists(join(root, STATUS_FILENAME)):
-                    raise UnknownProjectError(
-                        "%r is not a tailorized project" % proj)
-
-            tailored = TailorizedProject(root, options.verbose, config)
-
-            if options.bootstrap:
-                tailored.bootstrap(options.source_kind, options.target_kind,
-                                   options.source_repository,
-                                   options.source_module,
-                                   options.revision,
-                                   options.target_repository,
-                                   options.target_module,
-                                   options.subdir)
-            elif options.update:
-                tailored.update(options.single_commit,
-                                options.concatenate_logs)
+                sys.stderr.write("Operation not performed, given --debug\n")