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