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