~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to __init__.py

  • Committer: Aaron Bentley
  • Date: 2006-03-29 06:43:34 UTC
  • mfrom: (355.1.3 bzrtools)
  • Revision ID: aaron.bentley@utoronto.ca-20060329064334-62e56b84dedf3f8d
Merge combined work

Show diffs side-by-side

added added

removed removed

Lines of Context:
269
269
    This command will remove a checkout without losing data.  That means
270
270
    it only removes checkouts, and only if they have no uncommitted changes.
271
271
    """
 
272
    takes_options = [Option("branch", help="Remove associtated branch from"
 
273
                                           " repository")]
272
274
    takes_args = ["checkout"]
273
 
    def run(self, checkout):
 
275
    def run(self, checkout, branch=False):
274
276
        from zap import zap
275
 
        return zap(checkout)
 
277
        return zap(checkout, remove_branch=branch)
276
278
 
277
279
 
278
280
class cmd_cbranch(bzrlib.commands.Command):
294
296
    standalone branches will be produced.  Standalone branches will also
295
297
    be produced if the source branch is in 0.7 format (or earlier).
296
298
    """
297
 
    takes_args = ["source", "target"]
298
 
    def run(self, source, target):
 
299
    takes_options = [Option("lightweight", 
 
300
                            help="Create a lightweight checkout")]
 
301
    takes_args = ["source", "target?"]
 
302
    def run(self, source, target=None, lightweight=False):
299
303
        from cbranch import cbranch
300
 
        return cbranch(source, target)
 
304
        return cbranch(source, target, lightweight=lightweight)
 
305
 
301
306
 
302
307
class cmd_branches(bzrlib.commands.Command):
303
308
    """Scan a location for branches <BZRTOOLS>"""