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