/brz/remove-bazaar

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