/brz/remove-bazaar : revision 7517

260

if revisions is None:

261

return None

262

if len(revisions) != 1:

263

raise errors.BzrCommandError(gettext(

263

raise errors.CommandError(gettext(

264

'brz %s --revision takes exactly one revision identifier') % (

265

command_name,))

266

return revisions[0]

396

from .status import show_tree_status

397

398

if revision and len(revision) > 2:

399

raise errors.BzrCommandError(

399

raise errors.CommandError(

400

gettext('brz status --revision takes exactly'

401

' one or two revision specifiers'))

402

441

@display_command

442

def run(self, revision_id=None, revision=None, directory=u'.'):

443

if revision_id is not None and revision is not None:

444

raise errors.BzrCommandError(gettext('You can only supply one of'

444

raise errors.CommandError(gettext('You can only supply one of'

445

' revision_id or --revision'))

446

if revision_id is None and revision is None:

447

raise errors.BzrCommandError(

447

raise errors.CommandError(

448

gettext('You must supply either --revision or a revision_id'))

449

450

b = controldir.ControlDir.open_containing_tree_or_branch(directory)[1]

451

452

revisions = getattr(b.repository, "revisions", None)

453

if revisions is None:

454

raise errors.BzrCommandError(

454

raise errors.CommandError(

455

gettext('Repository %r does not support '

456

'access to raw revision texts') % b.repository)

457

465

msg = gettext(

466

"The repository {0} contains no revision {1}.").format(

467

b.repository.base, revision_id.decode('utf-8'))

468

raise errors.BzrCommandError(msg)

468

raise errors.CommandError(msg)

469

elif revision is not None:

470

for rev in revision:

471

if rev is None:

472

raise errors.BzrCommandError(

472

raise errors.CommandError(

473

gettext('You cannot specify a NULL revision.'))

474

rev_id = rev.as_revision_id(b)

475

self.print_revision(revisions, rev_id)

501

try:

502

working = d.open_workingtree()

503

except errors.NoWorkingTree:

504

raise errors.BzrCommandError(

504

raise errors.CommandError(

505

gettext("No working tree to remove"))

506

except errors.NotLocalUrl:

507

raise errors.BzrCommandError(

507

raise errors.CommandError(

508

gettext("You cannot remove the working tree"

509

" of a remote path"))

510

if not force:

514

raise errors.ShelvedChanges(working)

515

516

if working.user_url != working.branch.user_url:

517

raise errors.BzrCommandError(

517

raise errors.CommandError(

518

gettext("You cannot remove the working tree"

519

" from a lightweight checkout"))

520

555

pass # There seems to be a real error here, so we'll reset

556

else:

557

# Refuse

558

raise errors.BzrCommandError(gettext(

558

raise errors.CommandError(gettext(

559

'The tree does not appear to be corrupt. You probably'

560

' want "brz revert" instead. Use "--force" if you are'

561

' sure you want to reset the working tree.'))

571

'-r -1 to set the state to the last commit')

572

else:

573

extra = ''

574

raise errors.BzrCommandError(

574

raise errors.CommandError(

575

gettext('failed to reset the tree state{0}').format(extra))

576

577

591

@display_command

592

def run(self, tree=False, location=u'.', revision=None):

593

if revision is not None and tree:

594

raise errors.BzrCommandError(

594

raise errors.CommandError(

595

gettext("--tree and --revision can not be used together"))

596

597

if tree:

607

self.enter_context(b.lock_read())

608

if revision:

609

if len(revision) != 1:

610

raise errors.BzrCommandError(gettext(

610

raise errors.CommandError(gettext(

611

"Revision numbers only make sense for single "

612

"revisions, not ranges"))

613

revid = revision[0].as_revision_id(b)

871

def run(self, revision=None, show_ids=False, kind=None, include_root=False,

872

file_list=None):

873

if kind and kind not in ['file', 'directory', 'symlink']:

874

raise errors.BzrCommandError(

874

raise errors.CommandError(

875

gettext('invalid kind %r specified') % (kind,))

876

877

revision = _get_one_revision('inventory', revision)

934

if names_list is None:

935

names_list = []

936

if len(names_list) < 2:

937

raise errors.BzrCommandError(gettext("missing file argument"))

937

raise errors.CommandError(gettext("missing file argument"))

938

tree, rel_names = WorkingTree.open_containing_paths(

939

names_list, canonicalize=False)

940

for file_name in rel_names[0:-1]:

941

if file_name == '':

942

raise errors.BzrCommandError(

942

raise errors.CommandError(

943

gettext("can not copy root of branch"))

944

self.enter_context(tree.lock_tree_write())

945

into_existing = osutils.isdir(names_list[-1])

947

try:

948

(src, dst) = rel_names

949

except IndexError:

950

raise errors.BzrCommandError(

950

raise errors.CommandError(

951

gettext('to copy multiple files the'

952

' destination must be a versioned'

953

' directory'))

961

try:

962

src_kind = tree.stored_kind(src)

963

except errors.NoSuchFile:

964

raise errors.BzrCommandError(

964

raise errors.CommandError(

965

gettext('Could not copy %s => %s: %s is not versioned.')

966

% (src, dst, src))

967

if src_kind is None:

968

raise errors.BzrCommandError(

968

raise errors.CommandError(

969

gettext('Could not copy %s => %s . %s is not versioned\\.'

970

% (src, dst, src)))

971

if src_kind == 'directory':

972

raise errors.BzrCommandError(

972

raise errors.CommandError(

973

gettext('Could not copy %s => %s . %s is a directory.'

974

% (src, dst, src)))

975

dst_parent = osutils.split(dst)[0]

977

try:

978

dst_parent_kind = tree.stored_kind(dst_parent)

979

except errors.NoSuchFile:

980

raise errors.BzrCommandError(

980

raise errors.CommandError(

981

gettext('Could not copy %s => %s: %s is not versioned.')

982

% (src, dst, dst_parent))

983

if dst_parent_kind != 'directory':

984

raise errors.BzrCommandError(

984

raise errors.CommandError(

985

gettext('Could not copy to %s: %s is not a directory.')

986

% (dst_parent, dst_parent))

987

1023

if auto:

1024

return self.run_auto(names_list, after, dry_run)

1025

elif dry_run:

1026

raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))

1026

raise errors.CommandError(gettext('--dry-run requires --auto.'))

1027

if names_list is None:

1028

names_list = []

1029

if len(names_list) < 2:

1030

raise errors.BzrCommandError(gettext("missing file argument"))

1030

raise errors.CommandError(gettext("missing file argument"))

1031

tree, rel_names = WorkingTree.open_containing_paths(

1032

names_list, canonicalize=False)

1033

for file_name in rel_names[0:-1]:

1034

if file_name == '':

1035

raise errors.BzrCommandError(

1035

raise errors.CommandError(

1036

gettext("can not move root of branch"))

1037

self.enter_context(tree.lock_tree_write())

1038

self._run(tree, names_list, rel_names, after)

1039

1040

def run_auto(self, names_list, after, dry_run):

1041

if names_list is not None and len(names_list) > 1:

1042

raise errors.BzrCommandError(

1042

raise errors.CommandError(

1043

gettext('Only one path may be specified to --auto.'))

1044

if after:

1045

raise errors.BzrCommandError(

1045

raise errors.CommandError(

1046

gettext('--after cannot be specified with --auto.'))

1047

work_tree, file_list = WorkingTree.open_containing_paths(

1048

names_list, default_directory='.')

1079

self.outf.write("%s => %s\n" % (src, dest))

1080

else:

1081

if len(names_list) != 2:

1082

raise errors.BzrCommandError(gettext('to mv multiple files the'

1082

raise errors.CommandError(gettext('to mv multiple files the'

1083

' destination must be a versioned'

1084

' directory'))

1085

1222

stored_loc = branch_to.get_parent()

1223

if location is None:

1224

if stored_loc is None:

1225

raise errors.BzrCommandError(gettext("No pull location known or"

1225

raise errors.CommandError(gettext("No pull location known or"

1226

" specified."))

1227

else:

1228

display_url = urlutils.unescape_for_display(stored_loc,

1235

revision = _get_one_revision('pull', revision)

1236

if mergeable is not None:

1237

if revision is not None:

1238

raise errors.BzrCommandError(gettext(

1238

raise errors.CommandError(gettext(

1239

'Cannot use -r with merge directives or bundles'))

1240

mergeable.install_revisions(branch_to.repository)

1241

base_revision_id, revision_id, verified = \

1390

# error by the feedback given to them. RBC 20080227.

1391

stacked_on = parent_url

1392

if not stacked_on:

1393

raise errors.BzrCommandError(gettext(

1393

raise errors.CommandError(gettext(

1394

"Could not determine branch to refer to."))

1395

1396

# Get the destination location

1399

if stored_loc is None:

1400

parent_loc = br_from.get_parent()

1401

if parent_loc:

1402

raise errors.BzrCommandError(gettext(

1402

raise errors.CommandError(gettext(

1403

"No push location known or specified. To push to the "

1404

"parent branch (at %s), use 'brz push :parent'." %

1405

urlutils.unescape_for_display(parent_loc,

1406

self.outf.encoding)))

1407

else:

1408

raise errors.BzrCommandError(gettext(

1408

raise errors.CommandError(gettext(

1409

"No push location known or specified."))

1410

else:

1411

display_url = urlutils.unescape_for_display(stored_loc,

1504

to_transport)

1505

except errors.NotBranchError:

1506

if not use_existing_dir:

1507

raise errors.BzrCommandError(gettext('Target directory "%s" '

1507

raise errors.CommandError(gettext('Target directory "%s" '

1508

'already exists.') % to_location)

1509

else:

1510

to_dir = None

1516

else:

1517

raise errors.AlreadyBranchError(to_location)

1518

except errors.NoSuchFile:

1519

raise errors.BzrCommandError(gettext('Parent of "%s" does not exist.')

1519

raise errors.CommandError(gettext('Parent of "%s" does not exist.')

1520

% to_location)

1521

else:

1522

to_dir = None

1537

to_transport.delete_tree('.')

1538

msg = gettext("The branch {0} has no revision {1}.").format(

1539

from_location, revision)

1540

raise errors.BzrCommandError(msg)

1540

raise errors.CommandError(msg)

1541

else:

1542

try:

1543

to_repo = to_dir.open_repository()

1593

if recursive:

1594

t = transport.get_transport(location, purpose='read')

1595

if not t.listable():

1596

raise errors.BzrCommandError(

1596

raise errors.CommandError(

1597

"Can't scan this type of location.")

1598

for b in controldir.ControlDir.find_branches(t):

1599

self.outf.write("%s\n" % urlutils.unescape_for_display(

1798

1799

def run(self, dir=None, revision=None, show_base=None):

1800

if revision is not None and len(revision) != 1:

1801

raise errors.BzrCommandError(gettext(

1801

raise errors.CommandError(gettext(

1802

"brz update --revision takes exactly one revision"))

1803

if dir is None:

1804

tree = WorkingTree.open_containing('.')[0]

1806

tree, relpath = WorkingTree.open_containing(dir)

1807

if relpath:

1808

# See bug 557886.

1809

raise errors.BzrCommandError(gettext(

1809

raise errors.CommandError(gettext(

1810

"brz update can only update a whole tree, "

1811

"not a file or subdirectory"))

1812

branch = tree.branch

1852

old_tip=old_tip,

1853

show_base=show_base)

1854

except errors.NoSuchRevision as e:

1855

raise errors.BzrCommandError(gettext(

1855

raise errors.CommandError(gettext(

1856

"branch has no revision %s\n"

1857

"brz update --revision only works"

1858

" for a revision in the branch history")

1954

specific_files=file_list).added

1955

file_list = sorted([f.path[1] for f in added], reverse=True)

1956

if len(file_list) == 0:

1957

raise errors.BzrCommandError(gettext('No matching files.'))

1957

raise errors.CommandError(gettext('No matching files.'))

1958

elif file_list is None:

1959

# missing files show up in iter_changes(basis) as

1960

# versioned-with-no-kind.

2116

to_transport.ensure_base()

2117

except errors.NoSuchFile:

2118

if not create_prefix:

2119

raise errors.BzrCommandError(gettext("Parent directory of %s"

2119

raise errors.CommandError(gettext("Parent directory of %s"

2120

" does not exist."

2121

"\nYou may supply --create-prefix to create all"

2122

" leading parent directories.")

2151

try:

2152

branch.set_append_revisions_only(True)

2153

except errors.UpgradeRequired:

2154

raise errors.BzrCommandError(gettext('This branch format cannot be set'

2154

raise errors.CommandError(gettext('This branch format cannot be set'

2155

' to append-revisions-only. Try --default.'))

2156

if not is_quiet():

2157

from .info import describe_layout, describe_format

2395

elif u':' in prefix:

2396

old_label, new_label = prefix.split(u":")

2397

else:

2398

raise errors.BzrCommandError(gettext(

2398

raise errors.CommandError(gettext(

2399

'--prefix expects two values separated by a colon'

2400

' (eg "old/:new/")'))

2401

2402

if revision and len(revision) > 2:

2403

raise errors.BzrCommandError(gettext('brz diff --revision takes exactly'

2403

raise errors.CommandError(gettext('brz diff --revision takes exactly'

2404

' one or two revision specifiers'))

2405

2406

if using is not None and format is not None:

2407

raise errors.BzrCommandError(gettext(

2407

raise errors.CommandError(gettext(

2408

'{0} and {1} are mutually exclusive').format(

2409

'--using', '--format'))

2410

2529

return int(limitstring)

2530

except ValueError:

2531

msg = gettext("The limit argument must be an integer.")

2532

raise errors.BzrCommandError(msg)

2532

raise errors.CommandError(msg)

2533

2534

2535

def _parse_levels(s):

2537

return int(s)

2538

except ValueError:

2539

msg = gettext("The levels argument must be an integer.")

2540

raise errors.BzrCommandError(msg)

2540

raise errors.CommandError(msg)

2541

2542

2543

class cmd_log(Command):

2804

include_merged = False

2805

if (exclude_common_ancestry

2806

and (revision is None or len(revision) != 2)):

2807

raise errors.BzrCommandError(gettext(

2807

raise errors.CommandError(gettext(

2808

'--exclude-common-ancestry requires -r with two revisions'))

2809

if include_merged:

2810

if levels is None:

2811

levels = 0

2812

else:

2813

raise errors.BzrCommandError(gettext(

2813

raise errors.CommandError(gettext(

2814

'{0} and {1} are mutually exclusive').format(

2815

'--levels', '--include-merged'))

2816

2818

if len(change) > 1:

2819

raise errors.RangeInChangeOption()

2820

if revision is not None:

2821

raise errors.BzrCommandError(gettext(

2821

raise errors.CommandError(gettext(

2822

'{0} and {1} are mutually exclusive').format(

2823

'--revision', '--change'))

2824

else:

2832

revision, file_list, self._exit_stack)

2833

for relpath, file_id, kind in file_info_list:

2834

if file_id is None:

2835

raise errors.BzrCommandError(gettext(

2835

raise errors.CommandError(gettext(

2836

"Path unknown at end or start of revision range: %s") %

2837

relpath)

2838

# If the relpath is the top of the tree, we log everything

2950

# b is taken from revision[0].get_branch(), and

2951

# show_log will use its revision_history. Having

2952

# different branches will lead to weird behaviors.

2953

raise errors.BzrCommandError(gettext(

2953

raise errors.CommandError(gettext(

2954

"brz %s doesn't accept two revisions in different"

2955

" branches.") % command_name)

2956

if start_spec.spec is None:

2966

else:

2967

rev2 = end_spec.in_history(branch)

2968

else:

2969

raise errors.BzrCommandError(gettext(

2969

raise errors.CommandError(gettext(

2970

'brz %s --revision takes one or two values.') % command_name)

2971

return rev1, rev2

2972

3046

null=False, kind=None, show_ids=False, path=None, directory=None):

3047

3048

if kind and kind not in ('file', 'directory', 'symlink', 'tree-reference'):

3049

raise errors.BzrCommandError(gettext('invalid kind specified'))

3049

raise errors.CommandError(gettext('invalid kind specified'))

3050

3051

if verbose and null:

3052

raise errors.BzrCommandError(

3052

raise errors.CommandError(

3053

gettext('Cannot set both --verbose and --null'))

3054

all = not (unknown or versioned or ignored)

3055

3059

fs_path = '.'

3060

else:

3061

if from_root:

3062

raise errors.BzrCommandError(gettext('cannot specify both --from-root'

3062

raise errors.CommandError(gettext('cannot specify both --from-root'

3063

' and PATH'))

3064

fs_path = path

3065

tree, branch, relpath = \

3236

self.outf.write("%s\n" % pattern)

3237

return

3238

if not name_pattern_list:

3239

raise errors.BzrCommandError(gettext("ignore requires at least one "

3239

raise errors.CommandError(gettext("ignore requires at least one "

3240

"NAME_PATTERN or --default-rules."))

3241

name_pattern_list = [globbing.normalize_pattern(p)

3242

for p in name_pattern_list]

3255

for name_pattern in name_pattern_list:

3256

if (name_pattern[0] == '/' or

3257

(len(name_pattern) > 1 and name_pattern[1] == ':')):

3258

raise errors.BzrCommandError(gettext(

3258

raise errors.CommandError(gettext(

3259

"NAME_PATTERN should not be an absolute path"))

3260

tree, relpath = WorkingTree.open_containing(directory)

3261

ignores.tree_ignores_add_patterns(tree, name_pattern_list)

3316

try:

3317

revno = int(revno)

3318

except ValueError:

3319

raise errors.BzrCommandError(gettext("not a valid revision-number: %r")

3319

raise errors.CommandError(gettext("not a valid revision-number: %r")

3320

% revno)

3321

revid = WorkingTree.open_containing(

3322

directory)[0].branch.get_rev_id(revno)

3387

3388

if uncommitted:

3389

if tree is None:

3390

raise errors.BzrCommandError(

3390

raise errors.CommandError(

3391

gettext("--uncommitted requires a working tree"))

3392

export_tree = tree

3393

else:

3415

export(export_tree, dest, format, root, subdir,

3416

per_file_timestamps=per_file_timestamps)

3417

except errors.NoSuchExportFormat as e:

3418

raise errors.BzrCommandError(

3418

raise errors.CommandError(

3419

gettext('Unsupported export format: %s') % e.format)

3420

3421

3443

def run(self, filename, revision=None, name_from_revision=False,

3444

filters=False, directory=None):

3445

if revision is not None and len(revision) != 1:

3446

raise errors.BzrCommandError(gettext("brz cat --revision takes exactly"

3446

raise errors.CommandError(gettext("brz cat --revision takes exactly"

3447

" one revision specifier"))

3448

tree, branch, relpath = \

3449

_open_directory_or_containing_tree_or_branch(filename, directory)

3462

if name_from_revision:

3463

# Try in revision if requested

3464

if not rev_tree.is_versioned(relpath):

3465

raise errors.BzrCommandError(gettext(

3465

raise errors.CommandError(gettext(

3466

"{0!r} is not present in revision {1}").format(

3467

filename, rev_tree.get_revision_id()))

3468

rev_tree_path = relpath

3476

if rev_tree_path is None:

3477

# Path didn't exist in working tree

3478

if not rev_tree.is_versioned(relpath):

3479

raise errors.BzrCommandError(gettext(

3479

raise errors.CommandError(gettext(

3480

"{0!r} is not present in revision {1}").format(

3481

filename, rev_tree.get_revision_id()))

3482

else:

3619

default_bugtracker = branch_config.get(

3620

"bugtracker")

3621

if default_bugtracker is None:

3622

raise errors.BzrCommandError(gettext(

3622

raise errors.CommandError(gettext(

3623

"No tracker specified for bug %s. Use the form "

3624

"'tracker:id' or specify a default bug tracker "

3625

"using the `bugtracker` option.\nSee "

3628

tag = default_bugtracker

3629

bug_id = tokens[0]

3630

elif len(tokens) != 2:

3631

raise errors.BzrCommandError(gettext(

3631

raise errors.CommandError(gettext(

3632

"Invalid bug %s. Must be in the form of 'tracker:id'. "

3633

"See \"brz help bugs\" for more information on this "

3634

"feature.\nCommit refused.") % bug)

3637

try:

3638

yield bugtracker.get_bug_url(tag, branch, bug_id), status

3639

except bugtracker.UnknownBugTrackerAbbreviation:

3640

raise errors.BzrCommandError(gettext(

3640

raise errors.CommandError(gettext(

3641

'Unrecognized bug %s. Commit refused.') % bug)

3642

except bugtracker.MalformedBugIdentifier as e:

3643

raise errors.BzrCommandError(gettext(

3643

raise errors.CommandError(gettext(

3644

u"%s\nCommit refused.") % (e,))

3645

3646

def run(self, message=None, file=None, verbose=False, selected_list=None,

3667

try:

3668

commit_stamp, offset = timestamp.parse_patch_date(commit_time)

3669

except ValueError as e:

3670

raise errors.BzrCommandError(gettext(

3670

raise errors.CommandError(gettext(

3671

"Could not parse --commit-time: " + str(e)))

3672

3673

properties = {}

3711

message = message.replace('\r\n', '\n')

3712

message = message.replace('\r', '\n')

3713

if file:

3714

raise errors.BzrCommandError(gettext(

3714

raise errors.CommandError(gettext(

3715

"please specify either --message or --file"))

3716

3717

def get_message(commit_obj):

3742

my_message = edit_commit_message_encoded(text,

3743

start_message=start_message)

3744

if my_message is None:

3745

raise errors.BzrCommandError(gettext("please specify a commit"

3745

raise errors.CommandError(gettext("please specify a commit"

3746

" message with either --message or --file"))

3747

if my_message == "":

3748

raise errors.BzrCommandError(gettext("Empty commit message specified."

3748

raise errors.CommandError(gettext("Empty commit message specified."

3749

" Please specify a commit message with either"

3750

" --message or --file or leave a blank message"

3751

" with --message \"\"."))

3765

exclude=tree.safe_relpath_files(exclude),

3766

lossy=lossy)

3767

except PointlessCommit:

3768

raise errors.BzrCommandError(gettext("No changes to commit."

3768

raise errors.CommandError(gettext("No changes to commit."

3769

" Please 'brz add' the files you want to commit, or use"

3770

" --unchanged to force an empty commit."))

3771

except ConflictsInTree:

3772

raise errors.BzrCommandError(gettext('Conflicts detected in working '

3772

raise errors.CommandError(gettext('Conflicts detected in working '

3773

'tree. Use "brz conflicts" to list, "brz resolve FILE" to'

3774

' resolve.'))

3775

except StrictCommitFailed:

3776

raise errors.BzrCommandError(gettext("Commit refused because there are"

3776

raise errors.CommandError(gettext("Commit refused because there are"

3777

" unknown files in the working tree."))

3778

except errors.BoundBranchOutOfDate as e:

3779

e.extra_help = (gettext("\n"

3955

return

3956

3957

if email:

3958

raise errors.BzrCommandError(gettext("--email can only be used to display existing "

3958

raise errors.CommandError(gettext("--email can only be used to display existing "

3959

"identity"))

3960

3961

# display a warning if an email address isn't included in the given name.

4045

4046

def remove_alias(self, alias_name):

4047

if alias_name is None:

4048

raise errors.BzrCommandError(gettext(

4048

raise errors.CommandError(gettext(

4049

'brz alias --remove expects an alias to remove.'))

4050

# If alias is not found, print something like:

4051

# unalias: foo: not found

4140

return test_server.FakeNFSServer

4141

msg = "No known transport type %s. Supported types are: sftp\n" %\

4142

(typestring)

4143

raise errors.BzrCommandError(msg)

4143

raise errors.CommandError(msg)

4144

4145

hidden = True

4146

takes_args = ['testspecs*']

4225

try:

4226

from . import tests

4227

except ImportError as e:

4228

raise errors.BzrCommandError("tests not available. Install the "

4228

raise errors.CommandError("tests not available. Install the "

4229

"breezy tests to run the breezy testsuite.")

4230

4231

if testspecs_list is not None:

4236

try:

4237

from .tests import SubUnitBzrRunnerv1

4238

except ImportError:

4239

raise errors.BzrCommandError(gettext(

4239

raise errors.CommandError(gettext(

4240

"subunit not available. subunit needs to be installed "

4241

"to use --subunit."))

4242

self.additional_selftest_args['runner_class'] = SubUnitBzrRunnerv1

4253

try:

4254

from .tests import SubUnitBzrRunnerv2

4255

except ImportError:

4256

raise errors.BzrCommandError(gettext(

4256

raise errors.CommandError(gettext(

4257

"subunit not available. subunit "

4258

"needs to be installed to use --subunit2."))

4259

self.additional_selftest_args['runner_class'] = SubUnitBzrRunnerv2

4262

self.additional_selftest_args.setdefault(

4263

'suite_decorators', []).append(parallel)

4264

if benchmark:

4265

raise errors.BzrCommandError(gettext(

4265

raise errors.CommandError(gettext(

4266

"--benchmark is no longer supported from brz 2.2; "

4267

"use bzr-usertest instead"))

4268

test_suite_factory = None

4490

4491

tree = WorkingTree.open_containing(directory)[0]

4492

if tree.branch.last_revision() == _mod_revision.NULL_REVISION:

4493

raise errors.BzrCommandError(gettext('Merging into empty branches not currently supported, '

4493

raise errors.CommandError(gettext('Merging into empty branches not currently supported, '

4494

'https://bugs.launchpad.net/bzr/+bug/308562'))

4495

4496

# die as quickly as possible if there are uncommitted changes

4512

mergeable = None

4513

else:

4514

if uncommitted:

4515

raise errors.BzrCommandError(gettext('Cannot use --uncommitted'

4515

raise errors.CommandError(gettext('Cannot use --uncommitted'

4516

' with bundles or merge directives.'))

4517

4518

if revision is not None:

4519

raise errors.BzrCommandError(gettext(

4519

raise errors.CommandError(gettext(

4520

'Cannot use -r with merge directives or bundles'))

4521

merger, verified = _mod_merge.Merger.from_mergeable(tree,

4522

mergeable)

4523

4524

if merger is None and uncommitted:

4525

if revision is not None and len(revision) > 0:

4526

raise errors.BzrCommandError(gettext('Cannot use --uncommitted and'

4526

raise errors.CommandError(gettext('Cannot use --uncommitted and'

4527

' --revision at the same time.'))

4528

merger = self.get_merger_from_uncommitted(tree, location, None)

4529

allow_pending = False

4549

return 0

4550

if pull and not preview:

4551

if merger.interesting_files is not None:

4552

raise errors.BzrCommandError(

4552

raise errors.CommandError(

4553

gettext('Cannot pull individual files'))

4554

if (merger.base_rev_id == tree.last_revision()):

4555

result = tree.pull(merger.other_branch, False,

4557

result.report(self.outf)

4558

return 0

4559

if merger.this_basis is None:

4560

raise errors.BzrCommandError(gettext(

4560

raise errors.CommandError(gettext(

4561

"This branch has no commits."

4562

" (perhaps you would prefer 'brz pull')"))

4563

if preview:

4616

def sanity_check_merger(self, merger):

4617

if (merger.show_base and

4618

merger.merge_type is not _mod_merge.Merge3Merger):

4619

raise errors.BzrCommandError(gettext("Show-base is not supported for this"

4619

raise errors.CommandError(gettext("Show-base is not supported for this"

4620

" merge type. %s") % merger.merge_type)

4621

if merger.reprocess is None:

4622

if merger.show_base:

4625

# Use reprocess if the merger supports it

4626

merger.reprocess = merger.merge_type.supports_reprocess

4627

if merger.reprocess and not merger.merge_type.supports_reprocess:

4628

raise errors.BzrCommandError(gettext("Conflict reduction is not supported"

4628

raise errors.CommandError(gettext("Conflict reduction is not supported"

4629

" for merge type %s.") %

4630

merger.merge_type)

4631

if merger.reprocess and merger.show_base:

4632

raise errors.BzrCommandError(gettext("Cannot do conflict reduction and"

4632

raise errors.CommandError(gettext("Cannot do conflict reduction and"

4633

" show base."))

4634

4635

if (merger.merge_type.requires_file_merge_plan and

4637

not getattr(merger.other_tree, 'plan_file_merge', None) or

4638

(merger.base_tree is not None and

4639

not getattr(merger.base_tree, 'plan_file_merge', None)))):

4640

raise errors.BzrCommandError(

4640

raise errors.CommandError(

4641

gettext('Plan file merge unsupported: '

4642

'Merge type incompatible with tree formats.'))

4643

4748

stored_location_type = "parent"

4749

mutter("%s", stored_location)

4750

if stored_location is None:

4751

raise errors.BzrCommandError(

4751

raise errors.CommandError(

4752

gettext("No location specified or remembered"))

4753

display_url = urlutils.unescape_for_display(stored_location, 'utf-8')

4754

note(gettext("{0} remembered {1} location {2}").format(verb_string,

4795

self.enter_context(tree.lock_write())

4796

parents = tree.get_parent_ids()

4797

if len(parents) != 2:

4798

raise errors.BzrCommandError(

4798

raise errors.CommandError(

4799

gettext("Sorry, remerge only works after normal"

4800

" merges. Not cherrypicking or multi-merges."))

4801

interesting_files = None

5070

if other_branch is None:

5071

other_branch = parent

5072

if other_branch is None:

5073

raise errors.BzrCommandError(gettext("No peer location known"

5073

raise errors.CommandError(gettext("No peer location known"

5074

" or specified."))

5075

display_url = urlutils.unescape_for_display(parent,

5076

self.outf.encoding)

5318

5319

def run(self, revision_id_list=None, revision=None, directory=u'.'):

5320

if revision_id_list is not None and revision is not None:

5321

raise errors.BzrCommandError(

5321

raise errors.CommandError(

5322

gettext('You can only supply one of revision_id or --revision'))

5323

if revision_id_list is None and revision is None:

5324

raise errors.BzrCommandError(

5324

raise errors.CommandError(

5325

gettext('You must supply either --revision or a revision_id'))

5326

b = WorkingTree.open_containing(directory)[0].branch

5327

self.enter_context(b.lock_write())

5349

if to_revid is None:

5350

to_revno = b.revno()

5351

if from_revno is None or to_revno is None:

5352

raise errors.BzrCommandError(

5352

raise errors.CommandError(

5353

gettext('Cannot sign a range of non-revision-history revisions'))

5354

with WriteGroup(b.repository):

5355

for revno in range(from_revno, to_revno + 1):

5356

b.repository.sign_revision(b.get_rev_id(revno),

5357

gpg_strategy)

5358

else:

5359

raise errors.BzrCommandError(

5359

raise errors.CommandError(

5360

gettext('Please supply either one revision, or a range.'))

5361

5362

5382

try:

5383

location = b.get_old_bound_location()

5384

except errors.UpgradeRequired:

5385

raise errors.BzrCommandError(

5385

raise errors.CommandError(

5386

gettext('No location supplied. '

5387

'This format does not remember old locations.'))

5388

else:

5389

if location is None:

5390

if b.get_bound_location() is not None:

5391

raise errors.BzrCommandError(

5391

raise errors.CommandError(

5392

gettext('Branch is already bound'))

5393

else:

5394

raise errors.BzrCommandError(

5394

raise errors.CommandError(

5395

gettext('No location supplied'

5396

' and no previous location known'))

5397

b_other = Branch.open(location)

5398

try:

5399

b.bind(b_other)

5400

except errors.DivergedBranches:

5401

raise errors.BzrCommandError(

5401

raise errors.CommandError(

5402

gettext('These branches have diverged.'

5403

' Try merging, and then bind again.'))

5404

if b.get_config().has_explicit_nickname():

5419

def run(self, directory=u'.'):

5420

b, relpath = Branch.open_containing(directory)

5421

if not b.unbind():

5422

raise errors.BzrCommandError(gettext('Local branch is not bound'))

5422

raise errors.CommandError(gettext('Local branch is not bound'))

5423

5424

5425

class cmd_uncommit(Command):

5678

containing_tree = WorkingTree.open_containing(parent_dir)[0]

5679

repo = containing_tree.branch.repository

5680

if not repo.supports_rich_root():

5681

raise errors.BzrCommandError(gettext(

5681

raise errors.CommandError(gettext(

5682

"Can't join trees because %s doesn't support rich root data.\n"

5683

"You can use brz upgrade on the repository.")

5684

% (repo,))

5688

except BadReferenceTarget as e:

5689

# XXX: Would be better to just raise a nicely printable

5690

# exception from the real origin. Also below. mbp 20070306

5691

raise errors.BzrCommandError(

5691

raise errors.CommandError(

5692

gettext("Cannot join {0}. {1}").format(tree, e.reason))

5693

else:

5694

try:

5695

containing_tree.subsume(sub_tree)

5696

except errors.BadSubsumeSource as e:

5697

raise errors.BzrCommandError(

5697

raise errors.CommandError(

5698

gettext("Cannot join {0}. {1}").format(tree, e.reason))

5699

5700

5786

if submit_branch is None:

5787

submit_branch = branch.get_parent()

5788

if submit_branch is None:

5789

raise errors.BzrCommandError(

5789

raise errors.CommandError(

5790

gettext('No submit branch specified or known'))

5791

5792

stored_public_branch = branch.get_public_branch()

5796

# FIXME: Should be done only if we succeed ? -- vila 2012-01-03

5797

branch.set_public_branch(public_branch)

5798

if not include_bundle and public_branch is None:

5799

raise errors.BzrCommandError(

5799

raise errors.CommandError(

5800

gettext('No public branch specified or known'))

5801

base_revision_id = None

5802

if revision is not None:

5803

if len(revision) > 2:

5804

raise errors.BzrCommandError(

5804

raise errors.CommandError(

5805

gettext('brz merge-directive takes '

5806

'at most two one revision identifiers'))

5807

revision_id = revision[-1].as_revision_id(branch)

5811

revision_id = branch.last_revision()

5812

revision_id = ensure_null(revision_id)

5813

if revision_id == NULL_REVISION:

5814

raise errors.BzrCommandError(gettext('No revisions to bundle.'))

5814

raise errors.CommandError(gettext('No revisions to bundle.'))

5815

directive = merge_directive.MergeDirective2.from_objects(

5816

branch.repository, revision_id, time.time(),

5817

osutils.local_time_offset(), submit_branch,

6058

self.enter_context(branch.lock_write())

6059

if delete:

6060

if tag_name is None:

6061

raise errors.BzrCommandError(

6061

raise errors.CommandError(

6062

gettext("No tag specified to delete."))

6063

branch.tags.delete_tag(tag_name)

6064

note(gettext('Deleted tag %s.') % tag_name)

6065

else:

6066

if revision:

6067

if len(revision) != 1:

6068

raise errors.BzrCommandError(gettext(

6068

raise errors.CommandError(gettext(

6069

"Tags can only be placed on a single revision, "

6070

"not on a range"))

6071

revision_id = revision[0].as_revision_id(branch)

6074

if tag_name is None:

6075

tag_name = branch.automatic_tag_name(revision_id)

6076

if tag_name is None:

6077

raise errors.BzrCommandError(gettext(

6077

raise errors.CommandError(gettext(

6078

"Please specify a tag name."))

6079

try:

6080

existing_target = branch.tags.lookup_tag(tag_name)

6238

stacked_on=None, unstacked=None):

6239

directory = controldir.ControlDir.open(location)

6240

if stacked_on and unstacked:

6241

raise errors.BzrCommandError(

6241

raise errors.CommandError(

6242

gettext("Can't use both --stacked-on and --unstacked"))

6243

elif stacked_on is not None:

6244

reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)

6253

if stacked_on or unstacked:

6254

return

6255

else:

6256

raise errors.BzrCommandError(gettext('No target configuration '

6256

raise errors.CommandError(gettext('No target configuration '

6257

'specified'))

6258

reconfiguration = None

6259

if tree_type == 'branch':

6332

possible_transports = [control_dir.root_transport]

6333

if to_location is None:

6334

if revision is None:

6335

raise errors.BzrCommandError(gettext('You must supply either a'

6335

raise errors.CommandError(gettext('You must supply either a'

6336

' revision or a location'))

6337

to_location = tree_location

6338

try:

6346

possible_transports.append(branch.user_transport)

6347

if create_branch:

6348

if branch is None:

6349

raise errors.BzrCommandError(

6349

raise errors.CommandError(

6350

gettext('cannot create branch without source branch'))

6351

to_location = lookup_new_sibling_branch(

6352

control_dir, to_location,

6374

store_uncommitted=store,

6375

possible_transports=possible_transports)

6376

except controldir.BranchReferenceLoop:

6377

raise errors.BzrCommandError(

6377

raise errors.CommandError(

6378

gettext('switching would create a branch reference loop. '

6379

'Use the "bzr up" command to switch to a '

6380

'different revision.'))

6486

name = current_view

6487

if delete:

6488

if file_list:

6489

raise errors.BzrCommandError(gettext(

6489

raise errors.CommandError(gettext(

6490

"Both --delete and a file list specified"))

6491

elif switch:

6492

raise errors.BzrCommandError(gettext(

6492

raise errors.CommandError(gettext(

6493

"Both --delete and --switch specified"))

6494

elif all:

6495

tree.views.set_view_info(None, {})

6496

self.outf.write(gettext("Deleted all views.\n"))

6497

elif name is None:

6498

raise errors.BzrCommandError(

6498

raise errors.CommandError(

6499

gettext("No current view to delete"))

6500

else:

6501

tree.views.delete_view(name)

6502

self.outf.write(gettext("Deleted '%s' view.\n") % name)

6503

elif switch:

6504

if file_list:

6505

raise errors.BzrCommandError(gettext(

6505

raise errors.CommandError(gettext(

6506

"Both --switch and a file list specified"))

6507

elif all:

6508

raise errors.BzrCommandError(gettext(

6508

raise errors.CommandError(gettext(

6509

"Both --switch and --all specified"))

6510

elif switch == 'off':

6511

if current_view is None:

6512

raise errors.BzrCommandError(

6512

raise errors.CommandError(

6513

gettext("No current view to disable"))

6514

tree.views.set_view_info(None, view_dict)

6515

self.outf.write(gettext("Disabled '%s' view.\n") %

6536

# No name given and no current view set

6537

name = 'my'

6538

elif name == 'off':

6539

raise errors.BzrCommandError(gettext(

6539

raise errors.CommandError(gettext(

6540

"Cannot change the 'off' pseudo view"))

6541

tree.views.set_view(name, sorted(file_list))

6542

view_str = views.view_display_str(tree.views.lookup_view())

6603

active_branch = None

6604

if (active_branch is not None and

6605

br.control_url == active_branch.control_url):

6606

raise errors.BzrCommandError(

6606

raise errors.CommandError(

6607

gettext("Branch is active. Use --force to remove it."))

6608

br.controldir.destroy_branch(br.name)

6609

6972

path_list = ['.']

6973

else:

6974

if from_root:

6975

raise errors.BzrCommandError(

6975

raise errors.CommandError(

6976

'cannot specify both --from-root and PATH.')

6977

6978

if files_with_matches and files_without_match:

6979

raise errors.BzrCommandError(

6979

raise errors.CommandError(

6980

'cannot specify both '

6981

'-l/--files-with-matches and -L/--files-without-matches.')

6982

6989

color = 'never'

6990

6991

if color not in ['always', 'never', 'auto']:

6992

raise errors.BzrCommandError('Valid values for --color are '

6992

raise errors.CommandError('Valid values for --color are '

6993

'"always", "never" or "auto".')

6994

6995

if levels is None: