Changeset 643 in tailor

Timestamp:

08/19/05 22:50:47 (8 years ago)

Author:

lele@…

Hash name:

20050819205047-97f81-2b0f2caee3550be011d1dcb4ec300abca6952c47

Message:

Dropped the interactive session

Files:

• vcpx/tailor.py (modified) (3 diffs)
• README (modified) (1 diff)
• vcpx/session.py (deleted)

vcpx/tailor.py

@@ -18 +18 @@
 from project import Project
 from source import InvocationError
-from session import interactive
 
 class Tailorizer(Project):
@@ -158 +157 @@
 
 GENERAL_OPTIONS = [
-    make_option("-i", "--interactive", default=False, action="store_true",
-                help="Start an interactive session."),
     make_option("-D", "--debug", dest="debug",
                 action="store_true", default=False,
@@ -300 +297 @@
     options, args = parser.parse_args()
 
-    if options.interactive:
-        interactive(options, args)
+    defaults = {}
+    for k,v in options.__dict__.items():
+        if k <> 'configfile':
+            defaults[k.replace('_', '-')] = str(v)
+
+    if options.configfile or (len(sys.argv)==2 and len(args)==1):
+        # Either we have a --configfile, or there are no options
+        # and a single argument (to support shebang style scripts)
+
+        if not options.configfile:
+            options.configfile = sys.argv[1]
+            args = None
+
+        config = Config(open(options.configfile), defaults)
+
+        if not args:
+            args = config.projects()
+
+        for projname in args:
+            tailorizer = Tailorizer(projname, config)
+            tailorizer()
     else:
-        defaults = {}
-        for k,v in options.__dict__.items():
-            if k not in ['interactive', 'configfile']:
-                defaults[k.replace('_', '-')] = str(v)
-
-        if options.configfile or (len(sys.argv)==2 and len(args)==1):
-            # Either we have a --configfile, or there are no options
-            # and a single argument (to support shebang style scripts)
-
-            if not options.configfile:
-                options.configfile = sys.argv[1]
-                args = None
-
-            config = Config(open(options.configfile), defaults)
-
-            if not args:
-                args = config.projects()
-
-            for projname in args:
-                tailorizer = Tailorizer(projname, config)
-                tailorizer()
-        else:
-            for omit in ['source-kind', 'target-kind',
-                         'source-module', 'target-module',
-                         'source-repository', 'target-repository',
-                         'start-revision', 'subdir']:
-                if omit in defaults:
-                    del defaults[omit]
-
-            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-directory', 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)
-            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 options.debug:
-                tailorizer = Tailorizer('project', config)
-                tailorizer()
-            elif not options.verbose:
-                sys.stderr.write("Operation not performed, try --verbose\n")
+        for omit in ['source-kind', 'target-kind',
+                     'source-module', 'target-module',
+                     'source-repository', 'target-repository',
+                     'start-revision', 'subdir']:
+            if omit in defaults:
+                del defaults[omit]
+
+        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-directory', 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)
+        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 options.debug:
+            tailorizer = Tailorizer('project', config)
+            tailorizer()
+        elif not options.verbose:
+            sys.stderr.write("Operation not performed, try --verbose\n")

README

@@ -361 +361 @@
 will fetch latest changes from the upstream repository.
 
-Interactive sessions
---------------------
-
-Tailor offers an alternative way of driving its activity by using an
-interactive session, bringing the configuration more similar to a
-script.
-
-Although this is still a work-in-progress, it's quickly becoming my
-preferred usage, as its functionality cover the underlying tailor
-features.
-
-For example, this is the script I'm using to test it::
-
-    cd /tmp
-    state_file tailor.state
-    source_kind darcs
-    target_kind svn
-    source_repository /home/lele/WiP/cvsync
-    sub_directory cvsync
-    refill_changelogs no
-    patch_name_format [%(module)s] Changeset %(revision)s by %(author)s
-
-that, as you can see, specifies the context needed by tailor to do its
-work. With the following command line::
-
-    $ tailor --verbose --interactive tailor.cmds
-    Welcome to the Tailor interactive session: you can issue several commands
-    with the usual `readline` facilities. With "help" you'll get a list of
-    available commands.
-
-    Current directory: /tmp
-    Current state file: /tmp/tailor.state
-    Current source kind: darcs
-    Current target kind: svn
-    Current source repository: /home/lele/WiP/cvsync
-    Sub directory: cvsync
-    Refill changelogs: False
-    Patch name format: [%(module)s] Changeset %(revision)s by %(author)s
-    tailor $ help
-    
-    Documented commands (type help <topic>):
-    ========================================
-    EOF                print_executed_commands  state_file
-    bootstrap          refill_changelogs        sub_directory
-    cd                 remove_first_log_line    target_kind
-    current_directory  save                     target_module
-    exit               source_kind              target_repository
-    logfile            source_module
-    patch_name_format  source_repository
-
-    Undocumented commands:
-    ======================
-    help
-
-    tailor $ help bootstrap
-    
-        Usage: bootstrap [revision]
-
-        Checkout the initial upstream revision, by default HEAD (or
-        specified by argument), then import the subtree into the
-        target repository.
-
-As another example, consider the following commands::
-
-    cd /tmp/wc
-    state_file tailor.state
-    source_kind cvs
-    target_kind darcs
-    source_repository :pserver:anonymous@cvs.sourceforge.net:/cvsroot/buildbot
-    source_module buildbot
-    refill_changelogs false
-    patch_name_format %(firstlogline)s
-    print_executed_commands true
-    bootstrap 2004/01/01 20:05:24
-    update ask
-
-Assuming ``/tmp/wc`` exists, executing them will first bootstrap a new
-darcs repository with a snapshot at the given date of the upstream
-sources, then will proceed with the update, asking confirmation about
-any single changeset::
-
-    ...
-    Collected 586 upstream changesets
-    Changeset 2004-01-07 00:42:07 by warner:
-    * buildbot/changes/mail.py (parseFreshCVSMail): ....
-    * test/test_mailparse.py (Test1.testMsg9): test for same
-
-    Apply [Y/n/v/h/q]? h
-    y: yes, apply it and keep going
-    n: no, skip the current changeset
-    v: view more detailed information
-    q: do not apply the current changeset and stop iterating
-
-    Apply [Y/n/v/h/q]? v
-    Revision: 2004-01-07 00:42:07 by warner
-    Date: 2004-01-07 00:42:07
-    Author: warner
-    Modified: ChangeLog,buildbot/changes/mail.py,test/test_mailparse.py
-    Added: test/mail/msg9
-    Log: * buildbot/changes/mail.py (parseFreshCVSMail): ...
-    * test/test_mailparse.py (Test1.testMsg9): test for same
-    
-    Apply [Y/n/v/h/q]?
-
         
 Further help