/brz/remove-bazaar : revision 803

15

# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

16

17

18

# TODO: Split the command framework away from the actual commands.

19

20

# TODO: probably should say which arguments are candidates for glob

21

# expansion on windows and do that at the command level.

22

23

import sys

24

import os

18

19

import sys, os

25

20

26

21

import bzrlib

27

from bzrlib.trace import mutter, note, log_error, warning

22

from bzrlib.trace import mutter, note, log_error

28

23

from bzrlib.errors import BzrError, BzrCheckError, BzrCommandError

29

24

from bzrlib.branch import find_branch

30

25

from bzrlib import BZRDIR

56

51

assert cmd.startswith("cmd_")

57

52

return cmd[4:].replace('_','-')

58

53

59

60

54

def _parse_revision_str(revstr):

61

"""This handles a revision string -> revno.

62

63

This always returns a list. The list will have one element for

64

65

It supports integers directly, but everything else it

66

defers for passing to Branch.get_revision_info()

67

68

>>> _parse_revision_str('234')

69

[234]

70

>>> _parse_revision_str('234..567')

71

[234, 567]

72

>>> _parse_revision_str('..')

73

[None, None]

74

>>> _parse_revision_str('..234')

75

[None, 234]

76

>>> _parse_revision_str('234..')

77

[234, None]

78

>>> _parse_revision_str('234..456..789') # Maybe this should be an error

79

[234, 456, 789]

80

>>> _parse_revision_str('234....789') # Error?

81

[234, None, 789]

82

>>> _parse_revision_str('revid:test@other.com-234234')

83

['revid:test@other.com-234234']

84

>>> _parse_revision_str('revid:test@other.com-234234..revid:test@other.com-234235')

85

['revid:test@other.com-234234', 'revid:test@other.com-234235']

86

>>> _parse_revision_str('revid:test@other.com-234234..23')

87

['revid:test@other.com-234234', 23]

88

>>> _parse_revision_str('date:2005-04-12')

89

['date:2005-04-12']

90

>>> _parse_revision_str('date:2005-04-12 12:24:33')

91

['date:2005-04-12 12:24:33']

92

>>> _parse_revision_str('date:2005-04-12T12:24:33')

93

['date:2005-04-12T12:24:33']

94

>>> _parse_revision_str('date:2005-04-12,12:24:33')

95

['date:2005-04-12,12:24:33']

96

>>> _parse_revision_str('-5..23')

97

[-5, 23]

98

>>> _parse_revision_str('-5')

99

[-5]

100

>>> _parse_revision_str('123a')

101

['123a']

102

>>> _parse_revision_str('abc')

103

['abc']

55

"""This handles a revision string -> revno.

56

57

There are several possibilities:

58

59

'234' -> 234

60

'234:345' -> [234, 345]

61

':234' -> [None, 234]

62

'234:' -> [234, None]

63

64

In the future we will also support:

65

'uuid:blah-blah-blah' -> ?

66

'hash:blahblahblah' -> ?

67

potentially:

68

'tag:mytag' -> ?

104

69

"""

105

import re

106

old_format_re = re.compile('\d*:\d*')

107

m = old_format_re.match(revstr)

108

if m:

109

warning('Colon separator for revision numbers is deprecated.'

110

' Use .. instead')

111

revs = []

112

for rev in revstr.split(':'):

113

if rev:

114

revs.append(int(rev))

115

else:

116

revs.append(None)

117

return revs

118

revs = []

119

for x in revstr.split('..'):

120

if not x:

121

revs.append(None)

122

else:

123

try:

124

revs.append(int(x))

125

except ValueError:

126

revs.append(x)

70

if revstr.find(':') != -1:

71

revs = revstr.split(':')

72

if len(revs) > 2:

73

raise ValueError('More than 2 pieces not supported for --revision: %r' % revstr)

74

75

if not revs[0]:

76

revs[0] = None

77

else:

78

revs[0] = int(revs[0])

79

80

if not revs[1]:

81

revs[1] = None

82

else:

83

revs[1] = int(revs[1])

84

else:

85

revs = int(revstr)

127

86

return revs

128

87

129

88

130

def get_merge_type(typestring):

131

"""Attempt to find the merge class/factory associated with a string."""

132

from merge import merge_types

133

try:

134

return merge_types[typestring][0]

135

except KeyError:

136

templ = '%s%%7s: %%s' % (' '*12)

137

lines = [templ % (f[0], f[1][1]) for f in merge_types.iteritems()]

138

type_list = '\n'.join(lines)

139

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

140

(typestring, type_list)

141

raise BzrCommandError(msg)

142

143

144

89

145

90

def _get_cmd_dict(plugins_override=True):

146

91

d = {}

219

164

assert isinstance(arguments, dict)

220

165

cmdargs = options.copy()

221

166

cmdargs.update(arguments)

222

if self.__doc__ == Command.__doc__:

223

from warnings import warn

224

warn("No help message set for %r" % self)

167

assert self.__doc__ != Command.__doc__, \

168

("No help message set for %r" % self)

225

169

self.status = self.run(**cmdargs)

226

if self.status is None:

227

self.status = 0

228

170

229

171

230

172

def run(self):

242

184

class ExternalCommand(Command):

243

185

"""Class to wrap external commands.

244

186

245

We cheat a little here, when get_cmd_class() calls us we actually

246

give it back an object we construct that has the appropriate path,

247

help, options etc for the specified command.

248

249

When run_bzr() tries to instantiate that 'class' it gets caught by

250

the __call__ method, which we override to call the Command.__init__

251

method. That then calls our run method which is pretty straight

252

forward.

253

254

The only wrinkle is that we have to map bzr's dictionary of options

255

and arguments back into command line options and arguments for the

256

script.

187

We cheat a little here, when get_cmd_class() calls us we actually give it back

188

an object we construct that has the appropriate path, help, options etc for the

189

specified command.

190

191

When run_bzr() tries to instantiate that 'class' it gets caught by the __call__

192

method, which we override to call the Command.__init__ method. That then calls

193

our run method which is pretty straight forward.

194

195

The only wrinkle is that we have to map bzr's dictionary of options and arguments

196

back into command line options and arguments for the script.

257

197

"""

258

198

259

199

def find_command(cls, cmd):

356

296

directory is shown. Otherwise, only the status of the specified

357

297

files or directories is reported. If a directory is given, status

358

298

is reported for everything inside that directory.

359

360

If a revision is specified, the changes since that revision are shown.

361

299

"""

362

300

takes_args = ['file*']

363

takes_options = ['all', 'show-ids', 'revision']

301

takes_options = ['all', 'show-ids']

364

302

aliases = ['st', 'stat']

365

303

366

304

def run(self, all=False, show_ids=False, file_list=None):

373

311

file_list = None

374

312

else:

375

313

b = find_branch('.')

376

377

from bzrlib.status import show_status

378

show_status(b, show_unchanged=all, show_ids=show_ids,

379

specific_files=file_list)

314

import status

315

status.show_status(b, show_unchanged=all, show_ids=show_ids,

316

specific_files=file_list)

380

317

381

318

382

319

class cmd_cat_revision(Command):

397

334

def run(self):

398

335

print find_branch('.').revno()

399

336

400

class cmd_revision_info(Command):

401

"""Show revision number and revision id for a given revision identifier.

402

"""

403

hidden = True

404

takes_args = ['revision_info*']

405

takes_options = ['revision']

406

def run(self, revision=None, revision_info_list=None):

407

from bzrlib.branch import find_branch

408

409

revs = []

410

if revision is not None:

411

revs.extend(revision)

412

if revision_info_list is not None:

413

revs.extend(revision_info_list)

414

if len(revs) == 0:

415

raise BzrCommandError('You must supply a revision identifier')

416

417

b = find_branch('.')

418

419

for rev in revs:

420

print '%4d %s' % b.get_revision_info(rev)

421

422

337

423

338

class cmd_add(Command):

424

339

"""Add specified files or directories.

433

348

whether already versioned or not, are searched for files or

434

349

subdirectories that are neither versioned or ignored, and these

435

350

are added. This search proceeds recursively into versioned

436

directories. If no names are given '.' is assumed.

351

directories.

437

352

438

Therefore simply saying 'bzr add' will version all files that

353

Therefore simply saying 'bzr add .' will version all files that

439

354

are currently unknown.

440

355

441

356

TODO: Perhaps adding a file whose directly is not versioned should

442

357

recursively add that parent, rather than giving an error?

443

358

"""

444

takes_args = ['file*']

359

takes_args = ['file+']

445

360

takes_options = ['verbose', 'no-recurse']

446

361

447

362

def run(self, file_list, verbose=False, no_recurse=False):

486

401

if revision == None:

487

402

inv = b.read_working_inventory()

488

403

else:

489

if len(revision) > 1:

490

raise BzrCommandError('bzr inventory --revision takes'

491

' exactly one revision identifier')

492

inv = b.get_revision_inventory(b.lookup_revision(revision[0]))

404

inv = b.get_revision_inventory(b.lookup_revision(revision))

493

405

494

406

for path, entry in inv.entries():

495

407

if show_ids:

510

422

def run(self, source_list, dest):

511

423

b = find_branch('.')

512

424

513

# TODO: glob expansion on windows?

514

425

b.move([b.relpath(s) for s in source_list], b.relpath(dest))

515

426

516

427

536

447

537

448

538

449

539

class cmd_mv(Command):

540

"""Move or rename a file.

541

542

usage:

543

bzr mv OLDNAME NEWNAME

544

bzr mv SOURCE... DESTINATION

545

546

If the last argument is a versioned directory, all the other names

547

are moved into it. Otherwise, there must be exactly two arguments

548

and the file is changed to a new name, which must not already exist.

549

550

Files cannot be moved between branches.

551

"""

552

takes_args = ['names*']

553

def run(self, names_list):

554

if len(names_list) < 2:

555

raise BzrCommandError("missing file argument")

556

b = find_branch(names_list[0])

557

558

rel_names = [b.relpath(x) for x in names_list]

559

560

if os.path.isdir(names_list[-1]):

561

# move into existing directory

562

b.move(rel_names[:-1], rel_names[-1])

563

else:

564

if len(names_list) != 2:

565

raise BzrCommandError('to mv multiple files the destination '

566

'must be a versioned directory')

567

b.move(rel_names[0], rel_names[1])

568

569

570

450

571

451

572

452

class cmd_pull(Command):

639

519

"""

640

520

takes_args = ['from_location', 'to_location?']

641

521

takes_options = ['revision']

642

aliases = ['get', 'clone']

643

522

644

523

def run(self, from_location, to_location=None, revision=None):

645

524

import errno

646

525

from bzrlib.merge import merge

647

from bzrlib.branch import DivergedBranches, \

526

from bzrlib.branch import DivergedBranches, NoSuchRevision, \

648

527

find_cached_branch, Branch

649

528

from shutil import rmtree

650

529

from meta_store import CachedStore

651

530

import tempfile

652

531

cache_root = tempfile.mkdtemp()

653

654

if revision is None:

655

revision = [None]

656

elif len(revision) > 1:

657

raise BzrCommandError('bzr branch --revision takes exactly 1 revision value')

658

659

532

try:

660

533

try:

661

534

br_from = find_cached_branch(from_location, cache_root)

682

555

raise

683

556

br_to = Branch(to_location, init=True)

684

557

685

br_to.set_root_id(br_from.get_root_id())

686

687

if revision:

688

if revision[0] is None:

689

revno = br_from.revno()

690

else:

691

revno, rev_id = br_from.get_revision_info(revision[0])

692

try:

693

br_to.update_revisions(br_from, stop_revision=revno)

694

except bzrlib.errors.NoSuchRevision:

695

rmtree(to_location)

696

msg = "The branch %s has no revision %d." % (from_location,

697

revno)

698

raise BzrCommandError(msg)

699

558

try:

559

br_to.update_revisions(br_from, stop_revision=revision)

560

except NoSuchRevision:

561

rmtree(to_location)

562

msg = "The branch %s has no revision %d." % (from_location,

563

revision)

564

raise BzrCommandError(msg)

700

565

merge((to_location, -1), (to_location, 0), this_dir=to_location,

701

566

check_clean=False, ignore_zero=True)

702

567

from_location = pull_loc(br_from)

870

735

file_list = None

871

736

else:

872

737

b = find_branch('.')

873

874

# TODO: Make show_diff support taking 2 arguments

875

base_rev = None

876

if revision is not None:

877

if len(revision) != 1:

878

raise BzrCommandError('bzr diff --revision takes exactly one revision identifier')

879

base_rev = revision[0]

880

738

881

show_diff(b, base_rev, specific_files=file_list,

739

show_diff(b, revision, specific_files=file_list,

882

740

external_diff_options=diff_options)

883

741

884

742

912

770

"""List files modified in working tree."""

913

771

hidden = True

914

772

def run(self):

915

from bzrlib.delta import compare_trees

916

773

import statcache

917

774

b = find_branch('.')

918

td = compare_trees(b.basis_tree(), b.working_tree())

775

inv = b.read_working_inventory()

776

sc = statcache.update_cache(b, inv)

777

basis = b.basis_tree()

778

basis_inv = basis.inventory

779

780

# We used to do this through iter_entries(), but that's slow

781

# when most of the files are unmodified, as is usually the

782

# case. So instead we iterate by inventory entry, and only

783

# calculate paths as necessary.

919

784

920

for path, id, kind in td.modified:

921

print path

785

for file_id in basis_inv:

786

cacheentry = sc.get(file_id)

787

if not cacheentry: # deleted

788

continue

789

ie = basis_inv[file_id]

790

if cacheentry[statcache.SC_SHA1] != ie.text_sha1:

791

path = inv.id2path(file_id)

792

print path

922

793

923

794

924

795

959

830

-r revision requests a specific revision, -r :end or -r begin: are

960

831

also valid.

961

832

962

--message allows you to give a regular expression, which will be evaluated

963

so that only matching entries will be displayed.

964

965

833

TODO: Make --revision support uuid: and hash: [future tag:] notation.

966

834

967

835

"""

968

836

969

837

takes_args = ['filename?']

970

takes_options = ['forward', 'timezone', 'verbose', 'show-ids', 'revision','long', 'message']

838

takes_options = ['forward', 'timezone', 'verbose', 'show-ids', 'revision']

971

839

972

840

def run(self, filename=None, timezone='original',

973

841

verbose=False,

974

842

show_ids=False,

975

843

forward=False,

976

revision=None,

977

message=None,

978

long=False):

844

revision=None):

979

845

from bzrlib.branch import find_branch

980

846

from bzrlib.log import log_formatter, show_log

981

847

import codecs

993

859

b = find_branch('.')

994

860

file_id = None

995

861

996

if revision is None:

997

rev1 = None

998

rev2 = None

999

elif len(revision) == 1:

1000

rev1 = rev2 = b.get_revision_info(revision[0])[0]

1001

elif len(revision) == 2:

1002

rev1 = b.get_revision_info(revision[0])[0]

1003

rev2 = b.get_revision_info(revision[1])[0]

862

if revision == None:

863

revision = [None, None]

864

elif isinstance(revision, int):

865

revision = [revision, revision]

1004

866

else:

1005

raise BzrCommandError('bzr log --revision takes one or two values.')

1006

1007

if rev1 == 0:

1008

rev1 = None

1009

if rev2 == 0:

1010

rev2 = None

867

# pair of revisions?

868

pass

869

870

assert len(revision) == 2

1011

871

1012

872

mutter('encoding log as %r' % bzrlib.user_encoding)

1013

873

1015

875

# in e.g. the default C locale.

1016

876

outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')

1017

877

1018

if long:

1019

log_format = 'long'

1020

else:

1021

log_format = 'short'

1022

lf = log_formatter(log_format,

878

lf = log_formatter('short',

1023

879

show_ids=show_ids,

1024

880

to_file=outf,

1025

881

show_timezone=timezone)

1029

885

file_id,

1030

886

verbose=verbose,

1031

887

direction=direction,

1032

start_revision=rev1,

1033

end_revision=rev2,

1034

search=message)

888

start_revision=revision[0],

889

end_revision=revision[1])

1035

890

1036

891

1037

892

1182

1037

If no revision is specified this exports the last committed revision.

1183

1038

1184

1039

Format may be an "exporter" name, such as tar, tgz, tbz2. If none is

1185

given, try to find the format with the extension. If no extension

1186

is found exports to a directory (equivalent to --format=dir).

1187

1188

Root may be the top directory for tar, tgz and tbz2 formats. If none

1189

is given, the top directory will be the root name of the file."""

1040

given, exports to a directory (equivalent to --format=dir)."""

1190

1041

# TODO: list known exporters

1191

1042

takes_args = ['dest']

1192

takes_options = ['revision', 'format', 'root']

1193

def run(self, dest, revision=None, format=None, root=None):

1194

import os.path

1043

takes_options = ['revision', 'format']

1044

def run(self, dest, revision=None, format='dir'):

1195

1045

b = find_branch('.')

1196

if revision is None:

1197

rev_id = b.last_patch()

1046

if revision == None:

1047

rh = b.revision_history()[-1]

1198

1048

else:

1199

if len(revision) != 1:

1200

raise BzrError('bzr export --revision takes exactly 1 argument')

1201

revno, rev_id = b.get_revision_info(revision[0])

1202

t = b.revision_tree(rev_id)

1203

root, ext = os.path.splitext(dest)

1204

if not format:

1205

if ext in (".tar",):

1206

format = "tar"

1207

elif ext in (".gz", ".tgz"):

1208

format = "tgz"

1209

elif ext in (".bz2", ".tbz2"):

1210

format = "tbz2"

1211

else:

1212

format = "dir"

1213

t.export(dest, format, root)

1049

rh = b.lookup_revision(int(revision))

1050

t = b.revision_tree(rh)

1051

t.export(dest, format)

1214

1052

1215

1053

1216

1054

class cmd_cat(Command):

1222

1060

def run(self, filename, revision=None):

1223

1061

if revision == None:

1224

1062

raise BzrCommandError("bzr cat requires a revision number")

1225

elif len(revision) != 1:

1226

raise BzrCommandError("bzr cat --revision takes exactly one number")

1227

1063

b = find_branch('.')

1228

b.print_file(b.relpath(filename), revision[0])

1064

b.print_file(b.relpath(filename), int(revision))

1229

1065

1230

1066

1231

1067

class cmd_local_time_offset(Command):

1238

1074

1239

1075

class cmd_commit(Command):

1240

1076

"""Commit changes into a new revision.

1241

1242

If no arguments are given, the entire tree is committed.

1243

1077

1244

1078

If selected files are specified, only changes to those files are

1245

committed. If a directory is specified then the directory and everything

1246

within it is committed.

1079

committed. If a directory is specified then its contents are also

1080

committed.

1247

1081

1248

1082

A selected-file commit may fail in some cases where the committed

1249

1083

tree would be invalid, such as trying to commit a file in a

1254

1088

TODO: Strict commit that fails if there are unknown or deleted files.

1255

1089

"""

1256

1090

takes_args = ['selected*']

1257

takes_options = ['message', 'file', 'verbose', 'unchanged']

1091

takes_options = ['message', 'file', 'verbose']

1258

1092

aliases = ['ci', 'checkin']

1259

1093

1260

# TODO: Give better message for -s, --summary, used by tla people

1261

1262

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

1263

unchanged=False):

1264

from bzrlib.errors import PointlessCommit

1094

def run(self, message=None, file=None, verbose=True, selected_list=None):

1095

from bzrlib.commit import commit

1265

1096

from bzrlib.osutils import get_text_message

1266

1097

1267

1098

## Warning: shadows builtin file()

1268

1099

if not message and not file:

1269

# FIXME: Ugly; change status code to send to a provided function?

1270

1271

1100

import cStringIO

1272

1101

stdout = sys.stdout

1273

1102

catcher = cStringIO.StringIO()

1288

1117

message = codecs.open(file, 'rt', bzrlib.user_encoding).read()

1289

1118

1290

1119

b = find_branch('.')

1291

if selected_list:

1292

selected_list = [b.relpath(s) for s in selected_list]

1293

1294

try:

1295

b.commit(message, verbose=verbose,

1296

specific_files=selected_list,

1297

allow_pointless=unchanged)

1298

except PointlessCommit:

1299

# FIXME: This should really happen before the file is read in;

1300

# perhaps prepare the commit; get the message; then actually commit

1301

raise BzrCommandError("no changes to commit",

1302

["use --unchanged to commit anyhow"])

1120

commit(b, message, verbose=verbose, specific_files=selected_list)

1303

1121

1304

1122

1305

1123

class cmd_check(Command):

1319

1137

1320

1138

1321

1139

1322

class cmd_scan_cache(Command):

1323

hidden = True

1324

def run(self):

1325

from bzrlib.hashcache import HashCache

1326

import os

1327

1328

c = HashCache('.')

1329

c.read()

1330

c.scan()

1331

1332

print '%6d stats' % c.stat_count

1333

print '%6d in hashcache' % len(c._cache)

1334

print '%6d files removed from cache' % c.removed_count

1335

print '%6d hashes updated' % c.update_count

1336

print '%6d files changed too recently to cache' % c.danger_count

1337

1338

if c.needs_write:

1339

c.write()

1340

1341

1342

1343

1140

class cmd_upgrade(Command):

1344

1141

"""Upgrade branch storage to current format.

1345

1142

1368

1165

class cmd_selftest(Command):

1369

1166

"""Run internal test suite"""

1370

1167

hidden = True

1371

takes_options = ['verbose']

1372

def run(self, verbose=False):

1168

def run(self):

1373

1169

from bzrlib.selftest import selftest

1374

return int(not selftest(verbose=verbose))

1170

return int(not selftest())

1375

1171

1376

1172

1377

1173

class cmd_version(Command):

1409

1205

['..', -1]

1410

1206

>>> parse_spec("../f/@35")

1411

1207

['../f', 35]

1412

>>> parse_spec('./@revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67')

1413

['.', 'revid:john@arbash-meinel.com-20050711044610-3ca0327c6a222f67']

1414

1208

"""

1415

1209

if spec is None:

1416

1210

return [None, None]

1420

1214

if parsed[1] == "":

1421

1215

parsed[1] = -1

1422

1216

else:

1423

try:

1424

parsed[1] = int(parsed[1])

1425

except ValueError:

1426

pass # We can allow stuff like ./@revid:blahblahblah

1427

else:

1428

assert parsed[1] >=0

1217

parsed[1] = int(parsed[1])

1218

assert parsed[1] >=0

1429

1219

else:

1430

1220

parsed = [spec, None]

1431

1221

return parsed

1455

1245

--force is given.

1456

1246

"""

1457

1247

takes_args = ['other_spec', 'base_spec?']

1458

takes_options = ['force', 'merge-type']

1248

takes_options = ['force']

1459

1249

1460

def run(self, other_spec, base_spec=None, force=False, merge_type=None):

1250

def run(self, other_spec, base_spec=None, force=False):

1461

1251

from bzrlib.merge import merge

1462

from bzrlib.merge_core import ApplyMerge3

1463

if merge_type is None:

1464

merge_type = ApplyMerge3

1465

1252

merge(parse_spec(other_spec), parse_spec(base_spec),

1466

check_clean=(not force), merge_type=merge_type)

1253

check_clean=(not force))

1254

1467

1255

1468

1256

1469

1257

class cmd_revert(Command):

1258

"""Restore selected files from a previous revision.

1259

"""

1260

takes_args = ['file+']

1261

def run(self, file_list):

1262

from bzrlib.branch import find_branch

1263

1264

if not file_list:

1265

file_list = ['.']

1266

1267

b = find_branch(file_list[0])

1268

1269

b.revert([b.relpath(f) for f in file_list])

1270

1271

1272

class cmd_merge_revert(Command):

1470

1273

"""Reverse all changes since the last commit.

1471

1274

1472

Only versioned files are affected. Specify filenames to revert only

1473

those files. By default, any files that are changed will be backed up

1474

first. Backup files have a '~' appended to their name.

1275

Only versioned files are affected.

1276

1277

TODO: Store backups of any files that will be reverted, so

1278

that the revert can be undone.

1475

1279

"""

1476

takes_options = ['revision', 'no-backup']

1477

takes_args = ['file*']

1478

aliases = ['merge-revert']

1280

takes_options = ['revision']

1479

1281

1480

def run(self, revision=None, no_backup=False, file_list=None):

1282

def run(self, revision=-1):

1481

1283

from bzrlib.merge import merge

1482

if file_list is not None:

1483

if len(file_list) == 0:

1484

raise BzrCommandError("No files specified")

1485

if revision is None:

1486

revision = [-1]

1487

elif len(revision) != 1:

1488

raise BzrCommandError('bzr revert --revision takes exactly 1 argument')

1489

merge(('.', revision[0]), parse_spec('.'),

1284

merge(('.', revision), parse_spec('.'),

1490

1285

check_clean=False,

1491

ignore_zero=True,

1492

backup_files=not no_backup,

1493

file_list=file_list)

1286

ignore_zero=True)

1494

1287

1495

1288

1496

1289

class cmd_assert_fail(Command):

1512

1305

help.help(topic)

1513

1306

1514

1307

1308

class cmd_update_stat_cache(Command):

1309

"""Update stat-cache mapping inodes to SHA-1 hashes.

1310

1311

For testing only."""

1312

hidden = True

1313

def run(self):

1314

import statcache

1315

b = find_branch('.')

1316

statcache.update_cache(b.base, b.read_working_inventory())

1317

1515

1318

1516

1319

1517

1320

class cmd_plugins(Command):

1519

1322

hidden = True

1520

1323

def run(self):

1521

1324

import bzrlib.plugin

1522

from inspect import getdoc

1523

1325

from pprint import pprint

1524

for plugin in bzrlib.plugin.all_plugins:

1525

print plugin.__path__[0]

1526

d = getdoc(plugin)

1527

if d:

1528

print '\t', d.split('\n')[0]

1529

1530

#pprint(bzrlib.plugin.all_plugins)

1326

pprint(bzrlib.plugin.all_plugins)

1531

1327

1532

1328

1533

1329

1551

1347

'verbose': None,

1552

1348

'version': None,

1553

1349

'email': None,

1554

'unchanged': None,

1555

1350

'update': None,

1556

'long': None,

1557

'root': str,

1558

'no-backup': None,

1559

'merge-type': get_merge_type,

1560

1351

}

1561

1352

1562

1353

SHORT_OPTIONS = {

1565

1356

'm': 'message',

1566

1357

'r': 'revision',

1567

1358

'v': 'verbose',

1568

'l': 'long',

1569

1359

}

1570

1360

1571

1361

1586

1376

>>> parse_args('commit --message=biter'.split())

1587

1377

(['commit'], {'message': u'biter'})

1588

1378

>>> parse_args('log -r 500'.split())

1589

(['log'], {'revision': [500]})

1590

>>> parse_args('log -r500..600'.split())

1379

(['log'], {'revision': 500})

1380

>>> parse_args('log -r500:600'.split())

1591

1381

(['log'], {'revision': [500, 600]})

1592

>>> parse_args('log -vr500..600'.split())

1382

>>> parse_args('log -vr500:600'.split())

1593

1383

(['log'], {'verbose': True, 'revision': [500, 600]})

1594

>>> parse_args('log -rv500..600'.split()) #the r takes an argument

1595

(['log'], {'revision': ['v500', 600]})

1384

>>> parse_args('log -rv500:600'.split()) #the r takes an argument

1385

Traceback (most recent call last):

1386

...

1387

ValueError: invalid literal for int(): v500

1596

1388

"""

1597

1389

args = []

1598

1390

opts = {}

1712

1504

return argdict

1713

1505

1714

1506

1507

def _parse_master_args(argv):

1508

"""Parse the arguments that always go with the original command.

1509

These are things like bzr --no-plugins, etc.

1510

1511

There are now 2 types of option flags. Ones that come *before* the command,

1512

and ones that come *after* the command.

1513

Ones coming *before* the command are applied against all possible commands.

1514

And are generally applied before plugins are loaded.

1515

1516

The current list are:

1517

--builtin Allow plugins to load, but don't let them override builtin commands,

1518

they will still be allowed if they do not override a builtin.

1519

--no-plugins Don't load any plugins. This lets you get back to official source

1520

behavior.

1521

--profile Enable the hotspot profile before running the command.

1522

For backwards compatibility, this is also a non-master option.

1523

--version Spit out the version of bzr that is running and exit.

1524

This is also a non-master option.

1525

--help Run help and exit, also a non-master option (I think that should stay, though)

1526

1527

>>> argv, opts = _parse_master_args(['bzr', '--test'])

1528

Traceback (most recent call last):

1529

...

1530

BzrCommandError: Invalid master option: 'test'

1531

>>> argv, opts = _parse_master_args(['bzr', '--version', 'command'])

1532

>>> print argv

1533

['command']

1534

>>> print opts['version']

1535

True

1536

>>> argv, opts = _parse_master_args(['bzr', '--profile', 'command', '--more-options'])

1537

>>> print argv

1538

['command', '--more-options']

1539

>>> print opts['profile']

1540

True

1541

>>> argv, opts = _parse_master_args(['bzr', '--no-plugins', 'command'])

1542

>>> print argv

1543

['command']

1544

>>> print opts['no-plugins']

1545

True

1546

>>> print opts['profile']

1547

False

1548

>>> argv, opts = _parse_master_args(['bzr', 'command', '--profile'])

1549

>>> print argv

1550

['command', '--profile']

1551

>>> print opts['profile']

1552

False

1553

"""

1554

master_opts = {'builtin':False,

1555

'no-plugins':False,

1556

'version':False,

1557

'profile':False,

1558

'help':False

1559

}

1560

1561

# This is the point where we could hook into argv[0] to determine

1562

# what front-end is supposed to be run

1563

# For now, we are just ignoring it.

1564

cmd_name = argv.pop(0)

1565

for arg in argv[:]:

1566

if arg[:2] != '--': # at the first non-option, we return the rest

1567

break

1568

arg = arg[2:] # Remove '--'

1569

if arg not in master_opts:

1570

# We could say that this is not an error, that we should

1571

# just let it be handled by the main section instead

1572

raise BzrCommandError('Invalid master option: %r' % arg)

1573

argv.pop(0) # We are consuming this entry

1574

master_opts[arg] = True

1575

return argv, master_opts

1576

1577

1715

1578

1716

1579

def run_bzr(argv):

1717

1580

"""Execute a command.

1718

1581

1719

1582

This is similar to main(), but without all the trappings for

1720

1583

logging and error handling.

1721

1722

argv

1723

The command-line arguments, without the program name from argv[0]

1724

1725

Returns a command status or raises an exception.

1726

1727

Special master options: these must come before the command because

1728

they control how the command is interpreted.

1729

1730

--no-plugins

1731

Do not load plugin modules at all

1732

1733

--builtin

1734

Only use builtin commands. (Plugins are still allowed to change

1735

other behaviour.)

1736

1737

--profile

1738

Run under the Python profiler.

1739

1584

"""

1740

1741

1585

argv = [a.decode(bzrlib.user_encoding) for a in argv]

1742

1743

opt_profile = opt_no_plugins = opt_builtin = False

1744

1745

# --no-plugins is handled specially at a very early stage. We need

1746

# to load plugins before doing other command parsing so that they

1747

# can override commands, but this needs to happen first.

1748

1749

for a in argv[:]:

1750

if a == '--profile':

1751

opt_profile = True

1752

elif a == '--no-plugins':

1753

opt_no_plugins = True

1754

elif a == '--builtin':

1755

opt_builtin = True

1756

else:

1757

break

1758

argv.remove(a)

1759

1760

if not opt_no_plugins:

1761

from bzrlib.plugin import load_plugins

1762

load_plugins()

1763

1764

args, opts = parse_args(argv)

1765

1766

if 'help' in opts:

1767

from bzrlib.help import help

1768

if args:

1769

help(args[0])

1770

else:

1771

help()

1772

return 0

1773

1774

if 'version' in opts:

1775

show_version()

1776

return 0

1777

1586

1778

if not args:

1779

print >>sys.stderr, "please try 'bzr help' for help"

1587

try:

1588

# some options like --builtin and --no-plugins have special effects

1589

argv, master_opts = _parse_master_args(argv)

1590

if not master_opts['no-plugins']:

1591

from bzrlib.plugin import load_plugins

1592

load_plugins()

1593

1594

args, opts = parse_args(argv)

1595

1596

if master_opts['help']:

1597

from bzrlib.help import help

1598

if argv:

1599

help(argv[0])

1600

else:

1601

help()

1602

return 0

1603

1604

if 'help' in opts:

1605

from bzrlib.help import help

1606

if args:

1607

help(args[0])

1608

else:

1609

help()

1610

return 0

1611

elif 'version' in opts:

1612

show_version()

1613

return 0

1614

elif args and args[0] == 'builtin':

1615

include_plugins=False

1616

args = args[1:]

1617

cmd = str(args.pop(0))

1618

except IndexError:

1619

import help

1620

help.help()

1780

1621

return 1

1781

1782

cmd = str(args.pop(0))

1783

1784

canonical_cmd, cmd_class = \

1785

get_cmd_class(cmd, plugins_override=not opt_builtin)

1622

1623

1624

plugins_override = not (master_opts['builtin'])

1625

canonical_cmd, cmd_class = get_cmd_class(cmd, plugins_override=plugins_override)

1626

1627

profile = master_opts['profile']

1628

# For backwards compatibility, I would rather stick with --profile being a

1629

# master/global option

1630

if 'profile' in opts:

1631

profile = True

1632

del opts['profile']

1786

1633

1787

1634

# check options are reasonable

1788

1635

allowed = cmd_class.takes_options

1797

1644

for k, v in opts.items():

1798

1645

cmdopts[k.replace('-', '_')] = v

1799

1646

1800

if opt_profile:

1647

if profile:

1801

1648

import hotshot, tempfile

1802

1649

pffileno, pfname = tempfile.mkstemp()

1803

1650

try:

1824

1671

1825

1672

def _report_exception(summary, quiet=False):

1826

1673

import traceback

1827

1828

1674

log_error('bzr: ' + summary)

1829

1675

bzrlib.trace.log_exception()

1830

1676

1831

if os.environ.get('BZR_DEBUG'):

1832

traceback.print_exc()

1833

1834

1677

if not quiet:

1835

sys.stderr.write('\n')

1836

1678

tb = sys.exc_info()[2]

1837

1679

exinfo = traceback.extract_tb(tb)

1838

1680

if exinfo:

1848

1690

try:

1849

1691

try:

1850

1692

try:

1851

return run_bzr(argv[1:])

1693

return run_bzr(argv)

1852

1694

finally:

1853

1695

# do this here inside the exception wrappers to catch EPIPE

1854

1696

sys.stdout.flush()

1855

1697

except BzrError, e:

1856

1698

quiet = isinstance(e, (BzrCommandError))

1857

_report_exception('error: ' + str(e), quiet=quiet)

1699

_report_exception('error: ' + e.args[0], quiet=quiet)

1858

1700

if len(e.args) > 1:

1859

1701

for h in e.args[1]:

1860

1702

# some explanation or hints