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