/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
1553.5.34 by Martin Pool
Stub lock-breaking command
1
# Copyright (C) 2004, 2005, 2006 by Canonical Ltd
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
1185.33.90 by Martin Pool
[merge] add --dry-run option (mpe)
17
"""builtin bzr commands"""
18
19
1508.1.20 by Robert Collins
Create a checkout command.
20
import errno
1185.65.29 by Robert Collins
Implement final review suggestions.
21
import os
1508.1.20 by Robert Collins
Create a checkout command.
22
from shutil import rmtree
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
23
import sys
24
25
import bzrlib
1508.1.25 by Robert Collins
Update per review comments.
26
import bzrlib.branch
27
from bzrlib.branch import Branch
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
28
import bzrlib.bzrdir as bzrdir
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
29
from bzrlib.commands import Command, display_command
1185.35.4 by Aaron Bentley
Implemented remerge
30
from bzrlib.revision import common_ancestor
1505.1.10 by John Arbash Meinel
Brought back 'optimized' version, for better errors, cleaned up exception handling.
31
import bzrlib.errors as errors
1185.35.4 by Aaron Bentley
Implemented remerge
32
from bzrlib.errors import (BzrError, BzrCheckError, BzrCommandError, 
1185.35.13 by Aaron Bentley
Merged Martin
33
                           NotBranchError, DivergedBranches, NotConflicted,
1558.2.1 by Aaron Bentley
Ensure remerge errors when file-id is None
34
                           NoSuchFile, NoWorkingTree, FileInWrongBranch,
35
                           NotVersionedError)
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
36
from bzrlib.log import show_one_log
1534.7.140 by Aaron Bentley
Moved the merge stuff into merge.py
37
from bzrlib.merge import Merge3Merger
1185.16.43 by Martin Pool
- clean up handling of option objects
38
from bzrlib.option import Option
1551.2.32 by Aaron Bentley
Handle progress phases more nicely in merge
39
from bzrlib.progress import DummyProgress, ProgressPhase
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
40
from bzrlib.revisionspec import RevisionSpec
1460 by Robert Collins
merge from martin.
41
import bzrlib.trace
1185.33.42 by Martin Pool
[patch] make --quiet a global option (robey)
42
from bzrlib.trace import mutter, note, log_error, warning, is_quiet
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
43
from bzrlib.transport.local import LocalTransport
1534.9.10 by Aaron Bentley
Fixed use of ui_factory (which can't be imported directly)
44
import bzrlib.ui
1457.1.4 by Robert Collins
Branch.relpath has been moved to WorkingTree.relpath.
45
from bzrlib.workingtree import WorkingTree
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
46
47
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
48
def tree_files(file_list, default_branch=u'.'):
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
49
    try:
1508.1.15 by Robert Collins
Merge from mpool.
50
        return internal_tree_files(file_list, default_branch)
1185.35.32 by Aaron Bentley
Fixed handling of files in mixed branches
51
    except FileInWrongBranch, e:
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
52
        raise BzrCommandError("%s is not in the same branch as %s" %
1185.35.32 by Aaron Bentley
Fixed handling of files in mixed branches
53
                             (e.path, file_list[0]))
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
54
1658.1.8 by Martin Pool
(internal_tree_files) Better docstring
55
1658.1.9 by Martin Pool
Give an error for bzr diff on an nonexistent file (Malone #3619)
56
# XXX: Bad function name; should possibly also be a class method of
57
# WorkingTree rather than a function.
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
58
def internal_tree_files(file_list, default_branch=u'.'):
1658.1.8 by Martin Pool
(internal_tree_files) Better docstring
59
    """Convert command-line paths to a WorkingTree and relative paths.
60
61
    This is typically used for command-line processors that take one or
62
    more filenames, and infer the workingtree that contains them.
63
64
    The filenames given are not required to exist.
65
66
    :param file_list: Filenames to convert.  
67
68
    :param default_branch: Fallback tree path to use if file_list is empty or None.
69
70
    :return: workingtree, [relative_paths]
1185.12.101 by Aaron Bentley
Made commit take branch from first argument, if supplied.
71
    """
72
    if file_list is None or len(file_list) == 0:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
73
        return WorkingTree.open_containing(default_branch)[0], file_list
74
    tree = WorkingTree.open_containing(file_list[0])[0]
1185.12.101 by Aaron Bentley
Made commit take branch from first argument, if supplied.
75
    new_list = []
76
    for filename in file_list:
1185.35.32 by Aaron Bentley
Fixed handling of files in mixed branches
77
        try:
78
            new_list.append(tree.relpath(filename))
1185.31.45 by John Arbash Meinel
Refactoring Exceptions found some places where the wrong exception was caught.
79
        except errors.PathNotChild:
1508.1.15 by Robert Collins
Merge from mpool.
80
            raise FileInWrongBranch(tree.branch, filename)
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
81
    return tree, new_list
1185.12.101 by Aaron Bentley
Made commit take branch from first argument, if supplied.
82
83
1553.5.78 by Martin Pool
New bzr init --format option and test
84
def get_format_type(typestring):
85
    """Parse and return a format specifier."""
1666.1.3 by Robert Collins
Fix and test upgrades from bzrdir 6 over SFTP.
86
    if typestring == "weave":
87
        return bzrdir.BzrDirFormat6()
1688.1.2 by Olaf Conradi
Rename format 'metadir' to 'default'. Only mention format 'knit' in help
88
    if typestring == "default":
1553.5.78 by Martin Pool
New bzr init --format option and test
89
        return bzrdir.BzrDirMetaFormat1()
1688.1.1 by Olaf Conradi
For campatability, make old format for weave repository inside metadir
90
    if typestring == "metaweave":
91
        format = bzrdir.BzrDirMetaFormat1()
92
        format.repository_format = bzrlib.repository.RepositoryFormat7()
93
        return format
1553.5.78 by Martin Pool
New bzr init --format option and test
94
    if typestring == "knit":
95
        format = bzrdir.BzrDirMetaFormat1()
96
        format.repository_format = bzrlib.repository.RepositoryFormatKnit1()
97
        return format
1688.1.3 by Olaf Conradi
Do mention the older formats inside help for commands 'init', 'init-repo'
98
    msg = "Unknown bzr format %s. Current formats are: default, knit,\n" \
99
          "metaweave and weave" % typestring
1553.5.78 by Martin Pool
New bzr init --format option and test
100
    raise BzrCommandError(msg)
101
102
1185.16.112 by mbp at sourcefrog
todo
103
# TODO: Make sure no commands unconditionally use the working directory as a
104
# branch.  If a filename argument is used, the first of them should be used to
105
# specify the branch.  (Perhaps this can be factored out into some kind of
106
# Argument class, representing a file in a branch, where the first occurrence
107
# opens the branch?)
108
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
109
class cmd_status(Command):
110
    """Display status summary.
111
112
    This reports on versioned and unknown files, reporting them
113
    grouped by state.  Possible states are:
114
115
    added
116
        Versioned in the working copy but not in the previous revision.
117
118
    removed
119
        Versioned in the previous revision but removed or deleted
120
        in the working copy.
121
122
    renamed
123
        Path of this file changed from the previous revision;
124
        the text may also have changed.  This includes files whose
125
        parent directory was renamed.
126
127
    modified
128
        Text has changed since the previous revision.
129
130
    unchanged
131
        Nothing about this file has changed since the previous revision.
132
        Only shown with --all.
133
134
    unknown
135
        Not versioned and not matching an ignore pattern.
136
137
    To see ignored files use 'bzr ignored'.  For details in the
138
    changes to file texts, use 'bzr diff'.
139
140
    If no arguments are specified, the status of the entire working
141
    directory is shown.  Otherwise, only the status of the specified
142
    files or directories is reported.  If a directory is given, status
143
    is reported for everything inside that directory.
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
144
145
    If a revision argument is given, the status is calculated against
146
    that revision, or between two revisions if two are provided.
1185.3.2 by Martin Pool
- remove -r option from status command because it's not used
147
    """
1185.16.76 by Martin Pool
doc
148
    
149
    # TODO: --no-recurse, --recurse options
150
    
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
151
    takes_args = ['file*']
1185.34.4 by Jelmer Vernooij
Support -r option to bzr status. The backend code already handled
152
    takes_options = ['all', 'show-ids', 'revision']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
153
    aliases = ['st', 'stat']
154
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
155
    @display_command
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
156
    def run(self, all=False, show_ids=False, file_list=None, revision=None):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
157
        tree, file_list = tree_files(file_list)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
158
            
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
159
        from bzrlib.status import show_tree_status
160
        show_tree_status(tree, show_unchanged=all, show_ids=show_ids,
161
                         specific_files=file_list, revision=revision)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
162
163
164
class cmd_cat_revision(Command):
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
165
    """Write out metadata for a revision.
166
    
167
    The revision to print can either be specified by a specific
168
    revision identifier, or you can use --revision.
169
    """
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
170
171
    hidden = True
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
172
    takes_args = ['revision_id?']
173
    takes_options = ['revision']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
174
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
175
    @display_command
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
176
    def run(self, revision_id=None, revision=None):
177
178
        if revision_id is not None and revision is not None:
179
            raise BzrCommandError('You can only supply one of revision_id or --revision')
180
        if revision_id is None and revision is None:
181
            raise BzrCommandError('You must supply either --revision or a revision_id')
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
182
        b = WorkingTree.open_containing(u'.')[0].branch
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
183
        if revision_id is not None:
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
184
            sys.stdout.write(b.repository.get_revision_xml(revision_id))
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
185
        elif revision is not None:
186
            for rev in revision:
187
                if rev is None:
188
                    raise BzrCommandError('You cannot specify a NULL revision.')
189
                revno, rev_id = rev.in_history(b)
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
190
                sys.stdout.write(b.repository.get_revision_xml(rev_id))
1185.1.29 by Robert Collins
merge merge tweaks from aaron, which includes latest .dev
191
    
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
192
193
class cmd_revno(Command):
194
    """Show current revision number.
195
196
    This is equal to the number of revisions on this branch."""
1185.50.16 by John Arbash Meinel
[patch] Michael Ellerman: 'Trivial patch to allow revno to take a location'
197
    takes_args = ['location?']
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
198
    @display_command
1185.50.16 by John Arbash Meinel
[patch] Michael Ellerman: 'Trivial patch to allow revno to take a location'
199
    def run(self, location=u'.'):
200
        print Branch.open_containing(location)[0].revno()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
201
1182 by Martin Pool
- more disentangling of xml storage format from objects
202
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
203
class cmd_revision_info(Command):
204
    """Show revision number and revision id for a given revision identifier.
205
    """
206
    hidden = True
207
    takes_args = ['revision_info*']
208
    takes_options = ['revision']
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
209
    @display_command
1185.5.4 by John Arbash Meinel
Updated bzr revision-info, created tests.
210
    def run(self, revision=None, revision_info_list=[]):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
211
212
        revs = []
213
        if revision is not None:
214
            revs.extend(revision)
1185.5.4 by John Arbash Meinel
Updated bzr revision-info, created tests.
215
        if revision_info_list is not None:
216
            for rev in revision_info_list:
217
                revs.append(RevisionSpec(rev))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
218
        if len(revs) == 0:
219
            raise BzrCommandError('You must supply a revision identifier')
220
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
221
        b = WorkingTree.open_containing(u'.')[0].branch
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
222
223
        for rev in revs:
1185.5.4 by John Arbash Meinel
Updated bzr revision-info, created tests.
224
            revinfo = rev.in_history(b)
225
            if revinfo.revno is None:
226
                print '     %s' % revinfo.rev_id
227
            else:
228
                print '%4d %s' % (revinfo.revno, revinfo.rev_id)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
229
230
    
231
class cmd_add(Command):
232
    """Add specified files or directories.
233
234
    In non-recursive mode, all the named items are added, regardless
235
    of whether they were previously ignored.  A warning is given if
236
    any of the named files are already versioned.
237
238
    In recursive mode (the default), files are treated the same way
239
    but the behaviour for directories is different.  Directories that
240
    are already versioned do not give a warning.  All directories,
241
    whether already versioned or not, are searched for files or
242
    subdirectories that are neither versioned or ignored, and these
243
    are added.  This search proceeds recursively into versioned
244
    directories.  If no names are given '.' is assumed.
245
246
    Therefore simply saying 'bzr add' will version all files that
247
    are currently unknown.
248
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
249
    Adding a file whose parent directory is not versioned will
250
    implicitly add the parent, and so on up to the root. This means
251
    you should never need to explictly add a directory, they'll just
252
    get added when you add a file in the directory.
1185.33.90 by Martin Pool
[merge] add --dry-run option (mpe)
253
254
    --dry-run will show which files would be added, but not actually 
255
    add them.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
256
    """
257
    takes_args = ['file*']
1185.46.9 by Aaron Bentley
Added verbose option to bzr add, to list all ignored files.
258
    takes_options = ['no-recurse', 'dry-run', 'verbose']
1185.53.1 by Michael Ellerman
Add support for bzr add --dry-run
259
1185.46.9 by Aaron Bentley
Added verbose option to bzr add, to list all ignored files.
260
    def run(self, file_list, no_recurse=False, dry_run=False, verbose=False):
1185.53.1 by Michael Ellerman
Add support for bzr add --dry-run
261
        import bzrlib.add
262
263
        if dry_run:
264
            if is_quiet():
265
                # This is pointless, but I'd rather not raise an error
266
                action = bzrlib.add.add_action_null
267
            else:
268
                action = bzrlib.add.add_action_print
269
        elif is_quiet():
270
            action = bzrlib.add.add_action_add
1446 by Robert Collins
fixup the verbose-does-nothing for add - add a --quiet instead
271
        else:
1185.53.1 by Michael Ellerman
Add support for bzr add --dry-run
272
            action = bzrlib.add.add_action_add_and_print
273
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
274
        added, ignored = bzrlib.add.smart_add(file_list, not no_recurse, 
275
                                              action)
276
        if len(ignored) > 0:
277
            for glob in sorted(ignored.keys()):
278
                match_len = len(ignored[glob])
1185.46.9 by Aaron Bentley
Added verbose option to bzr add, to list all ignored files.
279
                if verbose:
280
                    for path in ignored[glob]:
281
                        print "ignored %s matching \"%s\"" % (path, glob)
282
                else:
283
                    print "ignored %d file(s) matching \"%s\"" % (match_len,
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
284
                                                              glob)
285
            print "If you wish to add some of these files, please add them"\
286
                " by name."
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
287
288
289
class cmd_mkdir(Command):
290
    """Create a new versioned directory.
291
292
    This is equivalent to creating the directory and then adding it.
293
    """
294
    takes_args = ['dir+']
295
296
    def run(self, dir_list):
297
        for d in dir_list:
298
            os.mkdir(d)
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
299
            wt, dd = WorkingTree.open_containing(d)
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
300
            wt.add([dd])
1185.31.9 by John Arbash Meinel
Changed to printing the full path, rather than just the relative portion.
301
            print 'added', d
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
302
303
304
class cmd_relpath(Command):
305
    """Show path of a file relative to root"""
306
    takes_args = ['filename']
307
    hidden = True
308
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
309
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
310
    def run(self, filename):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
311
        tree, relpath = WorkingTree.open_containing(filename)
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
312
        print relpath
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
313
314
315
class cmd_inventory(Command):
1185.33.33 by Martin Pool
[patch] add 'bzr inventory --kind directory'; remove 'bzr directories'
316
    """Show inventory of the current working copy or a revision.
317
318
    It is possible to limit the output to a particular entry
319
    type using the --kind option.  For example; --kind file.
320
    """
321
    takes_options = ['revision', 'show-ids', 'kind']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
322
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
323
    @display_command
1185.33.33 by Martin Pool
[patch] add 'bzr inventory --kind directory'; remove 'bzr directories'
324
    def run(self, revision=None, show_ids=False, kind=None):
325
        if kind and kind not in ['file', 'directory', 'symlink']:
326
            raise BzrCommandError('invalid kind specified')
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
327
        tree = WorkingTree.open_containing(u'.')[0]
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
328
        if revision is None:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
329
            inv = tree.read_working_inventory()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
330
        else:
331
            if len(revision) > 1:
332
                raise BzrCommandError('bzr inventory --revision takes'
333
                    ' exactly one revision identifier')
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
334
            inv = tree.branch.repository.get_revision_inventory(
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
335
                revision[0].in_history(tree.branch).rev_id)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
336
337
        for path, entry in inv.entries():
1185.33.33 by Martin Pool
[patch] add 'bzr inventory --kind directory'; remove 'bzr directories'
338
            if kind and kind != entry.kind:
339
                continue
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
340
            if show_ids:
341
                print '%-50s %s' % (path, entry.file_id)
342
            else:
343
                print path
344
345
346
class cmd_mv(Command):
347
    """Move or rename a file.
348
349
    usage:
350
        bzr mv OLDNAME NEWNAME
351
        bzr mv SOURCE... DESTINATION
352
353
    If the last argument is a versioned directory, all the other names
354
    are moved into it.  Otherwise, there must be exactly two arguments
355
    and the file is changed to a new name, which must not already exist.
356
357
    Files cannot be moved between branches.
358
    """
359
    takes_args = ['names*']
1616.1.8 by Martin Pool
Unify 'mv', 'move', 'rename'. (#5379, Matthew Fuller)
360
    aliases = ['move', 'rename']
361
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
362
    def run(self, names_list):
363
        if len(names_list) < 2:
364
            raise BzrCommandError("missing file argument")
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
365
        tree, rel_names = tree_files(names_list)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
366
        
367
        if os.path.isdir(names_list[-1]):
368
            # move into existing directory
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
369
            for pair in tree.move(rel_names[:-1], rel_names[-1]):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
370
                print "%s => %s" % pair
371
        else:
372
            if len(names_list) != 2:
373
                raise BzrCommandError('to mv multiple files the destination '
374
                                      'must be a versioned directory')
1508.1.7 by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins).
375
            tree.rename_one(rel_names[0], rel_names[1])
1185.1.8 by Robert Collins
David Clymers patch to use rename rather than mv for two argument non-directory target bzr mv calls.
376
            print "%s => %s" % (rel_names[0], rel_names[1])
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
377
            
378
    
379
class cmd_pull(Command):
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
380
    """Turn this branch into a mirror of another branch.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
381
382
    This command only works on branches that have not diverged.  Branches are
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
383
    considered diverged if the destination branch's most recent commit is one
384
    that has not been merged (directly or indirectly) into the parent.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
385
1661.1.1 by Martin Pool
[merge] olaf's --remember changes
386
    If branches have diverged, you can use 'bzr merge' to integrate the changes
387
    from one into the other.  Once one branch has merged, the other should
388
    be able to pull it again.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
389
390
    If branches have diverged, you can use 'bzr merge' to pull the text changes
1185.12.92 by Aaron Bentley
Fixed pull help, renamed clobber to overwrite
391
    from one into the other.  Once one branch has merged, the other should
392
    be able to pull it again.
393
394
    If you want to forget your local changes and just update your branch to
1661.1.1 by Martin Pool
[merge] olaf's --remember changes
395
    match the remote one, use pull --overwrite.
1614.2.3 by Olaf Conradi
In commands push and pull, moved help text for --remember down. It's not
396
397
    If there is no default location set, the first pull will set it.  After
398
    that, you can omit the location to use the default.  To change the
399
    default, use --remember.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
400
    """
1185.76.1 by Erik BÃ¥gfors
Support for --revision in pull
401
    takes_options = ['remember', 'overwrite', 'revision', 'verbose']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
402
    takes_args = ['location?']
403
1185.76.1 by Erik BÃ¥gfors
Support for --revision in pull
404
    def run(self, location=None, remember=False, overwrite=False, revision=None, verbose=False):
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
405
        # FIXME: too much stuff is in the command class
406
        try:
407
            tree_to = WorkingTree.open_containing(u'.')[0]
408
            branch_to = tree_to.branch
409
        except NoWorkingTree:
410
            tree_to = None
411
            branch_to = Branch.open_containing(u'.')[0] 
412
        stored_loc = branch_to.get_parent()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
413
        if location is None:
414
            if stored_loc is None:
415
                raise BzrCommandError("No pull location known or specified.")
416
            else:
1185.12.12 by Aaron Bentley
Made merge use pull location or die if no branch specified.
417
                print "Using saved location: %s" % stored_loc
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
418
                location = stored_loc
1185.56.1 by Michael Ellerman
Simplify handling of DivergedBranches in cmd_pull()
419
1614.2.12 by Olaf Conradi
Merge bzr.dev
420
        if branch_to.get_parent() is None or remember:
421
            branch_to.set_parent(location)
1614.2.8 by Olaf Conradi
Added testcases for using pull with --remember. Moved remember code to
422
1614.2.12 by Olaf Conradi
Merge bzr.dev
423
        branch_from = Branch.open(location)
1185.56.1 by Michael Ellerman
Simplify handling of DivergedBranches in cmd_pull()
424
1185.76.4 by Erik BÃ¥gfors
expanded tabs
425
        if revision is None:
426
            rev_id = None
1185.76.3 by Erik BÃ¥gfors
changes for pull --revision based on input from John
427
        elif len(revision) == 1:
1614.2.12 by Olaf Conradi
Merge bzr.dev
428
            rev_id = revision[0].in_history(branch_from).rev_id
1185.76.4 by Erik BÃ¥gfors
expanded tabs
429
        else:
430
            raise BzrCommandError('bzr pull --revision takes one value.')
1185.76.1 by Erik BÃ¥gfors
Support for --revision in pull
431
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
432
        old_rh = branch_to.revision_history()
433
        if tree_to is not None:
1614.2.12 by Olaf Conradi
Merge bzr.dev
434
            count = tree_to.pull(branch_from, overwrite, rev_id)
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
435
        else:
1614.2.12 by Olaf Conradi
Merge bzr.dev
436
            count = branch_to.pull(branch_from, overwrite, rev_id)
1185.40.2 by Robey Pointer
when doing a 'pull', display the number of revisions pulled; on 'commit', display the current (new) revision number
437
        note('%d revision(s) pulled.' % (count,))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
438
1185.31.5 by John Arbash Meinel
Merged pull --verbose changes
439
        if verbose:
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
440
            new_rh = branch_to.revision_history()
1185.31.5 by John Arbash Meinel
Merged pull --verbose changes
441
            if old_rh != new_rh:
442
                # Something changed
443
                from bzrlib.log import show_changed_revisions
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
444
                show_changed_revisions(branch_to, old_rh, new_rh)
1185.31.5 by John Arbash Meinel
Merged pull --verbose changes
445
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
446
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
447
class cmd_push(Command):
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
448
    """Update a mirror of this branch.
449
    
450
    The target branch will not have its working tree populated because this
451
    is both expensive, and is not supported on remote file systems.
452
    
453
    Some smart servers or protocols *may* put the working tree in place in
454
    the future.
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
455
456
    This command only works on branches that have not diverged.  Branches are
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
457
    considered diverged if the destination branch's most recent commit is one
458
    that has not been merged (directly or indirectly) by the source branch.
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
459
460
    If branches have diverged, you can use 'bzr push --overwrite' to replace
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
461
    the other branch completely, discarding its unmerged changes.
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
462
    
463
    If you want to ensure you have the different changes in the other branch,
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
464
    do a merge (see bzr help merge) from the other branch, and commit that.
465
    After that you will be able to do a push without '--overwrite'.
1614.2.3 by Olaf Conradi
In commands push and pull, moved help text for --remember down. It's not
466
467
    If there is no default push location set, the first push will set it.
468
    After that, you can omit the location to use the default.  To change the
469
    default, use --remember.
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
470
    """
1495 by Robert Collins
Add a --create-prefix to the new push command.
471
    takes_options = ['remember', 'overwrite', 
472
                     Option('create-prefix', 
473
                            help='Create the path leading up to the branch '
474
                                 'if it does not already exist')]
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
475
    takes_args = ['location?']
476
1495 by Robert Collins
Add a --create-prefix to the new push command.
477
    def run(self, location=None, remember=False, overwrite=False,
1185.31.5 by John Arbash Meinel
Merged pull --verbose changes
478
            create_prefix=False, verbose=False):
1185.33.45 by Martin Pool
[merge] refactoring of branch vs working tree, etc (robertc)
479
        # FIXME: Way too big!  Put this into a function called from the
480
        # command.
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
481
        from bzrlib.transport import get_transport
482
        
1692.3.1 by Robert Collins
Fix push to work with just a branch, no need for a working tree.
483
        br_from = Branch.open_containing('.')[0]
484
        stored_loc = br_from.get_push_location()
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
485
        if location is None:
486
            if stored_loc is None:
487
                raise BzrCommandError("No push location known or specified.")
488
            else:
489
                print "Using saved location: %s" % stored_loc
490
                location = stored_loc
1614.2.9 by Olaf Conradi
Added testcases for using push with --remember. Moved remember code to
491
        if br_from.get_push_location() is None or remember:
492
            br_from.set_push_location(location)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
493
        try:
1563.2.38 by Robert Collins
make push preserve tree formats.
494
            dir_to = bzrlib.bzrdir.BzrDir.open(location)
495
            br_to = dir_to.open_branch()
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
496
        except NotBranchError:
497
            # create a branch.
498
            transport = get_transport(location).clone('..')
1495 by Robert Collins
Add a --create-prefix to the new push command.
499
            if not create_prefix:
500
                try:
501
                    transport.mkdir(transport.relpath(location))
502
                except NoSuchFile:
503
                    raise BzrCommandError("Parent directory of %s "
504
                                          "does not exist." % location)
505
            else:
506
                current = transport.base
507
                needed = [(transport, transport.relpath(location))]
508
                while needed:
509
                    try:
510
                        transport, relpath = needed[-1]
511
                        transport.mkdir(relpath)
512
                        needed.pop()
513
                    except NoSuchFile:
514
                        new_transport = transport.clone('..')
515
                        needed.append((new_transport,
516
                                       new_transport.relpath(transport.base)))
517
                        if new_transport.base == transport.base:
1616.1.16 by Martin Pool
typo
518
                            raise BzrCommandError("Could not create "
1495 by Robert Collins
Add a --create-prefix to the new push command.
519
                                                  "path prefix.")
1563.2.38 by Robert Collins
make push preserve tree formats.
520
            dir_to = br_from.bzrdir.clone(location)
521
            br_to = dir_to.open_branch()
1185.49.26 by John Arbash Meinel
Adding tests for remote sftp branches without working trees, plus a bugfix to allow push to still work with a warning.
522
        old_rh = br_to.revision_history()
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
523
        try:
1185.49.26 by John Arbash Meinel
Adding tests for remote sftp branches without working trees, plus a bugfix to allow push to still work with a warning.
524
            try:
1563.2.38 by Robert Collins
make push preserve tree formats.
525
                tree_to = dir_to.open_workingtree()
526
            except errors.NotLocalUrl:
1185.49.26 by John Arbash Meinel
Adding tests for remote sftp branches without working trees, plus a bugfix to allow push to still work with a warning.
527
                # TODO: This should be updated for branches which don't have a
528
                # working tree, as opposed to ones where we just couldn't 
529
                # update the tree.
1558.7.4 by Aaron Bentley
Adjust push warning [Matthew Fuller]
530
                warning('This transport does not update the working '
531
                        'tree of: %s' % (br_to.base,))
1185.49.26 by John Arbash Meinel
Adding tests for remote sftp branches without working trees, plus a bugfix to allow push to still work with a warning.
532
                count = br_to.pull(br_from, overwrite)
1563.2.38 by Robert Collins
make push preserve tree formats.
533
            except NoWorkingTree:
534
                count = br_to.pull(br_from, overwrite)
1185.49.26 by John Arbash Meinel
Adding tests for remote sftp branches without working trees, plus a bugfix to allow push to still work with a warning.
535
            else:
536
                count = tree_to.pull(br_from, overwrite)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
537
        except DivergedBranches:
538
            raise BzrCommandError("These branches have diverged."
539
                                  "  Try a merge then push with overwrite.")
1185.33.44 by Martin Pool
[patch] show number of revisions pushed/pulled/merged (Robey Pointer)
540
        note('%d revision(s) pushed.' % (count,))
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
541
1185.31.5 by John Arbash Meinel
Merged pull --verbose changes
542
        if verbose:
543
            new_rh = br_to.revision_history()
544
            if old_rh != new_rh:
545
                # Something changed
546
                from bzrlib.log import show_changed_revisions
547
                show_changed_revisions(br_to, old_rh, new_rh)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
548
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
549
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
550
class cmd_branch(Command):
551
    """Create a new copy of a branch.
552
553
    If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
554
    be used.  In other words, "branch ../foo/bar" will attempt to create ./bar.
555
556
    To retrieve the branch as of a particular revision, supply the --revision
557
    parameter, as in "branch foo/bar -r 5".
1185.10.2 by Aaron Bentley
Updated help message
558
559
    --basis is to speed up branching from remote branches.  When specified, it
560
    copies all the file-contents, inventory and revision data from the basis
561
    branch before copying anything from the remote branch.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
562
    """
563
    takes_args = ['from_location', 'to_location?']
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
564
    takes_options = ['revision', 'basis']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
565
    aliases = ['get', 'clone']
566
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
567
    def run(self, from_location, to_location=None, revision=None, basis=None):
1185.17.3 by Martin Pool
[pick] larger read lock scope for branch command
568
        if revision is None:
569
            revision = [None]
570
        elif len(revision) > 1:
571
            raise BzrCommandError(
572
                'bzr branch --revision takes exactly 1 revision value')
573
        try:
574
            br_from = Branch.open(from_location)
575
        except OSError, e:
576
            if e.errno == errno.ENOENT:
577
                raise BzrCommandError('Source location "%s" does not'
578
                                      ' exist.' % to_location)
579
            else:
580
                raise
581
        br_from.lock_read()
582
        try:
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
583
            if basis is not None:
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
584
                basis_dir = bzrdir.BzrDir.open_containing(basis)[0]
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
585
            else:
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
586
                basis_dir = None
1185.8.4 by Aaron Bentley
Fixed branch -r
587
            if len(revision) == 1 and revision[0] is not None:
1390 by Robert Collins
pair programming worx... merge integration and weave
588
                revision_id = revision[0].in_history(br_from)[1]
1185.8.4 by Aaron Bentley
Fixed branch -r
589
            else:
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
590
                # FIXME - wt.last_revision, fallback to branch, fall back to
591
                # None or perhaps NULL_REVISION to mean copy nothing
592
                # RBC 20060209
593
                revision_id = br_from.last_revision()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
594
            if to_location is None:
595
                to_location = os.path.basename(from_location.rstrip("/\\"))
1442.1.71 by Robert Collins
'bzr branch' sets the branch-name,
596
                name = None
597
            else:
598
                name = os.path.basename(to_location) + '\n'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
599
            try:
600
                os.mkdir(to_location)
601
            except OSError, e:
602
                if e.errno == errno.EEXIST:
603
                    raise BzrCommandError('Target directory "%s" already'
604
                                          ' exists.' % to_location)
605
                if e.errno == errno.ENOENT:
606
                    raise BzrCommandError('Parent of "%s" does not exist.' %
607
                                          to_location)
608
                else:
609
                    raise
610
            try:
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
611
                # preserve whatever source format we have.
612
                dir = br_from.bzrdir.sprout(to_location, revision_id, basis_dir)
613
                branch = dir.open_branch()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
614
            except bzrlib.errors.NoSuchRevision:
615
                rmtree(to_location)
1466 by Robert Collins
revision may be None in cmd_branch, do not treat as an int.
616
                msg = "The branch %s has no revision %s." % (from_location, revision[0])
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
617
                raise BzrCommandError(msg)
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
618
            except bzrlib.errors.UnlistableBranch:
1442.1.71 by Robert Collins
'bzr branch' sets the branch-name,
619
                rmtree(to_location)
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
620
                msg = "The branch %s cannot be used as a --basis" % (basis,)
1442.1.71 by Robert Collins
'bzr branch' sets the branch-name,
621
                raise BzrCommandError(msg)
622
            if name:
1185.65.27 by Robert Collins
Tweak storage towards mergability.
623
                branch.control_files.put_utf8('branch-name', name)
624
1185.33.44 by Martin Pool
[patch] show number of revisions pushed/pulled/merged (Robey Pointer)
625
            note('Branched %d revision(s).' % branch.revno())
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
626
        finally:
1185.17.3 by Martin Pool
[pick] larger read lock scope for branch command
627
            br_from.unlock()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
628
629
1508.1.20 by Robert Collins
Create a checkout command.
630
class cmd_checkout(Command):
631
    """Create a new checkout of an existing branch.
632
1508.1.28 by Robert Collins
Test using bzr checkout to reconstitute working trees.
633
    If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
634
    the branch found in '.'. This is useful if you have removed the working tree
635
    or if it was never created - i.e. if you pushed the branch to its current
636
    location using SFTP.
637
    
1508.1.20 by Robert Collins
Create a checkout command.
638
    If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
639
    be used.  In other words, "checkout ../foo/bar" will attempt to create ./bar.
640
641
    To retrieve the branch as of a particular revision, supply the --revision
642
    parameter, as in "checkout foo/bar -r 5". Note that this will be immediately
643
    out of date [so you cannot commit] but it may be useful (i.e. to examine old
644
    code.)
645
646
    --basis is to speed up checking out from remote branches.  When specified, it
647
    uses the inventory and file contents from the basis branch in preference to the
1185.50.88 by John Arbash Meinel
--basis has been implemented for checkouts.
648
    branch being checked out.
1508.1.20 by Robert Collins
Create a checkout command.
649
    """
1508.1.28 by Robert Collins
Test using bzr checkout to reconstitute working trees.
650
    takes_args = ['branch_location?', 'to_location?']
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
651
    takes_options = ['revision', # , 'basis']
652
                     Option('lightweight',
653
                            help="perform a lightweight checkout. Lightweight "
654
                                 "checkouts depend on access to the branch for "
655
                                 "every operation. Normal checkouts can perform "
656
                                 "common operations like diff and status without "
657
                                 "such access, and also support local commits."
658
                            ),
659
                     ]
1508.1.20 by Robert Collins
Create a checkout command.
660
1508.1.28 by Robert Collins
Test using bzr checkout to reconstitute working trees.
661
    def run(self, branch_location=None, to_location=None, revision=None, basis=None,
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
662
            lightweight=False):
1508.1.20 by Robert Collins
Create a checkout command.
663
        if revision is None:
664
            revision = [None]
665
        elif len(revision) > 1:
666
            raise BzrCommandError(
667
                'bzr checkout --revision takes exactly 1 revision value')
1508.1.28 by Robert Collins
Test using bzr checkout to reconstitute working trees.
668
        if branch_location is None:
669
            branch_location = bzrlib.osutils.getcwd()
670
            to_location = branch_location
1508.1.20 by Robert Collins
Create a checkout command.
671
        source = Branch.open(branch_location)
672
        if len(revision) == 1 and revision[0] is not None:
673
            revision_id = revision[0].in_history(source)[1]
674
        else:
675
            revision_id = None
676
        if to_location is None:
677
            to_location = os.path.basename(branch_location.rstrip("/\\"))
1508.1.28 by Robert Collins
Test using bzr checkout to reconstitute working trees.
678
        # if the source and to_location are the same, 
679
        # and there is no working tree,
680
        # then reconstitute a branch
681
        if (bzrlib.osutils.abspath(to_location) == 
682
            bzrlib.osutils.abspath(branch_location)):
683
            try:
684
                source.bzrdir.open_workingtree()
685
            except errors.NoWorkingTree:
686
                source.bzrdir.create_workingtree()
687
                return
1508.1.20 by Robert Collins
Create a checkout command.
688
        try:
689
            os.mkdir(to_location)
690
        except OSError, e:
691
            if e.errno == errno.EEXIST:
692
                raise BzrCommandError('Target directory "%s" already'
693
                                      ' exists.' % to_location)
694
            if e.errno == errno.ENOENT:
695
                raise BzrCommandError('Parent of "%s" does not exist.' %
696
                                      to_location)
697
            else:
698
                raise
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
699
        old_format = bzrlib.bzrdir.BzrDirFormat.get_default_format()
700
        bzrlib.bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
701
        try:
702
            if lightweight:
703
                checkout = bzrdir.BzrDirMetaFormat1().initialize(to_location)
704
                bzrlib.branch.BranchReferenceFormat().initialize(checkout, source)
705
            else:
706
                checkout_branch =  bzrlib.bzrdir.BzrDir.create_branch_convenience(
707
                    to_location, force_new_tree=False)
708
                checkout = checkout_branch.bzrdir
709
                checkout_branch.bind(source)
710
                if revision_id is not None:
711
                    rh = checkout_branch.revision_history()
712
                    checkout_branch.set_revision_history(rh[:rh.index(revision_id) + 1])
713
            checkout.create_workingtree(revision_id)
714
        finally:
715
            bzrlib.bzrdir.BzrDirFormat.set_default_format(old_format)
1508.1.20 by Robert Collins
Create a checkout command.
716
717
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
718
class cmd_renames(Command):
719
    """Show list of renamed files.
720
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
721
    # TODO: Option to show renames between two historical versions.
722
723
    # TODO: Only show renames under dir, rather than in the whole branch.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
724
    takes_args = ['dir?']
725
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
726
    @display_command
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
727
    def run(self, dir=u'.'):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
728
        tree = WorkingTree.open_containing(dir)[0]
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
729
        old_inv = tree.basis_tree().inventory
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
730
        new_inv = tree.read_working_inventory()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
731
732
        renames = list(bzrlib.tree.find_renames(old_inv, new_inv))
733
        renames.sort()
734
        for old_name, new_name in renames:
735
            print "%s => %s" % (old_name, new_name)        
736
737
1508.1.24 by Robert Collins
Add update command for use with checkouts.
738
class cmd_update(Command):
739
    """Update a tree to have the latest code committed to its branch.
740
    
741
    This will perform a merge into the working tree, and may generate
1587.1.10 by Robert Collins
update updates working tree and branch together.
742
    conflicts. If you have any local changes, you will still 
743
    need to commit them after the update for the update to be complete.
744
    
745
    If you want to discard your local changes, you can just do a 
746
    'bzr revert' instead of 'bzr commit' after the update.
1508.1.24 by Robert Collins
Add update command for use with checkouts.
747
    """
748
    takes_args = ['dir?']
749
750
    def run(self, dir='.'):
751
        tree = WorkingTree.open_containing(dir)[0]
752
        tree.lock_write()
753
        try:
754
            if tree.last_revision() == tree.branch.last_revision():
1587.1.11 by Robert Collins
Local commits appear to be working properly.
755
                # may be up to date, check master too.
756
                master = tree.branch.get_master_branch()
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
757
                if master is None or master.last_revision == tree.last_revision():
1587.1.11 by Robert Collins
Local commits appear to be working properly.
758
                    note("Tree is up to date.")
759
                    return
1508.1.24 by Robert Collins
Add update command for use with checkouts.
760
            conflicts = tree.update()
761
            note('Updated to revision %d.' %
762
                 (tree.branch.revision_id_to_revno(tree.last_revision()),))
763
            if conflicts != 0:
764
                return 1
765
            else:
766
                return 0
767
        finally:
768
            tree.unlock()
769
770
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
771
class cmd_info(Command):
1624.3.27 by Olaf Conradi
Add updated help message for bzr info.
772
    """Show information about a working tree, branch or repository.
773
774
    This command will show all known locations and formats associated to the
775
    tree, branch or repository.  Statistical information is included with
776
    each report.
777
778
    Branches and working trees will also report any missing revisions.
779
    """
780
    takes_args = ['location?']
1624.3.21 by Olaf Conradi
Make bzr info command work on both local and remote locations. Support
781
    takes_options = ['verbose']
1624.3.27 by Olaf Conradi
Add updated help message for bzr info.
782
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
783
    @display_command
1624.3.27 by Olaf Conradi
Add updated help message for bzr info.
784
    def run(self, location=None, verbose=False):
785
        from bzrlib.info import show_bzrdir_info
786
        show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
787
                         verbose=verbose)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
788
789
790
class cmd_remove(Command):
791
    """Make a file unversioned.
792
793
    This makes bzr stop tracking changes to a versioned file.  It does
794
    not delete the working copy.
795
    """
796
    takes_args = ['file+']
797
    takes_options = ['verbose']
1424 by Robert Collins
add rm alias to remove
798
    aliases = ['rm']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
799
    
800
    def run(self, file_list, verbose=False):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
801
        tree, file_list = tree_files(file_list)
1185.12.105 by Aaron Bentley
Substituted branch_files for equivalent code
802
        tree.remove(file_list, verbose=verbose)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
803
804
805
class cmd_file_id(Command):
806
    """Print file_id of a particular file or directory.
807
808
    The file_id is assigned when the file is first added and remains the
809
    same through all revisions where the file exists, even when it is
810
    moved or renamed.
811
    """
812
    hidden = True
813
    takes_args = ['filename']
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
814
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
815
    def run(self, filename):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
816
        tree, relpath = WorkingTree.open_containing(filename)
817
        i = tree.inventory.path2id(relpath)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
818
        if i == None:
819
            raise BzrError("%r is not a versioned file" % filename)
820
        else:
821
            print i
822
823
824
class cmd_file_path(Command):
825
    """Print path of file_ids to a file or directory.
826
827
    This prints one line for each directory down to the target,
828
    starting at the branch root."""
829
    hidden = True
830
    takes_args = ['filename']
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
831
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
832
    def run(self, filename):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
833
        tree, relpath = WorkingTree.open_containing(filename)
834
        inv = tree.inventory
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
835
        fid = inv.path2id(relpath)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
836
        if fid == None:
837
            raise BzrError("%r is not a versioned file" % filename)
838
        for fip in inv.get_idpath(fid):
839
            print fip
840
841
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
842
class cmd_reconcile(Command):
843
    """Reconcile bzr metadata in a branch.
844
845
    This can correct data mismatches that may have been caused by
846
    previous ghost operations or bzr upgrades. You should only
847
    need to run this command if 'bzr check' or a bzr developer 
848
    advises you to run it.
849
850
    If a second branch is provided, cross-branch reconciliation is
851
    also attempted, which will check that data like the tree root
852
    id which was not present in very early bzr versions is represented
853
    correctly in both branches.
854
855
    At the same time it is run it may recompress data resulting in 
856
    a potential saving in disk space or performance gain.
857
858
    The branch *MUST* be on a listable system such as local disk or sftp.
859
    """
860
    takes_args = ['branch?']
861
862
    def run(self, branch="."):
863
        from bzrlib.reconcile import reconcile
864
        dir = bzrlib.bzrdir.BzrDir.open(branch)
865
        reconcile(dir)
866
867
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
868
class cmd_revision_history(Command):
869
    """Display list of revision ids on this branch."""
870
    hidden = True
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
871
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
872
    def run(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
873
        branch = WorkingTree.open_containing(u'.')[0].branch
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
874
        for patchid in branch.revision_history():
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
875
            print patchid
876
877
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
878
class cmd_ancestry(Command):
879
    """List all revisions merged into this branch."""
880
    hidden = True
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
881
    @display_command
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
882
    def run(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
883
        tree = WorkingTree.open_containing(u'.')[0]
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
884
        b = tree.branch
885
        # FIXME. should be tree.last_revision
1551.3.11 by Aaron Bentley
Merge from Robert
886
        for revision_id in b.repository.get_ancestry(b.last_revision()):
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
887
            print revision_id
888
889
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
890
class cmd_init(Command):
891
    """Make a directory into a versioned branch.
892
893
    Use this to create an empty branch, or before importing an
894
    existing project.
895
1662.1.19 by Martin Pool
Better error message when initting existing tree
896
    If there is a repository in a parent directory of the location, then 
897
    the history of the branch will be stored in the repository.  Otherwise
898
    init creates a standalone branch which carries its own history in 
899
    .bzr.
900
901
    If there is already a branch at the location but it has no working tree,
902
    the tree can be populated with 'bzr checkout'.
903
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
904
    Recipe for importing a tree of files:
905
        cd ~/project
906
        bzr init
1185.12.93 by Aaron Bentley
Fixed obsolete help
907
        bzr add .
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
908
        bzr status
909
        bzr commit -m 'imported project'
910
    """
1185.16.138 by Martin Pool
[patch] 'bzr init DIR' (John)
911
    takes_args = ['location?']
1553.5.78 by Martin Pool
New bzr init --format option and test
912
    takes_options = [
913
                     Option('format', 
1688.1.3 by Olaf Conradi
Do mention the older formats inside help for commands 'init', 'init-repo'
914
                            help='Specify a format for this branch. Current'
915
                                 ' formats are: default, knit, metaweave and'
916
                                 ' weave. Default is knit; metaweave and'
917
                                 ' weave are deprecated',
1553.5.78 by Martin Pool
New bzr init --format option and test
918
                            type=get_format_type),
919
                     ]
920
    def run(self, location=None, format=None):
1185.16.138 by Martin Pool
[patch] 'bzr init DIR' (John)
921
        from bzrlib.branch import Branch
1688.1.2 by Olaf Conradi
Rename format 'metadir' to 'default'. Only mention format 'knit' in help
922
        if format is None:
923
            format = get_format_type('default')
1185.16.138 by Martin Pool
[patch] 'bzr init DIR' (John)
924
        if location is None:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
925
            location = u'.'
1185.16.138 by Martin Pool
[patch] 'bzr init DIR' (John)
926
        else:
927
            # The path has to exist to initialize a
928
            # branch inside of it.
929
            # Just using os.mkdir, since I don't
930
            # believe that we want to create a bunch of
931
            # locations if the user supplies an extended path
932
            if not os.path.exists(location):
933
                os.mkdir(location)
1654.1.4 by Robert Collins
Teach `bzr init` how to init at the root of a repository.
934
        try:
1662.1.19 by Martin Pool
Better error message when initting existing tree
935
            existing_bzrdir = bzrdir.BzrDir.open(location)
1654.1.4 by Robert Collins
Teach `bzr init` how to init at the root of a repository.
936
        except NotBranchError:
1662.1.19 by Martin Pool
Better error message when initting existing tree
937
            # really a NotBzrDir error...
1654.1.4 by Robert Collins
Teach `bzr init` how to init at the root of a repository.
938
            bzrdir.BzrDir.create_branch_convenience(location, format=format)
939
        else:
1662.1.19 by Martin Pool
Better error message when initting existing tree
940
            if existing_bzrdir.has_branch():
941
                if existing_bzrdir.has_workingtree():
942
                    raise errors.AlreadyBranchError(location)
943
                else:
944
                    raise errors.BranchExistsWithoutWorkingTree(location)
1654.1.4 by Robert Collins
Teach `bzr init` how to init at the root of a repository.
945
            else:
1662.1.19 by Martin Pool
Better error message when initting existing tree
946
                existing_bzrdir.create_branch()
947
                existing_bzrdir.create_workingtree()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
948
949
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
950
class cmd_init_repository(Command):
1658.1.6 by Martin Pool
init-repo shouldn't insist on creating a new directory (Malone #38331)
951
    """Create a shared repository to hold branches.
952
953
    New branches created under the repository directory will store their revisions
954
    in the repository, not in the branch directory, if the branch format supports
955
    shared storage.
956
1662.1.11 by Martin Pool
Better help for init-repo (Erik)
957
    example:
1658.1.6 by Martin Pool
init-repo shouldn't insist on creating a new directory (Malone #38331)
958
        bzr init-repo repo
1662.1.11 by Martin Pool
Better help for init-repo (Erik)
959
        bzr init repo/trunk
960
        bzr checkout --lightweight repo/trunk trunk-checkout
961
        cd trunk-checkout
1658.1.6 by Martin Pool
init-repo shouldn't insist on creating a new directory (Malone #38331)
962
        (add files here)
963
    """
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
964
    takes_args = ["location"] 
965
    takes_options = [Option('format', 
1688.1.3 by Olaf Conradi
Do mention the older formats inside help for commands 'init', 'init-repo'
966
                            help='Specify a format for this repository.'
967
                                 ' Current formats are: default, knit,'
968
                                 ' metaweave and weave. Default is knit;'
969
                                 ' metaweave and weave are deprecated',
1624.2.1 by Erik BÃ¥gfors
support for --tree in bzr init-repo
970
                            type=get_format_type),
1624.2.4 by Erik BÃ¥gfors
rename --tree to --trees
971
                     Option('trees',
1624.2.1 by Erik BÃ¥gfors
support for --tree in bzr init-repo
972
                             help='Allows branches in repository to have'
973
                             ' a working tree')]
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
974
    aliases = ["init-repo"]
1624.2.4 by Erik BÃ¥gfors
rename --tree to --trees
975
    def run(self, location, format=None, trees=False):
1558.5.1 by Aaron Bentley
Added make-repository command
976
        from bzrlib.transport import get_transport
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
977
        if format is None:
1688.1.2 by Olaf Conradi
Rename format 'metadir' to 'default'. Only mention format 'knit' in help
978
            format = get_format_type('default')
1658.1.6 by Martin Pool
init-repo shouldn't insist on creating a new directory (Malone #38331)
979
        transport = get_transport(location)
980
        if not transport.has('.'):
981
            transport.mkdir('')
982
        newdir = format.initialize_on_transport(transport)
1558.5.2 by Aaron Bentley
Created *shared* repositories...
983
        repo = newdir.create_repository(shared=True)
1624.2.4 by Erik BÃ¥gfors
rename --tree to --trees
984
        repo.set_make_working_trees(trees)
1558.5.1 by Aaron Bentley
Added make-repository command
985
986
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
987
class cmd_diff(Command):
988
    """Show differences in working tree.
989
    
990
    If files are listed, only the changes in those files are listed.
991
    Otherwise, all changes for the tree are listed.
992
993
    examples:
994
        bzr diff
995
        bzr diff -r1
1185.1.2 by Martin Pool
- merge various windows and other fixes from Ollie Rutherfurd
996
        bzr diff -r1..2
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
997
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
998
    # TODO: Allow diff across branches.
999
    # TODO: Option to use external diff command; could be GNU diff, wdiff,
1000
    #       or a graphical diff.
1001
1002
    # TODO: Python difflib is not exactly the same as unidiff; should
1003
    #       either fix it up or prefer to use an external diff.
1004
1005
    # TODO: If a directory is given, diff everything under that.
1006
1007
    # TODO: Selected-file diff is inefficient and doesn't show you
1008
    #       deleted files.
1009
1010
    # TODO: This probably handles non-Unix newlines poorly.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1011
    
1012
    takes_args = ['file*']
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
1013
    takes_options = ['revision', 'diff-options', 'diff-prefix']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1014
    aliases = ['di', 'dif']
1015
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1016
    @display_command
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
1017
    def run(self, revision=None, file_list=None, diff_options=None,
1018
       diff_prefix=None):
1551.2.15 by Aaron Bentley
Rename cmd_show_diff to diff_cmd_helper
1019
        from bzrlib.diff import diff_cmd_helper, show_diff_trees
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
1020
1021
        if diff_prefix:
1022
            if not ':' in diff_prefix:
1023
                 raise BzrError("--diff-prefix expects two values separated by a colon")            
1024
            old_label,new_label=diff_prefix.split(":")
1025
        else:
1026
            old_label='a/'
1027
            new_label='b/'
1028
        
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1029
        try:
1551.2.13 by Aaron Bentley
Got diff working properly with checkouts
1030
            tree1, file_list = internal_tree_files(file_list)
1031
            tree2 = None
1508.1.15 by Robert Collins
Merge from mpool.
1032
            b = None
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1033
            b2 = None
1185.35.32 by Aaron Bentley
Fixed handling of files in mixed branches
1034
        except FileInWrongBranch:
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1035
            if len(file_list) != 2:
1036
                raise BzrCommandError("Files are in different branches")
1037
1551.2.13 by Aaron Bentley
Got diff working properly with checkouts
1038
            tree1, file1 = WorkingTree.open_containing(file_list[0])
1039
            tree2, file2 = WorkingTree.open_containing(file_list[1])
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1040
            if file1 != "" or file2 != "":
1508.1.15 by Robert Collins
Merge from mpool.
1041
                # FIXME diff those two files. rbc 20051123
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1042
                raise BzrCommandError("Files are in different branches")
1043
            file_list = None
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1044
        if revision is not None:
1551.2.13 by Aaron Bentley
Got diff working properly with checkouts
1045
            if tree2 is not None:
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1046
                raise BzrCommandError("Can't specify -r with two branches")
1185.50.44 by John Arbash Meinel
[patch] Robey Pointer: diff -r 1.. should diff against working tree.
1047
            if (len(revision) == 1) or (revision[1].spec is None):
1551.2.15 by Aaron Bentley
Rename cmd_show_diff to diff_cmd_helper
1048
                return diff_cmd_helper(tree1, file_list, diff_options,
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
1049
                                       revision[0], 
1050
                                       old_label=old_label, new_label=new_label)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1051
            elif len(revision) == 2:
1551.2.15 by Aaron Bentley
Rename cmd_show_diff to diff_cmd_helper
1052
                return diff_cmd_helper(tree1, file_list, diff_options,
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
1053
                                       revision[0], revision[1],
1054
                                       old_label=old_label, new_label=new_label)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1055
            else:
1056
                raise BzrCommandError('bzr diff --revision takes exactly one or two revision identifiers')
1057
        else:
1551.2.13 by Aaron Bentley
Got diff working properly with checkouts
1058
            if tree2 is not None:
1059
                return show_diff_trees(tree1, tree2, sys.stdout, 
1060
                                       specific_files=file_list,
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
1061
                                       external_diff_options=diff_options,
1062
                                       old_label=old_label, new_label=new_label)
1508.1.15 by Robert Collins
Merge from mpool.
1063
            else:
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
1064
                return diff_cmd_helper(tree1, file_list, diff_options,
1065
                                       old_label=old_label, new_label=new_label)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1066
1067
1068
class cmd_deleted(Command):
1069
    """List files deleted in the working tree.
1070
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1071
    # TODO: Show files deleted since a previous revision, or
1072
    # between two revisions.
1073
    # TODO: Much more efficient way to do this: read in new
1074
    # directories with readdir, rather than stating each one.  Same
1075
    # level of effort but possibly much less IO.  (Or possibly not,
1076
    # if the directories are very large...)
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1077
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1078
    def run(self, show_ids=False):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1079
        tree = WorkingTree.open_containing(u'.')[0]
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1080
        old = tree.basis_tree()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1081
        for path, ie in old.inventory.iter_entries():
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1082
            if not tree.has_id(ie.file_id):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1083
                if show_ids:
1084
                    print '%-50s %s' % (path, ie.file_id)
1085
                else:
1086
                    print path
1087
1088
1089
class cmd_modified(Command):
1090
    """List files modified in working tree."""
1091
    hidden = True
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1092
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1093
    def run(self):
1094
        from bzrlib.delta import compare_trees
1095
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1096
        tree = WorkingTree.open_containing(u'.')[0]
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1097
        td = compare_trees(tree.basis_tree(), tree)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1098
1398 by Robert Collins
integrate in Gustavos x-bit patch
1099
        for path, id, kind, text_modified, meta_modified in td.modified:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1100
            print path
1101
1102
1103
1104
class cmd_added(Command):
1105
    """List files added in working tree."""
1106
    hidden = True
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1107
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1108
    def run(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1109
        wt = WorkingTree.open_containing(u'.')[0]
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1110
        basis_inv = wt.basis_tree().inventory
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1111
        inv = wt.inventory
1112
        for file_id in inv:
1113
            if file_id in basis_inv:
1114
                continue
1115
            path = inv.id2path(file_id)
1548 by Martin Pool
Fix 'bzr added' typo, and tests for that command.
1116
            if not os.access(bzrlib.osutils.abspath(path), os.F_OK):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1117
                continue
1118
            print path
1119
                
1120
        
1121
1122
class cmd_root(Command):
1123
    """Show the tree root directory.
1124
1125
    The root is the nearest enclosing directory with a .bzr control
1126
    directory."""
1127
    takes_args = ['filename?']
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1128
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1129
    def run(self, filename=None):
1130
        """Print the branch root."""
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1131
        tree = WorkingTree.open_containing(filename)[0]
1132
        print tree.basedir
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1133
1134
1135
class cmd_log(Command):
1626.1.2 by Martin Pool
Better help message for log command.
1136
    """Show log of a branch, file, or directory.
1137
1138
    By default show the log of the branch containing the working directory.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1139
1185.16.153 by Martin Pool
[patch] fix help for bzr log (Matthieu)
1140
    To request a range of logs, you can use the command -r begin..end
1141
    -r revision requests a specific revision, -r ..end or -r begin.. are
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1142
    also valid.
1626.1.2 by Martin Pool
Better help message for log command.
1143
1144
    examples:
1145
        bzr log
1146
        bzr log foo.c
1147
        bzr log -r -10.. http://server/branch
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1148
    """
1149
1393.1.55 by Martin Pool
doc
1150
    # TODO: Make --revision support uuid: and hash: [future tag:] notation.
1151
1626.1.2 by Martin Pool
Better help message for log command.
1152
    takes_args = ['location?']
1185.16.46 by mbp at sourcefrog
- add help strings to some options
1153
    takes_options = [Option('forward', 
1154
                            help='show from oldest to newest'),
1626.1.2 by Martin Pool
Better help message for log command.
1155
                     'timezone', 
1156
                     Option('verbose', 
1157
                             help='show files changed in each revision'),
1185.16.46 by mbp at sourcefrog
- add help strings to some options
1158
                     'show-ids', 'revision',
1553.2.1 by Erik BÃ¥gfors
Support for plugins to register log formatters and set default formatter
1159
                     'log-format',
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
1160
                     'line', 'long', 
1185.16.46 by mbp at sourcefrog
- add help strings to some options
1161
                     Option('message',
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
1162
                            help='show revisions whose message matches this regexp',
1163
                            type=str),
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
1164
                     'short',
1185.16.57 by Martin Pool
[merge] from aaron
1165
                     ]
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1166
    @display_command
1626.1.2 by Martin Pool
Better help message for log command.
1167
    def run(self, location=None, timezone='original',
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1168
            verbose=False,
1169
            show_ids=False,
1170
            forward=False,
1171
            revision=None,
1553.2.1 by Erik BÃ¥gfors
Support for plugins to register log formatters and set default formatter
1172
            log_format=None,
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1173
            message=None,
1174
            long=False,
1185.12.25 by Aaron Bentley
Added one-line log format
1175
            short=False,
1176
            line=False):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1177
        from bzrlib.log import log_formatter, show_log
1178
        import codecs
1185.16.49 by mbp at sourcefrog
- more refactoring and tests of commandline
1179
        assert message is None or isinstance(message, basestring), \
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
1180
            "invalid message argument %r" % message
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1181
        direction = (forward and 'forward') or 'reverse'
1182
        
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1183
        # log everything
1184
        file_id = None
1626.1.2 by Martin Pool
Better help message for log command.
1185
        if location:
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1186
            # find the file id to log:
1187
1626.1.2 by Martin Pool
Better help message for log command.
1188
            dir, fp = bzrdir.BzrDir.open_containing(location)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1189
            b = dir.open_branch()
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
1190
            if fp != '':
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1191
                try:
1192
                    # might be a tree:
1193
                    inv = dir.open_workingtree().inventory
1194
                except (errors.NotBranchError, errors.NotLocalUrl):
1195
                    # either no tree, or is remote.
1196
                    inv = b.basis_tree().inventory
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1197
                file_id = inv.path2id(fp)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1198
        else:
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1199
            # local dir only
1200
            # FIXME ? log the current subdir only RBC 20060203 
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
1201
            dir, relpath = bzrdir.BzrDir.open_containing('.')
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1202
            b = dir.open_branch()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1203
1204
        if revision is None:
1205
            rev1 = None
1206
            rev2 = None
1207
        elif len(revision) == 1:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1208
            rev1 = rev2 = revision[0].in_history(b).revno
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1209
        elif len(revision) == 2:
1553.4.2 by Michael Ellerman
Make bzr log -r .. work, fixes bug #4609. Add a bunch of tests to make sure
1210
            if revision[0].spec is None:
1211
                # missing begin-range means first revision
1212
                rev1 = 1
1213
            else:
1214
                rev1 = revision[0].in_history(b).revno
1215
1540.2.6 by Robey Pointer
make 'log' and 'status' treat '-r N..' as implicitly '-r N..-1'
1216
            if revision[1].spec is None:
1217
                # missing end-range means last known revision
1218
                rev2 = b.revno()
1219
            else:
1220
                rev2 = revision[1].in_history(b).revno
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1221
        else:
1222
            raise BzrCommandError('bzr log --revision takes one or two values.')
1223
1185.36.1 by Daniel Silverstone
A revision of zero is meant to be zero, not None. Also order the revisions supplied to cope with the user being confused
1224
        # By this point, the revision numbers are converted to the +ve
1225
        # form if they were supplied in the -ve form, so we can do
1226
        # this comparison in relative safety
1227
        if rev1 > rev2:
1228
            (rev2, rev1) = (rev1, rev2)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1229
1185.31.4 by John Arbash Meinel
Fixing mutter() calls to not have to do string processing.
1230
        mutter('encoding log as %r', bzrlib.user_encoding)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1231
1232
        # use 'replace' so that we don't abort if trying to write out
1233
        # in e.g. the default C locale.
1234
        outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
1235
1553.2.1 by Erik BÃ¥gfors
Support for plugins to register log formatters and set default formatter
1236
        if (log_format == None):
1553.2.9 by Erik BÃ¥gfors
log_formatter => log_format for "named" formatters
1237
            default = bzrlib.config.BranchConfig(b).log_format()
1553.2.4 by Erik BÃ¥gfors
Support for setting the default log format at a configuration option
1238
            log_format = get_log_format(long=long, short=short, line=line, default=default)
1553.2.1 by Erik BÃ¥gfors
Support for plugins to register log formatters and set default formatter
1239
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1240
        lf = log_formatter(log_format,
1241
                           show_ids=show_ids,
1242
                           to_file=outf,
1243
                           show_timezone=timezone)
1244
1245
        show_log(b,
1246
                 lf,
1247
                 file_id,
1248
                 verbose=verbose,
1249
                 direction=direction,
1250
                 start_revision=rev1,
1251
                 end_revision=rev2,
1252
                 search=message)
1253
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1254
1553.2.4 by Erik BÃ¥gfors
Support for setting the default log format at a configuration option
1255
def get_log_format(long=False, short=False, line=False, default='long'):
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
1256
    log_format = default
1257
    if long:
1258
        log_format = 'long'
1259
    if short:
1260
        log_format = 'short'
1261
    if line:
1262
        log_format = 'line'
1263
    return log_format
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1264
1265
1266
class cmd_touching_revisions(Command):
1267
    """Return revision-ids which affected a particular file.
1268
1269
    A more user-friendly interface is "bzr log FILE"."""
1270
    hidden = True
1271
    takes_args = ["filename"]
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1272
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1273
    def run(self, filename):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1274
        tree, relpath = WorkingTree.open_containing(filename)
1275
        b = tree.branch
1276
        inv = tree.read_working_inventory()
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
1277
        file_id = inv.path2id(relpath)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1278
        for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
1279
            print "%6d %s" % (revno, what)
1280
1281
1282
class cmd_ls(Command):
1283
    """List files in a tree.
1284
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1285
    # TODO: Take a revision or remote path and list that tree instead.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1286
    hidden = True
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1287
    takes_options = ['verbose', 'revision',
1288
                     Option('non-recursive',
1289
                            help='don\'t recurse into sub-directories'),
1290
                     Option('from-root',
1291
                            help='Print all paths from the root of the branch.'),
1292
                     Option('unknown', help='Print unknown files'),
1293
                     Option('versioned', help='Print versioned files'),
1294
                     Option('ignored', help='Print ignored files'),
1295
1296
                     Option('null', help='Null separate the files'),
1297
                    ]
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1298
    @display_command
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1299
    def run(self, revision=None, verbose=False, 
1300
            non_recursive=False, from_root=False,
1301
            unknown=False, versioned=False, ignored=False,
1302
            null=False):
1303
1304
        if verbose and null:
1305
            raise BzrCommandError('Cannot set both --verbose and --null')
1306
        all = not (unknown or versioned or ignored)
1307
1308
        selection = {'I':ignored, '?':unknown, 'V':versioned}
1309
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1310
        tree, relpath = WorkingTree.open_containing(u'.')
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1311
        if from_root:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1312
            relpath = u''
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1313
        elif relpath:
1314
            relpath += '/'
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1315
        if revision is not None:
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
1316
            tree = tree.branch.repository.revision_tree(
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1317
                revision[0].in_history(tree.branch).rev_id)
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
1318
        for fp, fc, kind, fid, entry in tree.list_files():
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1319
            if fp.startswith(relpath):
1320
                fp = fp[len(relpath):]
1321
                if non_recursive and '/' in fp:
1322
                    continue
1323
                if not all and not selection[fc]:
1324
                    continue
1325
                if verbose:
1326
                    kindch = entry.kind_character()
1327
                    print '%-8s %s%s' % (fc, fp, kindch)
1328
                elif null:
1329
                    sys.stdout.write(fp)
1330
                    sys.stdout.write('\0')
1331
                    sys.stdout.flush()
1332
                else:
1333
                    print fp
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1334
1335
1336
class cmd_unknowns(Command):
1337
    """List unknown files."""
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1338
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1339
    def run(self):
1340
        from bzrlib.osutils import quotefn
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1341
        for f in WorkingTree.open_containing(u'.')[0].unknowns():
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1342
            print quotefn(f)
1343
1344
1345
class cmd_ignore(Command):
1346
    """Ignore a command or pattern.
1347
1348
    To remove patterns from the ignore list, edit the .bzrignore file.
1349
1350
    If the pattern contains a slash, it is compared to the whole path
1185.16.4 by Martin Pool
- doc and todo for ignore command
1351
    from the branch root.  Otherwise, it is compared to only the last
1352
    component of the path.  To match a file only in the root directory,
1353
    prepend './'.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1354
1355
    Ignore patterns are case-insensitive on case-insensitive systems.
1356
1357
    Note: wildcards must be quoted from the shell on Unix.
1358
1359
    examples:
1360
        bzr ignore ./Makefile
1361
        bzr ignore '*.class'
1362
    """
1185.16.4 by Martin Pool
- doc and todo for ignore command
1363
    # TODO: Complain if the filename is absolute
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1364
    takes_args = ['name_pattern']
1365
    
1366
    def run(self, name_pattern):
1367
        from bzrlib.atomicfile import AtomicFile
1368
        import os.path
1369
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1370
        tree, relpath = WorkingTree.open_containing(u'.')
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1371
        ifn = tree.abspath('.bzrignore')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1372
1373
        if os.path.exists(ifn):
1374
            f = open(ifn, 'rt')
1375
            try:
1376
                igns = f.read().decode('utf-8')
1377
            finally:
1378
                f.close()
1379
        else:
1380
            igns = ''
1381
1382
        # TODO: If the file already uses crlf-style termination, maybe
1383
        # we should use that for the newly added lines?
1384
1385
        if igns and igns[-1] != '\n':
1386
            igns += '\n'
1387
        igns += name_pattern + '\n'
1388
1389
        try:
1390
            f = AtomicFile(ifn, 'wt')
1391
            f.write(igns.encode('utf-8'))
1392
            f.commit()
1393
        finally:
1394
            f.close()
1395
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1396
        inv = tree.inventory
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1397
        if inv.path2id('.bzrignore'):
1398
            mutter('.bzrignore is already versioned')
1399
        else:
1400
            mutter('need to make new .bzrignore file versioned')
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
1401
            tree.add(['.bzrignore'])
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1402
1403
1404
class cmd_ignored(Command):
1405
    """List ignored files and the patterns that matched them.
1406
1407
    See also: bzr ignore"""
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1408
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1409
    def run(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1410
        tree = WorkingTree.open_containing(u'.')[0]
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
1411
        for path, file_class, kind, file_id, entry in tree.list_files():
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1412
            if file_class != 'I':
1413
                continue
1414
            ## XXX: Slightly inefficient since this was already calculated
1415
            pat = tree.is_ignored(path)
1416
            print '%-50s %s' % (path, pat)
1417
1418
1419
class cmd_lookup_revision(Command):
1420
    """Lookup the revision-id from a revision-number
1421
1422
    example:
1423
        bzr lookup-revision 33
1424
    """
1425
    hidden = True
1426
    takes_args = ['revno']
1427
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1428
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1429
    def run(self, revno):
1430
        try:
1431
            revno = int(revno)
1432
        except ValueError:
1433
            raise BzrCommandError("not a valid revision-number: %r" % revno)
1434
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1435
        print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1436
1437
1438
class cmd_export(Command):
1439
    """Export past revision to destination directory.
1440
1441
    If no revision is specified this exports the last committed revision.
1442
1443
    Format may be an "exporter" name, such as tar, tgz, tbz2.  If none is
1444
    given, try to find the format with the extension. If no extension
1445
    is found exports to a directory (equivalent to --format=dir).
1446
1447
    Root may be the top directory for tar, tgz and tbz2 formats. If none
1185.31.11 by John Arbash Meinel
Merging Alexander's zip export patch
1448
    is given, the top directory will be the root name of the file.
1449
1450
    Note: export of tree with non-ascii filenames to zip is not supported.
1451
1551.3.11 by Aaron Bentley
Merge from Robert
1452
     Supported formats       Autodetected by extension
1453
     -----------------       -------------------------
1185.31.11 by John Arbash Meinel
Merging Alexander's zip export patch
1454
         dir                            -
1455
         tar                          .tar
1456
         tbz2                    .tar.bz2, .tbz2
1457
         tgz                      .tar.gz, .tgz
1458
         zip                          .zip
1459
    """
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1460
    takes_args = ['dest']
1461
    takes_options = ['revision', 'format', 'root']
1462
    def run(self, dest, revision=None, format=None, root=None):
1463
        import os.path
1185.31.12 by John Arbash Meinel
Refactored the export code to make it easier to add new export formats.
1464
        from bzrlib.export import export
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1465
        tree = WorkingTree.open_containing(u'.')[0]
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1466
        b = tree.branch
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1467
        if revision is None:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1468
            # should be tree.last_revision  FIXME
1241 by Martin Pool
- rename last_patch to last_revision
1469
            rev_id = b.last_revision()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1470
        else:
1471
            if len(revision) != 1:
1472
                raise BzrError('bzr export --revision takes exactly 1 argument')
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1473
            rev_id = revision[0].in_history(b).rev_id
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
1474
        t = b.repository.revision_tree(rev_id)
1185.31.12 by John Arbash Meinel
Refactored the export code to make it easier to add new export formats.
1475
        try:
1476
            export(t, dest, format, root)
1477
        except errors.NoSuchExportFormat, e:
1478
            raise BzrCommandError('Unsupported export format: %s' % e.format)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1479
1480
1481
class cmd_cat(Command):
1482
    """Write a file's text from a previous revision."""
1483
1484
    takes_options = ['revision']
1485
    takes_args = ['filename']
1486
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1487
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1488
    def run(self, filename, revision=None):
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
1489
        if revision is not None and len(revision) != 1:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1490
            raise BzrCommandError("bzr cat --revision takes exactly one number")
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1491
        tree = None
1492
        try:
1493
            tree, relpath = WorkingTree.open_containing(filename)
1494
            b = tree.branch
1495
        except NotBranchError:
1496
            pass
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
1497
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1498
        if tree is None:
1499
            b, relpath = Branch.open_containing(filename)
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
1500
        if revision is None:
1501
            revision_id = b.last_revision()
1502
        else:
1503
            revision_id = revision[0].in_history(b).rev_id
1504
        b.print_file(relpath, revision_id)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1505
1506
1507
class cmd_local_time_offset(Command):
1508
    """Show the offset in seconds from GMT to local time."""
1509
    hidden = True    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1510
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1511
    def run(self):
1512
        print bzrlib.osutils.local_time_offset()
1513
1514
1515
1516
class cmd_commit(Command):
1517
    """Commit changes into a new revision.
1518
    
1519
    If no arguments are given, the entire tree is committed.
1520
1521
    If selected files are specified, only changes to those files are
1522
    committed.  If a directory is specified then the directory and everything 
1523
    within it is committed.
1524
1525
    A selected-file commit may fail in some cases where the committed
1526
    tree would be invalid, such as trying to commit a file in a
1527
    newly-added directory that is not itself committed.
1528
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1529
    # TODO: Run hooks on tree to-be-committed, and after commit.
1530
1185.16.65 by mbp at sourcefrog
- new commit --strict option
1531
    # TODO: Strict commit that fails if there are deleted files.
1532
    #       (what does "deleted files" mean ??)
1533
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1534
    # TODO: Give better message for -s, --summary, used by tla people
1535
1536
    # XXX: verbose currently does nothing
1537
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1538
    takes_args = ['selected*']
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
1539
    takes_options = ['message', 'verbose', 
1540
                     Option('unchanged',
1541
                            help='commit even if nothing has changed'),
1542
                     Option('file', type=str, 
1543
                            argname='msgfile',
1544
                            help='file containing commit message'),
1185.16.65 by mbp at sourcefrog
- new commit --strict option
1545
                     Option('strict',
1546
                            help="refuse to commit if there are unknown "
1547
                            "files in the working tree."),
1587.1.8 by Robert Collins
Local commits on unbound branches fail.
1548
                     Option('local',
1549
                            help="perform a local only commit in a bound "
1550
                                 "branch. Such commits are not pushed to "
1551
                                 "the master branch until a normal commit "
1552
                                 "is performed."
1553
                            ),
1185.16.43 by Martin Pool
- clean up handling of option objects
1554
                     ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1555
    aliases = ['ci', 'checkin']
1556
1557
    def run(self, message=None, file=None, verbose=True, selected_list=None,
1587.1.8 by Robert Collins
Local commits on unbound branches fail.
1558
            unchanged=False, strict=False, local=False):
1607.1.5 by Robert Collins
Make commit verbose mode work!.
1559
        from bzrlib.commit import (NullCommitReporter, ReportCommitToLog)
1185.16.65 by mbp at sourcefrog
- new commit --strict option
1560
        from bzrlib.errors import (PointlessCommit, ConflictsInTree,
1561
                StrictCommitFailed)
1185.33.76 by Martin Pool
Fix import error.
1562
        from bzrlib.msgeditor import edit_commit_message, \
1563
                make_commit_message_template
1185.33.72 by Martin Pool
Fix commit message template for non-ascii files, and add test for handling of
1564
        from tempfile import TemporaryFile
1565
        import codecs
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1566
1185.33.77 by Martin Pool
doc
1567
        # TODO: Need a blackbox test for invoking the external editor; may be
1568
        # slightly problematic to run this cross-platform.
1569
1185.33.72 by Martin Pool
Fix commit message template for non-ascii files, and add test for handling of
1570
        # TODO: do more checks that the commit will succeed before 
1571
        # spending the user's valuable time typing a commit message.
1572
        #
1573
        # TODO: if the commit *does* happen to fail, then save the commit 
1574
        # message to a temporary file where it can be recovered
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1575
        tree, selected_list = tree_files(selected_list)
1587.1.8 by Robert Collins
Local commits on unbound branches fail.
1576
        if local and not tree.branch.get_bound_location():
1577
            raise errors.LocalRequiresBoundBranch()
1414 by Robert Collins
merge in an adjusted version of Jelmer's empty-log detection patch.
1578
        if message is None and not file:
1185.33.76 by Martin Pool
Fix import error.
1579
            template = make_commit_message_template(tree, selected_list)
1185.33.72 by Martin Pool
Fix commit message template for non-ascii files, and add test for handling of
1580
            message = edit_commit_message(template)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1581
            if message is None:
1169 by Martin Pool
- clean up nasty code for inserting the status summary into commit template
1582
                raise BzrCommandError("please specify a commit message"
1583
                                      " with either --message or --file")
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1584
        elif message and file:
1585
            raise BzrCommandError("please specify either --message or --file")
1586
        
1587
        if file:
1588
            import codecs
1589
            message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1590
1414 by Robert Collins
merge in an adjusted version of Jelmer's empty-log detection patch.
1591
        if message == "":
1592
                raise BzrCommandError("empty commit message specified")
1607.1.5 by Robert Collins
Make commit verbose mode work!.
1593
        
1594
        if verbose:
1595
            reporter = ReportCommitToLog()
1596
        else:
1597
            reporter = NullCommitReporter()
1598
        
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1599
        try:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1600
            tree.commit(message, specific_files=selected_list,
1607.1.5 by Robert Collins
Make commit verbose mode work!.
1601
                        allow_pointless=unchanged, strict=strict, local=local,
1602
                        reporter=reporter)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1603
        except PointlessCommit:
1604
            # FIXME: This should really happen before the file is read in;
1605
            # perhaps prepare the commit; get the message; then actually commit
1606
            raise BzrCommandError("no changes to commit",
1607
                                  ["use --unchanged to commit anyhow"])
1185.14.10 by Aaron Bentley
Commit aborts with conflicts in the tree.
1608
        except ConflictsInTree:
1609
            raise BzrCommandError("Conflicts detected in working tree.  "
1610
                'Use "bzr conflicts" to list, "bzr resolve FILE" to resolve.')
1185.16.65 by mbp at sourcefrog
- new commit --strict option
1611
        except StrictCommitFailed:
1612
            raise BzrCommandError("Commit refused because there are unknown "
1613
                                  "files in the working tree.")
1505.1.24 by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge
1614
        except errors.BoundBranchOutOfDate, e:
1615
            raise BzrCommandError(str(e)
1587.1.12 by Robert Collins
Update help message to be more bound branch friendly.
1616
                                  + ' Either unbind, update, or'
1617
                                    ' pass --local to commit.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1618
1619
1620
class cmd_check(Command):
1621
    """Validate consistency of branch history.
1622
1623
    This command checks various invariants about the branch storage to
1624
    detect data corruption or bzr bugs.
1625
    """
1512 by Robert Collins
Merge from Martin. Adjust check to work with HTTP again.
1626
    takes_args = ['branch?']
1449 by Robert Collins
teach check about ghosts
1627
    takes_options = ['verbose']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1628
1512 by Robert Collins
Merge from Martin. Adjust check to work with HTTP again.
1629
    def run(self, branch=None, verbose=False):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1630
        from bzrlib.check import check
1512 by Robert Collins
Merge from Martin. Adjust check to work with HTTP again.
1631
        if branch is None:
1632
            tree = WorkingTree.open_containing()[0]
1633
            branch = tree.branch
1634
        else:
1635
            branch = Branch.open(branch)
1636
        check(branch, verbose)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1637
1638
1639
class cmd_scan_cache(Command):
1640
    hidden = True
1641
    def run(self):
1642
        from bzrlib.hashcache import HashCache
1643
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1644
        c = HashCache(u'.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1645
        c.read()
1646
        c.scan()
1647
            
1648
        print '%6d stats' % c.stat_count
1649
        print '%6d in hashcache' % len(c._cache)
1650
        print '%6d files removed from cache' % c.removed_count
1651
        print '%6d hashes updated' % c.update_count
1652
        print '%6d files changed too recently to cache' % c.danger_count
1653
1654
        if c.needs_write:
1655
            c.write()
1534.5.16 by Robert Collins
Review feedback.
1656
1657
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1658
class cmd_upgrade(Command):
1659
    """Upgrade branch storage to current format.
1660
1661
    The check command or bzr developers may sometimes advise you to run
1534.4.13 by Robert Collins
Give a reasonable warning on attempts to upgrade a readonly url.
1662
    this command. When the default format has changed you may also be warned
1663
    during other operations to upgrade.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1664
    """
1534.4.13 by Robert Collins
Give a reasonable warning on attempts to upgrade a readonly url.
1665
    takes_args = ['url?']
1534.5.13 by Robert Collins
Correct buggy test.
1666
    takes_options = [
1667
                     Option('format', 
1688.1.3 by Olaf Conradi
Do mention the older formats inside help for commands 'init', 'init-repo'
1668
                            help='Upgrade to a specific format. Current formats'
1669
                                 ' are: default, knit, metaweave and weave.'
1670
                                 ' Default is knit; metaweave and weave are'
1671
                                 ' deprecated',
1534.5.13 by Robert Collins
Correct buggy test.
1672
                            type=get_format_type),
1673
                    ]
1674
1675
1676
    def run(self, url='.', format=None):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1677
        from bzrlib.upgrade import upgrade
1688.1.2 by Olaf Conradi
Rename format 'metadir' to 'default'. Only mention format 'knit' in help
1678
        if format is None:
1679
            format = get_format_type('default')
1534.5.13 by Robert Collins
Correct buggy test.
1680
        upgrade(url, format)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1681
1682
1683
class cmd_whoami(Command):
1684
    """Show bzr user id."""
1685
    takes_options = ['email']
1686
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1687
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1688
    def run(self, email=False):
1371 by Martin Pool
- raise NotBranchError if format file can't be read
1689
        try:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1690
            b = WorkingTree.open_containing(u'.')[0].branch
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1691
            config = bzrlib.config.BranchConfig(b)
1371 by Martin Pool
- raise NotBranchError if format file can't be read
1692
        except NotBranchError:
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1693
            config = bzrlib.config.GlobalConfig()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1694
        
1695
        if email:
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1696
            print config.user_email()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1697
        else:
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1698
            print config.username()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1699
1534.4.25 by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite.
1700
1185.35.14 by Aaron Bentley
Implemented nick command
1701
class cmd_nick(Command):
1551.3.11 by Aaron Bentley
Merge from Robert
1702
    """Print or set the branch nickname.  
1703
1185.35.14 by Aaron Bentley
Implemented nick command
1704
    If unset, the tree root directory name is used as the nickname
1705
    To print the current nickname, execute with no argument.  
1706
    """
1707
    takes_args = ['nickname?']
1708
    def run(self, nickname=None):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1709
        branch = Branch.open_containing(u'.')[0]
1185.35.14 by Aaron Bentley
Implemented nick command
1710
        if nickname is None:
1711
            self.printme(branch)
1712
        else:
1713
            branch.nick = nickname
1714
1715
    @display_command
1716
    def printme(self, branch):
1717
        print branch.nick 
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1718
1534.4.25 by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite.
1719
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1720
class cmd_selftest(Command):
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1721
    """Run internal test suite.
1722
    
1723
    This creates temporary test directories in the working directory,
1724
    but not existing data is affected.  These directories are deleted
1725
    if the tests pass, or left behind to help in debugging if they
1185.35.20 by Aaron Bentley
Only keep test failure directories if --keep-output is specified
1726
    fail and --keep-output is specified.
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1727
    
1728
    If arguments are given, they are regular expressions that say
1185.16.58 by mbp at sourcefrog
- run all selftests by default
1729
    which tests should run.
1552 by Martin Pool
Improved help text for bzr selftest
1730
1731
    If the global option '--no-plugins' is given, plugins are not loaded
1732
    before running the selftests.  This has two effects: features provided or
1733
    modified by plugins will not be tested, and tests provided by plugins will
1734
    not be run.
1735
1736
    examples:
1737
        bzr selftest ignore
1738
        bzr --no-plugins selftest -v
1185.16.58 by mbp at sourcefrog
- run all selftests by default
1739
    """
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1740
    # TODO: --list should give a list of all available tests
1534.4.25 by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite.
1741
1742
    # NB: this is used from the class without creating an instance, which is
1743
    # why it does not have a self parameter.
1744
    def get_transport_type(typestring):
1745
        """Parse and return a transport specifier."""
1746
        if typestring == "sftp":
1747
            from bzrlib.transport.sftp import SFTPAbsoluteServer
1748
            return SFTPAbsoluteServer
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1749
        if typestring == "memory":
1750
            from bzrlib.transport.memory import MemoryServer
1751
            return MemoryServer
1558.10.1 by Aaron Bentley
Handle lockdirs over NFS properly
1752
        if typestring == "fakenfs":
1558.10.2 by Robert Collins
Refactor the FakeNFS support into a TransportDecorator.
1753
            from bzrlib.transport.fakenfs import FakeNFSServer
1558.10.1 by Aaron Bentley
Handle lockdirs over NFS properly
1754
            return FakeNFSServer
1534.4.25 by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite.
1755
        msg = "No known transport type %s. Supported types are: sftp\n" %\
1756
            (typestring)
1757
        raise BzrCommandError(msg)
1758
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1759
    hidden = True
1185.1.57 by Robert Collins
nuke --pattern to selftest, replace with regexp.search calls.
1760
    takes_args = ['testspecs*']
1552 by Martin Pool
Improved help text for bzr selftest
1761
    takes_options = ['verbose',
1185.16.58 by mbp at sourcefrog
- run all selftests by default
1762
                     Option('one', help='stop when one test fails'),
1185.35.20 by Aaron Bentley
Only keep test failure directories if --keep-output is specified
1763
                     Option('keep-output', 
1534.4.25 by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite.
1764
                            help='keep output directories when tests fail'),
1765
                     Option('transport', 
1766
                            help='Use a different transport by default '
1767
                                 'throughout the test suite.',
1768
                            type=get_transport_type),
1185.16.58 by mbp at sourcefrog
- run all selftests by default
1769
                    ]
1770
1185.35.20 by Aaron Bentley
Only keep test failure directories if --keep-output is specified
1771
    def run(self, testspecs_list=None, verbose=False, one=False,
1534.4.25 by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite.
1772
            keep_output=False, transport=None):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1773
        import bzrlib.ui
1185.31.25 by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py
1774
        from bzrlib.tests import selftest
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1775
        # we don't want progress meters from the tests to go to the
1776
        # real output; and we don't want log messages cluttering up
1777
        # the real logs.
1778
        save_ui = bzrlib.ui.ui_factory
1779
        bzrlib.trace.info('running tests...')
1780
        try:
1781
            bzrlib.ui.ui_factory = bzrlib.ui.SilentUIFactory()
1185.1.57 by Robert Collins
nuke --pattern to selftest, replace with regexp.search calls.
1782
            if testspecs_list is not None:
1783
                pattern = '|'.join(testspecs_list)
1784
            else:
1785
                pattern = ".*"
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1786
            result = selftest(verbose=verbose, 
1185.16.58 by mbp at sourcefrog
- run all selftests by default
1787
                              pattern=pattern,
1185.35.20 by Aaron Bentley
Only keep test failure directories if --keep-output is specified
1788
                              stop_on_failure=one, 
1534.4.25 by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite.
1789
                              keep_output=keep_output,
1790
                              transport=transport)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1791
            if result:
1792
                bzrlib.trace.info('tests passed')
1793
            else:
1794
                bzrlib.trace.info('tests failed')
1795
            return int(not result)
1796
        finally:
1797
            bzrlib.ui.ui_factory = save_ui
1798
1799
1185.62.8 by John Arbash Meinel
Deprecating bzrlib.get_bzr_revision, in favor of bzrlib.builtins._get_bzr_branch
1800
def _get_bzr_branch():
1801
    """If bzr is run from a branch, return Branch or None"""
1802
    import bzrlib.errors
1803
    from bzrlib.branch import Branch
1804
    from bzrlib.osutils import abspath
1805
    from os.path import dirname
1806
    
1807
    try:
1808
        branch = Branch.open(dirname(abspath(dirname(__file__))))
1809
        return branch
1810
    except bzrlib.errors.BzrError:
1811
        return None
1812
    
1813
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1814
def show_version():
1815
    print "bzr (bazaar-ng) %s" % bzrlib.__version__
1816
    # is bzrlib itself in a branch?
1185.62.8 by John Arbash Meinel
Deprecating bzrlib.get_bzr_revision, in favor of bzrlib.builtins._get_bzr_branch
1817
    branch = _get_bzr_branch()
1818
    if branch:
1819
        rh = branch.revision_history()
1820
        revno = len(rh)
1185.62.1 by John Arbash Meinel
bzr --version prints branch nickname.
1821
        print "  bzr checkout, revision %d" % (revno,)
1822
        print "  nick: %s" % (branch.nick,)
1185.62.8 by John Arbash Meinel
Deprecating bzrlib.get_bzr_revision, in favor of bzrlib.builtins._get_bzr_branch
1823
        if rh:
1824
            print "  revid: %s" % (rh[-1],)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1825
    print bzrlib.__copyright__
1826
    print "http://bazaar-ng.org/"
1827
    print
1828
    print "bzr comes with ABSOLUTELY NO WARRANTY.  bzr is free software, and"
1829
    print "you may use, modify and redistribute it under the terms of the GNU"
1830
    print "General Public License version 2 or later."
1831
1832
1833
class cmd_version(Command):
1834
    """Show version of bzr."""
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1835
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1836
    def run(self):
1837
        show_version()
1838
1839
class cmd_rocks(Command):
1840
    """Statement of optimism."""
1841
    hidden = True
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1842
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1843
    def run(self):
1844
        print "it sure does!"
1845
1846
1847
class cmd_find_merge_base(Command):
1848
    """Find and print a base revision for merging two branches.
1849
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1850
    # TODO: Options to specify revisions on either side, as if
1851
    #       merging only part of the history.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1852
    takes_args = ['branch', 'other']
1853
    hidden = True
1854
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1855
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1856
    def run(self, branch, other):
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
1857
        from bzrlib.revision import common_ancestor, MultipleRevisionSources
1858
        
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
1859
        branch1 = Branch.open_containing(branch)[0]
1860
        branch2 = Branch.open_containing(other)[0]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1861
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
1862
        history_1 = branch1.revision_history()
1863
        history_2 = branch2.revision_history()
1864
1241 by Martin Pool
- rename last_patch to last_revision
1865
        last1 = branch1.last_revision()
1866
        last2 = branch2.last_revision()
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
1867
1551.2.2 by Aaron Bentley
Fix find-merge-base for new API [recommit]
1868
        source = MultipleRevisionSources(branch1.repository, 
1869
                                         branch2.repository)
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
1870
        
1871
        base_rev_id = common_ancestor(last1, last2, source)
1872
1873
        print 'merge base is revision %s' % base_rev_id
1874
        
1875
        return
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1876
1877
        if base_revno is None:
1878
            raise bzrlib.errors.UnrelatedBranches()
1879
1880
        print ' r%-6d in %s' % (base_revno, branch)
1881
1882
        other_revno = branch2.revision_id_to_revno(base_revid)
1883
        
1884
        print ' r%-6d in %s' % (other_revno, other)
1885
1886
1887
1888
class cmd_merge(Command):
1889
    """Perform a three-way merge.
1890
    
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
1891
    The branch is the branch you will merge from.  By default, it will
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
1892
    merge the latest revision.  If you specify a revision, that
1893
    revision will be merged.  If you specify two revisions, the first
1894
    will be used as a BASE, and the second one as OTHER.  Revision
1895
    numbers are always relative to the specified branch.
1896
1551.2.19 by Aaron Bentley
Added See Conflicts to merge help
1897
    By default, bzr will try to merge in all new work from the other
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
1898
    branch, automatically determining an appropriate base.  If this
1899
    fails, you may need to give an explicit base.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1900
    
1551.2.18 by Aaron Bentley
Updated docs to clarify conflict handling
1901
    Merge will do its best to combine the changes in two branches, but there
1902
    are some kinds of problems only a human can fix.  When it encounters those,
1903
    it will mark a conflict.  A conflict means that you need to fix something,
1904
    before you should commit.
1905
1551.2.19 by Aaron Bentley
Added See Conflicts to merge help
1906
    Use bzr resolve when you have fixed a problem.  See also bzr conflicts.
1551.2.18 by Aaron Bentley
Updated docs to clarify conflict handling
1907
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
1908
    If there is no default branch set, the first merge will set it. After
1909
    that, you can omit the branch to use the default.  To change the
1614.2.2 by Olaf Conradi
Merge command:
1910
    default, use --remember.
1911
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1912
    Examples:
1913
1914
    To merge the latest revision from bzr.dev
1915
    bzr merge ../bzr.dev
1916
1917
    To merge changes up to and including revision 82 from bzr.dev
1918
    bzr merge -r 82 ../bzr.dev
1919
1920
    To merge the changes introduced by 82, without previous changes:
1921
    bzr merge -r 81..82 ../bzr.dev
1922
    
1923
    merge refuses to run if there are any uncommitted changes, unless
1924
    --force is given.
1925
    """
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
1926
    takes_args = ['branch?']
1614.2.2 by Olaf Conradi
Merge command:
1927
    takes_options = ['revision', 'force', 'merge-type', 'reprocess', 'remember',
1185.18.1 by Aaron Bentley
Added --show-base to merge
1928
                     Option('show-base', help="Show base revision text in "
1929
                            "conflicts")]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1930
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
1931
    def run(self, branch=None, revision=None, force=False, merge_type=None,
1614.2.2 by Olaf Conradi
Merge command:
1932
            show_base=False, reprocess=False, remember=False):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1933
        if merge_type is None:
1534.7.139 by Aaron Bentley
ApplyMerge3 -> Merge3Merger
1934
            merge_type = Merge3Merger
1614.2.2 by Olaf Conradi
Merge command:
1935
1936
        tree = WorkingTree.open_containing(u'.')[0]
1937
        stored_loc = tree.branch.get_parent()
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
1938
        if branch is None:
1614.2.2 by Olaf Conradi
Merge command:
1939
            if stored_loc is None:
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
1940
                raise BzrCommandError("No merge branch known or specified.")
1185.12.12 by Aaron Bentley
Made merge use pull location or die if no branch specified.
1941
            else:
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
1942
                print "Using saved branch: %s" % stored_loc
1943
                branch = stored_loc
1614.2.2 by Olaf Conradi
Merge command:
1944
1614.2.6 by Olaf Conradi
Add testcase for --remember when merge fails. It should still remember
1945
        if tree.branch.get_parent() is None or remember:
1946
            tree.branch.set_parent(branch)
1947
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1948
        if revision is None or len(revision) < 1:
1949
            base = [None, None]
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
1950
            other = [branch, -1]
1645.1.1 by Aaron Bentley
Implement single-file merge
1951
            other_branch, path = Branch.open_containing(branch)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1952
        else:
1953
            if len(revision) == 1:
974.1.52 by aaron.bentley at utoronto
Merged mpool's latest changes (~0.0.7)
1954
                base = [None, None]
1645.1.1 by Aaron Bentley
Implement single-file merge
1955
                other_branch, path = Branch.open_containing(branch)
1185.12.46 by Aaron Bentley
Fixed -r brokenness in merge
1956
                revno = revision[0].in_history(other_branch).revno
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
1957
                other = [branch, revno]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1958
            else:
1959
                assert len(revision) == 2
1960
                if None in revision:
1961
                    raise BzrCommandError(
1962
                        "Merge doesn't permit that revision specifier.")
1645.1.1 by Aaron Bentley
Implement single-file merge
1963
                b, path = Branch.open_containing(branch)
1185.5.1 by John Arbash Meinel
Applying bad-merge revision patch.
1964
1965
                base = [branch, revision[0].in_history(b).revno]
1966
                other = [branch, revision[1].in_history(b).revno]
1645.1.1 by Aaron Bentley
Implement single-file merge
1967
        if path != "":
1968
            interesting_files = [path]
1969
        else:
1970
            interesting_files = None
1551.2.25 by Aaron Bentley
Stop using deprecated methods in merge and revert
1971
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
1972
        try:
1551.2.25 by Aaron Bentley
Stop using deprecated methods in merge and revert
1973
            try:
1974
                conflict_count = merge(other, base, check_clean=(not force),
1975
                                       merge_type=merge_type, 
1976
                                       reprocess=reprocess,
1977
                                       show_base=show_base, 
1645.1.1 by Aaron Bentley
Implement single-file merge
1978
                                       pb=pb, file_list=interesting_files)
1551.2.25 by Aaron Bentley
Stop using deprecated methods in merge and revert
1979
            finally:
1980
                pb.finished()
1476 by Robert Collins
Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
1981
            if conflict_count != 0:
1982
                return 1
1983
            else:
1984
                return 0
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
1985
        except bzrlib.errors.AmbiguousBase, e:
1173 by Martin Pool
- message typo
1986
            m = ("sorry, bzr can't determine the right merge base yet\n"
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
1987
                 "candidates are:\n  "
1988
                 + "\n  ".join(e.bases)
1989
                 + "\n"
1990
                 "please specify an explicit base with -r,\n"
1991
                 "and (if you want) report this to the bzr developers\n")
1992
            log_error(m)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1993
1994
1185.35.4 by Aaron Bentley
Implemented remerge
1995
class cmd_remerge(Command):
1996
    """Redo a merge.
1997
    """
1998
    takes_args = ['file*']
1999
    takes_options = ['merge-type', 'reprocess',
2000
                     Option('show-base', help="Show base revision text in "
2001
                            "conflicts")]
2002
2003
    def run(self, file_list=None, merge_type=None, show_base=False,
2004
            reprocess=False):
2005
        from bzrlib.merge import merge_inner, transform_tree
2006
        if merge_type is None:
1534.7.139 by Aaron Bentley
ApplyMerge3 -> Merge3Merger
2007
            merge_type = Merge3Merger
1508.1.15 by Robert Collins
Merge from mpool.
2008
        tree, file_list = tree_files(file_list)
2009
        tree.lock_write()
1185.35.4 by Aaron Bentley
Implemented remerge
2010
        try:
1508.1.15 by Robert Collins
Merge from mpool.
2011
            pending_merges = tree.pending_merges() 
1185.35.4 by Aaron Bentley
Implemented remerge
2012
            if len(pending_merges) != 1:
2013
                raise BzrCommandError("Sorry, remerge only works after normal"
2014
                                      + " merges.  Not cherrypicking or"
2015
                                      + "multi-merges.")
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2016
            repository = tree.branch.repository
1508.1.15 by Robert Collins
Merge from mpool.
2017
            base_revision = common_ancestor(tree.branch.last_revision(), 
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2018
                                            pending_merges[0], repository)
2019
            base_tree = repository.revision_tree(base_revision)
2020
            other_tree = repository.revision_tree(pending_merges[0])
1185.35.4 by Aaron Bentley
Implemented remerge
2021
            interesting_ids = None
2022
            if file_list is not None:
2023
                interesting_ids = set()
2024
                for filename in file_list:
1508.1.15 by Robert Collins
Merge from mpool.
2025
                    file_id = tree.path2id(filename)
1558.2.1 by Aaron Bentley
Ensure remerge errors when file-id is None
2026
                    if file_id is None:
2027
                        raise NotVersionedError(filename)
1185.35.4 by Aaron Bentley
Implemented remerge
2028
                    interesting_ids.add(file_id)
1508.1.15 by Robert Collins
Merge from mpool.
2029
                    if tree.kind(file_id) != "directory":
1185.35.4 by Aaron Bentley
Implemented remerge
2030
                        continue
1185.35.13 by Aaron Bentley
Merged Martin
2031
                    
1508.1.15 by Robert Collins
Merge from mpool.
2032
                    for name, ie in tree.inventory.iter_entries(file_id):
1185.35.4 by Aaron Bentley
Implemented remerge
2033
                        interesting_ids.add(ie.file_id)
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
2034
            transform_tree(tree, tree.basis_tree(), interesting_ids)
1185.35.4 by Aaron Bentley
Implemented remerge
2035
            if file_list is None:
1508.1.15 by Robert Collins
Merge from mpool.
2036
                restore_files = list(tree.iter_conflicts())
1185.35.4 by Aaron Bentley
Implemented remerge
2037
            else:
2038
                restore_files = file_list
2039
            for filename in restore_files:
2040
                try:
1508.1.15 by Robert Collins
Merge from mpool.
2041
                    restore(tree.abspath(filename))
1185.35.4 by Aaron Bentley
Implemented remerge
2042
                except NotConflicted:
2043
                    pass
1551.5.1 by Aaron Bentley
Stop using deprecated api in remerge
2044
            conflicts =  merge_inner(tree.branch, other_tree, base_tree,
2045
                                     this_tree=tree,
1185.35.4 by Aaron Bentley
Implemented remerge
2046
                                     interesting_ids = interesting_ids, 
2047
                                     other_rev_id=pending_merges[0], 
2048
                                     merge_type=merge_type, 
2049
                                     show_base=show_base,
2050
                                     reprocess=reprocess)
2051
        finally:
1508.1.15 by Robert Collins
Merge from mpool.
2052
            tree.unlock()
1185.35.4 by Aaron Bentley
Implemented remerge
2053
        if conflicts > 0:
2054
            return 1
2055
        else:
2056
            return 0
2057
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2058
class cmd_revert(Command):
2059
    """Reverse all changes since the last commit.
2060
2061
    Only versioned files are affected.  Specify filenames to revert only 
2062
    those files.  By default, any files that are changed will be backed up
2063
    first.  Backup files have a '~' appended to their name.
2064
    """
2065
    takes_options = ['revision', 'no-backup']
2066
    takes_args = ['file*']
2067
    aliases = ['merge-revert']
2068
2069
    def run(self, revision=None, no_backup=False, file_list=None):
2070
        from bzrlib.commands import parse_spec
2071
        if file_list is not None:
2072
            if len(file_list) == 0:
2073
                raise BzrCommandError("No files specified")
1457.1.9 by Robert Collins
Change cmd_revert implementation to call workingtree.Revert.
2074
        else:
2075
            file_list = []
1185.50.53 by John Arbash Meinel
[patch] Aaron Bentley: make revert work in a subdirectory.
2076
        
2077
        tree, file_list = tree_files(file_list)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2078
        if revision is None:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2079
            # FIXME should be tree.last_revision
1558.4.2 by Aaron Bentley
Revert in checkout works properly
2080
            rev_id = tree.last_revision()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2081
        elif len(revision) != 1:
2082
            raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
1185.5.8 by John Arbash Meinel
Fixed bzr revert with the new RevisionSpec code.
2083
        else:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2084
            rev_id = revision[0].in_history(tree.branch).rev_id
1551.2.25 by Aaron Bentley
Stop using deprecated methods in merge and revert
2085
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
2086
        try:
2087
            tree.revert(file_list, 
2088
                        tree.branch.repository.revision_tree(rev_id),
2089
                        not no_backup, pb)
2090
        finally:
2091
            pb.finished()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2092
2093
2094
class cmd_assert_fail(Command):
2095
    """Test reporting of assertion failures"""
2096
    hidden = True
2097
    def run(self):
2098
        assert False, "always fails"
2099
2100
2101
class cmd_help(Command):
2102
    """Show help on a command or other topic.
2103
2104
    For a list of all available commands, say 'bzr help commands'."""
1553.4.3 by Michael Ellerman
Add custom description for help's --long option, this fixes bug #31217.
2105
    takes_options = [Option('long', 'show help on all commands')]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2106
    takes_args = ['topic?']
1616.1.15 by Martin Pool
Handle 'bzr ?', etc.
2107
    aliases = ['?', '--help', '-?', '-h']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2108
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2109
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2110
    def run(self, topic=None, long=False):
2111
        import help
2112
        if topic is None and long:
2113
            topic = "commands"
2114
        help.help(topic)
2115
2116
2117
class cmd_shell_complete(Command):
2118
    """Show appropriate completions for context.
2119
2120
    For a list of all available commands, say 'bzr shell-complete'."""
2121
    takes_args = ['context?']
2122
    aliases = ['s-c']
2123
    hidden = True
2124
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2125
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2126
    def run(self, context=None):
2127
        import shellcomplete
2128
        shellcomplete.shellcomplete(context)
2129
2130
1228 by Martin Pool
- add fetch command as builtin
2131
class cmd_fetch(Command):
2132
    """Copy in history from another branch but don't merge it.
2133
2134
    This is an internal method used for pull and merge."""
2135
    hidden = True
2136
    takes_args = ['from_branch', 'to_branch']
2137
    def run(self, from_branch, to_branch):
2138
        from bzrlib.fetch import Fetcher
2139
        from bzrlib.branch import Branch
1185.16.100 by mbp at sourcefrog
Update fetch command for new Branch constructors.
2140
        from_b = Branch.open(from_branch)
2141
        to_b = Branch.open(to_branch)
1185.65.27 by Robert Collins
Tweak storage towards mergability.
2142
        Fetcher(to_b, from_b)
1228 by Martin Pool
- add fetch command as builtin
2143
2144
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2145
class cmd_missing(Command):
1185.54.3 by Aaron Bentley
Factored out find_unmerged
2146
    """Show unmerged/unpulled revisions between two branches.
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2147
1185.54.3 by Aaron Bentley
Factored out find_unmerged
2148
    OTHER_BRANCH may be local or remote."""
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2149
    takes_args = ['other_branch?']
2150
    takes_options = [Option('reverse', 'Reverse the order of revisions'),
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
2151
                     Option('mine-only', 
2152
                            'Display changes in the local branch only'),
2153
                     Option('theirs-only', 
2154
                            'Display changes in the remote branch only'), 
1553.2.3 by Erik BÃ¥gfors
cover the missing command with formatters as well
2155
                     'log-format',
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
2156
                     'line',
2157
                     'long', 
2158
                     'short',
2159
                     'show-ids',
1185.54.19 by Aaron Bentley
All tests pass
2160
                     'verbose'
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
2161
                     ]
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2162
2163
    def run(self, other_branch=None, reverse=False, mine_only=False,
1553.2.6 by Erik BÃ¥gfors
Make default formatter work for the missing command
2164
            theirs_only=False, log_format=None, long=False, short=False, line=False, 
1185.54.19 by Aaron Bentley
All tests pass
2165
            show_ids=False, verbose=False):
2166
        from bzrlib.missing import find_unmerged, iter_log_data
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
2167
        from bzrlib.log import log_formatter
1185.46.5 by Aaron Bentley
Use unicode pathname in cmd_missing
2168
        local_branch = bzrlib.branch.Branch.open_containing(u".")[0]
1185.54.16 by Aaron Bentley
fixed location handling to match old missing
2169
        parent = local_branch.get_parent()
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2170
        if other_branch is None:
1185.54.16 by Aaron Bentley
fixed location handling to match old missing
2171
            other_branch = parent
2172
            if other_branch is None:
2173
                raise BzrCommandError("No missing location known or specified.")
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2174
            print "Using last location: " + local_branch.get_parent()
2175
        remote_branch = bzrlib.branch.Branch.open(other_branch)
1551.2.46 by abentley
Made bzr missing . work on win32
2176
        if remote_branch.base == local_branch.base:
2177
            remote_branch = local_branch
1666.1.5 by Robert Collins
Merge bound branch test performance improvements.
2178
        local_branch.lock_read()
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
2179
        try:
1551.2.46 by abentley
Made bzr missing . work on win32
2180
            remote_branch.lock_read()
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
2181
            try:
2182
                local_extra, remote_extra = find_unmerged(local_branch, remote_branch)
2183
                if (log_format == None):
2184
                    default = bzrlib.config.BranchConfig(local_branch).log_format()
2185
                    log_format = get_log_format(long=long, short=short, line=line, default=default)
2186
                lf = log_formatter(log_format, sys.stdout,
2187
                                   show_ids=show_ids,
2188
                                   show_timezone='original')
2189
                if reverse is False:
2190
                    local_extra.reverse()
2191
                    remote_extra.reverse()
2192
                if local_extra and not theirs_only:
2193
                    print "You have %d extra revision(s):" % len(local_extra)
2194
                    for data in iter_log_data(local_extra, local_branch.repository,
2195
                                              verbose):
2196
                        lf.show(*data)
2197
                    printed_local = True
2198
                else:
2199
                    printed_local = False
2200
                if remote_extra and not mine_only:
2201
                    if printed_local is True:
2202
                        print "\n\n"
2203
                    print "You are missing %d revision(s):" % len(remote_extra)
2204
                    for data in iter_log_data(remote_extra, remote_branch.repository, 
2205
                                              verbose):
2206
                        lf.show(*data)
2207
                if not remote_extra and not local_extra:
2208
                    status_code = 0
2209
                    print "Branches are up to date."
2210
                else:
2211
                    status_code = 1
2212
            finally:
1666.1.5 by Robert Collins
Merge bound branch test performance improvements.
2213
                remote_branch.unlock()
2214
        finally:
2215
            local_branch.unlock()
2216
        if not status_code and parent is None and other_branch is not None:
2217
            local_branch.lock_write()
2218
            try:
2219
                # handle race conditions - a parent might be set while we run.
2220
                if local_branch.get_parent() is None:
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
2221
                    local_branch.set_parent(other_branch)
2222
            finally:
2223
                local_branch.unlock()
1666.1.5 by Robert Collins
Merge bound branch test performance improvements.
2224
        return status_code
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2225
2226
2227
class cmd_plugins(Command):
2228
    """List plugins"""
2229
    hidden = True
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2230
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2231
    def run(self):
2232
        import bzrlib.plugin
2233
        from inspect import getdoc
1516 by Robert Collins
* bzrlib.plugin.all_plugins has been changed from an attribute to a
2234
        for name, plugin in bzrlib.plugin.all_plugins().items():
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2235
            if hasattr(plugin, '__path__'):
2236
                print plugin.__path__[0]
2237
            elif hasattr(plugin, '__file__'):
2238
                print plugin.__file__
2239
            else:
2240
                print `plugin`
2241
                
2242
            d = getdoc(plugin)
2243
            if d:
2244
                print '\t', d.split('\n')[0]
2245
2246
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
2247
class cmd_testament(Command):
2248
    """Show testament (signing-form) of a revision."""
2249
    takes_options = ['revision', 'long']
2250
    takes_args = ['branch?']
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2251
    @display_command
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
2252
    def run(self, branch=u'.', revision=None, long=False):
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
2253
        from bzrlib.testament import Testament
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2254
        b = WorkingTree.open_containing(branch)[0].branch
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
2255
        b.lock_read()
2256
        try:
2257
            if revision is None:
2258
                rev_id = b.last_revision()
2259
            else:
2260
                rev_id = revision[0].in_history(b).rev_id
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2261
            t = Testament.from_revision(b.repository, rev_id)
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
2262
            if long:
2263
                sys.stdout.writelines(t.as_text_lines())
2264
            else:
2265
                sys.stdout.write(t.as_short_text())
2266
        finally:
2267
            b.unlock()
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2268
2269
2270
class cmd_annotate(Command):
2271
    """Show the origin of each line in a file.
2272
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
2273
    This prints out the given file with an annotation on the left side
2274
    indicating which revision, author and date introduced the change.
2275
2276
    If the origin is the same for a run of consecutive lines, it is 
2277
    shown only at the top, unless the --all option is given.
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2278
    """
2279
    # TODO: annotate directories; showing when each file was last changed
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
2280
    # TODO: if the working copy is modified, show annotations on that 
2281
    #       with new uncommitted lines marked
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2282
    aliases = ['blame', 'praise']
2283
    takes_args = ['filename']
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
2284
    takes_options = [Option('all', help='show annotations on all lines'),
2285
                     Option('long', help='show date in annotations'),
1692.5.1 by Olaf Conradi
Add --revision option to bzr annotate command.
2286
                     'revision'
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
2287
                     ]
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2288
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2289
    @display_command
1692.5.1 by Olaf Conradi
Add --revision option to bzr annotate command.
2290
    def run(self, filename, all=False, long=False, revision=None):
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2291
        from bzrlib.annotate import annotate_file
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2292
        tree, relpath = WorkingTree.open_containing(filename)
2293
        branch = tree.branch
2294
        branch.lock_read()
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2295
        try:
1692.5.1 by Olaf Conradi
Add --revision option to bzr annotate command.
2296
            if revision is None:
1558.14.5 by Aaron Bentley
Changed rev_id to revision_id in cmd_annotate
2297
                revision_id = branch.last_revision()
1692.5.1 by Olaf Conradi
Add --revision option to bzr annotate command.
2298
            elif len(revision) != 1:
2299
                raise BzrCommandError('bzr annotate --revision takes exactly 1 argument')
2300
            else:
1558.14.5 by Aaron Bentley
Changed rev_id to revision_id in cmd_annotate
2301
                revision_id = revision[0].in_history(branch).rev_id
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
2302
            file_id = tree.inventory.path2id(relpath)
1558.14.5 by Aaron Bentley
Changed rev_id to revision_id in cmd_annotate
2303
            tree = branch.repository.revision_tree(revision_id)
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2304
            file_version = tree.inventory[file_id].revision
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2305
            annotate_file(branch, file_version, file_id, long, all, sys.stdout)
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2306
        finally:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2307
            branch.unlock()
1185.16.33 by Martin Pool
- move 'conflict' and 'resolved' from shipped plugin to regular builtins
2308
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
2309
2310
class cmd_re_sign(Command):
2311
    """Create a digital signature for an existing revision."""
2312
    # TODO be able to replace existing ones.
2313
2314
    hidden = True # is this right ?
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
2315
    takes_args = ['revision_id*']
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
2316
    takes_options = ['revision']
2317
    
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
2318
    def run(self, revision_id_list=None, revision=None):
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
2319
        import bzrlib.config as config
2320
        import bzrlib.gpg as gpg
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
2321
        if revision_id_list is not None and revision is not None:
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
2322
            raise BzrCommandError('You can only supply one of revision_id or --revision')
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
2323
        if revision_id_list is None and revision is None:
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
2324
            raise BzrCommandError('You must supply either --revision or a revision_id')
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
2325
        b = WorkingTree.open_containing(u'.')[0].branch
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
2326
        gpg_strategy = gpg.GPGStrategy(config.BranchConfig(b))
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
2327
        if revision_id_list is not None:
2328
            for revision_id in revision_id_list:
2329
                b.repository.sign_revision(revision_id, gpg_strategy)
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
2330
        elif revision is not None:
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
2331
            if len(revision) == 1:
2332
                revno, rev_id = revision[0].in_history(b)
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2333
                b.repository.sign_revision(rev_id, gpg_strategy)
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
2334
            elif len(revision) == 2:
2335
                # are they both on rh- if so we can walk between them
2336
                # might be nice to have a range helper for arbitrary
2337
                # revision paths. hmm.
2338
                from_revno, from_revid = revision[0].in_history(b)
2339
                to_revno, to_revid = revision[1].in_history(b)
2340
                if to_revid is None:
2341
                    to_revno = b.revno()
2342
                if from_revno is None or to_revno is None:
2343
                    raise BzrCommandError('Cannot sign a range of non-revision-history revisions')
2344
                for revno in range(from_revno, to_revno + 1):
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2345
                    b.repository.sign_revision(b.get_rev_id(revno), 
2346
                                               gpg_strategy)
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
2347
            else:
2348
                raise BzrCommandError('Please supply either one revision, or a range.')
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
2349
1505.1.22 by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
2350
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2351
class cmd_bind(Command):
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
2352
    """Bind the current branch to a master branch.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2353
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
2354
    After binding, commits must succeed on the master branch
2355
    before they are executed on the local one.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2356
    """
2357
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
2358
    takes_args = ['location']
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2359
    takes_options = []
2360
2361
    def run(self, location=None):
1505.1.22 by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
2362
        b, relpath = Branch.open_containing(u'.')
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2363
        b_other = Branch.open(location)
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
2364
        try:
2365
            b.bind(b_other)
2366
        except DivergedBranches:
2367
            raise BzrCommandError('These branches have diverged.'
1505.1.12 by John Arbash Meinel
Fixing up the error message for a failed bind.
2368
                                  ' Try merging, and then bind again.')
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2369
1505.1.22 by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
2370
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2371
class cmd_unbind(Command):
2372
    """Bind the current branch to its parent.
2373
2374
    After unbinding, the local branch is considered independent.
2375
    """
2376
2377
    takes_args = []
2378
    takes_options = []
2379
2380
    def run(self):
1505.1.22 by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
2381
        b, relpath = Branch.open_containing(u'.')
2382
        if not b.unbind():
2383
            raise BzrCommandError('Local branch is not bound')
2384
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
2385
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2386
class cmd_uncommit(bzrlib.commands.Command):
2387
    """Remove the last committed revision.
2388
2389
    By supplying the --all flag, it will not only remove the entry 
2390
    from revision_history, but also remove all of the entries in the
2391
    stores.
2392
2393
    --verbose will print out what is being removed.
2394
    --dry-run will go through all the motions, but not actually
2395
    remove anything.
2396
    
2397
    In the future, uncommit will create a changeset, which can then
2398
    be re-applied.
1553.5.34 by Martin Pool
Stub lock-breaking command
2399
    """
1185.62.11 by John Arbash Meinel
Added TODO for bzr uncommit to remove unreferenced information.
2400
1553.5.34 by Martin Pool
Stub lock-breaking command
2401
    # TODO: jam 20060108 Add an option to allow uncommit to remove
2402
    # unreferenced information in 'branch-as-repostory' branches.
2403
    # TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
2404
    # information in shared branches as well.
1185.62.10 by John Arbash Meinel
Removed --all from bzr uncommit, it was broken anyway.
2405
    takes_options = ['verbose', 'revision',
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2406
                    Option('dry-run', help='Don\'t actually make changes'),
2407
                    Option('force', help='Say yes to all questions.')]
2408
    takes_args = ['location?']
2409
    aliases = []
2410
1185.62.10 by John Arbash Meinel
Removed --all from bzr uncommit, it was broken anyway.
2411
    def run(self, location=None, 
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2412
            dry_run=False, verbose=False,
2413
            revision=None, force=False):
2414
        from bzrlib.branch import Branch
2415
        from bzrlib.log import log_formatter
2416
        import sys
2417
        from bzrlib.uncommit import uncommit
2418
2419
        if location is None:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
2420
            location = u'.'
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
2421
        control, relpath = bzrdir.BzrDir.open_containing(location)
2422
        try:
2423
            tree = control.open_workingtree()
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
2424
            b = tree.branch
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
2425
        except (errors.NoWorkingTree, errors.NotLocalUrl):
2426
            tree = None
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
2427
            b = control.open_branch()
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2428
2429
        if revision is None:
2430
            revno = b.revno()
2431
            rev_id = b.last_revision()
2432
        else:
2433
            revno, rev_id = revision[0].in_history(b)
2434
        if rev_id is None:
2435
            print 'No revisions to uncommit.'
2436
2437
        for r in range(revno, b.revno()+1):
2438
            rev_id = b.get_rev_id(r)
2439
            lf = log_formatter('short', to_file=sys.stdout,show_timezone='original')
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2440
            lf.show(r, b.repository.get_revision(rev_id), None)
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2441
2442
        if dry_run:
2443
            print 'Dry-run, pretending to remove the above revisions.'
2444
            if not force:
2445
                val = raw_input('Press <enter> to continue')
2446
        else:
2447
            print 'The above revision(s) will be removed.'
2448
            if not force:
2449
                val = raw_input('Are you sure [y/N]? ')
2450
                if val.lower() not in ('y', 'yes'):
2451
                    print 'Canceled'
2452
                    return 0
2453
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
2454
        uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2455
                revno=revno)
2456
2457
1553.5.34 by Martin Pool
Stub lock-breaking command
2458
class cmd_break_lock(Command):
2459
    """Break a dead lock on a repository, branch or working directory.
2460
1553.5.35 by Martin Pool
Start break-lock --show
2461
    CAUTION: Locks should only be broken when you are sure that the process
1553.5.34 by Martin Pool
Stub lock-breaking command
2462
    holding the lock has been stopped.
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
2463
2464
    You can get information on what locks are open via the 'bzr info' command.
1553.5.35 by Martin Pool
Start break-lock --show
2465
    
2466
    example:
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
2467
        bzr break-lock
1553.5.34 by Martin Pool
Stub lock-breaking command
2468
    """
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
2469
    takes_args = ['location?']
2470
2471
    def run(self, location=None, show=False):
2472
        if location is None:
2473
            location = u'.'
2474
        control, relpath = bzrdir.BzrDir.open_containing(location)
2475
        control.break_lock()
2476
        
1553.5.35 by Martin Pool
Start break-lock --show
2477
2478
2479
# command-line interpretation helper for merge-related commands
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
2480
def merge(other_revision, base_revision,
2481
          check_clean=True, ignore_zero=False,
1534.7.118 by Aaron Bentley
Dirty merge of the mainline
2482
          this_dir=None, backup_files=False, merge_type=Merge3Merger,
1553.5.35 by Martin Pool
Start break-lock --show
2483
          file_list=None, show_base=False, reprocess=False,
1534.9.6 by Aaron Bentley
Disable merge progress bars, except from the merge command
2484
          pb=DummyProgress()):
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
2485
    """Merge changes into a tree.
2486
2487
    base_revision
2488
        list(path, revno) Base for three-way merge.  
2489
        If [None, None] then a base will be automatically determined.
2490
    other_revision
2491
        list(path, revno) Other revision for three-way merge.
2492
    this_dir
2493
        Directory to merge changes into; '.' by default.
2494
    check_clean
2495
        If true, this_dir must have no uncommitted changes before the
2496
        merge begins.
2497
    ignore_zero - If true, suppress the "zero conflicts" message when 
2498
        there are no conflicts; should be set when doing something we expect
2499
        to complete perfectly.
2500
    file_list - If supplied, merge only changes to selected files.
2501
2502
    All available ancestors of other_revision and base_revision are
2503
    automatically pulled into the branch.
2504
2505
    The revno may be -1 to indicate the last revision on the branch, which is
2506
    the typical case.
2507
2508
    This function is intended for use from the command line; programmatic
2509
    clients might prefer to call merge.merge_inner(), which has less magic 
2510
    behavior.
2511
    """
1534.7.129 by Aaron Bentley
Converted test cases to Tree Transform
2512
    from bzrlib.merge import Merger
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
2513
    if this_dir is None:
2514
        this_dir = u'.'
1534.4.28 by Robert Collins
first cut at merge from integration.
2515
    this_tree = WorkingTree.open_containing(this_dir)[0]
1534.7.118 by Aaron Bentley
Dirty merge of the mainline
2516
    if show_base and not merge_type is Merge3Merger:
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
2517
        raise BzrCommandError("Show-base is not supported for this merge"
2518
                              " type. %s" % merge_type)
1551.6.8 by Aaron Bentley
Implemented reprocess for weave
2519
    if reprocess and not merge_type.supports_reprocess:
1551.6.14 by Aaron Bentley
Tweaks from merge review
2520
        raise BzrCommandError("Conflict reduction is not supported for merge"
2521
                              " type %s." % merge_type)
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
2522
    if reprocess and show_base:
1551.6.14 by Aaron Bentley
Tweaks from merge review
2523
        raise BzrCommandError("Cannot do conflict reduction and show base.")
1551.2.32 by Aaron Bentley
Handle progress phases more nicely in merge
2524
    try:
2525
        merger = Merger(this_tree.branch, this_tree=this_tree, pb=pb)
2526
        merger.pp = ProgressPhase("Merge phase", 5, pb)
2527
        merger.pp.next_phase()
2528
        merger.check_basis(check_clean)
2529
        merger.set_other(other_revision)
2530
        merger.pp.next_phase()
2531
        merger.set_base(base_revision)
2532
        if merger.base_rev_id == merger.other_rev_id:
2533
            note('Nothing to do.')
2534
            return 0
2535
        merger.backup_files = backup_files
2536
        merger.merge_type = merge_type 
2537
        merger.set_interesting_files(file_list)
2538
        merger.show_base = show_base 
2539
        merger.reprocess = reprocess
2540
        conflicts = merger.do_merge()
1645.1.1 by Aaron Bentley
Implement single-file merge
2541
        if file_list is None:
2542
            merger.set_pending()
1551.2.32 by Aaron Bentley
Handle progress phases more nicely in merge
2543
    finally:
2544
        pb.clear()
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
2545
    return conflicts
2546
2547
1185.16.33 by Martin Pool
- move 'conflict' and 'resolved' from shipped plugin to regular builtins
2548
# these get imported and then picked up by the scan for cmd_*
2549
# TODO: Some more consistent way to split command definitions across files;
2550
# we do need to load at least some information about them to know of 
1616.1.7 by Martin Pool
New developer commands 'weave-list' and 'weave-join'.
2551
# aliases.  ideally we would avoid loading the implementation until the
2552
# details were needed.
1185.35.4 by Aaron Bentley
Implemented remerge
2553
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
1185.78.6 by John Arbash Meinel
Adding sign-my-commits as a builtin, along with some simple tests.
2554
from bzrlib.sign_my_commits import cmd_sign_my_commits
1616.1.17 by Martin Pool
New 'weave-plan-merge' and 'weave-merge-text' commands lifted from weave.py
2555
from bzrlib.weave_commands import cmd_weave_list, cmd_weave_join, \
2556
        cmd_weave_plan_merge, cmd_weave_merge_text