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 |
||
17 |
||
18 |
import sys |
|
19 |
import os |
|
20 |
||
21 |
import bzrlib |
|
22 |
import bzrlib.trace |
|
23 |
from bzrlib.trace import mutter, note, log_error, warning |
|
24 |
from bzrlib.errors import BzrError, BzrCheckError, BzrCommandError |
|
1185.2.12
by Lalo Martins
killed find_cached_root() |
25 |
from bzrlib.branch import Branch |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
26 |
from bzrlib import BZRDIR |
27 |
from bzrlib.commands import Command |
|
28 |
||
29 |
||
30 |
class cmd_status(Command): |
|
31 |
"""Display status summary.
|
|
32 |
||
33 |
This reports on versioned and unknown files, reporting them
|
|
34 |
grouped by state. Possible states are:
|
|
35 |
||
36 |
added
|
|
37 |
Versioned in the working copy but not in the previous revision.
|
|
38 |
||
39 |
removed
|
|
40 |
Versioned in the previous revision but removed or deleted
|
|
41 |
in the working copy.
|
|
42 |
||
43 |
renamed
|
|
44 |
Path of this file changed from the previous revision;
|
|
45 |
the text may also have changed. This includes files whose
|
|
46 |
parent directory was renamed.
|
|
47 |
||
48 |
modified
|
|
49 |
Text has changed since the previous revision.
|
|
50 |
||
51 |
unchanged
|
|
52 |
Nothing about this file has changed since the previous revision.
|
|
53 |
Only shown with --all.
|
|
54 |
||
55 |
unknown
|
|
56 |
Not versioned and not matching an ignore pattern.
|
|
57 |
||
58 |
To see ignored files use 'bzr ignored'. For details in the
|
|
59 |
changes to file texts, use 'bzr diff'.
|
|
60 |
||
61 |
If no arguments are specified, the status of the entire working
|
|
62 |
directory is shown. Otherwise, only the status of the specified
|
|
63 |
files or directories is reported. If a directory is given, status
|
|
64 |
is reported for everything inside that directory.
|
|
1185.1.35
by Robert Collins
Heikki Paajanen's status -r patch |
65 |
|
66 |
If a revision argument is given, the status is calculated against
|
|
67 |
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 |
68 |
"""
|
1185.1.11
by Robert Collins
fixme note for bzr status |
69 |
# XXX: FIXME: bzr status should accept a -r option to show changes
|
70 |
# relative to a revision, or between revisions
|
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
71 |
|
72 |
takes_args = ['file*'] |
|
1092.3.4
by Robert Collins
update symlink branch to integration |
73 |
takes_options = ['all', 'show-ids'] |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
74 |
aliases = ['st', 'stat'] |
75 |
||
1185.1.35
by Robert Collins
Heikki Paajanen's status -r patch |
76 |
def run(self, all=False, show_ids=False, file_list=None, revision=None): |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
77 |
if file_list: |
1185.2.11
by Lalo Martins
killed all uses of find_branch() if favor of the new constructors. |
78 |
b = Branch.open_containing(file_list[0]) |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
79 |
file_list = [b.relpath(x) for x in file_list] |
80 |
# special case: only one path was given and it's the root
|
|
81 |
# of the branch
|
|
82 |
if file_list == ['']: |
|
83 |
file_list = None |
|
84 |
else: |
|
1185.2.11
by Lalo Martins
killed all uses of find_branch() if favor of the new constructors. |
85 |
b = Branch.open_containing('.') |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
86 |
|
87 |
from bzrlib.status import show_status |
|
88 |
show_status(b, show_unchanged=all, show_ids=show_ids, |
|
1185.1.35
by Robert Collins
Heikki Paajanen's status -r patch |
89 |
specific_files=file_list, revision=revision) |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
90 |
|
91 |
||
92 |
class cmd_cat_revision(Command): |
|
1185.5.3
by John Arbash Meinel
cat-revision allows --revision for easier investigation. |
93 |
"""Write out metadata for a revision.
|
94 |
|
|
95 |
The revision to print can either be specified by a specific
|
|
96 |
revision identifier, or you can use --revision.
|
|
97 |
"""
|
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
98 |
|
99 |
hidden = True |
|
1185.5.3
by John Arbash Meinel
cat-revision allows --revision for easier investigation. |
100 |
takes_args = ['revision_id?'] |
101 |
takes_options = ['revision'] |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
102 |
|
1185.5.3
by John Arbash Meinel
cat-revision allows --revision for easier investigation. |
103 |
def run(self, revision_id=None, revision=None): |
104 |
from bzrlib.revisionspec import RevisionSpec |
|
105 |
||
106 |
if revision_id is not None and revision is not None: |
|
107 |
raise BzrCommandError('You can only supply one of revision_id or --revision') |
|
108 |
if revision_id is None and revision is None: |
|
109 |
raise BzrCommandError('You must supply either --revision or a revision_id') |
|
1185.2.11
by Lalo Martins
killed all uses of find_branch() if favor of the new constructors. |
110 |
b = Branch.open_containing('.') |
1185.5.3
by John Arbash Meinel
cat-revision allows --revision for easier investigation. |
111 |
if revision_id is not None: |
112 |
sys.stdout.write(b.get_revision_xml_file(revision_id).read()) |
|
113 |
elif revision is not None: |
|
114 |
for rev in revision: |
|
115 |
if rev is None: |
|
116 |
raise BzrCommandError('You cannot specify a NULL revision.') |
|
117 |
revno, rev_id = rev.in_history(b) |
|
118 |
sys.stdout.write(b.get_revision_xml_file(rev_id).read()) |
|
1185.1.29
by Robert Collins
merge merge tweaks from aaron, which includes latest .dev |
119 |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
120 |
|
121 |
class cmd_revno(Command): |
|
122 |
"""Show current revision number.
|
|
123 |
||
124 |
This is equal to the number of revisions on this branch."""
|
|
125 |
def run(self): |
|
1185.2.11
by Lalo Martins
killed all uses of find_branch() if favor of the new constructors. |
126 |
print Branch.open_containing('.').revno() |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
127 |
|
1182
by Martin Pool
- more disentangling of xml storage format from objects |
128 |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
129 |
class cmd_revision_info(Command): |
130 |
"""Show revision number and revision id for a given revision identifier.
|
|
131 |
"""
|
|
132 |
hidden = True |
|
133 |
takes_args = ['revision_info*'] |
|
134 |
takes_options = ['revision'] |
|
1185.5.4
by John Arbash Meinel
Updated bzr revision-info, created tests. |
135 |
def run(self, revision=None, revision_info_list=[]): |
1185.2.14
by Lalo Martins
fixing up users of RevisionSpec, and moving it over to commands.py |
136 |
from bzrlib.revisionspec import RevisionSpec |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
137 |
|
138 |
revs = [] |
|
139 |
if revision is not None: |
|
140 |
revs.extend(revision) |
|
1185.5.4
by John Arbash Meinel
Updated bzr revision-info, created tests. |
141 |
if revision_info_list is not None: |
142 |
for rev in revision_info_list: |
|
143 |
revs.append(RevisionSpec(rev)) |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
144 |
if len(revs) == 0: |
145 |
raise BzrCommandError('You must supply a revision identifier') |
|
146 |
||
1185.2.11
by Lalo Martins
killed all uses of find_branch() if favor of the new constructors. |
147 |
b = Branch.open_containing('.') |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
148 |
|
149 |
for rev in revs: |
|
1185.5.4
by John Arbash Meinel
Updated bzr revision-info, created tests. |
150 |
revinfo = rev.in_history(b) |
151 |
if revinfo.revno is None: |
|
152 |
print ' %s' % revinfo.rev_id |
|
153 |
else: |
|
154 |
print '%4d %s' % (revinfo.revno, revinfo.rev_id) |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
155 |
|
156 |
||
157 |
class cmd_add(Command): |
|
158 |
"""Add specified files or directories.
|
|
159 |
||
160 |
In non-recursive mode, all the named items are added, regardless
|
|
161 |
of whether they were previously ignored. A warning is given if
|
|
162 |
any of the named files are already versioned.
|
|
163 |
||
164 |
In recursive mode (the default), files are treated the same way
|
|
165 |
but the behaviour for directories is different. Directories that
|
|
166 |
are already versioned do not give a warning. All directories,
|
|
167 |
whether already versioned or not, are searched for files or
|
|
168 |
subdirectories that are neither versioned or ignored, and these
|
|
169 |
are added. This search proceeds recursively into versioned
|
|
170 |
directories. If no names are given '.' is assumed.
|
|
171 |
||
172 |
Therefore simply saying 'bzr add' will version all files that
|
|
173 |
are currently unknown.
|
|
174 |
||
1185.3.3
by Martin Pool
- patch from mpe to automatically add parent directories |
175 |
Adding a file whose parent directory is not versioned will
|
176 |
implicitly add the parent, and so on up to the root. This means
|
|
177 |
you should never need to explictly add a directory, they'll just
|
|
178 |
get added when you add a file in the directory.
|
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
179 |
"""
|
180 |
takes_args = ['file*'] |
|
181 |
takes_options = ['verbose', 'no-recurse'] |
|
182 |
||
183 |
def run(self, file_list, verbose=False, no_recurse=False): |
|
1159
by Martin Pool
- clean up parameters to smart_add and smart_add_branch |
184 |
# verbose currently has no effect
|
185 |
from bzrlib.add import smart_add, add_reporter_print |
|
186 |
smart_add(file_list, not no_recurse, add_reporter_print) |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
187 |
|
188 |
||
189 |
||
190 |
class cmd_mkdir(Command): |
|
191 |
"""Create a new versioned directory.
|
|
192 |
||
193 |
This is equivalent to creating the directory and then adding it.
|
|
194 |
"""
|
|
195 |
takes_args = ['dir+'] |
|
196 |
||
197 |
def run(self, dir_list): |
|
198 |
b = None |
|
199 |
||
200 |
for d in dir_list: |
|
201 |
os.mkdir(d) |
|
202 |
if not b: |
|
1185.2.11
by Lalo Martins
killed all uses of find_branch() if favor of the new constructors. |
203 |
b = Branch.open_containing(d) |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
204 |
b.add([d]) |
205 |
print 'added', d |
|
206 |
||
207 |
||
208 |
class cmd_relpath(Command): |
|
209 |
"""Show path of a file relative to root"""
|
|
210 |
takes_args = ['filename'] |
|
211 |
hidden = True |
|
212 |
||
213 |
def run(self, filename): |
|
1185.2.11
by Lalo Martins
killed all uses of find_branch() if favor of the new constructors. |
214 |
print Branch.open_containing(filename).relpath(filename) |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
215 |
|
216 |
||
217 |
||
218 |
class cmd_inventory(Command): |
|
219 |
"""Show inventory of the current working copy or a revision."""
|
|
220 |
takes_options = ['revision', 'show-ids'] |
|
221 |
||
222 |
def run(self, revision=None, show_ids=False): |
|
1185.2.11
by Lalo Martins
killed all uses of find_branch() if favor of the new constructors. |
223 |
b = Branch.open_containing('.') |
1185.2.14
by Lalo Martins
fixing up users of RevisionSpec, and moving it over to commands.py |
224 |
if revision is None: |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
225 |
inv = b.read_working_inventory() |
226 |
else: |
|
227 |
if len(revision) > 1: |
|
228 |
raise BzrCommandError('bzr inventory --revision takes' |
|
229 |
' exactly one revision identifier') |
|
1185.2.14
by Lalo Martins
fixing up users of RevisionSpec, and moving it over to commands.py |
230 |
inv = b.get_revision_inventory(revision[0].in_history(b).rev_id) |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
231 |
|
232 |
for path, entry in inv.entries(): |
|
233 |
if show_ids: |
|
234 |
print '%-50s %s' % (path, entry.file_id) |
|
235 |
else: |
|
236 |
print path |
|
237 |
||
238 |
||
239 |
class cmd_move(Command): |
|
240 |
"""Move files to a different directory.
|
|
241 |
||
242 |
examples:
|
|
243 |
bzr move *.txt doc
|
|
244 |
||
245 |
The destination must be a versioned directory in the same branch.
|
|
246 |
"""
|
|
247 |
takes_args = ['source$', 'dest'] |
|
248 |
def run(self, source_list, dest): |
|
1185.2.11
by Lalo Martins
killed all uses of find_branch() if favor of the new constructors. |
249 |
b = Branch.open_containing('.') |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
250 |
|
251 |
# TODO: glob expansion on windows?
|
|
252 |
b.move([b.relpath(s) for s in source_list], b.relpath(dest)) |
|
253 |
||
254 |
||
255 |
class cmd_rename(Command): |
|
256 |
"""Change the name of an entry.
|
|
257 |
||
258 |
examples:
|
|
259 |
bzr rename frob.c frobber.c
|
|
260 |
bzr rename src/frob.c lib/frob.c
|
|
261 |
||
262 |
It is an error if the destination name exists.
|
|
263 |
||
264 |
See also the 'move' command, which moves files into a different
|
|
265 |
directory without changing their name.
|
|
266 |
||
267 |
TODO: Some way to rename multiple files without invoking bzr for each
|
|
268 |
one?"""
|
|
269 |
takes_args = ['from_name', 'to_name'] |
|
270 |
||
271 |
def run(self, from_name, to_name): |
|
1185.2.11
by Lalo Martins
killed all uses of find_branch() if favor of the new constructors. |
272 |
b = Branch.open_containing('.') |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
273 |
b.rename_one(b.relpath(from_name), b.relpath(to_name)) |
274 |
||
275 |
||
276 |
||
277 |
class cmd_mv(Command): |
|
278 |
"""Move or rename a file.
|
|
279 |
||
280 |
usage:
|
|
281 |
bzr mv OLDNAME NEWNAME
|
|
282 |
bzr mv SOURCE... DESTINATION
|
|
283 |
||
284 |
If the last argument is a versioned directory, all the other names
|
|
285 |
are moved into it. Otherwise, there must be exactly two arguments
|
|
286 |
and the file is changed to a new name, which must not already exist.
|
|
287 |
||
288 |
Files cannot be moved between branches.
|
|
289 |
"""
|
|
290 |
takes_args = ['names*'] |
|
291 |
def run(self, names_list): |
|
292 |
if len(names_list) < 2: |
|
293 |
raise BzrCommandError("missing file argument") |
|
1185.2.11
by Lalo Martins
killed all uses of find_branch() if favor of the new constructors. |
294 |
b = Branch.open_containing(names_list[0]) |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
295 |
|
296 |
rel_names = [b.relpath(x) for x in names_list] |
|
297 |
||
298 |
if os.path.isdir(names_list[-1]): |
|
299 |
# move into existing directory
|
|
300 |
for pair in b.move(rel_names[:-1], rel_names[-1]): |
|
301 |
print "%s => %s" % pair |
|
302 |
else: |
|
303 |
if len(names_list) != 2: |
|
304 |
raise BzrCommandError('to mv multiple files the destination ' |
|
305 |
'must be a versioned directory') |
|
1185.1.8
by Robert Collins
David Clymers patch to use rename rather than mv for two argument non-directory target bzr mv calls. |
306 |
b.rename_one(rel_names[0], rel_names[1]) |
307 |
print "%s => %s" % (rel_names[0], rel_names[1]) |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
308 |
|
309 |
||
310 |
||
311 |
||
312 |
class cmd_pull(Command): |
|
313 |
"""Pull any changes from another branch into the current one.
|
|
314 |
||
315 |
If the location is omitted, the last-used location will be used.
|
|
316 |
Both the revision history and the working directory will be
|
|
317 |
updated.
|
|
318 |
||
319 |
This command only works on branches that have not diverged. Branches are
|
|
320 |
considered diverged if both branches have had commits without first
|
|
321 |
pulling from the other.
|
|
322 |
||
323 |
If branches have diverged, you can use 'bzr merge' to pull the text changes
|
|
324 |
from one into the other.
|
|
325 |
"""
|
|
326 |
takes_args = ['location?'] |
|
327 |
||
328 |
def run(self, location=None): |
|
329 |
from bzrlib.merge import merge |
|
330 |
import tempfile |
|
331 |
from shutil import rmtree |
|
332 |
import errno |
|
333 |
||
1185.2.11
by Lalo Martins
killed all uses of find_branch() if favor of the new constructors. |
334 |
br_to = Branch.open_containing('.') |
974.1.79
by Aaron Bentley
Fixed issues with pull not having a default location after branch |
335 |
stored_loc = br_to.get_parent() |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
336 |
if location is None: |
337 |
if stored_loc is None: |
|
338 |
raise BzrCommandError("No pull location known or specified.") |
|
339 |
else: |
|
340 |
print "Using last location: %s" % stored_loc |
|
341 |
location = stored_loc |
|
342 |
cache_root = tempfile.mkdtemp() |
|
1185.2.12
by Lalo Martins
killed find_cached_root() |
343 |
from bzrlib.errors import DivergedBranches |
1185.2.11
by Lalo Martins
killed all uses of find_branch() if favor of the new constructors. |
344 |
br_from = Branch.open_containing(location) |
1185.2.3
by Lalo Martins
unifying 'base' (from Branch) and 'baseurl' (from RemoteBranch) attributes; |
345 |
location = br_from.base |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
346 |
old_revno = br_to.revno() |
347 |
try: |
|
1185.2.12
by Lalo Martins
killed find_cached_root() |
348 |
from bzrlib.errors import DivergedBranches |
349 |
br_from = Branch.open(location) |
|
350 |
br_from.setup_caching(cache_root) |
|
1185.2.3
by Lalo Martins
unifying 'base' (from Branch) and 'baseurl' (from RemoteBranch) attributes; |
351 |
location = br_from.base |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
352 |
old_revno = br_to.revno() |
353 |
try: |
|
354 |
br_to.update_revisions(br_from) |
|
355 |
except DivergedBranches: |
|
356 |
raise BzrCommandError("These branches have diverged." |
|
357 |
" Try merge.") |
|
358 |
||
359 |
merge(('.', -1), ('.', old_revno), check_clean=False) |
|
360 |
if location != stored_loc: |
|
974.1.79
by Aaron Bentley
Fixed issues with pull not having a default location after branch |
361 |
br_to.set_parent(location) |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
362 |
finally: |
363 |
rmtree(cache_root) |
|
364 |
||
365 |
||
366 |
||
367 |
class cmd_branch(Command): |
|
368 |
"""Create a new copy of a branch.
|
|
369 |
||
370 |
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
|
|
371 |
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
|
|
372 |
||
373 |
To retrieve the branch as of a particular revision, supply the --revision
|
|
374 |
parameter, as in "branch foo/bar -r 5".
|
|
375 |
"""
|
|
376 |
takes_args = ['from_location', 'to_location?'] |
|
377 |
takes_options = ['revision'] |
|
378 |
aliases = ['get', 'clone'] |
|
379 |
||
380 |
def run(self, from_location, to_location=None, revision=None): |
|
1185.2.12
by Lalo Martins
killed find_cached_root() |
381 |
from bzrlib.branch import copy_branch |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
382 |
import tempfile |
383 |
import errno |
|
384 |
from shutil import rmtree |
|
385 |
cache_root = tempfile.mkdtemp() |
|
386 |
try: |
|
387 |
if revision is None: |
|
388 |
revision = [None] |
|
389 |
elif len(revision) > 1: |
|
390 |
raise BzrCommandError( |
|
391 |
'bzr branch --revision takes exactly 1 revision value') |
|
392 |
try: |
|
1185.2.12
by Lalo Martins
killed find_cached_root() |
393 |
br_from = Branch.open(from_location) |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
394 |
except OSError, e: |
395 |
if e.errno == errno.ENOENT: |
|
396 |
raise BzrCommandError('Source location "%s" does not' |
|
397 |
' exist.' % to_location) |
|
398 |
else: |
|
399 |
raise
|
|
1185.2.12
by Lalo Martins
killed find_cached_root() |
400 |
br_from.setup_caching(cache_root) |
1185.8.4
by Aaron Bentley
Fixed branch -r |
401 |
if len(revision) == 1 and revision[0] is not None: |
402 |
revno = revision[0].in_history(br_from)[0] |
|
403 |
else: |
|
404 |
revno = None |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
405 |
if to_location is None: |
406 |
to_location = os.path.basename(from_location.rstrip("/\\")) |
|
407 |
try: |
|
408 |
os.mkdir(to_location) |
|
409 |
except OSError, e: |
|
410 |
if e.errno == errno.EEXIST: |
|
411 |
raise BzrCommandError('Target directory "%s" already' |
|
412 |
' exists.' % to_location) |
|
413 |
if e.errno == errno.ENOENT: |
|
414 |
raise BzrCommandError('Parent of "%s" does not exist.' % |
|
415 |
to_location) |
|
416 |
else: |
|
417 |
raise
|
|
418 |
try: |
|
1185.8.4
by Aaron Bentley
Fixed branch -r |
419 |
copy_branch(br_from, to_location, revno) |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
420 |
except bzrlib.errors.NoSuchRevision: |
421 |
rmtree(to_location) |
|
422 |
msg = "The branch %s has no revision %d." % (from_location, revision[0]) |
|
423 |
raise BzrCommandError(msg) |
|
424 |
finally: |
|
425 |
rmtree(cache_root) |
|
426 |
||
427 |
||
428 |
class cmd_renames(Command): |
|
429 |
"""Show list of renamed files.
|
|
430 |
||
431 |
TODO: Option to show renames between two historical versions.
|
|
432 |
||
433 |
TODO: Only show renames under dir, rather than in the whole branch.
|
|
434 |
"""
|
|
435 |
takes_args = ['dir?'] |
|
436 |
||
437 |
def run(self, dir='.'): |
|
1185.2.11
by Lalo Martins
killed all uses of find_branch() if favor of the new constructors. |
438 |
b = Branch.open_containing(dir) |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
439 |
old_inv = b.basis_tree().inventory |
440 |
new_inv = b.read_working_inventory() |
|
441 |
||
442 |
renames = list(bzrlib.tree.find_renames(old_inv, new_inv)) |
|
443 |
renames.sort() |
|
444 |
for old_name, new_name in renames: |
|
445 |
print "%s => %s" % (old_name, new_name) |
|
446 |
||
447 |
||
448 |
class cmd_info(Command): |
|
449 |
"""Show statistical information about a branch."""
|
|
450 |
takes_args = ['branch?'] |
|
451 |
||
452 |
def run(self, branch=None): |
|
453 |
import info |
|
454 |
||
1185.2.11
by Lalo Martins
killed all uses of find_branch() if favor of the new constructors. |
455 |
b = Branch.open_containing(branch) |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
456 |
info.show_info(b) |
457 |
||
458 |
||
459 |
class cmd_remove(Command): |
|
460 |
"""Make a file unversioned.
|
|
461 |
||
462 |
This makes bzr stop tracking changes to a versioned file. It does
|
|
463 |
not delete the working copy.
|
|
464 |
"""
|
|
465 |
takes_args = ['file+'] |
|
466 |
takes_options = ['verbose'] |
|
467 |
||
468 |
def run(self, file_list, verbose=False): |
|
1185.2.11
by Lalo Martins
killed all uses of find_branch() if favor of the new constructors. |
469 |
b = Branch.open_containing(file_list[0]) |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
470 |
b.remove([b.relpath(f) for f in file_list], verbose=verbose) |
471 |
||
472 |
||
473 |
class cmd_file_id(Command): |
|
474 |
"""Print file_id of a particular file or directory.
|
|
475 |
||
476 |
The file_id is assigned when the file is first added and remains the
|
|
477 |
same through all revisions where the file exists, even when it is
|
|
478 |
moved or renamed.
|
|
479 |
"""
|
|
480 |
hidden = True |
|
481 |
takes_args = ['filename'] |
|
482 |
def run(self, filename): |
|
1185.2.11
by Lalo Martins
killed all uses of find_branch() if favor of the new constructors. |
483 |
b = Branch.open_containing(filename) |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
484 |
i = b.inventory.path2id(b.relpath(filename)) |
485 |
if i == None: |
|
486 |
raise BzrError("%r is not a versioned file" % filename) |
|
487 |
else: |
|
488 |
print i |
|
489 |
||
490 |
||
491 |
class cmd_file_path(Command): |
|
492 |
"""Print path of file_ids to a file or directory.
|
|
493 |
||
494 |
This prints one line for each directory down to the target,
|
|
495 |
starting at the branch root."""
|
|
496 |
hidden = True |
|
497 |
takes_args = ['filename'] |
|
498 |
def run(self, filename): |
|
1185.2.11
by Lalo Martins
killed all uses of find_branch() if favor of the new constructors. |
499 |
b = Branch.open_containing(filename) |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
500 |
inv = b.inventory |
501 |
fid = inv.path2id(b.relpath(filename)) |
|
502 |
if fid == None: |
|
503 |
raise BzrError("%r is not a versioned file" % filename) |
|
504 |
for fip in inv.get_idpath(fid): |
|
505 |
print fip |
|
506 |
||
507 |
||
508 |
class cmd_revision_history(Command): |
|
509 |
"""Display list of revision ids on this branch."""
|
|
510 |
hidden = True |
|
511 |
def run(self): |
|
1185.2.11
by Lalo Martins
killed all uses of find_branch() if favor of the new constructors. |
512 |
for patchid in Branch.open_containing('.').revision_history(): |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
513 |
print patchid |
514 |
||
515 |
||
516 |
class cmd_directories(Command): |
|
517 |
"""Display list of versioned directories in this branch."""
|
|
518 |
def run(self): |
|
1185.2.11
by Lalo Martins
killed all uses of find_branch() if favor of the new constructors. |
519 |
for name, ie in Branch.open_containing('.').read_working_inventory().directories(): |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
520 |
if name == '': |
521 |
print '.' |
|
522 |
else: |
|
523 |
print name |
|
524 |
||
525 |
||
526 |
class cmd_init(Command): |
|
527 |
"""Make a directory into a versioned branch.
|
|
528 |
||
529 |
Use this to create an empty branch, or before importing an
|
|
530 |
existing project.
|
|
531 |
||
532 |
Recipe for importing a tree of files:
|
|
533 |
cd ~/project
|
|
534 |
bzr init
|
|
535 |
bzr add -v .
|
|
536 |
bzr status
|
|
537 |
bzr commit -m 'imported project'
|
|
538 |
"""
|
|
539 |
def run(self): |
|
1185.2.9
by Lalo Martins
getting rid of everything that calls the Branch constructor directly |
540 |
Branch.initialize('.') |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
541 |
|
542 |
||
543 |
class cmd_diff(Command): |
|
544 |
"""Show differences in working tree.
|
|
545 |
|
|
546 |
If files are listed, only the changes in those files are listed.
|
|
547 |
Otherwise, all changes for the tree are listed.
|
|
548 |
||
549 |
TODO: Allow diff across branches.
|
|
550 |
||
551 |
TODO: Option to use external diff command; could be GNU diff, wdiff,
|
|
552 |
or a graphical diff.
|
|
553 |
||
554 |
TODO: Python difflib is not exactly the same as unidiff; should
|
|
555 |
either fix it up or prefer to use an external diff.
|
|
556 |
||
557 |
TODO: If a directory is given, diff everything under that.
|
|
558 |
||
559 |
TODO: Selected-file diff is inefficient and doesn't show you
|
|
560 |
deleted files.
|
|
561 |
||
562 |
TODO: This probably handles non-Unix newlines poorly.
|
|
563 |
||
564 |
examples:
|
|
565 |
bzr diff
|
|
566 |
bzr diff -r1
|
|
1185.1.2
by Martin Pool
- merge various windows and other fixes from Ollie Rutherfurd |
567 |
bzr diff -r1..2
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
568 |
"""
|
569 |
||
570 |
takes_args = ['file*'] |
|
571 |
takes_options = ['revision', 'diff-options'] |
|
572 |
aliases = ['di', 'dif'] |
|
573 |
||
574 |
def run(self, revision=None, file_list=None, diff_options=None): |
|
575 |
from bzrlib.diff import show_diff |
|
576 |
||
577 |
if file_list: |
|
1185.2.11
by Lalo Martins
killed all uses of find_branch() if favor of the new constructors. |
578 |
b = Branch.open_containing(file_list[0]) |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
579 |
file_list = [b.relpath(f) for f in file_list] |
580 |
if file_list == ['']: |
|
581 |
# just pointing to top-of-tree
|
|
582 |
file_list = None |
|
583 |
else: |
|
1185.2.11
by Lalo Martins
killed all uses of find_branch() if favor of the new constructors. |
584 |
b = Branch.open_containing('.') |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
585 |
|
586 |
if revision is not None: |
|
587 |
if len(revision) == 1: |
|
588 |
show_diff(b, revision[0], specific_files=file_list, |
|
589 |
external_diff_options=diff_options) |
|
590 |
elif len(revision) == 2: |
|
591 |
show_diff(b, revision[0], specific_files=file_list, |
|
592 |
external_diff_options=diff_options, |
|
593 |
revision2=revision[1]) |
|
594 |
else: |
|
595 |
raise BzrCommandError('bzr diff --revision takes exactly one or two revision identifiers') |
|
596 |
else: |
|
597 |
show_diff(b, None, specific_files=file_list, |
|
598 |
external_diff_options=diff_options) |
|
599 |
||
600 |
||
601 |
||
602 |
||
603 |
class cmd_deleted(Command): |
|
604 |
"""List files deleted in the working tree.
|
|
605 |
||
606 |
TODO: Show files deleted since a previous revision, or between two revisions.
|
|
607 |
"""
|
|
608 |
def run(self, show_ids=False): |
|
1185.2.11
by Lalo Martins
killed all uses of find_branch() if favor of the new constructors. |
609 |
b = Branch.open_containing('.') |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
610 |
old = b.basis_tree() |
611 |
new = b.working_tree() |
|
612 |
||
613 |
## TODO: Much more efficient way to do this: read in new
|
|
614 |
## directories with readdir, rather than stating each one. Same
|
|
615 |
## level of effort but possibly much less IO. (Or possibly not,
|
|
616 |
## if the directories are very large...)
|
|
617 |
||
618 |
for path, ie in old.inventory.iter_entries(): |
|
619 |
if not new.has_id(ie.file_id): |
|
620 |
if show_ids: |
|
621 |
print '%-50s %s' % (path, ie.file_id) |
|
622 |
else: |
|
623 |
print path |
|
624 |
||
625 |
||
626 |
class cmd_modified(Command): |
|
627 |
"""List files modified in working tree."""
|
|
628 |
hidden = True |
|
629 |
def run(self): |
|
630 |
from bzrlib.delta import compare_trees |
|
631 |
||
1185.2.11
by Lalo Martins
killed all uses of find_branch() if favor of the new constructors. |
632 |
b = Branch.open_containing('.') |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
633 |
td = compare_trees(b.basis_tree(), b.working_tree()) |
634 |
||
635 |
for path, id, kind in td.modified: |
|
636 |
print path |
|
637 |
||
638 |
||
639 |
||
640 |
class cmd_added(Command): |
|
641 |
"""List files added in working tree."""
|
|
642 |
hidden = True |
|
643 |
def run(self): |
|
1185.2.11
by Lalo Martins
killed all uses of find_branch() if favor of the new constructors. |
644 |
b = Branch.open_containing('.') |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
645 |
wt = b.working_tree() |
646 |
basis_inv = b.basis_tree().inventory |
|
647 |
inv = wt.inventory |
|
648 |
for file_id in inv: |
|
649 |
if file_id in basis_inv: |
|
650 |
continue
|
|
651 |
path = inv.id2path(file_id) |
|
652 |
if not os.access(b.abspath(path), os.F_OK): |
|
653 |
continue
|
|
654 |
print path |
|
655 |
||
656 |
||
657 |
||
658 |
class cmd_root(Command): |
|
659 |
"""Show the tree root directory.
|
|
660 |
||
661 |
The root is the nearest enclosing directory with a .bzr control
|
|
662 |
directory."""
|
|
663 |
takes_args = ['filename?'] |
|
664 |
def run(self, filename=None): |
|
665 |
"""Print the branch root."""
|
|
1185.2.11
by Lalo Martins
killed all uses of find_branch() if favor of the new constructors. |
666 |
b = Branch.open_containing(filename) |
1185.2.3
by Lalo Martins
unifying 'base' (from Branch) and 'baseurl' (from RemoteBranch) attributes; |
667 |
print b.base |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
668 |
|
669 |
||
670 |
class cmd_log(Command): |
|
671 |
"""Show log of this branch.
|
|
672 |
||
673 |
To request a range of logs, you can use the command -r begin:end
|
|
674 |
-r revision requests a specific revision, -r :end or -r begin: are
|
|
675 |
also valid.
|
|
676 |
||
677 |
--message allows you to give a regular expression, which will be evaluated
|
|
678 |
so that only matching entries will be displayed.
|
|
679 |
||
680 |
TODO: Make --revision support uuid: and hash: [future tag:] notation.
|
|
681 |
|
|
682 |
"""
|
|
683 |
||
684 |
takes_args = ['filename?'] |
|
685 |
takes_options = ['forward', 'timezone', 'verbose', 'show-ids', 'revision', |
|
686 |
'long', 'message', 'short',] |
|
687 |
||
688 |
def run(self, filename=None, timezone='original', |
|
689 |
verbose=False, |
|
690 |
show_ids=False, |
|
691 |
forward=False, |
|
692 |
revision=None, |
|
693 |
message=None, |
|
694 |
long=False, |
|
695 |
short=False): |
|
696 |
from bzrlib.log import log_formatter, show_log |
|
697 |
import codecs |
|
698 |
||
699 |
direction = (forward and 'forward') or 'reverse' |
|
700 |
||
701 |
if filename: |
|
1185.2.11
by Lalo Martins
killed all uses of find_branch() if favor of the new constructors. |
702 |
b = Branch.open_containing(filename) |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
703 |
fp = b.relpath(filename) |
704 |
if fp: |
|
705 |
file_id = b.read_working_inventory().path2id(fp) |
|
706 |
else: |
|
707 |
file_id = None # points to branch root |
|
708 |
else: |
|
1185.2.11
by Lalo Martins
killed all uses of find_branch() if favor of the new constructors. |
709 |
b = Branch.open_containing('.') |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
710 |
file_id = None |
711 |
||
712 |
if revision is None: |
|
713 |
rev1 = None |
|
714 |
rev2 = None |
|
715 |
elif len(revision) == 1: |
|
1185.2.14
by Lalo Martins
fixing up users of RevisionSpec, and moving it over to commands.py |
716 |
rev1 = rev2 = revision[0].in_history(b).revno |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
717 |
elif len(revision) == 2: |
1185.2.14
by Lalo Martins
fixing up users of RevisionSpec, and moving it over to commands.py |
718 |
rev1 = revision[0].in_history(b).revno |
719 |
rev2 = revision[1].in_history(b).revno |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
720 |
else: |
721 |
raise BzrCommandError('bzr log --revision takes one or two values.') |
|
722 |
||
723 |
if rev1 == 0: |
|
724 |
rev1 = None |
|
725 |
if rev2 == 0: |
|
726 |
rev2 = None |
|
727 |
||
728 |
mutter('encoding log as %r' % bzrlib.user_encoding) |
|
729 |
||
730 |
# use 'replace' so that we don't abort if trying to write out
|
|
731 |
# in e.g. the default C locale.
|
|
732 |
outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace') |
|
733 |
||
734 |
if not short: |
|
735 |
log_format = 'long' |
|
736 |
else: |
|
737 |
log_format = 'short' |
|
738 |
lf = log_formatter(log_format, |
|
739 |
show_ids=show_ids, |
|
740 |
to_file=outf, |
|
741 |
show_timezone=timezone) |
|
742 |
||
743 |
show_log(b, |
|
744 |
lf, |
|
745 |
file_id, |
|
746 |
verbose=verbose, |
|
747 |
direction=direction, |
|
748 |
start_revision=rev1, |
|
749 |
end_revision=rev2, |
|
750 |
search=message) |
|
751 |
||
752 |
||
753 |
||
754 |
class cmd_touching_revisions(Command): |
|
755 |
"""Return revision-ids which affected a particular file.
|
|
756 |
||
757 |
A more user-friendly interface is "bzr log FILE"."""
|
|
758 |
hidden = True |
|
759 |
takes_args = ["filename"] |
|
760 |
def run(self, filename): |
|
1185.2.11
by Lalo Martins
killed all uses of find_branch() if favor of the new constructors. |
761 |
b = Branch.open_containing(filename) |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
762 |
inv = b.read_working_inventory() |
763 |
file_id = inv.path2id(b.relpath(filename)) |
|
764 |
for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id): |
|
765 |
print "%6d %s" % (revno, what) |
|
766 |
||
767 |
||
768 |
class cmd_ls(Command): |
|
769 |
"""List files in a tree.
|
|
770 |
||
771 |
TODO: Take a revision or remote path and list that tree instead.
|
|
772 |
"""
|
|
773 |
hidden = True |
|
774 |
def run(self, revision=None, verbose=False): |
|
1185.2.11
by Lalo Martins
killed all uses of find_branch() if favor of the new constructors. |
775 |
b = Branch.open_containing('.') |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
776 |
if revision == None: |
777 |
tree = b.working_tree() |
|
778 |
else: |
|
1185.2.14
by Lalo Martins
fixing up users of RevisionSpec, and moving it over to commands.py |
779 |
tree = b.revision_tree(revision.in_history(b).rev_id) |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
780 |
|
781 |
for fp, fc, kind, fid in tree.list_files(): |
|
782 |
if verbose: |
|
783 |
if kind == 'directory': |
|
784 |
kindch = '/' |
|
785 |
elif kind == 'file': |
|
786 |
kindch = '' |
|
787 |
else: |
|
788 |
kindch = '???' |
|
789 |
||
790 |
print '%-8s %s%s' % (fc, fp, kindch) |
|
791 |
else: |
|
792 |
print fp |
|
793 |
||
794 |
||
795 |
||
796 |
class cmd_unknowns(Command): |
|
797 |
"""List unknown files."""
|
|
798 |
def run(self): |
|
799 |
from bzrlib.osutils import quotefn |
|
1185.2.11
by Lalo Martins
killed all uses of find_branch() if favor of the new constructors. |
800 |
for f in Branch.open_containing('.').unknowns(): |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
801 |
print quotefn(f) |
802 |
||
803 |
||
804 |
||
805 |
class cmd_ignore(Command): |
|
806 |
"""Ignore a command or pattern.
|
|
807 |
||
808 |
To remove patterns from the ignore list, edit the .bzrignore file.
|
|
809 |
||
810 |
If the pattern contains a slash, it is compared to the whole path
|
|
811 |
from the branch root. Otherwise, it is comapred to only the last
|
|
812 |
component of the path.
|
|
813 |
||
814 |
Ignore patterns are case-insensitive on case-insensitive systems.
|
|
815 |
||
816 |
Note: wildcards must be quoted from the shell on Unix.
|
|
817 |
||
818 |
examples:
|
|
819 |
bzr ignore ./Makefile
|
|
820 |
bzr ignore '*.class'
|
|
821 |
"""
|
|
822 |
takes_args = ['name_pattern'] |
|
823 |
||
824 |
def run(self, name_pattern): |
|
825 |
from bzrlib.atomicfile import AtomicFile |
|
826 |
import os.path |
|
827 |
||
1185.2.11
by Lalo Martins
killed all uses of find_branch() if favor of the new constructors. |
828 |
b = Branch.open_containing('.') |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
829 |
ifn = b.abspath('.bzrignore') |
830 |
||
831 |
if os.path.exists(ifn): |
|
832 |
f = open(ifn, 'rt') |
|
833 |
try: |
|
834 |
igns = f.read().decode('utf-8') |
|
835 |
finally: |
|
836 |
f.close() |
|
837 |
else: |
|
838 |
igns = '' |
|
839 |
||
840 |
# TODO: If the file already uses crlf-style termination, maybe
|
|
841 |
# we should use that for the newly added lines?
|
|
842 |
||
843 |
if igns and igns[-1] != '\n': |
|
844 |
igns += '\n' |
|
845 |
igns += name_pattern + '\n' |
|
846 |
||
847 |
try: |
|
848 |
f = AtomicFile(ifn, 'wt') |
|
849 |
f.write(igns.encode('utf-8')) |
|
850 |
f.commit() |
|
851 |
finally: |
|
852 |
f.close() |
|
853 |
||
854 |
inv = b.working_tree().inventory |
|
855 |
if inv.path2id('.bzrignore'): |
|
856 |
mutter('.bzrignore is already versioned') |
|
857 |
else: |
|
858 |
mutter('need to make new .bzrignore file versioned') |
|
859 |
b.add(['.bzrignore']) |
|
860 |
||
861 |
||
862 |
||
863 |
class cmd_ignored(Command): |
|
864 |
"""List ignored files and the patterns that matched them.
|
|
865 |
||
866 |
See also: bzr ignore"""
|
|
867 |
def run(self): |
|
1185.2.11
by Lalo Martins
killed all uses of find_branch() if favor of the new constructors. |
868 |
tree = Branch.open_containing('.').working_tree() |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
869 |
for path, file_class, kind, file_id in tree.list_files(): |
870 |
if file_class != 'I': |
|
871 |
continue
|
|
872 |
## XXX: Slightly inefficient since this was already calculated
|
|
873 |
pat = tree.is_ignored(path) |
|
874 |
print '%-50s %s' % (path, pat) |
|
875 |
||
876 |
||
877 |
class cmd_lookup_revision(Command): |
|
878 |
"""Lookup the revision-id from a revision-number
|
|
879 |
||
880 |
example:
|
|
881 |
bzr lookup-revision 33
|
|
882 |
"""
|
|
883 |
hidden = True |
|
884 |
takes_args = ['revno'] |
|
885 |
||
886 |
def run(self, revno): |
|
887 |
try: |
|
888 |
revno = int(revno) |
|
889 |
except ValueError: |
|
890 |
raise BzrCommandError("not a valid revision-number: %r" % revno) |
|
891 |
||
1185.2.11
by Lalo Martins
killed all uses of find_branch() if favor of the new constructors. |
892 |
print Branch.open_containing('.').get_rev_id(revno) |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
893 |
|
894 |
||
895 |
class cmd_export(Command): |
|
896 |
"""Export past revision to destination directory.
|
|
897 |
||
898 |
If no revision is specified this exports the last committed revision.
|
|
899 |
||
900 |
Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
|
|
901 |
given, try to find the format with the extension. If no extension
|
|
902 |
is found exports to a directory (equivalent to --format=dir).
|
|
903 |
||
904 |
Root may be the top directory for tar, tgz and tbz2 formats. If none
|
|
905 |
is given, the top directory will be the root name of the file."""
|
|
906 |
# TODO: list known exporters
|
|
907 |
takes_args = ['dest'] |
|
908 |
takes_options = ['revision', 'format', 'root'] |
|
909 |
def run(self, dest, revision=None, format=None, root=None): |
|
910 |
import os.path |
|
1185.2.11
by Lalo Martins
killed all uses of find_branch() if favor of the new constructors. |
911 |
b = Branch.open_containing('.') |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
912 |
if revision is None: |
913 |
rev_id = b.last_patch() |
|
914 |
else: |
|
915 |
if len(revision) != 1: |
|
916 |
raise BzrError('bzr export --revision takes exactly 1 argument') |
|
1185.2.14
by Lalo Martins
fixing up users of RevisionSpec, and moving it over to commands.py |
917 |
rev_id = revision[0].in_history(b).rev_id |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
918 |
t = b.revision_tree(rev_id) |
919 |
root, ext = os.path.splitext(dest) |
|
920 |
if not format: |
|
921 |
if ext in (".tar",): |
|
922 |
format = "tar" |
|
923 |
elif ext in (".gz", ".tgz"): |
|
924 |
format = "tgz" |
|
925 |
elif ext in (".bz2", ".tbz2"): |
|
926 |
format = "tbz2" |
|
927 |
else: |
|
928 |
format = "dir" |
|
929 |
t.export(dest, format, root) |
|
930 |
||
931 |
||
932 |
class cmd_cat(Command): |
|
933 |
"""Write a file's text from a previous revision."""
|
|
934 |
||
935 |
takes_options = ['revision'] |
|
936 |
takes_args = ['filename'] |
|
937 |
||
938 |
def run(self, filename, revision=None): |
|
1185.2.14
by Lalo Martins
fixing up users of RevisionSpec, and moving it over to commands.py |
939 |
if revision is None: |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
940 |
raise BzrCommandError("bzr cat requires a revision number") |
941 |
elif len(revision) != 1: |
|
942 |
raise BzrCommandError("bzr cat --revision takes exactly one number") |
|
1185.2.11
by Lalo Martins
killed all uses of find_branch() if favor of the new constructors. |
943 |
b = Branch.open_containing('.') |
1185.2.14
by Lalo Martins
fixing up users of RevisionSpec, and moving it over to commands.py |
944 |
b.print_file(b.relpath(filename), revision[0].in_history(b).revno) |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
945 |
|
946 |
||
947 |
class cmd_local_time_offset(Command): |
|
948 |
"""Show the offset in seconds from GMT to local time."""
|
|
949 |
hidden = True |
|
950 |
def run(self): |
|
951 |
print bzrlib.osutils.local_time_offset() |
|
952 |
||
953 |
||
954 |
||
955 |
class cmd_commit(Command): |
|
956 |
"""Commit changes into a new revision.
|
|
957 |
|
|
958 |
If no arguments are given, the entire tree is committed.
|
|
959 |
||
960 |
If selected files are specified, only changes to those files are
|
|
961 |
committed. If a directory is specified then the directory and everything
|
|
962 |
within it is committed.
|
|
963 |
||
964 |
A selected-file commit may fail in some cases where the committed
|
|
965 |
tree would be invalid, such as trying to commit a file in a
|
|
966 |
newly-added directory that is not itself committed.
|
|
967 |
||
968 |
TODO: Run hooks on tree to-be-committed, and after commit.
|
|
969 |
||
970 |
TODO: Strict commit that fails if there are unknown or deleted files.
|
|
971 |
"""
|
|
972 |
takes_args = ['selected*'] |
|
973 |
takes_options = ['message', 'file', 'verbose', 'unchanged'] |
|
974 |
aliases = ['ci', 'checkin'] |
|
975 |
||
976 |
# TODO: Give better message for -s, --summary, used by tla people
|
|
977 |
||
978 |
def run(self, message=None, file=None, verbose=True, selected_list=None, |
|
979 |
unchanged=False): |
|
980 |
from bzrlib.errors import PointlessCommit |
|
1167
by Martin Pool
- split commit message editor functions out into own file |
981 |
from bzrlib.msgeditor import edit_commit_message |
1169
by Martin Pool
- clean up nasty code for inserting the status summary into commit template |
982 |
from bzrlib.status import show_status |
983 |
from cStringIO import StringIO |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
984 |
|
1185.2.11
by Lalo Martins
killed all uses of find_branch() if favor of the new constructors. |
985 |
b = Branch.open_containing('.') |
1169
by Martin Pool
- clean up nasty code for inserting the status summary into commit template |
986 |
if selected_list: |
987 |
selected_list = [b.relpath(s) for s in selected_list] |
|
988 |
||
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
989 |
if not message and not file: |
1169
by Martin Pool
- clean up nasty code for inserting the status summary into commit template |
990 |
catcher = StringIO() |
991 |
show_status(b, specific_files=selected_list, |
|
992 |
to_file=catcher) |
|
993 |
message = edit_commit_message(catcher.getvalue()) |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
994 |
|
995 |
if message is None: |
|
1169
by Martin Pool
- clean up nasty code for inserting the status summary into commit template |
996 |
raise BzrCommandError("please specify a commit message" |
997 |
" with either --message or --file") |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
998 |
elif message and file: |
999 |
raise BzrCommandError("please specify either --message or --file") |
|
1000 |
||
1001 |
if file: |
|
1002 |
import codecs |
|
1003 |
message = codecs.open(file, 'rt', bzrlib.user_encoding).read() |
|
1004 |
||
1005 |
try: |
|
1006 |
b.commit(message, verbose=verbose, |
|
1007 |
specific_files=selected_list, |
|
1008 |
allow_pointless=unchanged) |
|
1009 |
except PointlessCommit: |
|
1010 |
# FIXME: This should really happen before the file is read in;
|
|
1011 |
# perhaps prepare the commit; get the message; then actually commit
|
|
1012 |
raise BzrCommandError("no changes to commit", |
|
1013 |
["use --unchanged to commit anyhow"]) |
|
1014 |
||
1015 |
||
1016 |
class cmd_check(Command): |
|
1017 |
"""Validate consistency of branch history.
|
|
1018 |
||
1019 |
This command checks various invariants about the branch storage to
|
|
1020 |
detect data corruption or bzr bugs.
|
|
1021 |
"""
|
|
1022 |
takes_args = ['dir?'] |
|
1023 |
||
1024 |
def run(self, dir='.'): |
|
1025 |
from bzrlib.check import check |
|
1026 |
||
1185.2.11
by Lalo Martins
killed all uses of find_branch() if favor of the new constructors. |
1027 |
check(Branch.open_containing(dir)) |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1028 |
|
1029 |
||
1030 |
class cmd_scan_cache(Command): |
|
1031 |
hidden = True |
|
1032 |
def run(self): |
|
1033 |
from bzrlib.hashcache import HashCache |
|
1034 |
||
1035 |
c = HashCache('.') |
|
1036 |
c.read() |
|
1037 |
c.scan() |
|
1038 |
||
1039 |
print '%6d stats' % c.stat_count |
|
1040 |
print '%6d in hashcache' % len(c._cache) |
|
1041 |
print '%6d files removed from cache' % c.removed_count |
|
1042 |
print '%6d hashes updated' % c.update_count |
|
1043 |
print '%6d files changed too recently to cache' % c.danger_count |
|
1044 |
||
1045 |
if c.needs_write: |
|
1046 |
c.write() |
|
1047 |
||
1048 |
||
1049 |
||
1050 |
class cmd_upgrade(Command): |
|
1051 |
"""Upgrade branch storage to current format.
|
|
1052 |
||
1053 |
The check command or bzr developers may sometimes advise you to run
|
|
1054 |
this command.
|
|
1055 |
"""
|
|
1056 |
takes_args = ['dir?'] |
|
1057 |
||
1058 |
def run(self, dir='.'): |
|
1059 |
from bzrlib.upgrade import upgrade |
|
1185.2.11
by Lalo Martins
killed all uses of find_branch() if favor of the new constructors. |
1060 |
upgrade(Branch.open_containing(dir)) |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1061 |
|
1062 |
||
1063 |
||
1064 |
class cmd_whoami(Command): |
|
1065 |
"""Show bzr user id."""
|
|
1066 |
takes_options = ['email'] |
|
1067 |
||
1068 |
def run(self, email=False): |
|
1069 |
try: |
|
1185.2.11
by Lalo Martins
killed all uses of find_branch() if favor of the new constructors. |
1070 |
b = bzrlib.branch.Branch.open_containing('.') |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1071 |
except: |
1072 |
b = None |
|
1073 |
||
1074 |
if email: |
|
1075 |
print bzrlib.osutils.user_email(b) |
|
1076 |
else: |
|
1077 |
print bzrlib.osutils.username(b) |
|
1078 |
||
1079 |
||
1080 |
class cmd_selftest(Command): |
|
1081 |
"""Run internal test suite"""
|
|
1082 |
hidden = True |
|
1083 |
takes_options = ['verbose', 'pattern'] |
|
1084 |
def run(self, verbose=False, pattern=".*"): |
|
1085 |
import bzrlib.ui |
|
1086 |
from bzrlib.selftest import selftest |
|
1087 |
# we don't want progress meters from the tests to go to the
|
|
1088 |
# real output; and we don't want log messages cluttering up
|
|
1089 |
# the real logs.
|
|
1090 |
save_ui = bzrlib.ui.ui_factory |
|
1091 |
bzrlib.trace.info('running tests...') |
|
1092 |
try: |
|
1093 |
bzrlib.ui.ui_factory = bzrlib.ui.SilentUIFactory() |
|
1094 |
result = selftest(verbose=verbose, pattern=pattern) |
|
1095 |
if result: |
|
1096 |
bzrlib.trace.info('tests passed') |
|
1097 |
else: |
|
1098 |
bzrlib.trace.info('tests failed') |
|
1099 |
return int(not result) |
|
1100 |
finally: |
|
1101 |
bzrlib.ui.ui_factory = save_ui |
|
1102 |
||
1103 |
||
1104 |
def show_version(): |
|
1105 |
print "bzr (bazaar-ng) %s" % bzrlib.__version__ |
|
1106 |
# is bzrlib itself in a branch?
|
|
1107 |
bzrrev = bzrlib.get_bzr_revision() |
|
1108 |
if bzrrev: |
|
1109 |
print " (bzr checkout, revision %d {%s})" % bzrrev |
|
1110 |
print bzrlib.__copyright__ |
|
1111 |
print "http://bazaar-ng.org/" |
|
1112 |
print
|
|
1113 |
print "bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and" |
|
1114 |
print "you may use, modify and redistribute it under the terms of the GNU" |
|
1115 |
print "General Public License version 2 or later." |
|
1116 |
||
1117 |
||
1118 |
class cmd_version(Command): |
|
1119 |
"""Show version of bzr."""
|
|
1120 |
def run(self): |
|
1121 |
show_version() |
|
1122 |
||
1123 |
class cmd_rocks(Command): |
|
1124 |
"""Statement of optimism."""
|
|
1125 |
hidden = True |
|
1126 |
def run(self): |
|
1127 |
print "it sure does!" |
|
1128 |
||
1129 |
||
1130 |
class cmd_find_merge_base(Command): |
|
1131 |
"""Find and print a base revision for merging two branches.
|
|
1132 |
||
1133 |
TODO: Options to specify revisions on either side, as if
|
|
1134 |
merging only part of the history.
|
|
1135 |
"""
|
|
1136 |
takes_args = ['branch', 'other'] |
|
1137 |
hidden = True |
|
1138 |
||
1139 |
def run(self, branch, other): |
|
1155
by Martin Pool
- update find-merge-base to use new common_ancestor code |
1140 |
from bzrlib.revision import common_ancestor, MultipleRevisionSources |
1141 |
||
1185.2.11
by Lalo Martins
killed all uses of find_branch() if favor of the new constructors. |
1142 |
branch1 = Branch.open_containing(branch) |
1143 |
branch2 = Branch.open_containing(other) |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1144 |
|
1155
by Martin Pool
- update find-merge-base to use new common_ancestor code |
1145 |
history_1 = branch1.revision_history() |
1146 |
history_2 = branch2.revision_history() |
|
1147 |
||
1148 |
last1 = branch1.last_patch() |
|
1149 |
last2 = branch2.last_patch() |
|
1150 |
||
1151 |
source = MultipleRevisionSources(branch1, branch2) |
|
1152 |
||
1153 |
base_rev_id = common_ancestor(last1, last2, source) |
|
1154 |
||
1155 |
print 'merge base is revision %s' % base_rev_id |
|
1156 |
||
1157 |
return
|
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1158 |
|
1159 |
if base_revno is None: |
|
1160 |
raise bzrlib.errors.UnrelatedBranches() |
|
1161 |
||
1162 |
print ' r%-6d in %s' % (base_revno, branch) |
|
1163 |
||
1164 |
other_revno = branch2.revision_id_to_revno(base_revid) |
|
1165 |
||
1166 |
print ' r%-6d in %s' % (other_revno, other) |
|
1167 |
||
1168 |
||
1169 |
||
1170 |
class cmd_merge(Command): |
|
1171 |
"""Perform a three-way merge.
|
|
1172 |
|
|
1172
by Martin Pool
- better explanation when merge fails with AmbiguousBase |
1173 |
The branch is the branch you will merge from. By default, it will
|
1174 |
merge the latest revision. If you specify a revision, that
|
|
1175 |
revision will be merged. If you specify two revisions, the first
|
|
1176 |
will be used as a BASE, and the second one as OTHER. Revision
|
|
1177 |
numbers are always relative to the specified branch.
|
|
1178 |
||
1179 |
By default bzr will try to merge in all new work from the other
|
|
1180 |
branch, automatically determining an appropriate base. If this
|
|
1181 |
fails, you may need to give an explicit base.
|
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1182 |
|
1183 |
Examples:
|
|
1184 |
||
1185 |
To merge the latest revision from bzr.dev
|
|
1186 |
bzr merge ../bzr.dev
|
|
1187 |
||
1188 |
To merge changes up to and including revision 82 from bzr.dev
|
|
1189 |
bzr merge -r 82 ../bzr.dev
|
|
1190 |
||
1191 |
To merge the changes introduced by 82, without previous changes:
|
|
1192 |
bzr merge -r 81..82 ../bzr.dev
|
|
1193 |
|
|
1194 |
merge refuses to run if there are any uncommitted changes, unless
|
|
1195 |
--force is given.
|
|
1196 |
"""
|
|
1197 |
takes_args = ['branch?'] |
|
1198 |
takes_options = ['revision', 'force', 'merge-type'] |
|
1199 |
||
1200 |
def run(self, branch='.', revision=None, force=False, |
|
1201 |
merge_type=None): |
|
1202 |
from bzrlib.merge import merge |
|
1203 |
from bzrlib.merge_core import ApplyMerge3 |
|
1204 |
if merge_type is None: |
|
1205 |
merge_type = ApplyMerge3 |
|
1206 |
||
1207 |
if revision is None or len(revision) < 1: |
|
1208 |
base = [None, None] |
|
974.1.52
by aaron.bentley at utoronto
Merged mpool's latest changes (~0.0.7) |
1209 |
other = [branch, -1] |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1210 |
else: |
1211 |
if len(revision) == 1: |
|
974.1.52
by aaron.bentley at utoronto
Merged mpool's latest changes (~0.0.7) |
1212 |
base = [None, None] |
1185.2.14
by Lalo Martins
fixing up users of RevisionSpec, and moving it over to commands.py |
1213 |
other = [branch, revision[0].in_history(branch).revno] |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1214 |
else: |
1215 |
assert len(revision) == 2 |
|
1216 |
if None in revision: |
|
1217 |
raise BzrCommandError( |
|
1218 |
"Merge doesn't permit that revision specifier.") |
|
1185.5.1
by John Arbash Meinel
Applying bad-merge revision patch. |
1219 |
b = Branch.open(branch) |
1220 |
||
1221 |
base = [branch, revision[0].in_history(b).revno] |
|
1222 |
other = [branch, revision[1].in_history(b).revno] |
|
1172
by Martin Pool
- better explanation when merge fails with AmbiguousBase |
1223 |
|
1224 |
try: |
|
1225 |
merge(other, base, check_clean=(not force), merge_type=merge_type) |
|
1226 |
except bzrlib.errors.AmbiguousBase, e: |
|
1173
by Martin Pool
- message typo |
1227 |
m = ("sorry, bzr can't determine the right merge base yet\n" |
1172
by Martin Pool
- better explanation when merge fails with AmbiguousBase |
1228 |
"candidates are:\n " |
1229 |
+ "\n ".join(e.bases) |
|
1230 |
+ "\n" |
|
1231 |
"please specify an explicit base with -r,\n" |
|
1232 |
"and (if you want) report this to the bzr developers\n") |
|
1233 |
log_error(m) |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1234 |
|
1235 |
||
1236 |
class cmd_revert(Command): |
|
1237 |
"""Reverse all changes since the last commit.
|
|
1238 |
||
1239 |
Only versioned files are affected. Specify filenames to revert only
|
|
1240 |
those files. By default, any files that are changed will be backed up
|
|
1241 |
first. Backup files have a '~' appended to their name.
|
|
1242 |
"""
|
|
1243 |
takes_options = ['revision', 'no-backup'] |
|
1244 |
takes_args = ['file*'] |
|
1245 |
aliases = ['merge-revert'] |
|
1246 |
||
1247 |
def run(self, revision=None, no_backup=False, file_list=None): |
|
1248 |
from bzrlib.merge import merge |
|
1249 |
from bzrlib.commands import parse_spec |
|
1250 |
||
1251 |
if file_list is not None: |
|
1252 |
if len(file_list) == 0: |
|
1253 |
raise BzrCommandError("No files specified") |
|
1254 |
if revision is None: |
|
1185.5.8
by John Arbash Meinel
Fixed bzr revert with the new RevisionSpec code. |
1255 |
revno = -1 |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1256 |
elif len(revision) != 1: |
1257 |
raise BzrCommandError('bzr revert --revision takes exactly 1 argument') |
|
1185.5.8
by John Arbash Meinel
Fixed bzr revert with the new RevisionSpec code. |
1258 |
else: |
1259 |
b = Branch.open_containing('.') |
|
1260 |
revno = revision[0].in_history(b).revno |
|
1261 |
merge(('.', revno), parse_spec('.'), |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1262 |
check_clean=False, |
1263 |
ignore_zero=True, |
|
1264 |
backup_files=not no_backup, |
|
1265 |
file_list=file_list) |
|
1266 |
if not file_list: |
|
1185.2.9
by Lalo Martins
getting rid of everything that calls the Branch constructor directly |
1267 |
Branch.open_containing('.').set_pending_merges([]) |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1268 |
|
1269 |
||
1270 |
class cmd_assert_fail(Command): |
|
1271 |
"""Test reporting of assertion failures"""
|
|
1272 |
hidden = True |
|
1273 |
def run(self): |
|
1274 |
assert False, "always fails" |
|
1275 |
||
1276 |
||
1277 |
class cmd_help(Command): |
|
1278 |
"""Show help on a command or other topic.
|
|
1279 |
||
1280 |
For a list of all available commands, say 'bzr help commands'."""
|
|
1281 |
takes_options = ['long'] |
|
1282 |
takes_args = ['topic?'] |
|
1283 |
aliases = ['?'] |
|
1284 |
||
1285 |
def run(self, topic=None, long=False): |
|
1286 |
import help |
|
1287 |
if topic is None and long: |
|
1288 |
topic = "commands" |
|
1289 |
help.help(topic) |
|
1290 |
||
1291 |
||
1292 |
class cmd_shell_complete(Command): |
|
1293 |
"""Show appropriate completions for context.
|
|
1294 |
||
1295 |
For a list of all available commands, say 'bzr shell-complete'."""
|
|
1296 |
takes_args = ['context?'] |
|
1297 |
aliases = ['s-c'] |
|
1298 |
hidden = True |
|
1299 |
||
1300 |
def run(self, context=None): |
|
1301 |
import shellcomplete |
|
1302 |
shellcomplete.shellcomplete(context) |
|
1303 |
||
1304 |
||
1305 |
class cmd_missing(Command): |
|
1306 |
"""What is missing in this branch relative to other branch.
|
|
1307 |
"""
|
|
1308 |
takes_args = ['remote?'] |
|
1309 |
aliases = ['mis', 'miss'] |
|
1310 |
# We don't have to add quiet to the list, because
|
|
1311 |
# unknown options are parsed as booleans
|
|
1312 |
takes_options = ['verbose', 'quiet'] |
|
1313 |
||
1314 |
def run(self, remote=None, verbose=False, quiet=False): |
|
1315 |
from bzrlib.errors import BzrCommandError |
|
1149
by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it |
1316 |
from bzrlib.missing import show_missing |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1317 |
|
1318 |
if verbose and quiet: |
|
1319 |
raise BzrCommandError('Cannot pass both quiet and verbose') |
|
1320 |
||
1185.2.11
by Lalo Martins
killed all uses of find_branch() if favor of the new constructors. |
1321 |
b = Branch.open_containing('.') |
1149
by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it |
1322 |
parent = b.get_parent() |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1323 |
if remote is None: |
1324 |
if parent is None: |
|
1325 |
raise BzrCommandError("No missing location known or specified.") |
|
1326 |
else: |
|
1327 |
if not quiet: |
|
1328 |
print "Using last location: %s" % parent |
|
1329 |
remote = parent |
|
1330 |
elif parent is None: |
|
1185.3.15
by Martin Pool
- merge in many integration fixes from Robert |
1331 |
# We only update parent if it did not exist, missing
|
1332 |
# should not change the parent
|
|
974.1.79
by Aaron Bentley
Fixed issues with pull not having a default location after branch |
1333 |
b.set_parent(remote) |
1185.2.11
by Lalo Martins
killed all uses of find_branch() if favor of the new constructors. |
1334 |
br_remote = Branch.open_containing(remote) |
1185.7.2
by Martin Pool
- merge integration from robertc |
1335 |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1336 |
return show_missing(b, br_remote, verbose=verbose, quiet=quiet) |
1337 |
||
1338 |
||
1185.7.2
by Martin Pool
- merge integration from robertc |
1339 |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1340 |
class cmd_plugins(Command): |
1341 |
"""List plugins"""
|
|
1342 |
hidden = True |
|
1343 |
def run(self): |
|
1344 |
import bzrlib.plugin |
|
1345 |
from inspect import getdoc |
|
1346 |
for plugin in bzrlib.plugin.all_plugins: |
|
1347 |
if hasattr(plugin, '__path__'): |
|
1348 |
print plugin.__path__[0] |
|
1349 |
elif hasattr(plugin, '__file__'): |
|
1350 |
print plugin.__file__ |
|
1351 |
else: |
|
1352 |
print `plugin` |
|
1353 |
||
1354 |
d = getdoc(plugin) |
|
1355 |
if d: |
|
1356 |
print '\t', d.split('\n')[0] |
|
1357 |
||
1358 |