/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1
# Copyright (C) 2004, 2005 by Canonical Ltd
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
1442.1.71 by Robert Collins
'bzr branch' sets the branch-name,
17
# DO NOT change this to cStringIO - it results in control files 
18
# written as UCS4
19
# FIXIT! (Only deal with byte streams OR unicode at any one layer.)
20
# RBC 20051018
21
from StringIO import StringIO
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
22
import sys
23
import os
24
25
import bzrlib
1460 by Robert Collins
merge from martin.
26
from bzrlib import BZRDIR
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
27
from bzrlib.commands import Command, display_command
1460 by Robert Collins
merge from martin.
28
from bzrlib.branch import Branch
1185.35.4 by Aaron Bentley
Implemented remerge
29
from bzrlib.revision import common_ancestor
1185.31.12 by John Arbash Meinel
Refactored the export code to make it easier to add new export formats.
30
import bzrlib.errors as errors
1185.35.4 by Aaron Bentley
Implemented remerge
31
from bzrlib.errors import (BzrError, BzrCheckError, BzrCommandError, 
1185.35.13 by Aaron Bentley
Merged Martin
32
                           NotBranchError, DivergedBranches, NotConflicted,
1508.1.15 by Robert Collins
Merge from mpool.
33
                           NoSuchFile, NoWorkingTree, FileInWrongBranch)
1185.16.43 by Martin Pool
- clean up handling of option objects
34
from bzrlib.option import Option
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
35
from bzrlib.revisionspec import RevisionSpec
1460 by Robert Collins
merge from martin.
36
import bzrlib.trace
1185.33.42 by Martin Pool
[patch] make --quiet a global option (robey)
37
from bzrlib.trace import mutter, note, log_error, warning, is_quiet
1457.1.4 by Robert Collins
Branch.relpath has been moved to WorkingTree.relpath.
38
from bzrlib.workingtree import WorkingTree
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
39
40
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
41
def tree_files(file_list, default_branch=u'.'):
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
42
    try:
1508.1.15 by Robert Collins
Merge from mpool.
43
        return internal_tree_files(file_list, default_branch)
1185.35.32 by Aaron Bentley
Fixed handling of files in mixed branches
44
    except FileInWrongBranch, e:
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
45
        raise BzrCommandError("%s is not in the same branch as %s" %
1185.35.32 by Aaron Bentley
Fixed handling of files in mixed branches
46
                             (e.path, file_list[0]))
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
47
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
48
def internal_tree_files(file_list, default_branch=u'.'):
1185.12.101 by Aaron Bentley
Made commit take branch from first argument, if supplied.
49
    """\
50
    Return a branch and list of branch-relative paths.
51
    If supplied file_list is empty or None, the branch default will be used,
52
    and returned file_list will match the original.
53
    """
54
    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
55
        return WorkingTree.open_containing(default_branch)[0], file_list
56
    tree = WorkingTree.open_containing(file_list[0])[0]
1185.12.101 by Aaron Bentley
Made commit take branch from first argument, if supplied.
57
    new_list = []
58
    for filename in file_list:
1185.35.32 by Aaron Bentley
Fixed handling of files in mixed branches
59
        try:
60
            new_list.append(tree.relpath(filename))
61
        except NotBranchError:
1508.1.15 by Robert Collins
Merge from mpool.
62
            raise FileInWrongBranch(tree.branch, filename)
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
63
    return tree, new_list
1185.12.101 by Aaron Bentley
Made commit take branch from first argument, if supplied.
64
65
1185.16.112 by mbp at sourcefrog
todo
66
# TODO: Make sure no commands unconditionally use the working directory as a
67
# branch.  If a filename argument is used, the first of them should be used to
68
# specify the branch.  (Perhaps this can be factored out into some kind of
69
# Argument class, representing a file in a branch, where the first occurrence
70
# opens the branch?)
71
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
72
class cmd_status(Command):
73
    """Display status summary.
74
75
    This reports on versioned and unknown files, reporting them
76
    grouped by state.  Possible states are:
77
78
    added
79
        Versioned in the working copy but not in the previous revision.
80
81
    removed
82
        Versioned in the previous revision but removed or deleted
83
        in the working copy.
84
85
    renamed
86
        Path of this file changed from the previous revision;
87
        the text may also have changed.  This includes files whose
88
        parent directory was renamed.
89
90
    modified
91
        Text has changed since the previous revision.
92
93
    unchanged
94
        Nothing about this file has changed since the previous revision.
95
        Only shown with --all.
96
97
    unknown
98
        Not versioned and not matching an ignore pattern.
99
100
    To see ignored files use 'bzr ignored'.  For details in the
101
    changes to file texts, use 'bzr diff'.
102
103
    If no arguments are specified, the status of the entire working
104
    directory is shown.  Otherwise, only the status of the specified
105
    files or directories is reported.  If a directory is given, status
106
    is reported for everything inside that directory.
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
107
108
    If a revision argument is given, the status is calculated against
109
    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
110
    """
1185.16.76 by Martin Pool
doc
111
    
112
    # TODO: --no-recurse, --recurse options
113
    
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
114
    takes_args = ['file*']
1185.34.4 by Jelmer Vernooij
Support -r option to bzr status. The backend code already handled
115
    takes_options = ['all', 'show-ids', 'revision']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
116
    aliases = ['st', 'stat']
117
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
118
    @display_command
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
119
    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
120
        tree, file_list = tree_files(file_list)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
121
            
122
        from bzrlib.status import show_status
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
123
        show_status(tree.branch, show_unchanged=all, show_ids=show_ids,
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
124
                    specific_files=file_list, revision=revision)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
125
126
127
class cmd_cat_revision(Command):
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
128
    """Write out metadata for a revision.
129
    
130
    The revision to print can either be specified by a specific
131
    revision identifier, or you can use --revision.
132
    """
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
133
134
    hidden = True
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
135
    takes_args = ['revision_id?']
136
    takes_options = ['revision']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
137
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
138
    @display_command
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
139
    def run(self, revision_id=None, revision=None):
140
141
        if revision_id is not None and revision is not None:
142
            raise BzrCommandError('You can only supply one of revision_id or --revision')
143
        if revision_id is None and revision is None:
144
            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)
145
        b = WorkingTree.open_containing(u'.')[0].branch
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
146
        if revision_id is not None:
1185.42.5 by Jelmer Vernooij
Make get_revision_xml_file() private
147
            sys.stdout.write(b.get_revision_xml(revision_id))
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
148
        elif revision is not None:
149
            for rev in revision:
150
                if rev is None:
151
                    raise BzrCommandError('You cannot specify a NULL revision.')
152
                revno, rev_id = rev.in_history(b)
1185.42.5 by Jelmer Vernooij
Make get_revision_xml_file() private
153
                sys.stdout.write(b.get_revision_xml(rev_id))
1185.1.29 by Robert Collins
merge merge tweaks from aaron, which includes latest .dev
154
    
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
155
156
class cmd_revno(Command):
157
    """Show current revision number.
158
159
    This is equal to the number of revisions on this branch."""
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
160
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
161
    def run(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
162
        print Branch.open_containing(u'.')[0].revno()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
163
1182 by Martin Pool
- more disentangling of xml storage format from objects
164
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
165
class cmd_revision_info(Command):
166
    """Show revision number and revision id for a given revision identifier.
167
    """
168
    hidden = True
169
    takes_args = ['revision_info*']
170
    takes_options = ['revision']
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
171
    @display_command
1185.5.4 by John Arbash Meinel
Updated bzr revision-info, created tests.
172
    def run(self, revision=None, revision_info_list=[]):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
173
174
        revs = []
175
        if revision is not None:
176
            revs.extend(revision)
1185.5.4 by John Arbash Meinel
Updated bzr revision-info, created tests.
177
        if revision_info_list is not None:
178
            for rev in revision_info_list:
179
                revs.append(RevisionSpec(rev))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
180
        if len(revs) == 0:
181
            raise BzrCommandError('You must supply a revision identifier')
182
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
183
        b = WorkingTree.open_containing(u'.')[0].branch
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
184
185
        for rev in revs:
1185.5.4 by John Arbash Meinel
Updated bzr revision-info, created tests.
186
            revinfo = rev.in_history(b)
187
            if revinfo.revno is None:
188
                print '     %s' % revinfo.rev_id
189
            else:
190
                print '%4d %s' % (revinfo.revno, revinfo.rev_id)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
191
192
    
193
class cmd_add(Command):
194
    """Add specified files or directories.
195
196
    In non-recursive mode, all the named items are added, regardless
197
    of whether they were previously ignored.  A warning is given if
198
    any of the named files are already versioned.
199
200
    In recursive mode (the default), files are treated the same way
201
    but the behaviour for directories is different.  Directories that
202
    are already versioned do not give a warning.  All directories,
203
    whether already versioned or not, are searched for files or
204
    subdirectories that are neither versioned or ignored, and these
205
    are added.  This search proceeds recursively into versioned
206
    directories.  If no names are given '.' is assumed.
207
208
    Therefore simply saying 'bzr add' will version all files that
209
    are currently unknown.
210
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
211
    Adding a file whose parent directory is not versioned will
212
    implicitly add the parent, and so on up to the root. This means
213
    you should never need to explictly add a directory, they'll just
214
    get added when you add a file in the directory.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
215
    """
216
    takes_args = ['file*']
1185.33.42 by Martin Pool
[patch] make --quiet a global option (robey)
217
    takes_options = ['no-recurse']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
218
    
1185.33.42 by Martin Pool
[patch] make --quiet a global option (robey)
219
    def run(self, file_list, no_recurse=False):
1446 by Robert Collins
fixup the verbose-does-nothing for add - add a --quiet instead
220
        from bzrlib.add import smart_add, add_reporter_print, add_reporter_null
1185.33.42 by Martin Pool
[patch] make --quiet a global option (robey)
221
        if is_quiet():
1446 by Robert Collins
fixup the verbose-does-nothing for add - add a --quiet instead
222
            reporter = add_reporter_null
223
        else:
224
            reporter = add_reporter_print
225
        smart_add(file_list, not no_recurse, reporter)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
226
227
228
class cmd_mkdir(Command):
229
    """Create a new versioned directory.
230
231
    This is equivalent to creating the directory and then adding it.
232
    """
233
    takes_args = ['dir+']
234
235
    def run(self, dir_list):
236
        for d in dir_list:
237
            os.mkdir(d)
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
238
            wt, dd = WorkingTree.open_containing(d)
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
239
            wt.add([dd])
1185.31.9 by John Arbash Meinel
Changed to printing the full path, rather than just the relative portion.
240
            print 'added', d
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
241
242
243
class cmd_relpath(Command):
244
    """Show path of a file relative to root"""
245
    takes_args = ['filename']
246
    hidden = True
247
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
248
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
249
    def run(self, filename):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
250
        tree, relpath = WorkingTree.open_containing(filename)
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
251
        print relpath
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
252
253
254
class cmd_inventory(Command):
1185.33.33 by Martin Pool
[patch] add 'bzr inventory --kind directory'; remove 'bzr directories'
255
    """Show inventory of the current working copy or a revision.
256
257
    It is possible to limit the output to a particular entry
258
    type using the --kind option.  For example; --kind file.
259
    """
260
    takes_options = ['revision', 'show-ids', 'kind']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
261
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
262
    @display_command
1185.33.33 by Martin Pool
[patch] add 'bzr inventory --kind directory'; remove 'bzr directories'
263
    def run(self, revision=None, show_ids=False, kind=None):
264
        if kind and kind not in ['file', 'directory', 'symlink']:
265
            raise BzrCommandError('invalid kind specified')
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
266
        tree = WorkingTree.open_containing(u'.')[0]
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
267
        if revision is None:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
268
            inv = tree.read_working_inventory()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
269
        else:
270
            if len(revision) > 1:
271
                raise BzrCommandError('bzr inventory --revision takes'
272
                    ' exactly one revision identifier')
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
273
            inv = tree.branch.get_revision_inventory(
274
                revision[0].in_history(tree.branch).rev_id)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
275
276
        for path, entry in inv.entries():
1185.33.33 by Martin Pool
[patch] add 'bzr inventory --kind directory'; remove 'bzr directories'
277
            if kind and kind != entry.kind:
278
                continue
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
279
            if show_ids:
280
                print '%-50s %s' % (path, entry.file_id)
281
            else:
282
                print path
283
284
285
class cmd_move(Command):
286
    """Move files to a different directory.
287
288
    examples:
289
        bzr move *.txt doc
290
291
    The destination must be a versioned directory in the same branch.
292
    """
293
    takes_args = ['source$', 'dest']
294
    def run(self, source_list, dest):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
295
        tree, source_list = tree_files(source_list)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
296
        # TODO: glob expansion on windows?
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
297
        tree.move(source_list, tree.relpath(dest))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
298
299
300
class cmd_rename(Command):
301
    """Change the name of an entry.
302
303
    examples:
304
      bzr rename frob.c frobber.c
305
      bzr rename src/frob.c lib/frob.c
306
307
    It is an error if the destination name exists.
308
309
    See also the 'move' command, which moves files into a different
310
    directory without changing their name.
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
311
    """
312
    # TODO: Some way to rename multiple files without invoking 
313
    # bzr for each one?"""
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
314
    takes_args = ['from_name', 'to_name']
315
    
316
    def run(self, from_name, to_name):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
317
        tree, (from_name, to_name) = tree_files((from_name, to_name))
1508.1.7 by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins).
318
        tree.rename_one(from_name, to_name)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
319
320
321
class cmd_mv(Command):
322
    """Move or rename a file.
323
324
    usage:
325
        bzr mv OLDNAME NEWNAME
326
        bzr mv SOURCE... DESTINATION
327
328
    If the last argument is a versioned directory, all the other names
329
    are moved into it.  Otherwise, there must be exactly two arguments
330
    and the file is changed to a new name, which must not already exist.
331
332
    Files cannot be moved between branches.
333
    """
334
    takes_args = ['names*']
335
    def run(self, names_list):
336
        if len(names_list) < 2:
337
            raise BzrCommandError("missing file argument")
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
338
        tree, rel_names = tree_files(names_list)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
339
        
340
        if os.path.isdir(names_list[-1]):
341
            # move into existing directory
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
342
            for pair in tree.move(rel_names[:-1], rel_names[-1]):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
343
                print "%s => %s" % pair
344
        else:
345
            if len(names_list) != 2:
346
                raise BzrCommandError('to mv multiple files the destination '
347
                                      'must be a versioned directory')
1508.1.7 by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins).
348
            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.
349
            print "%s => %s" % (rel_names[0], rel_names[1])
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
350
            
351
    
352
class cmd_pull(Command):
353
    """Pull any changes from another branch into the current one.
354
1185.12.92 by Aaron Bentley
Fixed pull help, renamed clobber to overwrite
355
    If there is no default location set, the first pull will set it.  After
356
    that, you can omit the location to use the default.  To change the
357
    default, use --remember.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
358
359
    This command only works on branches that have not diverged.  Branches are
360
    considered diverged if both branches have had commits without first
361
    pulling from the other.
362
363
    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
364
    from one into the other.  Once one branch has merged, the other should
365
    be able to pull it again.
366
367
    If you want to forget your local changes and just update your branch to
368
    match the remote one, use --overwrite.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
369
    """
1185.32.4 by John Arbash Meinel
[merge] up-to-date against bzr.dev
370
    takes_options = ['remember', 'overwrite', 'verbose']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
371
    takes_args = ['location?']
372
1185.32.4 by John Arbash Meinel
[merge] up-to-date against bzr.dev
373
    def run(self, location=None, remember=False, overwrite=False, verbose=False):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
374
        from bzrlib.merge import merge
375
        from shutil import rmtree
376
        import errno
1185.33.45 by Martin Pool
[merge] refactoring of branch vs working tree, etc (robertc)
377
        # FIXME: too much stuff is in the command class        
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
378
        tree_to = WorkingTree.open_containing(u'.')[0]
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
379
        stored_loc = tree_to.branch.get_parent()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
380
        if location is None:
381
            if stored_loc is None:
382
                raise BzrCommandError("No pull location known or specified.")
383
            else:
1185.12.12 by Aaron Bentley
Made merge use pull location or die if no branch specified.
384
                print "Using saved location: %s" % stored_loc
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
385
                location = stored_loc
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
386
        br_from = Branch.open(location)
1185.33.45 by Martin Pool
[merge] refactoring of branch vs working tree, etc (robertc)
387
        br_to = tree_to.branch
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
388
        try:
1185.32.1 by John Arbash Meinel
Updated bzr pull to support a --verbose flag, which prints out what changes.
389
            old_rh = br_to.revision_history()
1185.33.45 by Martin Pool
[merge] refactoring of branch vs working tree, etc (robertc)
390
            count = tree_to.pull(br_from, overwrite)
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
391
        except DivergedBranches:
1185.33.45 by Martin Pool
[merge] refactoring of branch vs working tree, etc (robertc)
392
            # FIXME: Just make DivergedBranches display the right message
393
            # itself.
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
394
            raise BzrCommandError("These branches have diverged."
395
                                  "  Try merge.")
1494 by Robert Collins
Set push and pull locations only upon success.
396
        if br_to.get_parent() is None or remember:
397
            br_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
398
        note('%d revision(s) pulled.' % (count,))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
399
1185.31.5 by John Arbash Meinel
Merged pull --verbose changes
400
        if verbose:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
401
            new_rh = tree_to.branch.revision_history()
1185.31.5 by John Arbash Meinel
Merged pull --verbose changes
402
            if old_rh != new_rh:
403
                # Something changed
404
                from bzrlib.log import show_changed_revisions
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
405
                show_changed_revisions(tree_to.branch, old_rh, new_rh)
1185.31.5 by John Arbash Meinel
Merged pull --verbose changes
406
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
407
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
408
class cmd_push(Command):
409
    """Push this branch into another branch.
410
    
411
    The remote branch will not have its working tree populated because this
412
    is both expensive, and may not be supported on the remote file system.
413
    
414
    Some smart servers or protocols *may* put the working tree in place.
415
416
    If there is no default push location set, the first push will set it.
417
    After that, you can omit the location to use the default.  To change the
418
    default, use --remember.
419
420
    This command only works on branches that have not diverged.  Branches are
421
    considered diverged if the branch being pushed to is not an older version
422
    of this branch.
423
424
    If branches have diverged, you can use 'bzr push --overwrite' to replace
425
    the other branch completely.
426
    
427
    If you want to ensure you have the different changes in the other branch,
428
    do a merge (see bzr help merge) from the other branch, and commit that
429
    before doing a 'push --overwrite'.
430
    """
1495 by Robert Collins
Add a --create-prefix to the new push command.
431
    takes_options = ['remember', 'overwrite', 
432
                     Option('create-prefix', 
433
                            help='Create the path leading up to the branch '
434
                                 'if it does not already exist')]
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
435
    takes_args = ['location?']
436
1495 by Robert Collins
Add a --create-prefix to the new push command.
437
    def run(self, location=None, remember=False, overwrite=False,
1185.31.5 by John Arbash Meinel
Merged pull --verbose changes
438
            create_prefix=False, verbose=False):
1185.33.45 by Martin Pool
[merge] refactoring of branch vs working tree, etc (robertc)
439
        # FIXME: Way too big!  Put this into a function called from the
440
        # command.
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
441
        import errno
442
        from shutil import rmtree
443
        from bzrlib.transport import get_transport
444
        
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
445
        tree_from = WorkingTree.open_containing(u'.')[0]
1185.33.45 by Martin Pool
[merge] refactoring of branch vs working tree, etc (robertc)
446
        br_from = tree_from.branch
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
447
        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.
448
        if location is None:
449
            if stored_loc is None:
450
                raise BzrCommandError("No push location known or specified.")
451
            else:
452
                print "Using saved location: %s" % stored_loc
453
                location = stored_loc
454
        try:
455
            br_to = Branch.open(location)
456
        except NotBranchError:
457
            # create a branch.
458
            transport = get_transport(location).clone('..')
1495 by Robert Collins
Add a --create-prefix to the new push command.
459
            if not create_prefix:
460
                try:
461
                    transport.mkdir(transport.relpath(location))
462
                except NoSuchFile:
463
                    raise BzrCommandError("Parent directory of %s "
464
                                          "does not exist." % location)
465
            else:
466
                current = transport.base
467
                needed = [(transport, transport.relpath(location))]
468
                while needed:
469
                    try:
470
                        transport, relpath = needed[-1]
471
                        transport.mkdir(relpath)
472
                        needed.pop()
473
                    except NoSuchFile:
474
                        new_transport = transport.clone('..')
475
                        needed.append((new_transport,
476
                                       new_transport.relpath(transport.base)))
477
                        if new_transport.base == transport.base:
478
                            raise BzrCommandError("Could not creeate "
479
                                                  "path prefix.")
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
480
            br_to = Branch.initialize(location)
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.
481
        old_rh = br_to.revision_history()
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
482
        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.
483
            try:
484
                tree_to = br_to.working_tree()
485
            except NoWorkingTree:
486
                # TODO: This should be updated for branches which don't have a
487
                # working tree, as opposed to ones where we just couldn't 
488
                # update the tree.
489
                warning('Unable to update the working tree of: %s' % (br_to.base,))
490
                count = br_to.pull(br_from, overwrite)
491
            else:
492
                count = tree_to.pull(br_from, overwrite)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
493
        except DivergedBranches:
494
            raise BzrCommandError("These branches have diverged."
495
                                  "  Try a merge then push with overwrite.")
1494 by Robert Collins
Set push and pull locations only upon success.
496
        if br_from.get_push_location() is None or remember:
497
            br_from.set_push_location(location)
1185.33.44 by Martin Pool
[patch] show number of revisions pushed/pulled/merged (Robey Pointer)
498
        note('%d revision(s) pushed.' % (count,))
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
499
1185.31.5 by John Arbash Meinel
Merged pull --verbose changes
500
        if verbose:
501
            new_rh = br_to.revision_history()
502
            if old_rh != new_rh:
503
                # Something changed
504
                from bzrlib.log import show_changed_revisions
505
                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.
506
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
507
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
508
class cmd_branch(Command):
509
    """Create a new copy of a branch.
510
511
    If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
512
    be used.  In other words, "branch ../foo/bar" will attempt to create ./bar.
513
514
    To retrieve the branch as of a particular revision, supply the --revision
515
    parameter, as in "branch foo/bar -r 5".
1185.10.2 by Aaron Bentley
Updated help message
516
517
    --basis is to speed up branching from remote branches.  When specified, it
518
    copies all the file-contents, inventory and revision data from the basis
519
    branch before copying anything from the remote branch.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
520
    """
521
    takes_args = ['from_location', 'to_location?']
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
522
    takes_options = ['revision', 'basis']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
523
    aliases = ['get', 'clone']
524
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
525
    def run(self, from_location, to_location=None, revision=None, basis=None):
1393.1.5 by Martin Pool
- move copy_branch into bzrlib.clone
526
        from bzrlib.clone import copy_branch
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
527
        import errno
528
        from shutil import rmtree
1185.17.3 by Martin Pool
[pick] larger read lock scope for branch command
529
        if revision is None:
530
            revision = [None]
531
        elif len(revision) > 1:
532
            raise BzrCommandError(
533
                'bzr branch --revision takes exactly 1 revision value')
534
        try:
535
            br_from = Branch.open(from_location)
536
        except OSError, e:
537
            if e.errno == errno.ENOENT:
538
                raise BzrCommandError('Source location "%s" does not'
539
                                      ' exist.' % to_location)
540
            else:
541
                raise
542
        br_from.lock_read()
543
        try:
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
544
            if basis is not None:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
545
                basis_branch = WorkingTree.open_containing(basis)[0].branch
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
546
            else:
547
                basis_branch = None
1185.8.4 by Aaron Bentley
Fixed branch -r
548
            if len(revision) == 1 and revision[0] is not None:
1390 by Robert Collins
pair programming worx... merge integration and weave
549
                revision_id = revision[0].in_history(br_from)[1]
1185.8.4 by Aaron Bentley
Fixed branch -r
550
            else:
1390 by Robert Collins
pair programming worx... merge integration and weave
551
                revision_id = None
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
552
            if to_location is None:
553
                to_location = os.path.basename(from_location.rstrip("/\\"))
1442.1.71 by Robert Collins
'bzr branch' sets the branch-name,
554
                name = None
555
            else:
556
                name = os.path.basename(to_location) + '\n'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
557
            try:
558
                os.mkdir(to_location)
559
            except OSError, e:
560
                if e.errno == errno.EEXIST:
561
                    raise BzrCommandError('Target directory "%s" already'
562
                                          ' exists.' % to_location)
563
                if e.errno == errno.ENOENT:
564
                    raise BzrCommandError('Parent of "%s" does not exist.' %
565
                                          to_location)
566
                else:
567
                    raise
568
            try:
1391 by Robert Collins
merge from integration
569
                copy_branch(br_from, to_location, revision_id, basis_branch)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
570
            except bzrlib.errors.NoSuchRevision:
571
                rmtree(to_location)
1466 by Robert Collins
revision may be None in cmd_branch, do not treat as an int.
572
                msg = "The branch %s has no revision %s." % (from_location, revision[0])
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
573
                raise BzrCommandError(msg)
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
574
            except bzrlib.errors.UnlistableBranch:
1442.1.71 by Robert Collins
'bzr branch' sets the branch-name,
575
                rmtree(to_location)
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
576
                msg = "The branch %s cannot be used as a --basis"
1442.1.71 by Robert Collins
'bzr branch' sets the branch-name,
577
                raise BzrCommandError(msg)
1185.33.44 by Martin Pool
[patch] show number of revisions pushed/pulled/merged (Robey Pointer)
578
            branch = Branch.open(to_location)
1442.1.71 by Robert Collins
'bzr branch' sets the branch-name,
579
            if name:
580
                name = StringIO(name)
581
                branch.put_controlfile('branch-name', name)
1185.33.44 by Martin Pool
[patch] show number of revisions pushed/pulled/merged (Robey Pointer)
582
            note('Branched %d revision(s).' % branch.revno())
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
583
        finally:
1185.17.3 by Martin Pool
[pick] larger read lock scope for branch command
584
            br_from.unlock()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
585
586
587
class cmd_renames(Command):
588
    """Show list of renamed files.
589
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
590
    # TODO: Option to show renames between two historical versions.
591
592
    # TODO: Only show renames under dir, rather than in the whole branch.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
593
    takes_args = ['dir?']
594
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
595
    @display_command
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
596
    def run(self, dir=u'.'):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
597
        tree = WorkingTree.open_containing(dir)[0]
598
        old_inv = tree.branch.basis_tree().inventory
599
        new_inv = tree.read_working_inventory()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
600
601
        renames = list(bzrlib.tree.find_renames(old_inv, new_inv))
602
        renames.sort()
603
        for old_name, new_name in renames:
604
            print "%s => %s" % (old_name, new_name)        
605
606
607
class cmd_info(Command):
608
    """Show statistical information about a branch."""
609
    takes_args = ['branch?']
610
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
611
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
612
    def run(self, branch=None):
613
        import info
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
614
        b = WorkingTree.open_containing(branch)[0].branch
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
615
        info.show_info(b)
616
617
618
class cmd_remove(Command):
619
    """Make a file unversioned.
620
621
    This makes bzr stop tracking changes to a versioned file.  It does
622
    not delete the working copy.
623
    """
624
    takes_args = ['file+']
625
    takes_options = ['verbose']
1424 by Robert Collins
add rm alias to remove
626
    aliases = ['rm']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
627
    
628
    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
629
        tree, file_list = tree_files(file_list)
1185.12.105 by Aaron Bentley
Substituted branch_files for equivalent code
630
        tree.remove(file_list, verbose=verbose)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
631
632
633
class cmd_file_id(Command):
634
    """Print file_id of a particular file or directory.
635
636
    The file_id is assigned when the file is first added and remains the
637
    same through all revisions where the file exists, even when it is
638
    moved or renamed.
639
    """
640
    hidden = True
641
    takes_args = ['filename']
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
642
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
643
    def run(self, filename):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
644
        tree, relpath = WorkingTree.open_containing(filename)
645
        i = tree.inventory.path2id(relpath)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
646
        if i == None:
647
            raise BzrError("%r is not a versioned file" % filename)
648
        else:
649
            print i
650
651
652
class cmd_file_path(Command):
653
    """Print path of file_ids to a file or directory.
654
655
    This prints one line for each directory down to the target,
656
    starting at the branch root."""
657
    hidden = True
658
    takes_args = ['filename']
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
659
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
660
    def run(self, filename):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
661
        tree, relpath = WorkingTree.open_containing(filename)
662
        inv = tree.inventory
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
663
        fid = inv.path2id(relpath)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
664
        if fid == None:
665
            raise BzrError("%r is not a versioned file" % filename)
666
        for fip in inv.get_idpath(fid):
667
            print fip
668
669
670
class cmd_revision_history(Command):
671
    """Display list of revision ids on this branch."""
672
    hidden = True
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
673
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
674
    def run(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
675
        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
676
        for patchid in branch.revision_history():
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
677
            print patchid
678
679
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
680
class cmd_ancestry(Command):
681
    """List all revisions merged into this branch."""
682
    hidden = True
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
683
    @display_command
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
684
    def run(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
685
        tree = WorkingTree.open_containing(u'.')[0]
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
686
        b = tree.branch
687
        # FIXME. should be tree.last_revision
1241 by Martin Pool
- rename last_patch to last_revision
688
        for revision_id in b.get_ancestry(b.last_revision()):
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
689
            print revision_id
690
691
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
692
class cmd_init(Command):
693
    """Make a directory into a versioned branch.
694
695
    Use this to create an empty branch, or before importing an
696
    existing project.
697
698
    Recipe for importing a tree of files:
699
        cd ~/project
700
        bzr init
1185.12.93 by Aaron Bentley
Fixed obsolete help
701
        bzr add .
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
702
        bzr status
703
        bzr commit -m 'imported project'
704
    """
1185.16.138 by Martin Pool
[patch] 'bzr init DIR' (John)
705
    takes_args = ['location?']
706
    def run(self, location=None):
707
        from bzrlib.branch import Branch
708
        if location is None:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
709
            location = u'.'
1185.16.138 by Martin Pool
[patch] 'bzr init DIR' (John)
710
        else:
711
            # The path has to exist to initialize a
712
            # branch inside of it.
713
            # Just using os.mkdir, since I don't
714
            # believe that we want to create a bunch of
715
            # locations if the user supplies an extended path
716
            if not os.path.exists(location):
717
                os.mkdir(location)
718
        Branch.initialize(location)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
719
720
721
class cmd_diff(Command):
722
    """Show differences in working tree.
723
    
724
    If files are listed, only the changes in those files are listed.
725
    Otherwise, all changes for the tree are listed.
726
727
    examples:
728
        bzr diff
729
        bzr diff -r1
1185.1.2 by Martin Pool
- merge various windows and other fixes from Ollie Rutherfurd
730
        bzr diff -r1..2
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
731
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
732
    # TODO: Allow diff across branches.
733
    # TODO: Option to use external diff command; could be GNU diff, wdiff,
734
    #       or a graphical diff.
735
736
    # TODO: Python difflib is not exactly the same as unidiff; should
737
    #       either fix it up or prefer to use an external diff.
738
739
    # TODO: If a directory is given, diff everything under that.
740
741
    # TODO: Selected-file diff is inefficient and doesn't show you
742
    #       deleted files.
743
744
    # TODO: This probably handles non-Unix newlines poorly.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
745
    
746
    takes_args = ['file*']
747
    takes_options = ['revision', 'diff-options']
748
    aliases = ['di', 'dif']
749
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
750
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
751
    def run(self, revision=None, file_list=None, diff_options=None):
752
        from bzrlib.diff import show_diff
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
753
        try:
1508.1.15 by Robert Collins
Merge from mpool.
754
            tree, file_list = internal_tree_files(file_list)
755
            b = None
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
756
            b2 = None
1185.35.32 by Aaron Bentley
Fixed handling of files in mixed branches
757
        except FileInWrongBranch:
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
758
            if len(file_list) != 2:
759
                raise BzrCommandError("Files are in different branches")
760
761
            b, file1 = Branch.open_containing(file_list[0])
762
            b2, file2 = Branch.open_containing(file_list[1])
763
            if file1 != "" or file2 != "":
1508.1.15 by Robert Collins
Merge from mpool.
764
                # FIXME diff those two files. rbc 20051123
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
765
                raise BzrCommandError("Files are in different branches")
766
            file_list = None
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
767
        if revision is not None:
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
768
            if b2 is not None:
769
                raise BzrCommandError("Can't specify -r with two branches")
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
770
            if len(revision) == 1:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
771
                return show_diff(tree.branch, revision[0], specific_files=file_list,
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
772
                                 external_diff_options=diff_options)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
773
            elif len(revision) == 2:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
774
                return show_diff(tree.branch, revision[0], specific_files=file_list,
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
775
                                 external_diff_options=diff_options,
776
                                 revision2=revision[1])
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
777
            else:
778
                raise BzrCommandError('bzr diff --revision takes exactly one or two revision identifiers')
779
        else:
1508.1.15 by Robert Collins
Merge from mpool.
780
            if b is not None:
781
                return show_diff(b, None, specific_files=file_list,
782
                                 external_diff_options=diff_options, b2=b2)
783
            else:
784
                return show_diff(tree.branch, None, specific_files=file_list,
785
                                 external_diff_options=diff_options)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
786
787
788
class cmd_deleted(Command):
789
    """List files deleted in the working tree.
790
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
791
    # TODO: Show files deleted since a previous revision, or
792
    # between two revisions.
793
    # TODO: Much more efficient way to do this: read in new
794
    # directories with readdir, rather than stating each one.  Same
795
    # level of effort but possibly much less IO.  (Or possibly not,
796
    # if the directories are very large...)
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
797
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
798
    def run(self, show_ids=False):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
799
        tree = WorkingTree.open_containing(u'.')[0]
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
800
        old = tree.branch.basis_tree()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
801
        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
802
            if not tree.has_id(ie.file_id):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
803
                if show_ids:
804
                    print '%-50s %s' % (path, ie.file_id)
805
                else:
806
                    print path
807
808
809
class cmd_modified(Command):
810
    """List files modified in working tree."""
811
    hidden = True
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
812
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
813
    def run(self):
814
        from bzrlib.delta import compare_trees
815
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
816
        tree = WorkingTree.open_containing(u'.')[0]
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
817
        td = compare_trees(tree.branch.basis_tree(), tree)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
818
1398 by Robert Collins
integrate in Gustavos x-bit patch
819
        for path, id, kind, text_modified, meta_modified in td.modified:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
820
            print path
821
822
823
824
class cmd_added(Command):
825
    """List files added in working tree."""
826
    hidden = True
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
827
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
828
    def run(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
829
        wt = WorkingTree.open_containing(u'.')[0]
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
830
        basis_inv = wt.branch.basis_tree().inventory
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
831
        inv = wt.inventory
832
        for file_id in inv:
833
            if file_id in basis_inv:
834
                continue
835
            path = inv.id2path(file_id)
836
            if not os.access(b.abspath(path), os.F_OK):
837
                continue
838
            print path
839
                
840
        
841
842
class cmd_root(Command):
843
    """Show the tree root directory.
844
845
    The root is the nearest enclosing directory with a .bzr control
846
    directory."""
847
    takes_args = ['filename?']
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
848
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
849
    def run(self, filename=None):
850
        """Print the branch root."""
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
851
        tree = WorkingTree.open_containing(filename)[0]
852
        print tree.basedir
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
853
854
855
class cmd_log(Command):
856
    """Show log of this branch.
857
1185.16.153 by Martin Pool
[patch] fix help for bzr log (Matthieu)
858
    To request a range of logs, you can use the command -r begin..end
859
    -r revision requests a specific revision, -r ..end or -r begin.. are
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
860
    also valid.
861
    """
862
1393.1.55 by Martin Pool
doc
863
    # TODO: Make --revision support uuid: and hash: [future tag:] notation.
864
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
865
    takes_args = ['filename?']
1185.16.46 by mbp at sourcefrog
- add help strings to some options
866
    takes_options = [Option('forward', 
867
                            help='show from oldest to newest'),
868
                     'timezone', 'verbose', 
869
                     'show-ids', 'revision',
1185.16.57 by Martin Pool
[merge] from aaron
870
                     Option('line', help='format with one line per revision'),
1185.16.46 by mbp at sourcefrog
- add help strings to some options
871
                     'long', 
872
                     Option('message',
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
873
                            help='show revisions whose message matches this regexp',
874
                            type=str),
1185.16.57 by Martin Pool
[merge] from aaron
875
                     Option('short', help='use moderately short format'),
876
                     ]
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
877
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
878
    def run(self, filename=None, timezone='original',
879
            verbose=False,
880
            show_ids=False,
881
            forward=False,
882
            revision=None,
883
            message=None,
884
            long=False,
1185.12.25 by Aaron Bentley
Added one-line log format
885
            short=False,
886
            line=False):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
887
        from bzrlib.log import log_formatter, show_log
888
        import codecs
1185.16.49 by mbp at sourcefrog
- more refactoring and tests of commandline
889
        assert message is None or isinstance(message, basestring), \
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
890
            "invalid message argument %r" % message
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
891
        direction = (forward and 'forward') or 'reverse'
892
        
893
        if filename:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
894
            # might be a tree:
895
            tree = None
896
            try:
897
                tree, fp = WorkingTree.open_containing(filename)
898
                b = tree.branch
899
                if fp != '':
900
                    inv = tree.read_working_inventory()
901
            except NotBranchError:
902
                pass
903
            if tree is None:
904
                b, fp = Branch.open_containing(filename)
905
                if fp != '':
906
                    inv = b.get_inventory(b.last_revision())
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
907
            if fp != '':
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
908
                file_id = inv.path2id(fp)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
909
            else:
910
                file_id = None  # points to branch root
911
        else:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
912
            tree, relpath = WorkingTree.open_containing(u'.')
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
913
            b = tree.branch
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
914
            file_id = None
915
916
        if revision is None:
917
            rev1 = None
918
            rev2 = None
919
        elif len(revision) == 1:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
920
            rev1 = rev2 = revision[0].in_history(b).revno
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
921
        elif len(revision) == 2:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
922
            rev1 = revision[0].in_history(b).revno
923
            rev2 = revision[1].in_history(b).revno
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
924
        else:
925
            raise BzrCommandError('bzr log --revision takes one or two values.')
926
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
927
        # By this point, the revision numbers are converted to the +ve
928
        # form if they were supplied in the -ve form, so we can do
929
        # this comparison in relative safety
930
        if rev1 > rev2:
931
            (rev2, rev1) = (rev1, rev2)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
932
1185.31.4 by John Arbash Meinel
Fixing mutter() calls to not have to do string processing.
933
        mutter('encoding log as %r', bzrlib.user_encoding)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
934
935
        # use 'replace' so that we don't abort if trying to write out
936
        # in e.g. the default C locale.
937
        outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
938
1185.12.25 by Aaron Bentley
Added one-line log format
939
        log_format = 'long'
940
        if short:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
941
            log_format = 'short'
1185.12.25 by Aaron Bentley
Added one-line log format
942
        if line:
943
            log_format = 'line'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
944
        lf = log_formatter(log_format,
945
                           show_ids=show_ids,
946
                           to_file=outf,
947
                           show_timezone=timezone)
948
949
        show_log(b,
950
                 lf,
951
                 file_id,
952
                 verbose=verbose,
953
                 direction=direction,
954
                 start_revision=rev1,
955
                 end_revision=rev2,
956
                 search=message)
957
958
959
960
class cmd_touching_revisions(Command):
961
    """Return revision-ids which affected a particular file.
962
963
    A more user-friendly interface is "bzr log FILE"."""
964
    hidden = True
965
    takes_args = ["filename"]
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, filename):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
968
        tree, relpath = WorkingTree.open_containing(filename)
969
        b = tree.branch
970
        inv = tree.read_working_inventory()
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
971
        file_id = inv.path2id(relpath)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
972
        for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
973
            print "%6d %s" % (revno, what)
974
975
976
class cmd_ls(Command):
977
    """List files in a tree.
978
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
979
    # TODO: Take a revision or remote path and list that tree instead.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
980
    hidden = True
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
981
    takes_options = ['verbose', 'revision',
982
                     Option('non-recursive',
983
                            help='don\'t recurse into sub-directories'),
984
                     Option('from-root',
985
                            help='Print all paths from the root of the branch.'),
986
                     Option('unknown', help='Print unknown files'),
987
                     Option('versioned', help='Print versioned files'),
988
                     Option('ignored', help='Print ignored files'),
989
990
                     Option('null', help='Null separate the files'),
991
                    ]
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
992
    @display_command
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
993
    def run(self, revision=None, verbose=False, 
994
            non_recursive=False, from_root=False,
995
            unknown=False, versioned=False, ignored=False,
996
            null=False):
997
998
        if verbose and null:
999
            raise BzrCommandError('Cannot set both --verbose and --null')
1000
        all = not (unknown or versioned or ignored)
1001
1002
        selection = {'I':ignored, '?':unknown, 'V':versioned}
1003
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1004
        tree, relpath = WorkingTree.open_containing(u'.')
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1005
        if from_root:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1006
            relpath = u''
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1007
        elif relpath:
1008
            relpath += '/'
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1009
        if revision is not None:
1010
            tree = tree.branch.revision_tree(
1011
                revision[0].in_history(tree.branch).rev_id)
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
1012
        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.
1013
            if fp.startswith(relpath):
1014
                fp = fp[len(relpath):]
1015
                if non_recursive and '/' in fp:
1016
                    continue
1017
                if not all and not selection[fc]:
1018
                    continue
1019
                if verbose:
1020
                    kindch = entry.kind_character()
1021
                    print '%-8s %s%s' % (fc, fp, kindch)
1022
                elif null:
1023
                    sys.stdout.write(fp)
1024
                    sys.stdout.write('\0')
1025
                    sys.stdout.flush()
1026
                else:
1027
                    print fp
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1028
1029
1030
class cmd_unknowns(Command):
1031
    """List unknown files."""
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1032
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1033
    def run(self):
1034
        from bzrlib.osutils import quotefn
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1035
        for f in WorkingTree.open_containing(u'.')[0].unknowns():
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1036
            print quotefn(f)
1037
1038
1039
class cmd_ignore(Command):
1040
    """Ignore a command or pattern.
1041
1042
    To remove patterns from the ignore list, edit the .bzrignore file.
1043
1044
    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
1045
    from the branch root.  Otherwise, it is compared to only the last
1046
    component of the path.  To match a file only in the root directory,
1047
    prepend './'.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1048
1049
    Ignore patterns are case-insensitive on case-insensitive systems.
1050
1051
    Note: wildcards must be quoted from the shell on Unix.
1052
1053
    examples:
1054
        bzr ignore ./Makefile
1055
        bzr ignore '*.class'
1056
    """
1185.16.4 by Martin Pool
- doc and todo for ignore command
1057
    # TODO: Complain if the filename is absolute
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1058
    takes_args = ['name_pattern']
1059
    
1060
    def run(self, name_pattern):
1061
        from bzrlib.atomicfile import AtomicFile
1062
        import os.path
1063
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1064
        tree, relpath = WorkingTree.open_containing(u'.')
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1065
        ifn = tree.abspath('.bzrignore')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1066
1067
        if os.path.exists(ifn):
1068
            f = open(ifn, 'rt')
1069
            try:
1070
                igns = f.read().decode('utf-8')
1071
            finally:
1072
                f.close()
1073
        else:
1074
            igns = ''
1075
1076
        # TODO: If the file already uses crlf-style termination, maybe
1077
        # we should use that for the newly added lines?
1078
1079
        if igns and igns[-1] != '\n':
1080
            igns += '\n'
1081
        igns += name_pattern + '\n'
1082
1083
        try:
1084
            f = AtomicFile(ifn, 'wt')
1085
            f.write(igns.encode('utf-8'))
1086
            f.commit()
1087
        finally:
1088
            f.close()
1089
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1090
        inv = tree.inventory
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1091
        if inv.path2id('.bzrignore'):
1092
            mutter('.bzrignore is already versioned')
1093
        else:
1094
            mutter('need to make new .bzrignore file versioned')
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
1095
            tree.add(['.bzrignore'])
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1096
1097
1098
class cmd_ignored(Command):
1099
    """List ignored files and the patterns that matched them.
1100
1101
    See also: bzr ignore"""
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1102
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1103
    def run(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1104
        tree = WorkingTree.open_containing(u'.')[0]
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
1105
        for path, file_class, kind, file_id, entry in tree.list_files():
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1106
            if file_class != 'I':
1107
                continue
1108
            ## XXX: Slightly inefficient since this was already calculated
1109
            pat = tree.is_ignored(path)
1110
            print '%-50s %s' % (path, pat)
1111
1112
1113
class cmd_lookup_revision(Command):
1114
    """Lookup the revision-id from a revision-number
1115
1116
    example:
1117
        bzr lookup-revision 33
1118
    """
1119
    hidden = True
1120
    takes_args = ['revno']
1121
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1122
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1123
    def run(self, revno):
1124
        try:
1125
            revno = int(revno)
1126
        except ValueError:
1127
            raise BzrCommandError("not a valid revision-number: %r" % revno)
1128
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1129
        print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1130
1131
1132
class cmd_export(Command):
1133
    """Export past revision to destination directory.
1134
1135
    If no revision is specified this exports the last committed revision.
1136
1137
    Format may be an "exporter" name, such as tar, tgz, tbz2.  If none is
1138
    given, try to find the format with the extension. If no extension
1139
    is found exports to a directory (equivalent to --format=dir).
1140
1141
    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
1142
    is given, the top directory will be the root name of the file.
1143
1144
    Note: export of tree with non-ascii filenames to zip is not supported.
1145
1146
    Supported formats       Autodetected by extension
1147
    -----------------       -------------------------
1148
         dir                            -
1149
         tar                          .tar
1150
         tbz2                    .tar.bz2, .tbz2
1151
         tgz                      .tar.gz, .tgz
1152
         zip                          .zip
1153
    """
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1154
    takes_args = ['dest']
1155
    takes_options = ['revision', 'format', 'root']
1156
    def run(self, dest, revision=None, format=None, root=None):
1157
        import os.path
1185.31.12 by John Arbash Meinel
Refactored the export code to make it easier to add new export formats.
1158
        from bzrlib.export import export
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1159
        tree = WorkingTree.open_containing(u'.')[0]
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1160
        b = tree.branch
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1161
        if revision is None:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1162
            # should be tree.last_revision  FIXME
1241 by Martin Pool
- rename last_patch to last_revision
1163
            rev_id = b.last_revision()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1164
        else:
1165
            if len(revision) != 1:
1166
                raise BzrError('bzr export --revision takes exactly 1 argument')
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1167
            rev_id = revision[0].in_history(b).rev_id
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1168
        t = b.revision_tree(rev_id)
1185.31.12 by John Arbash Meinel
Refactored the export code to make it easier to add new export formats.
1169
        try:
1170
            export(t, dest, format, root)
1171
        except errors.NoSuchExportFormat, e:
1172
            raise BzrCommandError('Unsupported export format: %s' % e.format)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1173
1174
1175
class cmd_cat(Command):
1176
    """Write a file's text from a previous revision."""
1177
1178
    takes_options = ['revision']
1179
    takes_args = ['filename']
1180
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1181
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1182
    def run(self, filename, revision=None):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1183
        if revision is None:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1184
            raise BzrCommandError("bzr cat requires a revision number")
1185
        elif len(revision) != 1:
1186
            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
1187
        tree = None
1188
        try:
1189
            tree, relpath = WorkingTree.open_containing(filename)
1190
            b = tree.branch
1191
        except NotBranchError:
1192
            pass
1193
        if tree is None:
1194
            b, relpath = Branch.open_containing(filename)
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
1195
        b.print_file(relpath, revision[0].in_history(b).revno)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1196
1197
1198
class cmd_local_time_offset(Command):
1199
    """Show the offset in seconds from GMT to local time."""
1200
    hidden = True    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1201
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1202
    def run(self):
1203
        print bzrlib.osutils.local_time_offset()
1204
1205
1206
1207
class cmd_commit(Command):
1208
    """Commit changes into a new revision.
1209
    
1210
    If no arguments are given, the entire tree is committed.
1211
1212
    If selected files are specified, only changes to those files are
1213
    committed.  If a directory is specified then the directory and everything 
1214
    within it is committed.
1215
1216
    A selected-file commit may fail in some cases where the committed
1217
    tree would be invalid, such as trying to commit a file in a
1218
    newly-added directory that is not itself committed.
1219
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1220
    # TODO: Run hooks on tree to-be-committed, and after commit.
1221
1185.16.65 by mbp at sourcefrog
- new commit --strict option
1222
    # TODO: Strict commit that fails if there are deleted files.
1223
    #       (what does "deleted files" mean ??)
1224
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1225
    # TODO: Give better message for -s, --summary, used by tla people
1226
1227
    # XXX: verbose currently does nothing
1228
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1229
    takes_args = ['selected*']
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
1230
    takes_options = ['message', 'verbose', 
1231
                     Option('unchanged',
1232
                            help='commit even if nothing has changed'),
1233
                     Option('file', type=str, 
1234
                            argname='msgfile',
1235
                            help='file containing commit message'),
1185.16.65 by mbp at sourcefrog
- new commit --strict option
1236
                     Option('strict',
1237
                            help="refuse to commit if there are unknown "
1238
                            "files in the working tree."),
1185.16.43 by Martin Pool
- clean up handling of option objects
1239
                     ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1240
    aliases = ['ci', 'checkin']
1241
1242
    def run(self, message=None, file=None, verbose=True, selected_list=None,
1185.16.65 by mbp at sourcefrog
- new commit --strict option
1243
            unchanged=False, strict=False):
1244
        from bzrlib.errors import (PointlessCommit, ConflictsInTree,
1245
                StrictCommitFailed)
1167 by Martin Pool
- split commit message editor functions out into own file
1246
        from bzrlib.msgeditor import edit_commit_message
1169 by Martin Pool
- clean up nasty code for inserting the status summary into commit template
1247
        from bzrlib.status import show_status
1248
        from cStringIO import StringIO
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1249
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1250
        tree, selected_list = tree_files(selected_list)
1414 by Robert Collins
merge in an adjusted version of Jelmer's empty-log detection patch.
1251
        if message is None and not file:
1169 by Martin Pool
- clean up nasty code for inserting the status summary into commit template
1252
            catcher = StringIO()
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1253
            show_status(tree.branch, specific_files=selected_list,
1169 by Martin Pool
- clean up nasty code for inserting the status summary into commit template
1254
                        to_file=catcher)
1255
            message = edit_commit_message(catcher.getvalue())
1393.3.2 by Jelmer Vernooij
Fix error message when an empty commit message was specified (when using an editor). Previously bzr warned that it wanted either --message or --file.
1256
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1257
            if message is None:
1169 by Martin Pool
- clean up nasty code for inserting the status summary into commit template
1258
                raise BzrCommandError("please specify a commit message"
1259
                                      " with either --message or --file")
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1260
        elif message and file:
1261
            raise BzrCommandError("please specify either --message or --file")
1262
        
1263
        if file:
1264
            import codecs
1265
            message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1266
1414 by Robert Collins
merge in an adjusted version of Jelmer's empty-log detection patch.
1267
        if message == "":
1268
                raise BzrCommandError("empty commit message specified")
1269
            
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1270
        try:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1271
            tree.commit(message, specific_files=selected_list,
1272
                        allow_pointless=unchanged, strict=strict)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1273
        except PointlessCommit:
1274
            # FIXME: This should really happen before the file is read in;
1275
            # perhaps prepare the commit; get the message; then actually commit
1276
            raise BzrCommandError("no changes to commit",
1277
                                  ["use --unchanged to commit anyhow"])
1185.14.10 by Aaron Bentley
Commit aborts with conflicts in the tree.
1278
        except ConflictsInTree:
1279
            raise BzrCommandError("Conflicts detected in working tree.  "
1280
                'Use "bzr conflicts" to list, "bzr resolve FILE" to resolve.')
1185.16.65 by mbp at sourcefrog
- new commit --strict option
1281
        except StrictCommitFailed:
1282
            raise BzrCommandError("Commit refused because there are unknown "
1283
                                  "files in the working tree.")
1185.33.45 by Martin Pool
[merge] refactoring of branch vs working tree, etc (robertc)
1284
        note('Committed revision %d.' % (tree.branch.revno(),))
1185.49.17 by John Arbash Meinel
[merge] Robey Pointer - some sftp fixes, and an http patch
1285
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1286
1287
class cmd_check(Command):
1288
    """Validate consistency of branch history.
1289
1290
    This command checks various invariants about the branch storage to
1291
    detect data corruption or bzr bugs.
1292
    """
1512 by Robert Collins
Merge from Martin. Adjust check to work with HTTP again.
1293
    takes_args = ['branch?']
1449 by Robert Collins
teach check about ghosts
1294
    takes_options = ['verbose']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1295
1512 by Robert Collins
Merge from Martin. Adjust check to work with HTTP again.
1296
    def run(self, branch=None, verbose=False):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1297
        from bzrlib.check import check
1512 by Robert Collins
Merge from Martin. Adjust check to work with HTTP again.
1298
        if branch is None:
1299
            tree = WorkingTree.open_containing()[0]
1300
            branch = tree.branch
1301
        else:
1302
            branch = Branch.open(branch)
1303
        check(branch, verbose)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1304
1305
1306
class cmd_scan_cache(Command):
1307
    hidden = True
1308
    def run(self):
1309
        from bzrlib.hashcache import HashCache
1310
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1311
        c = HashCache(u'.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1312
        c.read()
1313
        c.scan()
1314
            
1315
        print '%6d stats' % c.stat_count
1316
        print '%6d in hashcache' % len(c._cache)
1317
        print '%6d files removed from cache' % c.removed_count
1318
        print '%6d hashes updated' % c.update_count
1319
        print '%6d files changed too recently to cache' % c.danger_count
1320
1321
        if c.needs_write:
1322
            c.write()
1323
            
1324
1325
1326
class cmd_upgrade(Command):
1327
    """Upgrade branch storage to current format.
1328
1329
    The check command or bzr developers may sometimes advise you to run
1330
    this command.
1377 by Martin Pool
- run conversion to weaves from the 'bzr upgrade' command
1331
1332
    This version of this command upgrades from the full-text storage
1333
    used by bzr 0.0.8 and earlier to the weave format (v5).
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1334
    """
1335
    takes_args = ['dir?']
1336
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1337
    def run(self, dir=u'.'):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1338
        from bzrlib.upgrade import upgrade
1377 by Martin Pool
- run conversion to weaves from the 'bzr upgrade' command
1339
        upgrade(dir)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1340
1341
1342
class cmd_whoami(Command):
1343
    """Show bzr user id."""
1344
    takes_options = ['email']
1345
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1346
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1347
    def run(self, email=False):
1371 by Martin Pool
- raise NotBranchError if format file can't be read
1348
        try:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1349
            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
1350
            config = bzrlib.config.BranchConfig(b)
1371 by Martin Pool
- raise NotBranchError if format file can't be read
1351
        except NotBranchError:
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1352
            config = bzrlib.config.GlobalConfig()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1353
        
1354
        if email:
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1355
            print config.user_email()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1356
        else:
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1357
            print config.username()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1358
1185.35.14 by Aaron Bentley
Implemented nick command
1359
class cmd_nick(Command):
1360
    """\
1361
    Print or set the branch nickname.  
1362
    If unset, the tree root directory name is used as the nickname
1363
    To print the current nickname, execute with no argument.  
1364
    """
1365
    takes_args = ['nickname?']
1366
    def run(self, nickname=None):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1367
        branch = Branch.open_containing(u'.')[0]
1185.35.14 by Aaron Bentley
Implemented nick command
1368
        if nickname is None:
1369
            self.printme(branch)
1370
        else:
1371
            branch.nick = nickname
1372
1373
    @display_command
1374
    def printme(self, branch):
1375
        print branch.nick 
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1376
1377
class cmd_selftest(Command):
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1378
    """Run internal test suite.
1379
    
1380
    This creates temporary test directories in the working directory,
1381
    but not existing data is affected.  These directories are deleted
1382
    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
1383
    fail and --keep-output is specified.
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1384
    
1385
    If arguments are given, they are regular expressions that say
1185.16.58 by mbp at sourcefrog
- run all selftests by default
1386
    which tests should run.
1387
    """
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1388
    # TODO: --list should give a list of all available tests
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1389
    hidden = True
1185.1.57 by Robert Collins
nuke --pattern to selftest, replace with regexp.search calls.
1390
    takes_args = ['testspecs*']
1185.16.58 by mbp at sourcefrog
- run all selftests by default
1391
    takes_options = ['verbose', 
1392
                     Option('one', help='stop when one test fails'),
1185.35.20 by Aaron Bentley
Only keep test failure directories if --keep-output is specified
1393
                     Option('keep-output', 
1394
                            help='keep output directories when tests fail')
1185.16.58 by mbp at sourcefrog
- run all selftests by default
1395
                    ]
1396
1185.35.20 by Aaron Bentley
Only keep test failure directories if --keep-output is specified
1397
    def run(self, testspecs_list=None, verbose=False, one=False,
1398
            keep_output=False):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1399
        import bzrlib.ui
1185.31.25 by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py
1400
        from bzrlib.tests import selftest
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1401
        # we don't want progress meters from the tests to go to the
1402
        # real output; and we don't want log messages cluttering up
1403
        # the real logs.
1404
        save_ui = bzrlib.ui.ui_factory
1405
        bzrlib.trace.info('running tests...')
1406
        try:
1407
            bzrlib.ui.ui_factory = bzrlib.ui.SilentUIFactory()
1185.1.57 by Robert Collins
nuke --pattern to selftest, replace with regexp.search calls.
1408
            if testspecs_list is not None:
1409
                pattern = '|'.join(testspecs_list)
1410
            else:
1411
                pattern = ".*"
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1412
            result = selftest(verbose=verbose, 
1185.16.58 by mbp at sourcefrog
- run all selftests by default
1413
                              pattern=pattern,
1185.35.20 by Aaron Bentley
Only keep test failure directories if --keep-output is specified
1414
                              stop_on_failure=one, 
1415
                              keep_output=keep_output)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1416
            if result:
1417
                bzrlib.trace.info('tests passed')
1418
            else:
1419
                bzrlib.trace.info('tests failed')
1420
            return int(not result)
1421
        finally:
1422
            bzrlib.ui.ui_factory = save_ui
1423
1424
1425
def show_version():
1426
    print "bzr (bazaar-ng) %s" % bzrlib.__version__
1427
    # is bzrlib itself in a branch?
1428
    bzrrev = bzrlib.get_bzr_revision()
1429
    if bzrrev:
1430
        print "  (bzr checkout, revision %d {%s})" % bzrrev
1431
    print bzrlib.__copyright__
1432
    print "http://bazaar-ng.org/"
1433
    print
1434
    print "bzr comes with ABSOLUTELY NO WARRANTY.  bzr is free software, and"
1435
    print "you may use, modify and redistribute it under the terms of the GNU"
1436
    print "General Public License version 2 or later."
1437
1438
1439
class cmd_version(Command):
1440
    """Show version of bzr."""
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1441
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1442
    def run(self):
1443
        show_version()
1444
1445
class cmd_rocks(Command):
1446
    """Statement of optimism."""
1447
    hidden = True
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1448
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1449
    def run(self):
1450
        print "it sure does!"
1451
1452
1453
class cmd_find_merge_base(Command):
1454
    """Find and print a base revision for merging two branches.
1455
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1456
    # TODO: Options to specify revisions on either side, as if
1457
    #       merging only part of the history.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1458
    takes_args = ['branch', 'other']
1459
    hidden = True
1460
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1461
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1462
    def run(self, branch, other):
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
1463
        from bzrlib.revision import common_ancestor, MultipleRevisionSources
1464
        
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
1465
        branch1 = Branch.open_containing(branch)[0]
1466
        branch2 = Branch.open_containing(other)[0]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1467
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
1468
        history_1 = branch1.revision_history()
1469
        history_2 = branch2.revision_history()
1470
1241 by Martin Pool
- rename last_patch to last_revision
1471
        last1 = branch1.last_revision()
1472
        last2 = branch2.last_revision()
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
1473
1474
        source = MultipleRevisionSources(branch1, branch2)
1475
        
1476
        base_rev_id = common_ancestor(last1, last2, source)
1477
1478
        print 'merge base is revision %s' % base_rev_id
1479
        
1480
        return
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1481
1482
        if base_revno is None:
1483
            raise bzrlib.errors.UnrelatedBranches()
1484
1485
        print ' r%-6d in %s' % (base_revno, branch)
1486
1487
        other_revno = branch2.revision_id_to_revno(base_revid)
1488
        
1489
        print ' r%-6d in %s' % (other_revno, other)
1490
1491
1492
1493
class cmd_merge(Command):
1494
    """Perform a three-way merge.
1495
    
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
1496
    The branch is the branch you will merge from.  By default, it will
1497
    merge the latest revision.  If you specify a revision, that
1498
    revision will be merged.  If you specify two revisions, the first
1499
    will be used as a BASE, and the second one as OTHER.  Revision
1500
    numbers are always relative to the specified branch.
1501
1502
    By default bzr will try to merge in all new work from the other
1503
    branch, automatically determining an appropriate base.  If this
1504
    fails, you may need to give an explicit base.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1505
    
1506
    Examples:
1507
1508
    To merge the latest revision from bzr.dev
1509
    bzr merge ../bzr.dev
1510
1511
    To merge changes up to and including revision 82 from bzr.dev
1512
    bzr merge -r 82 ../bzr.dev
1513
1514
    To merge the changes introduced by 82, without previous changes:
1515
    bzr merge -r 81..82 ../bzr.dev
1516
    
1517
    merge refuses to run if there are any uncommitted changes, unless
1518
    --force is given.
1519
    """
1520
    takes_args = ['branch?']
1185.24.3 by Aaron Bentley
Integrated reprocessing into the rest of the merge stuff
1521
    takes_options = ['revision', 'force', 'merge-type', 'reprocess',
1185.18.1 by Aaron Bentley
Added --show-base to merge
1522
                     Option('show-base', help="Show base revision text in "
1523
                            "conflicts")]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1524
1185.18.1 by Aaron Bentley
Added --show-base to merge
1525
    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
1526
            show_base=False, reprocess=False):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1527
        from bzrlib.merge import merge
1528
        from bzrlib.merge_core import ApplyMerge3
1529
        if merge_type is None:
1530
            merge_type = ApplyMerge3
1185.12.12 by Aaron Bentley
Made merge use pull location or die if no branch specified.
1531
        if branch is None:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1532
            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.
1533
            if branch is None:
1534
                raise BzrCommandError("No merge location known or specified.")
1535
            else:
1536
                print "Using saved location: %s" % branch 
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1537
        if revision is None or len(revision) < 1:
1538
            base = [None, None]
974.1.52 by aaron.bentley at utoronto
Merged mpool's latest changes (~0.0.7)
1539
            other = [branch, -1]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1540
        else:
1541
            if len(revision) == 1:
974.1.52 by aaron.bentley at utoronto
Merged mpool's latest changes (~0.0.7)
1542
                base = [None, None]
1185.12.53 by Aaron Bentley
Merged more from Robert
1543
                other_branch = Branch.open_containing(branch)[0]
1185.12.46 by Aaron Bentley
Fixed -r brokenness in merge
1544
                revno = revision[0].in_history(other_branch).revno
1545
                other = [branch, revno]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1546
            else:
1547
                assert len(revision) == 2
1548
                if None in revision:
1549
                    raise BzrCommandError(
1550
                        "Merge doesn't permit that revision specifier.")
1185.12.53 by Aaron Bentley
Merged more from Robert
1551
                b = Branch.open_containing(branch)[0]
1185.5.1 by John Arbash Meinel
Applying bad-merge revision patch.
1552
1553
                base = [branch, revision[0].in_history(b).revno]
1554
                other = [branch, revision[1].in_history(b).revno]
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
1555
1556
        try:
1476 by Robert Collins
Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
1557
            conflict_count = merge(other, base, check_clean=(not force),
1185.24.3 by Aaron Bentley
Integrated reprocessing into the rest of the merge stuff
1558
                                   merge_type=merge_type, reprocess=reprocess,
1476 by Robert Collins
Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
1559
                                   show_base=show_base)
1560
            if conflict_count != 0:
1561
                return 1
1562
            else:
1563
                return 0
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
1564
        except bzrlib.errors.AmbiguousBase, e:
1173 by Martin Pool
- message typo
1565
            m = ("sorry, bzr can't determine the right merge base yet\n"
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
1566
                 "candidates are:\n  "
1567
                 + "\n  ".join(e.bases)
1568
                 + "\n"
1569
                 "please specify an explicit base with -r,\n"
1570
                 "and (if you want) report this to the bzr developers\n")
1571
            log_error(m)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1572
1573
1185.35.4 by Aaron Bentley
Implemented remerge
1574
class cmd_remerge(Command):
1575
    """Redo a merge.
1576
    """
1577
    takes_args = ['file*']
1578
    takes_options = ['merge-type', 'reprocess',
1579
                     Option('show-base', help="Show base revision text in "
1580
                            "conflicts")]
1581
1582
    def run(self, file_list=None, merge_type=None, show_base=False,
1583
            reprocess=False):
1584
        from bzrlib.merge import merge_inner, transform_tree
1585
        from bzrlib.merge_core import ApplyMerge3
1586
        if merge_type is None:
1587
            merge_type = ApplyMerge3
1508.1.15 by Robert Collins
Merge from mpool.
1588
        tree, file_list = tree_files(file_list)
1589
        tree.lock_write()
1185.35.4 by Aaron Bentley
Implemented remerge
1590
        try:
1508.1.15 by Robert Collins
Merge from mpool.
1591
            pending_merges = tree.pending_merges() 
1185.35.4 by Aaron Bentley
Implemented remerge
1592
            if len(pending_merges) != 1:
1593
                raise BzrCommandError("Sorry, remerge only works after normal"
1594
                                      + " merges.  Not cherrypicking or"
1595
                                      + "multi-merges.")
1508.1.15 by Robert Collins
Merge from mpool.
1596
            base_revision = common_ancestor(tree.branch.last_revision(), 
1597
                                            pending_merges[0], tree.branch)
1598
            base_tree = tree.branch.revision_tree(base_revision)
1599
            other_tree = tree.branch.revision_tree(pending_merges[0])
1185.35.4 by Aaron Bentley
Implemented remerge
1600
            interesting_ids = None
1601
            if file_list is not None:
1602
                interesting_ids = set()
1603
                for filename in file_list:
1508.1.15 by Robert Collins
Merge from mpool.
1604
                    file_id = tree.path2id(filename)
1185.35.4 by Aaron Bentley
Implemented remerge
1605
                    interesting_ids.add(file_id)
1508.1.15 by Robert Collins
Merge from mpool.
1606
                    if tree.kind(file_id) != "directory":
1185.35.4 by Aaron Bentley
Implemented remerge
1607
                        continue
1185.35.13 by Aaron Bentley
Merged Martin
1608
                    
1508.1.15 by Robert Collins
Merge from mpool.
1609
                    for name, ie in tree.inventory.iter_entries(file_id):
1185.35.4 by Aaron Bentley
Implemented remerge
1610
                        interesting_ids.add(ie.file_id)
1508.1.15 by Robert Collins
Merge from mpool.
1611
            transform_tree(tree, tree.branch.basis_tree(), interesting_ids)
1185.35.4 by Aaron Bentley
Implemented remerge
1612
            if file_list is None:
1508.1.15 by Robert Collins
Merge from mpool.
1613
                restore_files = list(tree.iter_conflicts())
1185.35.4 by Aaron Bentley
Implemented remerge
1614
            else:
1615
                restore_files = file_list
1616
            for filename in restore_files:
1617
                try:
1508.1.15 by Robert Collins
Merge from mpool.
1618
                    restore(tree.abspath(filename))
1185.35.4 by Aaron Bentley
Implemented remerge
1619
                except NotConflicted:
1620
                    pass
1508.1.15 by Robert Collins
Merge from mpool.
1621
            conflicts =  merge_inner(tree.branch, other_tree, base_tree, 
1185.35.4 by Aaron Bentley
Implemented remerge
1622
                                     interesting_ids = interesting_ids, 
1623
                                     other_rev_id=pending_merges[0], 
1624
                                     merge_type=merge_type, 
1625
                                     show_base=show_base,
1626
                                     reprocess=reprocess)
1627
        finally:
1508.1.15 by Robert Collins
Merge from mpool.
1628
            tree.unlock()
1185.35.4 by Aaron Bentley
Implemented remerge
1629
        if conflicts > 0:
1630
            return 1
1631
        else:
1632
            return 0
1633
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1634
class cmd_revert(Command):
1635
    """Reverse all changes since the last commit.
1636
1637
    Only versioned files are affected.  Specify filenames to revert only 
1638
    those files.  By default, any files that are changed will be backed up
1639
    first.  Backup files have a '~' appended to their name.
1640
    """
1641
    takes_options = ['revision', 'no-backup']
1642
    takes_args = ['file*']
1643
    aliases = ['merge-revert']
1644
1645
    def run(self, revision=None, no_backup=False, file_list=None):
1457.1.7 by Robert Collins
Change cmd_revert to use merge_inner.
1646
        from bzrlib.merge import merge_inner
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1647
        from bzrlib.commands import parse_spec
1648
        if file_list is not None:
1649
            if len(file_list) == 0:
1650
                raise BzrCommandError("No files specified")
1457.1.9 by Robert Collins
Change cmd_revert implementation to call workingtree.Revert.
1651
        else:
1652
            file_list = []
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1653
        if revision is None:
1185.5.8 by John Arbash Meinel
Fixed bzr revert with the new RevisionSpec code.
1654
            revno = -1
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1655
            tree = WorkingTree.open_containing(u'.')[0]
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1656
            # FIXME should be tree.last_revision
1657
            rev_id = tree.branch.last_revision()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1658
        elif len(revision) != 1:
1659
            raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
1185.5.8 by John Arbash Meinel
Fixed bzr revert with the new RevisionSpec code.
1660
        else:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1661
            tree, file_list = tree_files(file_list)
1662
            rev_id = revision[0].in_history(tree.branch).rev_id
1663
        tree.revert(file_list, tree.branch.revision_tree(rev_id),
1457.1.9 by Robert Collins
Change cmd_revert implementation to call workingtree.Revert.
1664
                                not no_backup)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1665
1666
1667
class cmd_assert_fail(Command):
1668
    """Test reporting of assertion failures"""
1669
    hidden = True
1670
    def run(self):
1671
        assert False, "always fails"
1672
1673
1674
class cmd_help(Command):
1675
    """Show help on a command or other topic.
1676
1677
    For a list of all available commands, say 'bzr help commands'."""
1678
    takes_options = ['long']
1679
    takes_args = ['topic?']
1680
    aliases = ['?']
1681
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1682
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1683
    def run(self, topic=None, long=False):
1684
        import help
1685
        if topic is None and long:
1686
            topic = "commands"
1687
        help.help(topic)
1688
1689
1690
class cmd_shell_complete(Command):
1691
    """Show appropriate completions for context.
1692
1693
    For a list of all available commands, say 'bzr shell-complete'."""
1694
    takes_args = ['context?']
1695
    aliases = ['s-c']
1696
    hidden = True
1697
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1698
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1699
    def run(self, context=None):
1700
        import shellcomplete
1701
        shellcomplete.shellcomplete(context)
1702
1703
1228 by Martin Pool
- add fetch command as builtin
1704
class cmd_fetch(Command):
1705
    """Copy in history from another branch but don't merge it.
1706
1707
    This is an internal method used for pull and merge."""
1708
    hidden = True
1709
    takes_args = ['from_branch', 'to_branch']
1710
    def run(self, from_branch, to_branch):
1711
        from bzrlib.fetch import Fetcher
1712
        from bzrlib.branch import Branch
1185.16.100 by mbp at sourcefrog
Update fetch command for new Branch constructors.
1713
        from_b = Branch.open(from_branch)
1714
        to_b = Branch.open(to_branch)
1715
        from_b.lock_read()
1716
        try:
1717
            to_b.lock_write()
1718
            try:
1719
                Fetcher(to_b, from_b)
1720
            finally:
1721
                to_b.unlock()
1722
        finally:
1723
            from_b.unlock()
1228 by Martin Pool
- add fetch command as builtin
1724
1725
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1726
class cmd_missing(Command):
1727
    """What is missing in this branch relative to other branch.
1728
    """
1228 by Martin Pool
- add fetch command as builtin
1729
    # TODO: rewrite this in terms of ancestry so that it shows only
1730
    # unmerged things
1731
    
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1732
    takes_args = ['remote?']
1733
    aliases = ['mis', 'miss']
1185.33.42 by Martin Pool
[patch] make --quiet a global option (robey)
1734
    takes_options = ['verbose']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1735
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1736
    @display_command
1185.33.42 by Martin Pool
[patch] make --quiet a global option (robey)
1737
    def run(self, remote=None, verbose=False):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1738
        from bzrlib.errors import BzrCommandError
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1739
        from bzrlib.missing import show_missing
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1740
1185.33.42 by Martin Pool
[patch] make --quiet a global option (robey)
1741
        if verbose and is_quiet():
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1742
            raise BzrCommandError('Cannot pass both quiet and verbose')
1743
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1744
        tree = WorkingTree.open_containing(u'.')[0]
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1745
        parent = tree.branch.get_parent()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1746
        if remote is None:
1747
            if parent is None:
1748
                raise BzrCommandError("No missing location known or specified.")
1749
            else:
1185.33.42 by Martin Pool
[patch] make --quiet a global option (robey)
1750
                if not is_quiet():
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1751
                    print "Using last location: %s" % parent
1752
                remote = parent
1753
        elif parent is None:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1754
            # We only update parent if it did not exist, missing
1755
            # should not change the parent
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1756
            tree.branch.set_parent(remote)
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
1757
        br_remote = Branch.open_containing(remote)[0]
1185.33.45 by Martin Pool
[merge] refactoring of branch vs working tree, etc (robertc)
1758
        return show_missing(tree.branch, br_remote, verbose=verbose, 
1759
                            quiet=is_quiet())
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1760
1761
1762
class cmd_plugins(Command):
1763
    """List plugins"""
1764
    hidden = True
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1765
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1766
    def run(self):
1767
        import bzrlib.plugin
1768
        from inspect import getdoc
1769
        for plugin in bzrlib.plugin.all_plugins:
1770
            if hasattr(plugin, '__path__'):
1771
                print plugin.__path__[0]
1772
            elif hasattr(plugin, '__file__'):
1773
                print plugin.__file__
1774
            else:
1775
                print `plugin`
1776
                
1777
            d = getdoc(plugin)
1778
            if d:
1779
                print '\t', d.split('\n')[0]
1780
1781
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
1782
class cmd_testament(Command):
1783
    """Show testament (signing-form) of a revision."""
1784
    takes_options = ['revision', 'long']
1785
    takes_args = ['branch?']
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1786
    @display_command
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1787
    def run(self, branch=u'.', revision=None, long=False):
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
1788
        from bzrlib.testament import Testament
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1789
        b = WorkingTree.open_containing(branch)[0].branch
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
1790
        b.lock_read()
1791
        try:
1792
            if revision is None:
1793
                rev_id = b.last_revision()
1794
            else:
1795
                rev_id = revision[0].in_history(b).rev_id
1796
            t = Testament.from_revision(b, rev_id)
1797
            if long:
1798
                sys.stdout.writelines(t.as_text_lines())
1799
            else:
1800
                sys.stdout.write(t.as_short_text())
1801
        finally:
1802
            b.unlock()
1185.16.32 by Martin Pool
- add a basic annotate built-in command
1803
1804
1805
class cmd_annotate(Command):
1806
    """Show the origin of each line in a file.
1807
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
1808
    This prints out the given file with an annotation on the left side
1809
    indicating which revision, author and date introduced the change.
1810
1811
    If the origin is the same for a run of consecutive lines, it is 
1812
    shown only at the top, unless the --all option is given.
1185.16.32 by Martin Pool
- add a basic annotate built-in command
1813
    """
1814
    # TODO: annotate directories; showing when each file was last changed
1815
    # TODO: annotate a previous version of a file
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
1816
    # TODO: if the working copy is modified, show annotations on that 
1817
    #       with new uncommitted lines marked
1185.16.32 by Martin Pool
- add a basic annotate built-in command
1818
    aliases = ['blame', 'praise']
1819
    takes_args = ['filename']
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
1820
    takes_options = [Option('all', help='show annotations on all lines'),
1821
                     Option('long', help='show date in annotations'),
1822
                     ]
1185.16.32 by Martin Pool
- add a basic annotate built-in command
1823
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1824
    @display_command
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
1825
    def run(self, filename, all=False, long=False):
1185.16.32 by Martin Pool
- add a basic annotate built-in command
1826
        from bzrlib.annotate import annotate_file
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1827
        tree, relpath = WorkingTree.open_containing(filename)
1828
        branch = tree.branch
1829
        branch.lock_read()
1185.16.32 by Martin Pool
- add a basic annotate built-in command
1830
        try:
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
1831
            file_id = tree.inventory.path2id(relpath)
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1832
            tree = branch.revision_tree(branch.last_revision())
1185.16.32 by Martin Pool
- add a basic annotate built-in command
1833
            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
1834
            annotate_file(branch, file_version, file_id, long, all, sys.stdout)
1185.16.32 by Martin Pool
- add a basic annotate built-in command
1835
        finally:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1836
            branch.unlock()
1185.16.33 by Martin Pool
- move 'conflict' and 'resolved' from shipped plugin to regular builtins
1837
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
1838
1839
class cmd_re_sign(Command):
1840
    """Create a digital signature for an existing revision."""
1841
    # TODO be able to replace existing ones.
1842
1843
    hidden = True # is this right ?
1844
    takes_args = ['revision_id?']
1845
    takes_options = ['revision']
1846
    
1847
    def run(self, revision_id=None, revision=None):
1848
        import bzrlib.config as config
1849
        import bzrlib.gpg as gpg
1850
        if revision_id is not None and revision is not None:
1851
            raise BzrCommandError('You can only supply one of revision_id or --revision')
1852
        if revision_id is None and revision is None:
1853
            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)
1854
        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.
1855
        gpg_strategy = gpg.GPGStrategy(config.BranchConfig(b))
1856
        if revision_id is not None:
1442.1.60 by Robert Collins
gpg sign commits if the policy says we need to
1857
            b.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.
1858
        elif revision is not None:
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
1859
            if len(revision) == 1:
1860
                revno, rev_id = revision[0].in_history(b)
1442.1.60 by Robert Collins
gpg sign commits if the policy says we need to
1861
                b.sign_revision(rev_id, gpg_strategy)
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
1862
            elif len(revision) == 2:
1863
                # are they both on rh- if so we can walk between them
1864
                # might be nice to have a range helper for arbitrary
1865
                # revision paths. hmm.
1866
                from_revno, from_revid = revision[0].in_history(b)
1867
                to_revno, to_revid = revision[1].in_history(b)
1868
                if to_revid is None:
1869
                    to_revno = b.revno()
1870
                if from_revno is None or to_revno is None:
1871
                    raise BzrCommandError('Cannot sign a range of non-revision-history revisions')
1872
                for revno in range(from_revno, to_revno + 1):
1873
                    b.sign_revision(b.get_rev_id(revno), gpg_strategy)
1874
            else:
1875
                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.
1876
1877
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
1878
class cmd_uncommit(bzrlib.commands.Command):
1879
    """Remove the last committed revision.
1880
1881
    By supplying the --all flag, it will not only remove the entry 
1882
    from revision_history, but also remove all of the entries in the
1883
    stores.
1884
1885
    --verbose will print out what is being removed.
1886
    --dry-run will go through all the motions, but not actually
1887
    remove anything.
1888
    
1889
    In the future, uncommit will create a changeset, which can then
1890
    be re-applied.
1891
    """
1892
    takes_options = ['all', 'verbose', 'revision',
1893
                    Option('dry-run', help='Don\'t actually make changes'),
1894
                    Option('force', help='Say yes to all questions.')]
1895
    takes_args = ['location?']
1896
    aliases = []
1897
1898
    def run(self, location=None, all=False,
1899
            dry_run=False, verbose=False,
1900
            revision=None, force=False):
1901
        from bzrlib.branch import Branch
1902
        from bzrlib.log import log_formatter
1903
        import sys
1904
        from bzrlib.uncommit import uncommit
1905
1906
        if location is None:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1907
            location = u'.'
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
1908
        b, relpath = Branch.open_containing(location)
1909
1910
        if revision is None:
1911
            revno = b.revno()
1912
            rev_id = b.last_revision()
1913
        else:
1914
            revno, rev_id = revision[0].in_history(b)
1915
        if rev_id is None:
1916
            print 'No revisions to uncommit.'
1917
1918
        for r in range(revno, b.revno()+1):
1919
            rev_id = b.get_rev_id(r)
1920
            lf = log_formatter('short', to_file=sys.stdout,show_timezone='original')
1921
            lf.show(r, b.get_revision(rev_id), None)
1922
1923
        if dry_run:
1924
            print 'Dry-run, pretending to remove the above revisions.'
1925
            if not force:
1926
                val = raw_input('Press <enter> to continue')
1927
        else:
1928
            print 'The above revision(s) will be removed.'
1929
            if not force:
1930
                val = raw_input('Are you sure [y/N]? ')
1931
                if val.lower() not in ('y', 'yes'):
1932
                    print 'Canceled'
1933
                    return 0
1934
1935
        uncommit(b, remove_files=all,
1936
                dry_run=dry_run, verbose=verbose,
1937
                revno=revno)
1938
1939
1185.16.33 by Martin Pool
- move 'conflict' and 'resolved' from shipped plugin to regular builtins
1940
# these get imported and then picked up by the scan for cmd_*
1941
# TODO: Some more consistent way to split command definitions across files;
1942
# we do need to load at least some information about them to know of 
1943
# aliases.
1185.35.4 by Aaron Bentley
Implemented remerge
1944
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore