~abentley/bzrtools/bzrtools.dev : revision 538

82

from bzrlib.errors import BzrCommandError

83

import bzrlib.ignores

84

from bzrlib.option import Option

85

sys.path.insert(0, os.path.realpath(os.path.join(os.path.dirname(__file__),

85

sys.path.insert(0, os.path.realpath(os.path.join(os.path.dirname(__file__),

86

"external")))

87

88

import show_paths

105

106

To check what clean-tree will do, use --dry-run.

107

"""

108

takes_options = [Option('ignored', help='delete all ignored files.'),

108

takes_options = [Option('ignored', help='delete all ignored files.'),

109

Option('detritus', help='delete conflict files, merge'

110

' backups, and failed selftest dirs.'),

111

Option('unknown',

110

' backups, and failed selftest dirs.'),

111

Option('unknown',

112

help='delete files unknown to bzr. (default)'),

113

Option('dry-run', help='show files to delete instead of'

114

' deleting them.')]

132

with the last 5 characters of their revision identifier are used instead.

133

134

The value starting with d is "(maximum) distance from the null revision".

135

136

If --merge-branch is specified, the two branches are compared and a merge

137

base is selected.

138

139

Legend:

140

white normal revision

141

yellow THIS history

156

be disabled with --no-antialias.

157

"""

158

takes_args = ['branch', 'file']

159

takes_options = [Option('no-collapse', help="Do not skip simple nodes"),

159

takes_options = [Option('no-collapse', help="Do not skip simple nodes"),

160

Option('no-antialias',

161

help="Do not use rsvg to produce antialiased output"),

162

Option('merge-branch', type=str,

163

help="Use this branch to calcuate a merge base"),

161

help="Do not use rsvg to produce antialiased output"),

162

Option('merge-branch', type=str,

163

help="Use this branch to calcuate a merge base"),

164

Option('cluster', help="Use clustered output."),

165

Option('max-distance', help="Show no nodes farther than this",

166

type=int)]

171

ranking = "cluster"

172

else:

173

ranking = "forced"

174

graph.write_ancestry_file(branch, file, not no_collapse,

175

not no_antialias, merge_branch, ranking,

174

graph.write_ancestry_file(branch, file, not no_collapse,

175

not no_antialias, merge_branch, ranking,

176

max_distance=max_distance)

177

178

238

239

takes_args = ['file*']

240

takes_options = ['message', 'revision',

241

Option('all', help='Shelve all changes without prompting'),

241

Option('all', help='Shelve all changes without prompting'),

242

Option('no-color', help='Never display changes in color')]

243

244

def run(self, all=False, file_list=None, message=None, revision=None,

418

"""

419

takes_args = ["branch?"]

420

def run(self, branch=None):

421

from branchhistory import branch_history

421

from branchhistory import branch_history

422

return branch_history(branch)

423

424

444

class cmd_cbranch(bzrlib.commands.Command):

445

"""

446

Create a new checkout, associated with a new repository branch.

447

448

When you cbranch, bzr looks up a target location in locations.conf, and

449

creates the branch there.

450

454

cbranch_target:policy = appendpath

455

456

This will mean that if you run "bzr cbranch foo/bar foo/baz" in the

457

working directory root, the branch will be created in

457

working directory root, the branch will be created in

458

"/branch_root/foo/baz"

459

460

NOTE: cbranch also supports "cbranch_root", but that behaviour is

461

deprecated.

462

"""

463

takes_options = [Option("lightweight",

463

takes_options = [Option("lightweight",

464

help="Create a lightweight checkout"), 'revision']

465

takes_args = ["source", "target?"]

466

def run(self, source, target=None, lightweight=False, revision=None):

467

from cbranch import cbranch

468

return cbranch(source, target, lightweight=lightweight,

468

return cbranch(source, target, lightweight=lightweight,

469

revision=revision)

470

471

479

480

class cmd_multi_pull(bzrlib.commands.Command):

481

"""Pull all the branches under a location, e.g. a repository.

482

483

Both branches present in the directory and the branches of checkouts are

484

pulled.

485

"""

537

538

class cmd_import(bzrlib.commands.Command):

539

"""Import sources from a directory, tarball or zip file

540

541

This command will import a directory, tarball or zip file into a bzr

542

tree, replacing any versioned files already present. If a directory is

543

specified, it is used as the target. If the directory does not exist, or

548

If the tarball or zip has a single root directory, that directory is

549

stripped when extracting the tarball. This is not done for directories.

550

"""

551

552

takes_args = ['source', 'tree?']

553

def run(self, source, tree=None):

554

from upstream_import import do_import

578

579

This command should be used on local archives (or mirrors) only. It is

580

quite slow on remote archives.

581

582

reuse_history allows you to specify any previous imports you

581

582

reuse_history allows you to specify any previous imports you

583

have done of different archives, which this archive has branches

584

tagged from. This will dramatically reduce the time to convert

584

tagged from. This will dramatically reduce the time to convert

585

the archive as it will not have to convert the history already

586

converted in that other branch.

587

601

takes_args = ['to_root_dir', 'from_archive', 'reuse_history*']

602

takes_options = ['verbose', Option('prefixes', type=str,

603

help="Prefixes of branches to import, colon-separated"),

604

Option('encoding', type=str,

604

Option('encoding', type=str,

605

help='Force encoding to specified value. See WARNING.')]

606

607

def run(self, to_root_dir, from_archive, encoding=None, verbose=False,

627

"""

628

takes_args = ['to_location', 'from_branch?', 'reuse_history*']

629

takes_options = ['verbose', Option('max-count', type=int),

630

Option('encoding', type=str,

630

Option('encoding', type=str,

631

help='Force encoding to specified value. See WARNING.')]

632

633

def run(self, to_location, from_branch=None, fast=False, max_count=None,

636

from errors import NoPyBaz

637

try:

638

import baz_import

639

baz_import.baz_import_branch(to_location, from_branch, fast,

639

baz_import.baz_import_branch(to_location, from_branch, fast,

640

max_count, verbose, encoding, dry_run,

641

reuse_history_list)

642

except NoPyBaz:

646

class cmd_rspush(bzrlib.commands.Command):

647

"""Upload this branch to another location using rsync.

648

649

If no location is specified, the last-used location will be used. To

650

prevent dirty trees from being uploaded, rspush will error out if there are

651

unknown files or local changes. It will also error out if the upstream

652

directory is non-empty and not an earlier version of the branch.

649

If no location is specified, the last-used location will be used. To

650

prevent dirty trees from being uploaded, rspush will error out if there are

651

unknown files or local changes. It will also error out if the upstream

652

directory is non-empty and not an earlier version of the branch.

653

"""

654

takes_args = ['location?']

655

takes_options = [Option('overwrite', help='Ignore differences between'

661

from bzrlib import workingtree

662

import bzrtools

663

cur_branch = workingtree.WorkingTree.open_containing(".")[0]

664

bzrtools.rspush(cur_branch, location, overwrite=overwrite,

664

bzrtools.rspush(cur_branch, location, overwrite=overwrite,

665

working_tree=not no_tree)

666

667

681

cmd_branches,

682

cmd_branch_history,

683

cmd_branch_mark,

684

cmd_cbranch,

684

cmd_cbranch,

685

cmd_cdiff,

686

cmd_clean_tree,

687

cmd_fetch_ghosts,

690

cmd_multi_pull,

691

cmd_patch,

692

cmd_rspush,

693

cmd_shelf,

693

cmd_shelf,

694

cmd_shell,

695

cmd_shelve,

695

cmd_shelve,

696

cmd_switch,

697

cmd_unshelve,

698

cmd_zap,

697

cmd_unshelve,

698

cmd_zap,

699

]

700

701