cvsshell-devel — Mailinglist for developers of cvsshell

[Cvsshell-devel] CVS: cvsshell/src app.py,1.3,1.4 basic_cmds.py,1.7,1.8 configurable_app.py,1.2,1.3 cvs_shell.py,1.6,1.7 interactive_app.py,1.2,1.3 plugable_app.py,1.1.1.1,1.2 utils.py,1.2,1.3

[Stefan H. <ste...@us...>]

Update of /cvsroot/cvsshell/cvsshell/src
In directory usw-pr-cvs1:/tmp/cvs-serv30521/src

Modified Files:
	app.py basic_cmds.py configurable_app.py cvs_shell.py 
	interactive_app.py plugable_app.py utils.py 
Log Message:
Added license header



Index: app.py
===================================================================
RCS file: /cvsroot/cvsshell/cvsshell/src/app.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** app.py	7 Mar 2002 12:19:37 -0000	1.3
--- app.py	7 Mar 2002 13:08:49 -0000	1.4
***************
*** 1,2 ****
--- 1,23 ----
+ ###############################################################################
+ # This file is part of CvsShell  
+ # 
+ # CvsShell is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; either version 2 of the License, or
+ # (at your option) any later version.
+ # 
+ # CvsShell is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # 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 CvsShell; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ # 
+ # Copyright 2002 by Stefan Heimann
+ # Website: http://cvsshell.sourceforge.net/
+ ###############################################################################
+ 
  import sys, os, traceback, getopt
  AppError = 'AppError'

Index: basic_cmds.py
===================================================================
RCS file: /cvsroot/cvsshell/cvsshell/src/basic_cmds.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** basic_cmds.py	7 Mar 2002 12:59:28 -0000	1.7
--- basic_cmds.py	7 Mar 2002 13:08:49 -0000	1.8
***************
*** 1,2 ****
--- 1,23 ----
+ ###############################################################################
+ # This file is part of CvsShell  
+ # 
+ # CvsShell is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; either version 2 of the License, or
+ # (at your option) any later version.
+ # 
+ # CvsShell is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # 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 CvsShell; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ # 
+ # Copyright 2002 by Stefan Heimann
+ # Website: http://cvsshell.sourceforge.net/
+ ###############################################################################
+ 
  import os, string, re
  import utils

Index: configurable_app.py
===================================================================
RCS file: /cvsroot/cvsshell/cvsshell/src/configurable_app.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** configurable_app.py	7 Mar 2002 10:40:00 -0000	1.2
--- configurable_app.py	7 Mar 2002 13:08:49 -0000	1.3
***************
*** 1,2 ****
--- 1,23 ----
+ ###############################################################################
+ # This file is part of CvsShell  
+ # 
+ # CvsShell is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; either version 2 of the License, or
+ # (at your option) any later version.
+ # 
+ # CvsShell is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # 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 CvsShell; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ # 
+ # Copyright 2002 by Stefan Heimann
+ # Website: http://cvsshell.sourceforge.net/
+ ###############################################################################
+ 
  import os, sys, re, types
  from app import App

Index: cvs_shell.py
===================================================================
RCS file: /cvsroot/cvsshell/cvsshell/src/cvs_shell.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** cvs_shell.py	7 Mar 2002 12:38:23 -0000	1.6
--- cvs_shell.py	7 Mar 2002 13:08:49 -0000	1.7
***************
*** 1,3 ****
! #!/usr/bin/env python
  
  import os, sys, re, types
--- 1,22 ----
! ###############################################################################
! # This file is part of CvsShell  
! # 
! # CvsShell is free software; you can redistribute it and/or modify
! # it under the terms of the GNU General Public License as published by
! # the Free Software Foundation; either version 2 of the License, or
! # (at your option) any later version.
! # 
! # CvsShell is distributed in the hope that it will be useful,
! # but WITHOUT ANY WARRANTY; without even the implied warranty of
! # 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 CvsShell; if not, write to the Free Software
! # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
! # 
! # Copyright 2002 by Stefan Heimann
! # Website: http://cvsshell.sourceforge.net/
! ###############################################################################
  
  import os, sys, re, types

Index: interactive_app.py
===================================================================
RCS file: /cvsroot/cvsshell/cvsshell/src/interactive_app.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** interactive_app.py	7 Mar 2002 10:49:07 -0000	1.2
--- interactive_app.py	7 Mar 2002 13:08:49 -0000	1.3
***************
*** 1,2 ****
--- 1,23 ----
+ ###############################################################################
+ # This file is part of CvsShell  
+ # 
+ # CvsShell is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; either version 2 of the License, or
+ # (at your option) any later version.
+ # 
+ # CvsShell is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # 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 CvsShell; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ # 
+ # Copyright 2002 by Stefan Heimann
+ # Website: http://cvsshell.sourceforge.net/
+ ###############################################################################
+ 
  import os
  from app import App, AppError

Index: plugable_app.py
===================================================================
RCS file: /cvsroot/cvsshell/cvsshell/src/plugable_app.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** plugable_app.py	7 Mar 2002 00:03:23 -0000	1.1.1.1
--- plugable_app.py	7 Mar 2002 13:08:49 -0000	1.2
***************
*** 1,2 ****
--- 1,23 ----
+ ###############################################################################
+ # This file is part of CvsShell  
+ # 
+ # CvsShell is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; either version 2 of the License, or
+ # (at your option) any later version.
+ # 
+ # CvsShell is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # 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 CvsShell; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ # 
+ # Copyright 2002 by Stefan Heimann
+ # Website: http://cvsshell.sourceforge.net/
+ ###############################################################################
+ 
  import re, types
  from configurable_app import ConfigurableApp

Index: utils.py
===================================================================
RCS file: /cvsroot/cvsshell/cvsshell/src/utils.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** utils.py	7 Mar 2002 10:43:12 -0000	1.2
--- utils.py	7 Mar 2002 13:08:49 -0000	1.3
***************
*** 1,2 ****
--- 1,23 ----
+ ###############################################################################
+ # This file is part of CvsShell  
+ # 
+ # CvsShell is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; either version 2 of the License, or
+ # (at your option) any later version.
+ # 
+ # CvsShell is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # 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 CvsShell; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ # 
+ # Copyright 2002 by Stefan Heimann
+ # Website: http://cvsshell.sourceforge.net/
+ ###############################################################################
+ 
  import re
  

[Cvsshell-devel] CVS: cvsshell/src basic_cmds.py,1.6,1.7

[Stefan H. <ste...@us...>]

Update of /cvsroot/cvsshell/cvsshell/src
In directory usw-pr-cvs1:/tmp/cvs-serv27528/src

Modified Files:
	basic_cmds.py 
Log Message:
Fixed some problems



Index: basic_cmds.py
===================================================================
RCS file: /cvsroot/cvsshell/cvsshell/src/basic_cmds.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** basic_cmds.py	7 Mar 2002 12:35:06 -0000	1.6
--- basic_cmds.py	7 Mar 2002 12:59:28 -0000	1.7
***************
*** 153,157 ****
  def add(name, args, context):
      app = context['APP']
!     if args == '':
          args = app.prompt('enter filenumbers to add: ')
          if args is None: return
--- 153,157 ----
  def add(name, args, context):
      app = context['APP']
!     if not args:
          args = app.prompt('enter filenumbers to add: ')
          if args is None: return
***************
*** 196,200 ****
          if args is None: return
      def __doIt(e,filename):
!         return filename
      (rootDir, toDelete) = _applyOnEntryList(args, context, __doIt)
      toDeleteList = utils.Listing(rootDir, toDelete)
--- 196,200 ----
          if args is None: return
      def __doIt(e,filename):
!         return e
      (rootDir, toDelete) = _applyOnEntryList(args, context, __doIt)
      toDeleteList = utils.Listing(rootDir, toDelete)
***************
*** 207,211 ****
              app.printErr(msg)
          else:
!             filenames.append(name)
              e.status = utils.Entry.S_REMOVED
      if filenames:
--- 207,211 ----
              app.printErr(msg)
          else:
!             filenames.append(os.path.join(e.dir, e.name))
              e.status = utils.Entry.S_REMOVED
      if filenames:
***************
*** 287,303 ****
      (rootdir of listing, list with the return values from fun)."""
      app = context['APP']
      try:
          nums = utils.getNumbers(opts)
      except utils.ParseError, msg:
          app.printErr(msg)
!         return
      if len(nums) == 0:
          app.printMsg('No files specified.')
!         return
      try:
          listing = context['basic_cmds.listing']
      except KeyError:
          app.printErr(noListingErrMsg)
!         return
      result = []
      for x in nums:
--- 287,304 ----
      (rootdir of listing, list with the return values from fun)."""
      app = context['APP']
+     defRet = (None, None)
      try:
          nums = utils.getNumbers(opts)
      except utils.ParseError, msg:
          app.printErr(msg)
!         return defRet
      if len(nums) == 0:
          app.printMsg('No files specified.')
!         return defRet
      try:
          listing = context['basic_cmds.listing']
      except KeyError:
          app.printErr(noListingErrMsg)
!         return defRet
      result = []
      for x in nums:

[Cvsshell-devel] CVS: cvsshell LICENSE,NONE,1.1

[Stefan H. <ste...@us...>]

Update of /cvsroot/cvsshell/cvsshell
In directory usw-pr-cvs1:/tmp/cvs-serv27343

Added Files:
	LICENSE 
Log Message:
This is the LICENSE of the project (GPL)



--- NEW FILE: LICENSE ---
		    GNU GENERAL PUBLIC LICENSE
		       Version 2, June 1991

 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

			    Preamble

  The licenses for most software are designed to take away your
freedom to share and change it.  By contrast, the GNU General Public
License is intended to guarantee your freedom to share and change free
software--to make sure the software is free for all its users.  This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it.  (Some other Free Software Foundation software is covered by
the GNU Library General Public License instead.)  You can apply it to
your programs, too.

  When we speak of free software, we are referring to freedom, not
price.  Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.

  To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if you
distribute copies of the software, or if you modify it.

  For example, if you distribute copies of such a program, whether
gratis or for a fee, you must give the recipients all the rights that
you have.  You must make sure that they, too, receive or can get the
source code.  And you must show them these terms so they know their
rights.

  We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy,
distribute and/or modify the software.

  Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free
software.  If the software is modified by someone else and passed on, we
want its recipients to know that what they have is not the original, so
that any problems introduced by others will not reflect on the original
authors' reputations.

  Finally, any free program is threatened constantly by software
patents.  We wish to avoid the danger that redistributors of a free
program will individually obtain patent licenses, in effect making the
program proprietary.  To prevent this, we have made it clear that any
patent must be licensed for everyone's free use or not licensed at all.

  The precise terms and conditions for copying, distribution and
modification follow.

		    GNU GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

  0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License.  The "Program", below,
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language.  (Hereinafter, translation is included without limitation in
the term "modification".)  Each licensee is addressed as "you".

Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope.  The act of
running the Program is not restricted, and the output from the Program
is covered only if its contents constitute a work based on the
Program (independent of having been made by running the Program).
Whether that is true depends on what the Program does.

  1. You may copy and distribute verbatim copies of the Program's
source code as you receive it, in any medium, provided that you
conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the
notices that refer to this License and to the absence of any warranty;
and give any other recipients of the Program a copy of this License
along with the Program.

You may charge a fee for the physical act of transferring a copy, and
you may at your option offer warranty protection in exchange for a fee.

  2. You may modify your copy or copies of the Program or any portion
of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:

    a) You must cause the modified files to carry prominent notices
    stating that you changed the files and the date of any change.

    b) You must cause any work that you distribute or publish, that in
    whole or in part contains or is derived from the Program or any
    part thereof, to be licensed as a whole at no charge to all third
    parties under the terms of this License.

    c) If the modified program normally reads commands interactively
    when run, you must cause it, when started running for such
    interactive use in the most ordinary way, to print or display an
    announcement including an appropriate copyright notice and a
    notice that there is no warranty (or else, saying that you provide
    a warranty) and that users may redistribute the program under
    these conditions, and telling the user how to view a copy of this
    License.  (Exception: if the Program itself is interactive but
    does not normally print such an announcement, your work based on
    the Program is not required to print an announcement.)

These requirements apply to the modified work as a whole.  If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works.  But when you
distribute the same sections as part of a whole which is a work based
on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote it.

Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Program.

In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.

  3. You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following:

    a) Accompany it with the complete corresponding machine-readable
    source code, which must be distributed under the terms of Sections
    1 and 2 above on a medium customarily used for software interchange; or,

    b) Accompany it with a written offer, valid for at least three
    years, to give any third party, for a charge no more than your
    cost of physically performing source distribution, a complete
    machine-readable copy of the corresponding source code, to be
    distributed under the terms of Sections 1 and 2 above on a medium
    customarily used for software interchange; or,

    c) Accompany it with the information you received as to the offer
    to distribute corresponding source code.  (This alternative is
    allowed only for noncommercial distribution and only if you
    received the program in object code or executable form with such
    an offer, in accord with Subsection b above.)

The source code for a work means the preferred form of the work for
making modifications to it.  For an executable work, complete source
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable.  However, as a
special exception, the source code distributed need not include
anything that is normally distributed (in either source or binary
form) with the major components (compiler, kernel, and so on) of the
operating system on which the executable runs, unless that component
itself accompanies the executable.

If distribution of executable or object code is made by offering
access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.

  4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License.  Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
void, and will automatically terminate your rights under this License.
However, parties who have received copies, or rights, from you under
this License will not have their licenses terminated so long as such
parties remain in full compliance.

  5. You are not required to accept this License, since you have not
signed it.  However, nothing else grants you permission to modify or
distribute the Program or its derivative works.  These actions are
prohibited by law if you do not accept this License.  Therefore, by
modifying or distributing the Program (or any work based on the
Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Program or works based on it.

  6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to
these terms and conditions.  You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.

  7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License.  If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Program at all.  For example, if a patent
license would not permit royalty-free redistribution of the Program by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.

If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.

It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system, which is
implemented by public license practices.  Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.

This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.

  8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
may add an explicit geographical distribution limitation excluding
those countries, so that distribution is permitted only in or among
countries not thus excluded.  In such case, this License incorporates
the limitation as if written in the body of this License.

  9. The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time.  Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.

Each version is given a distinguishing version number.  If the Program
specifies a version number of this License which applies to it and "any
later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation.  If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
Foundation.

  10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the author
to ask for permission.  For software which is copyrighted by the Free
Software Foundation, write to the Free Software Foundation; we sometimes
make exceptions for this.  Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.

			    NO WARRANTY

  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
REPAIR OR CORRECTION.

  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.

		     END OF TERMS AND CONDITIONS

	    How to Apply These Terms to Your New Programs

  If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.

  To do so, attach the following notices to the program.  It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.

    <one line to give the program's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>

    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    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, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA


Also add information on how to contact you by electronic and paper mail.

If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:

    Gnomovision version 69, Copyright (C) year name of author
    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.

The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License.  Of course, the commands you use may
be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.

You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the program, if
necessary.  Here is a sample; alter the names:

  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
  `Gnomovision' (which makes passes at compilers) written by James Hacker.

  <signature of Ty Coon>, 1 April 1989
  Ty Coon, President of Vice

This General Public License does not permit incorporating your program into
proprietary programs.  If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library.  If this is what you want to do, use the GNU Library General
Public License instead of this License.

[Cvsshell-devel] CVS: cvsshell/etc cvsshell.ini,NONE,1.1 default-cvsshellrc,NONE,1.1

[Stefan H. <ste...@us...>]

Update of /cvsroot/cvsshell/cvsshell/etc
In directory usw-pr-cvs1:/tmp/cvs-serv27009/etc

Added Files:
	cvsshell.ini default-cvsshellrc 
Log Message:
Moved from src/etc



--- NEW FILE: cvsshell.ini ---
section COMMANDS:
  exit = basic_cmds.exitProgram
  ?, help = basic_cmds.cmdHelp
  cd = basic_cmds.changeDir
  up, upd, update = basic_cmds.update
  refresh = basic_cmds.simulateUpdate
  sr,set-root =  basic_cmds.setCvsRoot
  rr,read-root = basic_cmds.readCvsRoot
  cr,clear-root = basic_cmds.clearCvsRoot
  list = basic_cmds.printListing
  ad, add, new = basic_cmds.add
  ci, com, commit = basic_cmds.commit
  delete, remove = basic_cmds.remove
  co, get, checkout = basic_cmds.checkout
  st, stat, status = basic_cmds.status
  auto = basic_cmds.toggleCvsRootAutoUpdate
end

section PARSERS:
  INIT_CMDS = basic_cmds.parseInitCmdsSection
  CVSROOT = basic_cmds.parseCvsRootSection
  DEFAULT_CMD_OPTIONS = basic_cmds.parseDefaultOptions
end
--- NEW FILE: default-cvsshellrc ---
# Configfile for CvsShell
# See http://cvsshell.sourceforge.net for more information

# commands that should be executed at start-up
section INIT_CMDS:
  auto on
end

# options for cvs commands
#
# Format: option1, option2 = global options % options
# Global options are the options available for all commands,
# options are the options only available for this specific command.
# Example: cvs -n update -P
# Here, `-n' is a global option, while `-P' is just a option
#
# You can use the keyword `ALL' to apply options to all commands
#
# Note: You have to specify the options for every synonym of a command, too.
section DEFAULT_CMD_OPTIONS:
  ALL = -z 3 %
  up, upd, update = -q % -P -d
  co, get, checkout = -q %
end
 

# aliases for cvsroots
#
# Format: alias = cvsroot
section CVSROOT:

end

[Cvsshell-devel] CVS: cvsshell/etc - New directory

[Stefan H. <ste...@us...>]

Update of /cvsroot/cvsshell/cvsshell/etc
In directory usw-pr-cvs1:/tmp/cvs-serv26687/etc

Log Message:
Directory /cvsroot/cvsshell/cvsshell/etc added to the repository

[Cvsshell-devel] CVS: cvsshell/src/etc default-cvsshellrc,1.1.1.1,NONE

[Stefan H. <ste...@us...>]

Update of /cvsroot/cvsshell/cvsshell/src/etc
In directory usw-pr-cvs1:/tmp/cvs-serv25557/etc

Removed Files:
	default-cvsshellrc 
Log Message:
moved etc dir to ..


--- default-cvsshellrc DELETED ---

[Cvsshell-devel] CVS: cvsshell/src cvs_shell.py,1.5,1.6

[Stefan H. <ste...@us...>]

Update of /cvsroot/cvsshell/cvsshell/src
In directory usw-pr-cvs1:/tmp/cvs-serv21826

Modified Files:
	cvs_shell.py 
Log Message:
Moved etc dir to ..


Index: cvs_shell.py
===================================================================
RCS file: /cvsroot/cvsshell/cvsshell/src/cvs_shell.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** cvs_shell.py	7 Mar 2002 12:35:06 -0000	1.5
--- cvs_shell.py	7 Mar 2002 12:38:23 -0000	1.6
***************
*** 18,22 ****
          self.setCopyright('Copyright 2002 by Stefan Heimann. This software is released under the GPL.')
          self.setBugAddress('http://sourceforge.net/tracker/?group_id=48175&atid=452212')
!         etcDir = os.path.join(self.THIS_DIR,'etc')
          self.setConfigFile(os.path.join(self.HOME,'.cvsshellrc'),
                             os.path.join(etcDir, 'default-cvsshellrc'))
--- 18,22 ----
          self.setCopyright('Copyright 2002 by Stefan Heimann. This software is released under the GPL.')
          self.setBugAddress('http://sourceforge.net/tracker/?group_id=48175&atid=452212')
!         etcDir = os.path.join(self.THIS_DIR, '..', 'etc')
          self.setConfigFile(os.path.join(self.HOME,'.cvsshellrc'),
                             os.path.join(etcDir, 'default-cvsshellrc'))

[Cvsshell-devel] CVS: cvsshell/src basic_cmds.py,1.5,1.6 cvs_shell.py,1.4,1.5

[Stefan H. <ste...@us...>]

Update of /cvsroot/cvsshell/cvsshell/src
In directory usw-pr-cvs1:/tmp/cvs-serv20994

Modified Files:
	basic_cmds.py cvs_shell.py 
Log Message:
Applied changes suggested by pychecker



Index: basic_cmds.py
===================================================================
RCS file: /cvsroot/cvsshell/cvsshell/src/basic_cmds.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** basic_cmds.py	7 Mar 2002 12:20:58 -0000	1.5
--- basic_cmds.py	7 Mar 2002 12:35:06 -0000	1.6
***************
*** 406,409 ****
--- 406,410 ----
  
  def parseDefaultOptions(lines, context):
+     app = context['APP']
      splitRE = re.compile(r'\s*[,=]\s*')
      defOpts = {}

Index: cvs_shell.py
===================================================================
RCS file: /cvsroot/cvsshell/cvsshell/src/cvs_shell.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** cvs_shell.py	7 Mar 2002 12:23:09 -0000	1.4
--- cvs_shell.py	7 Mar 2002 12:35:06 -0000	1.5
***************
*** 7,10 ****
--- 7,11 ----
  
  VERSION = '0.1'
+ _cvsChangeCmdRE = re.compile(r'\s+(ad(d)?|new|ci|com(mit)?|delete|remove)\s+')
  
  class CvsShell(PlugableApp, InteractiveApp):
***************
*** 74,79 ****
          InteractiveApp.run(self)
  
-     _cvsChangeCmdRE = re.compile(r'\s+(ad(d)?|new|ci|com(mit)?|delete|remove)\s+')
      def execShellCmd(self, name, opts, context):
          app = context['APP']
          if name == 'cvs' and _cvsChangeCmdRE.search(opts):   # command may change the status
--- 75,80 ----
          InteractiveApp.run(self)
  
      def execShellCmd(self, name, opts, context):
+         global _cvsChangeCmdRE
          app = context['APP']
          if name == 'cvs' and _cvsChangeCmdRE.search(opts):   # command may change the status

[Cvsshell-devel] CVS: cvsshell/src cvs_shell.py,1.3,1.4

[Stefan H. <ste...@us...>]

Update of /cvsroot/cvsshell/cvsshell/src
In directory usw-pr-cvs1:/tmp/cvs-serv18467

Modified Files:
	cvs_shell.py 
Log Message:
forget `self' as 1st param for execShellCommand

Index: cvs_shell.py
===================================================================
RCS file: /cvsroot/cvsshell/cvsshell/src/cvs_shell.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** cvs_shell.py	7 Mar 2002 12:21:56 -0000	1.3
--- cvs_shell.py	7 Mar 2002 12:23:09 -0000	1.4
***************
*** 75,79 ****
  
      _cvsChangeCmdRE = re.compile(r'\s+(ad(d)?|new|ci|com(mit)?|delete|remove)\s+')
!     def execShellCmd(name, opts, context):
          app = context['APP']
          if name == 'cvs' and _cvsChangeCmdRE.search(opts):   # command may change the status
--- 75,79 ----
  
      _cvsChangeCmdRE = re.compile(r'\s+(ad(d)?|new|ci|com(mit)?|delete|remove)\s+')
!     def execShellCmd(self, name, opts, context):
          app = context['APP']
          if name == 'cvs' and _cvsChangeCmdRE.search(opts):   # command may change the status

[Cvsshell-devel] CVS: cvsshell/src cvs_shell.py,1.2,1.3

[Stefan H. <ste...@us...>]

Update of /cvsroot/cvsshell/cvsshell/src
In directory usw-pr-cvs1:/tmp/cvs-serv18166

Modified Files:
	cvs_shell.py 
Log Message:
execShellCmd now tries to find out if a command will modify the status
of the current cvs listing

Index: cvs_shell.py
===================================================================
RCS file: /cvsroot/cvsshell/cvsshell/src/cvs_shell.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** cvs_shell.py	7 Mar 2002 11:47:50 -0000	1.2
--- cvs_shell.py	7 Mar 2002 12:21:56 -0000	1.3
***************
*** 37,41 ****
          self.readCommandFile()
          self.readConfigFile()
!         
      def setCvsRoot(self, root):
          self.cvsRoot = root
--- 37,41 ----
          self.readCommandFile()
          self.readConfigFile()
!             
      def setCvsRoot(self, root):
          self.cvsRoot = root
***************
*** 74,79 ****
          InteractiveApp.run(self)
  
!     def execShellCmd(self, name, opts, context):
!         self.shell('%s %s' % (name, opts))
  
          
--- 74,83 ----
          InteractiveApp.run(self)
  
!     _cvsChangeCmdRE = re.compile(r'\s+(ad(d)?|new|ci|com(mit)?|delete|remove)\s+')
!     def execShellCmd(name, opts, context):
!         app = context['APP']
!         if name == 'cvs' and _cvsChangeCmdRE.search(opts):   # command may change the status
!             context['basic_cmds.dirty_listing'] = 1
!         app.shell('%s %s' % (name, opts))
  
          

[Cvsshell-devel] CVS: cvsshell/src basic_cmds.py,1.4,1.5

[Stefan H. <ste...@us...>]

Update of /cvsroot/cvsshell/cvsshell/src
In directory usw-pr-cvs1:/tmp/cvs-serv17778

Modified Files:
	basic_cmds.py 
Log Message:
* commit without args now works
* fixed problem with _cd

Index: basic_cmds.py
===================================================================
RCS file: /cvsroot/cvsshell/cvsshell/src/basic_cmds.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** basic_cmds.py	7 Mar 2002 11:49:16 -0000	1.4
--- basic_cmds.py	7 Mar 2002 12:20:58 -0000	1.5
***************
*** 52,55 ****
--- 52,56 ----
                   "to the underlying shell.")
  
+ 
  def exitProgram(name, opts, context):
      "Terminates the program."
***************
*** 57,60 ****
--- 58,62 ----
      return app.BREAK_REPL
  
+     
  def changeDir(name, opts, context):
      "Changes the current working directory."
***************
*** 165,170 ****
  def commit(name, args, context):
      app = context['APP']
!     if args == '':
          try:
              _runCvsCmd(context, 'commit', rootDir=rootDir, fork=1)
              context['basic_cmds.dirty_listing'] = 1
--- 167,177 ----
  def commit(name, args, context):
      app = context['APP']
!     if not args:
          try:
+             try:
+                 listing = context['basic_cmds.listing']
+                 rootDir = listing.rootDir
+             except KeyError:
+                 rootDir = ''
              _runCvsCmd(context, 'commit', rootDir=rootDir, fork=1)
              context['basic_cmds.dirty_listing'] = 1
***************
*** 426,429 ****
--- 433,437 ----
  def _cd(app, dir):
      """Changes the current working directory. Returns the old directory."""
+     if not dir: return
      oldDir = os.getcwd()
      app.printVMsg('cd ' + dir)

[Cvsshell-devel] CVS: cvsshell/src app.py,1.2,1.3

[Stefan H. <ste...@us...>]

Update of /cvsroot/cvsshell/cvsshell/src
In directory usw-pr-cvs1:/tmp/cvs-serv17696

Modified Files:
	app.py 
Log Message:
Fiexed bug with wrong format string in error message

Index: app.py
===================================================================
RCS file: /cvsroot/cvsshell/cvsshell/src/app.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** app.py	7 Mar 2002 11:50:28 -0000	1.2
--- app.py	7 Mar 2002 12:19:37 -0000	1.3
***************
*** 195,203 ****
  Python version: %s""" % (self.version, sys.platform, sys.version))
              self.printMsg("========== Traceback ends here ==========\n" \
!                           "You have discovered a bug in %s.") % self.name
              if self.bugAddress.find('@') > 0:
!                 self.printMsg("Please send a bug report to %s," % self.bugAddress)
              else:
!                 self.printMsg("Please fill out a bug report at %s," % self.bugAddress)
              self.printMsg("including the traceback above.")
          self.closeApp()
--- 195,203 ----
  Python version: %s""" % (self.version, sys.platform, sys.version))
              self.printMsg("========== Traceback ends here ==========\n" \
!                           "You have discovered a bug in %s." % self.name)
              if self.bugAddress.find('@') > 0:
!                 self.printMsg("Please send a bug report to \n %s," % self.bugAddress)
              else:
!                 self.printMsg("Please fill out a bug report at \n %s," % self.bugAddress)
              self.printMsg("including the traceback above.")
          self.closeApp()

[Cvsshell-devel] CVS: cvsshell/src app.py,1.1.1.1,1.2

[Stefan H. <ste...@us...>]

Update of /cvsroot/cvsshell/cvsshell/src
In directory usw-pr-cvs1:/tmp/cvs-serv11482

Modified Files:
	app.py 
Log Message:
bugAddress can now be either a email address or a URL

Index: app.py
===================================================================
RCS file: /cvsroot/cvsshell/cvsshell/src/app.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** app.py	7 Mar 2002 00:03:22 -0000	1.1.1.1
--- app.py	7 Mar 2002 11:50:28 -0000	1.2
***************
*** 194,201 ****
  Platform: %s
  Python version: %s""" % (self.version, sys.platform, sys.version))
!             self.printMsg("""========== Traceback ends here ==========
! You have discovered a bug in %s.
! Please send a bug report to %s,
! including the traceback above.""" % (self.name, self.bugAddress))
          self.closeApp()
          return res
--- 194,204 ----
  Platform: %s
  Python version: %s""" % (self.version, sys.platform, sys.version))
!             self.printMsg("========== Traceback ends here ==========\n" \
!                           "You have discovered a bug in %s.") % self.name
!             if self.bugAddress.find('@') > 0:
!                 self.printMsg("Please send a bug report to %s," % self.bugAddress)
!             else:
!                 self.printMsg("Please fill out a bug report at %s," % self.bugAddress)
!             self.printMsg("including the traceback above.")
          self.closeApp()
          return res

[Cvsshell-devel] CVS: cvsshell/src basic_cmds.py,1.3,1.4

[Stefan H. <ste...@us...>]

Update of /cvsroot/cvsshell/cvsshell/src
In directory usw-pr-cvs1:/tmp/cvs-serv11230

Modified Files:
	basic_cmds.py 
Log Message:
* Help items are now sorted before printed
* reflected renaming supdate into refresh

Index: basic_cmds.py
===================================================================
RCS file: /cvsroot/cvsshell/cvsshell/src/basic_cmds.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** basic_cmds.py	7 Mar 2002 10:44:18 -0000	1.3
--- basic_cmds.py	7 Mar 2002 11:49:16 -0000	1.4
***************
*** 7,11 ****
  ##############################
  
! noListingErrMsg = "No listing found. \nYou must run `update', `supdate' " \
                    "or `status' before using this command."
  CvsError = 'CvsError'
--- 7,11 ----
  ##############################
  
! noListingErrMsg = "No listing found. \nYou must run `update', `refresh' " \
                    "or `status' before using this command."
  CvsError = 'CvsError'
***************
*** 39,43 ****
          if len(x) > max_len: max_len = m
      printed = []
!     for x in app.cmdToDoc.items():
          name = app.cmdToCmds[x[0]]
          if name in printed: continue
--- 39,46 ----
          if len(x) > max_len: max_len = m
      printed = []
!     items = app.cmdToDoc.items()
!     items.sort(lambda x,y: cmp(x[0], y[0]))
!     print items
!     for x in items:
          name = app.cmdToCmds[x[0]]
          if name in printed: continue
***************
*** 45,49 ****
          doc = first_sentence.match(x[1]).group()
          space = (max_len-len(name)) * ' '
!         app.printMsg("%s%s: %s" % (name,space,doc))
      app.printMsg("All commands not listed here are passed " \
                   "to the underlying shell.")
--- 48,52 ----
          doc = first_sentence.match(x[1]).group()
          space = (max_len-len(name)) * ' '
!         app.printMsg("%s%s %s" % (name,space,doc))
      app.printMsg("All commands not listed here are passed " \
                   "to the underlying shell.")

[Cvsshell-devel] CVS: cvsshell/src cvs_shell.py,1.1.1.1,1.2

[Stefan H. <ste...@us...>]

Update of /cvsroot/cvsshell/cvsshell/src
In directory usw-pr-cvs1:/tmp/cvs-serv11003

Modified Files:
	cvs_shell.py 
Log Message:
Added copyright and bug address information

Index: cvs_shell.py
===================================================================
RCS file: /cvsroot/cvsshell/cvsshell/src/cvs_shell.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** cvs_shell.py	7 Mar 2002 00:03:23 -0000	1.1.1.1
--- cvs_shell.py	7 Mar 2002 11:47:50 -0000	1.2
***************
*** 15,20 ****
          self.setName('CvsShell')
          self.setVersion(VERSION)
!         self.setCopyright('FIXME') # FIXME
!         self.setBugAddress('FIXME') # FIXME
          etcDir = os.path.join(self.THIS_DIR,'etc')
          self.setConfigFile(os.path.join(self.HOME,'.cvsshellrc'),
--- 15,20 ----
          self.setName('CvsShell')
          self.setVersion(VERSION)
!         self.setCopyright('Copyright 2002 by Stefan Heimann. This software is released under the GPL.')
!         self.setBugAddress('http://sourceforge.net/tracker/?group_id=48175&atid=452212')
          etcDir = os.path.join(self.THIS_DIR,'etc')
          self.setConfigFile(os.path.join(self.HOME,'.cvsshellrc'),

[Cvsshell-devel] CVS: cvsshell/src interactive_app.py,1.1.1.1,1.2

[Stefan H. <ste...@us...>]

Update of /cvsroot/cvsshell/cvsshell/src
In directory usw-pr-cvs1:/tmp/cvs-serv30347

Modified Files:
	interactive_app.py 
Log Message:
Fixed problems with readline (handling was not correct when readline
not present)

Index: interactive_app.py
===================================================================
RCS file: /cvsroot/cvsshell/cvsshell/src/interactive_app.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** interactive_app.py	7 Mar 2002 00:03:23 -0000	1.1.1.1
--- interactive_app.py	7 Mar 2002 10:49:07 -0000	1.2
***************
*** 1,3 ****
! import os, readline
  from app import App, AppError
  
--- 1,3 ----
! import os
  from app import App, AppError
  
***************
*** 13,20 ****
                            "and tab completion will not be available.")
              return
!         readline.parse_and_bind("tab: complete")
  
      def setHistoryFile(self,filename):
          self.historyFile = filename
          try:
              readline.read_history_file(self.historyFile)
--- 13,24 ----
                            "and tab completion will not be available.")
              return
!         else:
!             readline.parse_and_bind("tab: complete")
  
      def setHistoryFile(self,filename):
          self.historyFile = filename
+         try:
+             import readline
+         except ImportError: return
          try:
              readline.read_history_file(self.historyFile)

[Cvsshell-devel] CVS: cvsshell/src basic_cmds.py,1.2,1.3

[Stefan H. <ste...@us...>]

Update of /cvsroot/cvsshell/cvsshell/src
In directory usw-pr-cvs1:/tmp/cvs-serv29390

Modified Files:
	basic_cmds.py 
Log Message:
 

Index: basic_cmds.py
===================================================================
RCS file: /cvsroot/cvsshell/cvsshell/src/basic_cmds.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** basic_cmds.py	7 Mar 2002 10:37:35 -0000	1.2
--- basic_cmds.py	7 Mar 2002 10:44:18 -0000	1.3
***************
*** 62,66 ****
          os.path.expanduser(opts)
      try:
!         _cd(opts)
      except OSError, msg:
          app.printErr(msg)
--- 62,66 ----
          os.path.expanduser(opts)
      try:
!         _cd(app,opts)
      except OSError, msg:
          app.printErr(msg)
***************
*** 159,164 ****
              _runCvsCmd(context, 'add', rootDir=rootDir, args=utils.list2string(filenames))
          except CvsError: pass
-         try: os.chdir(oldDir)
-         except OSError, msg: app.printErr(msg)
      
  def commit(name, args, context):
--- 159,162 ----
***************
*** 178,190 ****
      (rootDir, filenames) = _applyOnEntryList(args, context, __doIt)
      if filenames:
-         try: oldDir = os.chdir(rootDir)
-         except OSError,msg:
-             app.printErr("Could not change to the root directory of the current listing: %s" % str(msg))
-             return
          try:
              _runCvsCmd(context, 'commit', rootDir=rootDir, args=utils.list2string(filenames), fork=1)
          except CvsError: pass
-     try: os.chdir(oldDir)
-     except OSError, msg: app.printErr(msg)
  
  def remove(name, args, context):
--- 176,182 ----
***************
*** 323,327 ****
      if rootDir is not None:
          try:
!             oldDir = os.chdir(rootDir)
          except OSError,msg:
              app.printErr("Could not change to the root directory of the current listing: %s" % str(msg))
--- 315,319 ----
      if rootDir is not None:
          try:
!             oldDir = _cd(app,rootDir)
          except OSError,msg:
              app.printErr("Could not change to the root directory of the current listing: %s" % str(msg))
***************
*** 356,360 ****
      if oldDir is not None:
          try:
!             os.chdir(oldDir)
          except OSError,msg:
              app.printErr(msg)
--- 348,352 ----
      if oldDir is not None:
          try:
!             _cd(app,oldDir)
          except OSError,msg:
              app.printErr(msg)
***************
*** 429,435 ****
  ##############################
  
! def _cd(dir):
      """Changes the current working directory. Returns the old directory."""
      oldDir = os.getcwd()
      os.chdir(dir)
      return oldDir
--- 421,428 ----
  ##############################
  
! def _cd(app, dir):
      """Changes the current working directory. Returns the old directory."""
      oldDir = os.getcwd()
+     app.printVMsg('cd ' + dir)
      os.chdir(dir)
      return oldDir

[Cvsshell-devel] CVS: cvsshell/src utils.py,1.1.1.1,1.2

[Stefan H. <ste...@us...>]

Update of /cvsroot/cvsshell/cvsshell/src
In directory usw-pr-cvs1:/tmp/cvs-serv28770

Modified Files:
	utils.py 
Log Message:
* Made sort routine work with python 2.1
* Improved printing of entrylist

Index: utils.py
===================================================================
RCS file: /cvsroot/cvsshell/cvsshell/src/utils.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** utils.py	7 Mar 2002 00:03:24 -0000	1.1.1.1
--- utils.py	7 Mar 2002 10:43:12 -0000	1.2
***************
*** 16,41 ****
  
      def sortEntries(self):
!         def __cmp(x,y):
!             try:
!                 i = 0
!                 for attr in self.sortOrder:
!                     i = eval("cmp(x.%s, y.%s)" % (attr,attr))
!                     if i != 0: return i
!                 return i
!             except AttributeError:
!                 return -1
!         self.entries.sort(__cmp)
  
      def printEntries(self, output):
!         id = 0
!         formatStr = "  %%%dd %%s\n" % len(`len(self.entries)`)
!         oldDir = ''
          if len(self.entries) == 0:
              output.write('No entries available.\n')
          for e in self.entries:
              newDir = e.dir
              if oldDir != newDir:
                  output.write("%s:\n" % newDir)
!             output.write(formatStr % (id, e))
              id += 1
              oldDir = newDir
--- 16,47 ----
  
      def sortEntries(self):
!         class __EntrySorter:
!             def __init__(self, order): self.order = order
!             def cmp(self,x,y):
!                 try:
!                     i = 0
!                     for attr in self.order:
!                         i = eval("cmp(x.%s, y.%s)" % (attr,attr))
!                         if i != 0: return i
!                         return i
!                 except AttributeError:
!                     return -1
!         self.entries.sort(__EntrySorter(self.sortOrder).cmp)
  
      def printEntries(self, output):
!         max = 0
!         for e in self.entries:
!             l = len(e.status)
!             if l > max: max = l
!         formatStr = "  %%%dd %%-%ds %%s\n" % (len(`len(self.entries)`), max)
!         oldDir = None
          if len(self.entries) == 0:
              output.write('No entries available.\n')
+         id = 0
          for e in self.entries:
              newDir = e.dir
              if oldDir != newDir:
                  output.write("%s:\n" % newDir)
!             output.write(formatStr % (id, e.status, e.name))
              id += 1
              oldDir = newDir
***************
*** 54,58 ****
      S_UPDATED = 'U'
      S_UNKNOWN = '?'
!     S_OK = 'O'       # file on the sandbox is in sync with repository
      S_DELETED = 'D'  # file scheduled for removal has been commited
      def __init__(self, dir, name, status):
--- 60,64 ----
      S_UPDATED = 'U'
      S_UNKNOWN = '?'
!     S_OK = 'OK'      # file on the sandbox is in sync with repository
      S_DELETED = 'D'  # file scheduled for removal has been commited
      def __init__(self, dir, name, status):
***************
*** 60,66 ****
          self.name = name
          self.status = status
-     def __repr__(self):
-         return "%s %s" % (self.status, self.name)
- 
  
  ###########################
--- 66,69 ----

[Cvsshell-devel] CVS: cvsshell/src configurable_app.py,1.1.1.1,1.2

[Stefan H. <ste...@us...>]

Update of /cvsroot/cvsshell/cvsshell/src
In directory usw-pr-cvs1:/tmp/cvs-serv28524

Modified Files:
	configurable_app.py 
Log Message:
StringTypes is only available in python 2.2, so I removed it from _getFun

Index: configurable_app.py
===================================================================
RCS file: /cvsroot/cvsshell/cvsshell/src/configurable_app.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** configurable_app.py	7 Mar 2002 00:03:23 -0000	1.1.1.1
--- configurable_app.py	7 Mar 2002 10:40:00 -0000	1.2
***************
*** 58,62 ****
          string, the module the function is contained in is loaded
          and the name of the function is evaluated."""
!         if type(fun) in types.StringTypes:
              if fun == '': return None
              try:
--- 58,62 ----
          string, the module the function is contained in is loaded
          and the name of the function is evaluated."""
!         if type(fun) is types.StringType:
              if fun == '': return None
              try:

[Cvsshell-devel] CVS: cvsshell/src basic_cmds.py,1.1.1.1,1.2

[Stefan H. <ste...@us...>]

Update of /cvsroot/cvsshell/cvsshell/src
In directory usw-pr-cvs1:/tmp/cvs-serv28018

Modified Files:
	basic_cmds.py 
Log Message:
added support for status


Index: basic_cmds.py
===================================================================
RCS file: /cvsroot/cvsshell/cvsshell/src/basic_cmds.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** basic_cmds.py	7 Mar 2002 00:03:22 -0000	1.1.1.1
--- basic_cmds.py	7 Mar 2002 10:37:35 -0000	1.2
***************
*** 62,66 ****
          os.path.expanduser(opts)
      try:
!         os.chdir(opts)
      except OSError, msg:
          app.printErr(msg)
--- 62,66 ----
          os.path.expanduser(opts)
      try:
!         _cd(opts)
      except OSError, msg:
          app.printErr(msg)
***************
*** 75,85 ****
  
  def status(name, args, context):
-     # FIXME status with args should also be possible
      app = context['APP']
      entries = []
!     regexHead = re.compile(r'File: (?P<file>\S+)\s+Status: (?P<status>\S+)')
      regexDir = re.compile(r'.*Examining (?P<dir>\S+)')
!     # problem: information about directories are printed
!     # on stderr!!
      
  def update(name, args, context, simulate=0):
--- 75,113 ----
  
  def status(name, args, context):
      app = context['APP']
      entries = []
!     regexHead = re.compile(r'File: (?P<name>\S+)\s+Status: (?P<status>.+)')
      regexDir = re.compile(r'.*Examining (?P<dir>\S+)')
!     regexUnknown = re.compile(r'^\?\s+(?P<filename>\S+)')
!     try:
!         lines = _runCvsCmd(context, 'status', args=args, getStderr=1)
!     except CvsError: return
!     entries = []
!     dir = None
!     for line in lines:
!         unknownRes = regexUnknown.search(line)
!         if unknownRes:
!             name = os.path.basename(unknownRes.group('filename'))
!             dir = os.path.dirname(unknownRes.group('filename'))
!             entries.append(utils.Entry(dir, name, utils.Entry.S_UNKNOWN))
!             continue
!         headRes = regexHead.search(line)
!         if headRes and dir is None:
!             raise InternalCvsError, "Parsing of status message failed: " \
!                   "`dir' is not set when get file information."
!         elif headRes:
!             name = headRes.group('name')
!             status = headRes.group('status').strip()
!             entries.append(utils.Entry(dir, name, status))
!             continue
!         dirRes = regexDir.search(line)
!         if dirRes:
!             dir = dirRes.group('dir')
!             if dir == '.': dir = ''
!     l = context['basic_cmds.listing'] = utils.Listing(os.getcwd(),
!                                                       entries)
!     context['basic_cmds.dirty_listing'] = 0
!     l.sortEntries()
!     _printListing(context)                         
      
  def update(name, args, context, simulate=0):
***************
*** 89,94 ****
      try:
          lines = _runCvsCmd(context, 'update', globOpts=globOpts, args=args)
!     except CvsError:
!         return
      entries = []
      for line in lines:
--- 117,121 ----
      try:
          lines = _runCvsCmd(context, 'update', globOpts=globOpts, args=args)
!     except CvsError: return
      entries = []
      for line in lines:
***************
*** 98,104 ****
          dir = os.path.dirname(x[1])
          entries.append(utils.Entry(dir, name, status))
!     context['basic_cmds.listing'] = utils.Listing(os.getcwd(),
!                                                   entries)
      context['basic_cmds.dirty_listing'] = 0
      _printListing(context)
  
--- 125,132 ----
          dir = os.path.dirname(x[1])
          entries.append(utils.Entry(dir, name, status))
!     l = context['basic_cmds.listing'] = utils.Listing(os.getcwd(),
!                                                       entries)
      context['basic_cmds.dirty_listing'] = 0
+     l.sortEntries()
      _printListing(context)
  
***************
*** 114,118 ****
      else:
          module = args[0]
!     _runCvsCmd(context, 'checkout', args=module)
      
  def add(name, args, context):
--- 142,148 ----
      else:
          module = args[0]
!     try:
!         _runCvsCmd(context, 'checkout', args=module)
!     except CvsError: pass
      
  def add(name, args, context):
***************
*** 121,148 ****
          args = app.prompt('enter filenumbers to add: ')
          if args is None: return
-     filenames = []
      def __doIt(e,filename):
-         filenames.append(filename)
          e.status = utils.Entry.S_ADDED
!     _applyOnEntryList(args, context, __doIt)
      if filenames:
!         _runCvsCmd(context, 'add', args=utils.list2string(filenames))
      
  def commit(name, args, context):
      app = context['APP']
      if args == '':
!         _runCvsCmd(context, 'commit', fork=1)
!         context['basic_cmds.dirty_listing'] = 1
          return
-     filenames = []
      def __doIt(e,filename):
-         filenames.append(filename)
          if e.status == utils.Entry.S_REMOVED:
              e.status = utils.Entry.S_DELETED
          else:
              e.status = utils.Entry.S_OK
!     _applyOnEntryList(args, context, __doIt)
      if filenames:
!         _runCvsCmd(context, 'commit', args=utils.list2string(filenames), fork=1)
  
  def remove(name, args, context):
--- 151,190 ----
          args = app.prompt('enter filenumbers to add: ')
          if args is None: return
      def __doIt(e,filename):
          e.status = utils.Entry.S_ADDED
!         return filename
!     (rootDir, filenames) = _applyOnEntryList(args, context, __doIt)
      if filenames:
!         try:
!             _runCvsCmd(context, 'add', rootDir=rootDir, args=utils.list2string(filenames))
!         except CvsError: pass
!         try: os.chdir(oldDir)
!         except OSError, msg: app.printErr(msg)
      
  def commit(name, args, context):
      app = context['APP']
      if args == '':
!         try:
!             _runCvsCmd(context, 'commit', rootDir=rootDir, fork=1)
!             context['basic_cmds.dirty_listing'] = 1
!         except CvsError: pass
          return
      def __doIt(e,filename):
          if e.status == utils.Entry.S_REMOVED:
              e.status = utils.Entry.S_DELETED
          else:
              e.status = utils.Entry.S_OK
!         return filename
!     (rootDir, filenames) = _applyOnEntryList(args, context, __doIt)
      if filenames:
!         try: oldDir = os.chdir(rootDir)
!         except OSError,msg:
!             app.printErr("Could not change to the root directory of the current listing: %s" % str(msg))
!             return
!         try:
!             _runCvsCmd(context, 'commit', rootDir=rootDir, args=utils.list2string(filenames), fork=1)
!         except CvsError: pass
!     try: os.chdir(oldDir)
!     except OSError, msg: app.printErr(msg)
  
  def remove(name, args, context):
***************
*** 151,160 ****
          args = app.prompt('enter filenumbers to remove: ')
          if args is None: return
-     toDelete = []
      def __doIt(e,filename):
!         toDelete.append(e)
!     _applyOnEntryList(args, context, __doIt)
!     listing = context['basic_cmds.listing']
!     toDeleteList = utils.Listing(listing.rootDir, toDelete)
      filenames = []
      for e in toDeleteList.entries:
--- 193,200 ----
          args = app.prompt('enter filenumbers to remove: ')
          if args is None: return
      def __doIt(e,filename):
!         return filename
!     (rootDir, toDelete) = _applyOnEntryList(args, context, __doIt)
!     toDeleteList = utils.Listing(rootDir, toDelete)
      filenames = []
      for e in toDeleteList.entries:
***************
*** 169,173 ****
      if filenames:
          args = utils.list2string(filenames)
!         _runCvsCmd(context, 'remove', args=args)
          toDeleteList.printEntries(app.output)
          answ = app.prompt("\nThe files have been scheduled for removal.\n" \
--- 209,215 ----
      if filenames:
          args = utils.list2string(filenames)
!         try:
!             _runCvsCmd(context, 'remove', rootDir=rootDir, args=args)
!         except CvsError: return
          toDeleteList.printEntries(app.output)
          answ = app.prompt("\nThe files have been scheduled for removal.\n" \
***************
*** 177,181 ****
              for e in toDeleteList.entries:
                  e.status = utils.Entry.S_DELETED
!             _runCvsCmd(context, 'commit', fork=1, args=args)
  
  def printListing(name, args, context):
--- 219,223 ----
              for e in toDeleteList.entries:
                  e.status = utils.Entry.S_DELETED
!             _runCvsCmd(context, 'commit', rootDir=rootDir, fork=1, args=args)
  
  def printListing(name, args, context):
***************
*** 240,244 ****
  def _applyOnEntryList(opts, context, fun):
      """fun must take 2 argument as the entry and its
!     filename is passed to it."""
      app = context['APP']
      try:
--- 282,287 ----
  def _applyOnEntryList(opts, context, fun):
      """fun must take 2 argument as the entry and its
!     filename is passed to it. Returns a tuple
!     (rootdir of listing, list with the return values from fun)."""
      app = context['APP']
      try:
***************
*** 255,266 ****
          app.printErr(noListingErrMsg)
          return
      for x in nums:
          e = listing.entries[x]
!         name = os.path.join(listing.rootDir, e.dir, e.name)
!         fun(e,name)
          
! def _runCvsCmd(context, cmd, globOpts = '', opts='', args='', fork=0):
      """
      * cmd is the command to execute
      * globOpts are global options passed by a function. These options
        override the default global options
--- 298,313 ----
          app.printErr(noListingErrMsg)
          return
+     result = []
      for x in nums:
          e = listing.entries[x]
!         name = os.path.join(e.dir, e.name)
!         result.append(fun(e,name))
!     return listing.rootDir, result
          
! 
! def _runCvsCmd(context, cmd, rootDir=None, globOpts = '', opts='', args='', fork=0, getStderr=0):
      """
      * cmd is the command to execute
+     * rootDir is the directory the command should be executed in
      * globOpts are global options passed by a function. These options
        override the default global options
***************
*** 272,275 ****
--- 319,331 ----
      """
      app = context['APP']
+ 
+     oldDir = None
+     if rootDir is not None:
+         try:
+             oldDir = os.chdir(rootDir)
+         except OSError,msg:
+             app.printErr("Could not change to the root directory of the current listing: %s" % str(msg))
+             raise CvsError
+     
      defGlobOpts,defOpts = _getOptions(context,cmd)
      userGlobOpts, userOpts = _splitOpts(args)
***************
*** 284,287 ****
--- 340,344 ----
  
      cmd = 'cvs %s %s %s' % (globOpts, cmd, opts)
+     if getStderr: cmd += ' 2>&1'
      app.printVMsg(cmd)
      if not fork:
***************
*** 297,300 ****
--- 354,364 ----
              raise CvsError
  
+     if oldDir is not None:
+         try:
+             os.chdir(oldDir)
+         except OSError,msg:
+             app.printErr(msg)
+ 
+ 
  def _isDirtyListing(context):
      try:
***************
*** 364,367 ****
--- 428,437 ----
  # Helper functions
  ##############################
+ 
+ def _cd(dir):
+     """Changes the current working directory. Returns the old directory."""
+     oldDir = os.getcwd()
+     os.chdir(dir)
+     return oldDir
  
  def _splitOpts(args):