bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
1551.10.18
by Aaron Bentley
Log works in local treeless branches (#84247) |
1 |
# Copyright (C) 2004, 2005, 2006, 2007 Canonical Ltd
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
2 |
#
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
3 |
# This program is free software; you can redistribute it and/or modify
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
7 |
#
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
8 |
# This program is distributed in the hope that it will be useful,
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
12 |
#
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
13 |
# You should have received a copy of the GNU General Public License
|
14 |
# along with this program; if not, write to the Free Software
|
|
15 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
16 |
||
1185.33.90
by Martin Pool
[merge] add --dry-run option (mpe) |
17 |
"""builtin bzr commands"""
|
18 |
||
1996.3.1
by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms |
19 |
import os |
1551.12.26
by Aaron Bentley
Get email working, with optional message |
20 |
from StringIO import StringIO |
1185.33.90
by Martin Pool
[merge] add --dry-run option (mpe) |
21 |
|
1996.3.1
by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms |
22 |
from bzrlib.lazy_import import lazy_import |
23 |
lazy_import(globals(), """ |
|
1685.1.52
by John Arbash Meinel
[merge] bzr.dev 1704 |
24 |
import codecs
|
1508.1.20
by Robert Collins
Create a checkout command. |
25 |
import errno
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
26 |
import sys
|
2089.1.1
by wang
If a commit fails, the commit message is stored in a file at the root of |
27 |
import tempfile
|
1551.12.8
by Aaron Bentley
Add merge-directive command |
28 |
import time
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
29 |
|
1773.4.2
by Martin Pool
Cleanup of imports; undeprecate all_revision_ids() |
30 |
import bzrlib
|
1836.1.26
by John Arbash Meinel
[merge] bzr.dev 1869 |
31 |
from bzrlib import (
|
32 |
branch,
|
|
2376.4.22
by Jonathan Lange
Variety of whitespace cleanups, tightening of tests and docstring changes in |
33 |
bugtracker,
|
1836.1.26
by John Arbash Meinel
[merge] bzr.dev 1869 |
34 |
bundle,
|
35 |
bzrdir,
|
|
2225.1.1
by Aaron Bentley
Added revert change display, with tests |
36 |
delta,
|
1836.1.26
by John Arbash Meinel
[merge] bzr.dev 1869 |
37 |
config,
|
38 |
errors,
|
|
2298.8.1
by Kent Gibson
Normalise ignore patterns to use '/' path separator. |
39 |
globbing,
|
1836.1.26
by John Arbash Meinel
[merge] bzr.dev 1869 |
40 |
ignores,
|
41 |
log,
|
|
1996.3.5
by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again. |
42 |
merge as _mod_merge,
|
1551.12.8
by Aaron Bentley
Add merge-directive command |
43 |
merge_directive,
|
1836.1.26
by John Arbash Meinel
[merge] bzr.dev 1869 |
44 |
osutils,
|
1551.12.14
by Aaron Bentley
Get merge-directive command basically working |
45 |
registry,
|
1836.1.26
by John Arbash Meinel
[merge] bzr.dev 1869 |
46 |
repository,
|
2598.5.1
by Aaron Bentley
Start eliminating the use of None to indicate null revision |
47 |
revision as _mod_revision,
|
2512.2.3
by Matthew Fuller
Default revision-info to the head of the branch when no revision is |
48 |
revisionspec,
|
2204.5.5
by Aaron Bentley
Remove RepositoryFormat.set_default_format, deprecate get_format_type |
49 |
symbol_versioning,
|
1836.1.26
by John Arbash Meinel
[merge] bzr.dev 1869 |
50 |
transport,
|
1996.3.30
by John Arbash Meinel
Don't import 'bzrlib.tree' directly in bzrlib.builtins |
51 |
tree as _mod_tree,
|
1836.1.26
by John Arbash Meinel
[merge] bzr.dev 1869 |
52 |
ui,
|
53 |
urlutils,
|
|
54 |
)
|
|
1996.3.1
by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms |
55 |
from bzrlib.branch import Branch
|
2120.7.2
by Aaron Bentley
Move autoresolve functionality to workingtree |
56 |
from bzrlib.conflicts import ConflictList
|
1996.3.1
by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms |
57 |
from bzrlib.revisionspec import RevisionSpec
|
2535.2.1
by Adeodato Simó
New SMTPConnection class, a reduced version of that in bzr-email. |
58 |
from bzrlib.smtp_connection import SMTPConnection
|
1996.3.1
by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms |
59 |
from bzrlib.workingtree import WorkingTree
|
60 |
""") |
|
61 |
||
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
62 |
from bzrlib.commands import Command, display_command |
2376.4.1
by jml at canonical
Blackbox-driven --fixes option to commit. |
63 |
from bzrlib.option import ListOption, Option, RegistryOption |
1551.2.32
by Aaron Bentley
Handle progress phases more nicely in merge |
64 |
from bzrlib.progress import DummyProgress, ProgressPhase |
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
65 |
from bzrlib.trace import mutter, note, log_error, warning, is_quiet, info |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
66 |
|
67 |
||
1185.33.66
by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko) |
68 |
def tree_files(file_list, default_branch=u'.'): |
1185.35.28
by Aaron Bentley
Support diff with two branches as input. |
69 |
try: |
1508.1.15
by Robert Collins
Merge from mpool. |
70 |
return internal_tree_files(file_list, default_branch) |
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
71 |
except errors.FileInWrongBranch, e: |
72 |
raise errors.BzrCommandError("%s is not in the same branch as %s" % |
|
73 |
(e.path, file_list[0])) |
|
1185.35.28
by Aaron Bentley
Support diff with two branches as input. |
74 |
|
1185.85.12
by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file. |
75 |
|
1658.1.9
by Martin Pool
Give an error for bzr diff on an nonexistent file (Malone #3619) |
76 |
# XXX: Bad function name; should possibly also be a class method of
|
77 |
# WorkingTree rather than a function.
|
|
1185.33.66
by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko) |
78 |
def internal_tree_files(file_list, default_branch=u'.'): |
1658.1.8
by Martin Pool
(internal_tree_files) Better docstring |
79 |
"""Convert command-line paths to a WorkingTree and relative paths. |
80 |
||
81 |
This is typically used for command-line processors that take one or
|
|
82 |
more filenames, and infer the workingtree that contains them.
|
|
83 |
||
84 |
The filenames given are not required to exist.
|
|
85 |
||
86 |
:param file_list: Filenames to convert.
|
|
87 |
||
2091.3.2
by Aaron Bentley
Traverse non-terminal symlinks for mv et al |
88 |
:param default_branch: Fallback tree path to use if file_list is empty or
|
89 |
None.
|
|
1658.1.8
by Martin Pool
(internal_tree_files) Better docstring |
90 |
|
91 |
:return: workingtree, [relative_paths]
|
|
1185.12.101
by Aaron Bentley
Made commit take branch from first argument, if supplied. |
92 |
"""
|
93 |
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 |
94 |
return WorkingTree.open_containing(default_branch)[0], file_list |
2091.3.5
by Aaron Bentley
Move realpath functionality into osutils |
95 |
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0] |
1185.12.101
by Aaron Bentley
Made commit take branch from first argument, if supplied. |
96 |
new_list = [] |
97 |
for filename in file_list: |
|
1185.35.32
by Aaron Bentley
Fixed handling of files in mixed branches |
98 |
try: |
2091.3.7
by Aaron Bentley
Rename real_parent to dereferenced_path |
99 |
new_list.append(tree.relpath(osutils.dereference_path(filename))) |
1185.31.45
by John Arbash Meinel
Refactoring Exceptions found some places where the wrong exception was caught. |
100 |
except errors.PathNotChild: |
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
101 |
raise errors.FileInWrongBranch(tree.branch, filename) |
1508.1.4
by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing |
102 |
return tree, new_list |
1185.12.101
by Aaron Bentley
Made commit take branch from first argument, if supplied. |
103 |
|
104 |
||
2204.5.5
by Aaron Bentley
Remove RepositoryFormat.set_default_format, deprecate get_format_type |
105 |
@symbol_versioning.deprecated_function(symbol_versioning.zero_fifteen) |
1553.5.78
by Martin Pool
New bzr init --format option and test |
106 |
def get_format_type(typestring): |
107 |
"""Parse and return a format specifier.""" |
|
2204.4.6
by Aaron Bentley
Fix default to work with RepositoryFormat.set_default_format |
108 |
# Have to use BzrDirMetaFormat1 directly, so that
|
109 |
# RepositoryFormat.set_default_format works
|
|
110 |
if typestring == "default": |
|
111 |
return bzrdir.BzrDirMetaFormat1() |
|
2204.4.3
by Aaron Bentley
Reimplement get_format_type in terms of FormatRegistry |
112 |
try: |
113 |
return bzrdir.format_registry.make_bzrdir(typestring) |
|
114 |
except KeyError: |
|
115 |
msg = 'Unknown bzr format "%s". See "bzr help formats".' % typestring |
|
116 |
raise errors.BzrCommandError(msg) |
|
1553.5.78
by Martin Pool
New bzr init --format option and test |
117 |
|
118 |
||
1185.16.112
by mbp at sourcefrog
todo |
119 |
# TODO: Make sure no commands unconditionally use the working directory as a
|
120 |
# branch. If a filename argument is used, the first of them should be used to
|
|
121 |
# specify the branch. (Perhaps this can be factored out into some kind of
|
|
122 |
# Argument class, representing a file in a branch, where the first occurrence
|
|
123 |
# opens the branch?)
|
|
124 |
||
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
125 |
class cmd_status(Command): |
126 |
"""Display status summary. |
|
127 |
||
128 |
This reports on versioned and unknown files, reporting them
|
|
129 |
grouped by state. Possible states are:
|
|
130 |
||
1551.10.10
by Aaron Bentley
Add help text |
131 |
added
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
132 |
Versioned in the working copy but not in the previous revision.
|
133 |
||
1551.10.10
by Aaron Bentley
Add help text |
134 |
removed
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
135 |
Versioned in the previous revision but removed or deleted
|
136 |
in the working copy.
|
|
137 |
||
1551.10.10
by Aaron Bentley
Add help text |
138 |
renamed
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
139 |
Path of this file changed from the previous revision;
|
140 |
the text may also have changed. This includes files whose
|
|
141 |
parent directory was renamed.
|
|
142 |
||
1551.10.10
by Aaron Bentley
Add help text |
143 |
modified
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
144 |
Text has changed since the previous revision.
|
145 |
||
1551.10.10
by Aaron Bentley
Add help text |
146 |
kind changed
|
147 |
File kind has been changed (e.g. from file to directory).
|
|
148 |
||
149 |
unknown
|
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
150 |
Not versioned and not matching an ignore pattern.
|
151 |
||
2374.1.1
by Ian Clatworthy
Help and man page fixes |
152 |
To see ignored files use 'bzr ignored'. For details on the
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
153 |
changes to file texts, use 'bzr diff'.
|
2147.2.1
by Keir Mierle
Add a --short flag to status to get svn-style status |
154 |
|
1551.10.10
by Aaron Bentley
Add help text |
155 |
--short gives a status flags for each item, similar to the SVN's status
|
156 |
command.
|
|
157 |
||
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
158 |
If no arguments are specified, the status of the entire working
|
159 |
directory is shown. Otherwise, only the status of the specified
|
|
160 |
files or directories is reported. If a directory is given, status
|
|
161 |
is reported for everything inside that directory.
|
|
1185.1.35
by Robert Collins
Heikki Paajanen's status -r patch |
162 |
|
163 |
If a revision argument is given, the status is calculated against
|
|
164 |
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 |
165 |
"""
|
1185.16.76
by Martin Pool
doc |
166 |
|
167 |
# TODO: --no-recurse, --recurse options
|
|
168 |
||
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
169 |
takes_args = ['file*'] |
2374.1.1
by Ian Clatworthy
Help and man page fixes |
170 |
takes_options = ['show-ids', 'revision', |
2598.1.1
by Martin Pool
Add test for and documentation of option style, fix up existing options to comply |
171 |
Option('short', help='Give short SVN-style status lines.'), |
172 |
Option('versioned', help='Only show versioned files.')] |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
173 |
aliases = ['st', 'stat'] |
1185.85.22
by John Arbash Meinel
Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run() |
174 |
|
175 |
encoding_type = 'replace' |
|
2520.1.3
by Daniel Watkins
'help status' now points to 'help status-flags'. |
176 |
_see_also = ['diff', 'revert', 'status-flags'] |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
177 |
|
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
178 |
@display_command
|
2318.2.1
by Kent Gibson
Apply status versioned patch |
179 |
def run(self, show_ids=False, file_list=None, revision=None, short=False, |
180 |
versioned=False): |
|
1551.2.9
by Aaron Bentley
Fix status to work with checkouts |
181 |
from bzrlib.status import show_tree_status |
1185.85.15
by John Arbash Meinel
Updated bzr status, adding test_cat |
182 |
|
1508.1.4
by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing |
183 |
tree, file_list = tree_files(file_list) |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
184 |
|
1773.1.2
by Robert Collins
Remove --all option from status. |
185 |
show_tree_status(tree, show_ids=show_ids, |
1185.85.84
by John Arbash Meinel
[merge] bzr.dev 1573, lots of updates |
186 |
specific_files=file_list, revision=revision, |
2318.2.1
by Kent Gibson
Apply status versioned patch |
187 |
to_file=self.outf, short=short, versioned=versioned) |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
188 |
|
189 |
||
190 |
class cmd_cat_revision(Command): |
|
1185.5.3
by John Arbash Meinel
cat-revision allows --revision for easier investigation. |
191 |
"""Write out metadata for a revision. |
192 |
|
|
193 |
The revision to print can either be specified by a specific
|
|
194 |
revision identifier, or you can use --revision.
|
|
195 |
"""
|
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
196 |
|
197 |
hidden = True |
|
1185.5.3
by John Arbash Meinel
cat-revision allows --revision for easier investigation. |
198 |
takes_args = ['revision_id?'] |
199 |
takes_options = ['revision'] |
|
1685.1.76
by Wouter van Heyst
codecleanup |
200 |
# cat-revision is more for frontends so should be exact
|
201 |
encoding = 'strict' |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
202 |
|
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
203 |
@display_command
|
1185.5.3
by John Arbash Meinel
cat-revision allows --revision for easier investigation. |
204 |
def run(self, revision_id=None, revision=None): |
205 |
||
1551.13.16
by Aaron Bentley
Fix cat-revision REVISION |
206 |
revision_id = osutils.safe_revision_id(revision_id, warn=False) |
1185.5.3
by John Arbash Meinel
cat-revision allows --revision for easier investigation. |
207 |
if revision_id is not None and revision is not None: |
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
208 |
raise errors.BzrCommandError('You can only supply one of' |
209 |
' revision_id or --revision') |
|
1185.5.3
by John Arbash Meinel
cat-revision allows --revision for easier investigation. |
210 |
if revision_id is None and revision is None: |
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
211 |
raise errors.BzrCommandError('You must supply either' |
212 |
' --revision or a revision_id') |
|
1185.33.66
by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko) |
213 |
b = WorkingTree.open_containing(u'.')[0].branch |
1185.85.72
by John Arbash Meinel
Fix some of the tests. |
214 |
|
215 |
# TODO: jam 20060112 should cat-revision always output utf-8?
|
|
1185.5.3
by John Arbash Meinel
cat-revision allows --revision for easier investigation. |
216 |
if revision_id is not None: |
1185.85.78
by John Arbash Meinel
[merge] jam-integration 1512, includes Storage changes. |
217 |
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8')) |
1185.5.3
by John Arbash Meinel
cat-revision allows --revision for easier investigation. |
218 |
elif revision is not None: |
219 |
for rev in revision: |
|
220 |
if rev is None: |
|
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
221 |
raise errors.BzrCommandError('You cannot specify a NULL' |
222 |
' revision.') |
|
1185.5.3
by John Arbash Meinel
cat-revision allows --revision for easier investigation. |
223 |
revno, rev_id = rev.in_history(b) |
1185.85.78
by John Arbash Meinel
[merge] jam-integration 1512, includes Storage changes. |
224 |
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8')) |
1185.1.29
by Robert Collins
merge merge tweaks from aaron, which includes latest .dev |
225 |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
226 |
|
2127.2.1
by Daniel Silverstone
Add remove-tree and its blackbox tests |
227 |
class cmd_remove_tree(Command): |
228 |
"""Remove the working tree from a given branch/checkout. |
|
229 |
||
230 |
Since a lightweight checkout is little more than a working tree
|
|
231 |
this will refuse to run against one.
|
|
2374.1.3
by Ian Clatworthy
Minor man page fixes for add, commit, export |
232 |
|
2374.1.4
by Ian Clatworthy
Include feedback from mailing list. |
233 |
To re-create the working tree, use "bzr checkout".
|
2127.2.1
by Daniel Silverstone
Add remove-tree and its blackbox tests |
234 |
"""
|
2485.1.2
by James Westby
Update with comments from review, thanks to John and Aaron. |
235 |
_see_also = ['checkout', 'working-trees'] |
2127.2.1
by Daniel Silverstone
Add remove-tree and its blackbox tests |
236 |
|
237 |
takes_args = ['location?'] |
|
238 |
||
2127.2.2
by Daniel Silverstone
Refactor the remove-tree stuff after review from J-A-M |
239 |
def run(self, location='.'): |
240 |
d = bzrdir.BzrDir.open(location) |
|
241 |
||
2127.2.1
by Daniel Silverstone
Add remove-tree and its blackbox tests |
242 |
try: |
243 |
working = d.open_workingtree() |
|
2127.2.2
by Daniel Silverstone
Refactor the remove-tree stuff after review from J-A-M |
244 |
except errors.NoWorkingTree: |
2127.2.1
by Daniel Silverstone
Add remove-tree and its blackbox tests |
245 |
raise errors.BzrCommandError("No working tree to remove") |
2127.2.2
by Daniel Silverstone
Refactor the remove-tree stuff after review from J-A-M |
246 |
except errors.NotLocalUrl: |
247 |
raise errors.BzrCommandError("You cannot remove the working tree of a " |
|
248 |
"remote path") |
|
249 |
||
250 |
working_path = working.bzrdir.root_transport.base |
|
251 |
branch_path = working.branch.bzrdir.root_transport.base |
|
252 |
if working_path != branch_path: |
|
253 |
raise errors.BzrCommandError("You cannot remove the working tree from " |
|
254 |
"a lightweight checkout") |
|
2127.2.1
by Daniel Silverstone
Add remove-tree and its blackbox tests |
255 |
|
256 |
d.destroy_workingtree() |
|
257 |
||
258 |
||
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
259 |
class cmd_revno(Command): |
260 |
"""Show current revision number. |
|
261 |
||
1185.85.24
by John Arbash Meinel
Moved run_bzr_decode into TestCase |
262 |
This is equal to the number of revisions on this branch.
|
263 |
"""
|
|
264 |
||
2425.2.3
by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins) |
265 |
_see_also = ['info'] |
1185.50.16
by John Arbash Meinel
[patch] Michael Ellerman: 'Trivial patch to allow revno to take a location' |
266 |
takes_args = ['location?'] |
1185.85.24
by John Arbash Meinel
Moved run_bzr_decode into TestCase |
267 |
|
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
268 |
@display_command
|
1185.50.16
by John Arbash Meinel
[patch] Michael Ellerman: 'Trivial patch to allow revno to take a location' |
269 |
def run(self, location=u'.'): |
1185.85.24
by John Arbash Meinel
Moved run_bzr_decode into TestCase |
270 |
self.outf.write(str(Branch.open_containing(location)[0].revno())) |
271 |
self.outf.write('\n') |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
272 |
|
1182
by Martin Pool
- more disentangling of xml storage format from objects |
273 |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
274 |
class cmd_revision_info(Command): |
275 |
"""Show revision number and revision id for a given revision identifier. |
|
276 |
"""
|
|
277 |
hidden = True |
|
278 |
takes_args = ['revision_info*'] |
|
279 |
takes_options = ['revision'] |
|
1185.85.24
by John Arbash Meinel
Moved run_bzr_decode into TestCase |
280 |
|
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
281 |
@display_command
|
1185.5.4
by John Arbash Meinel
Updated bzr revision-info, created tests. |
282 |
def run(self, revision=None, revision_info_list=[]): |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
283 |
|
284 |
revs = [] |
|
285 |
if revision is not None: |
|
286 |
revs.extend(revision) |
|
1185.5.4
by John Arbash Meinel
Updated bzr revision-info, created tests. |
287 |
if revision_info_list is not None: |
288 |
for rev in revision_info_list: |
|
1948.4.33
by John Arbash Meinel
Switch from get_revision_spec() to RevisionSpec.from_string() (as advised by Martin) |
289 |
revs.append(RevisionSpec.from_string(rev)) |
2512.2.3
by Matthew Fuller
Default revision-info to the head of the branch when no revision is |
290 |
|
291 |
b = Branch.open_containing(u'.')[0] |
|
292 |
||
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
293 |
if len(revs) == 0: |
2512.2.3
by Matthew Fuller
Default revision-info to the head of the branch when no revision is |
294 |
revs.append(RevisionSpec.from_string('-1')) |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
295 |
|
296 |
for rev in revs: |
|
1185.5.4
by John Arbash Meinel
Updated bzr revision-info, created tests. |
297 |
revinfo = rev.in_history(b) |
298 |
if revinfo.revno is None: |
|
2512.2.2
by Matthew Fuller
Update revision-info to show dotted revnos. |
299 |
dotted_map = b.get_revision_id_to_revno_map() |
300 |
revno = '.'.join(str(i) for i in dotted_map[revinfo.rev_id]) |
|
301 |
print '%s %s' % (revno, revinfo.rev_id) |
|
1185.5.4
by John Arbash Meinel
Updated bzr revision-info, created tests. |
302 |
else: |
303 |
print '%4d %s' % (revinfo.revno, revinfo.rev_id) |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
304 |
|
305 |
||
306 |
class cmd_add(Command): |
|
307 |
"""Add specified files or directories. |
|
308 |
||
309 |
In non-recursive mode, all the named items are added, regardless
|
|
310 |
of whether they were previously ignored. A warning is given if
|
|
311 |
any of the named files are already versioned.
|
|
312 |
||
313 |
In recursive mode (the default), files are treated the same way
|
|
314 |
but the behaviour for directories is different. Directories that
|
|
315 |
are already versioned do not give a warning. All directories,
|
|
316 |
whether already versioned or not, are searched for files or
|
|
317 |
subdirectories that are neither versioned or ignored, and these
|
|
318 |
are added. This search proceeds recursively into versioned
|
|
319 |
directories. If no names are given '.' is assumed.
|
|
320 |
||
321 |
Therefore simply saying 'bzr add' will version all files that
|
|
322 |
are currently unknown.
|
|
323 |
||
1185.3.3
by Martin Pool
- patch from mpe to automatically add parent directories |
324 |
Adding a file whose parent directory is not versioned will
|
325 |
implicitly add the parent, and so on up to the root. This means
|
|
1759.2.1
by Jelmer Vernooij
Fix some types (found using aspell). |
326 |
you should never need to explicitly add a directory, they'll just
|
1185.3.3
by Martin Pool
- patch from mpe to automatically add parent directories |
327 |
get added when you add a file in the directory.
|
1185.33.90
by Martin Pool
[merge] add --dry-run option (mpe) |
328 |
|
329 |
--dry-run will show which files would be added, but not actually
|
|
330 |
add them.
|
|
1911.3.2
by John Arbash Meinel
Adding the AddFromBaseAction, which tries to reuse file ids from another tree |
331 |
|
332 |
--file-ids-from will try to use the file ids from the supplied path.
|
|
333 |
It looks up ids trying to find a matching parent directory with the
|
|
2374.1.3
by Ian Clatworthy
Minor man page fixes for add, commit, export |
334 |
same filename, and then by pure path. This option is rarely needed
|
335 |
but can be useful when adding the same logical file into two
|
|
336 |
branches that will be merged later (without showing the two different
|
|
2374.1.4
by Ian Clatworthy
Include feedback from mailing list. |
337 |
adds as a conflict). It is also useful when merging another project
|
338 |
into a subdirectory of this one.
|
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
339 |
"""
|
340 |
takes_args = ['file*'] |
|
2598.1.10
by Martin Pool
Clean up options that are registered globally and used once or not at all. |
341 |
takes_options = [ |
342 |
Option('no-recurse', |
|
2598.1.11
by Martin Pool
Insist that all options have a help string and fix those that don't. |
343 |
help="Don't recursively add the contents of directories."), |
2598.1.10
by Martin Pool
Clean up options that are registered globally and used once or not at all. |
344 |
Option('dry-run', |
345 |
help="Show what would be done, but don't actually do anything."), |
|
346 |
'verbose', |
|
347 |
Option('file-ids-from', |
|
348 |
type=unicode, |
|
349 |
help='Lookup file ids from this tree.'), |
|
350 |
]
|
|
1185.85.22
by John Arbash Meinel
Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run() |
351 |
encoding_type = 'replace' |
2425.2.3
by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins) |
352 |
_see_also = ['remove'] |
1185.53.1
by Michael Ellerman
Add support for bzr add --dry-run |
353 |
|
1911.3.2
by John Arbash Meinel
Adding the AddFromBaseAction, which tries to reuse file ids from another tree |
354 |
def run(self, file_list, no_recurse=False, dry_run=False, verbose=False, |
355 |
file_ids_from=None): |
|
1185.53.1
by Michael Ellerman
Add support for bzr add --dry-run |
356 |
import bzrlib.add |
357 |
||
2255.7.69
by Robert Collins
Fix all blackbox add tests, and the add --from-ids case in the UI. |
358 |
base_tree = None |
1911.3.2
by John Arbash Meinel
Adding the AddFromBaseAction, which tries to reuse file ids from another tree |
359 |
if file_ids_from is not None: |
360 |
try: |
|
361 |
base_tree, base_path = WorkingTree.open_containing( |
|
362 |
file_ids_from) |
|
363 |
except errors.NoWorkingTree: |
|
1996.3.1
by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms |
364 |
base_branch, base_path = Branch.open_containing( |
1911.3.2
by John Arbash Meinel
Adding the AddFromBaseAction, which tries to reuse file ids from another tree |
365 |
file_ids_from) |
366 |
base_tree = base_branch.basis_tree() |
|
367 |
||
368 |
action = bzrlib.add.AddFromBaseAction(base_tree, base_path, |
|
369 |
to_file=self.outf, should_print=(not is_quiet())) |
|
370 |
else: |
|
371 |
action = bzrlib.add.AddAction(to_file=self.outf, |
|
372 |
should_print=(not is_quiet())) |
|
373 |
||
2255.7.69
by Robert Collins
Fix all blackbox add tests, and the add --from-ids case in the UI. |
374 |
if base_tree: |
375 |
base_tree.lock_read() |
|
376 |
try: |
|
2568.2.6
by Robert Collins
Review feedback. |
377 |
file_list = self._maybe_expand_globs(file_list) |
2568.2.2
by Robert Collins
* New method ``_glob_expand_file_list_if_needed`` on the ``Command`` class |
378 |
if file_list: |
379 |
tree = WorkingTree.open_containing(file_list[0])[0] |
|
380 |
else: |
|
381 |
tree = WorkingTree.open_containing(u'.')[0] |
|
2568.2.8
by Robert Collins
Really really change the command to use the new API. |
382 |
added, ignored = tree.smart_add(file_list, not |
2568.2.2
by Robert Collins
* New method ``_glob_expand_file_list_if_needed`` on the ``Command`` class |
383 |
no_recurse, action=action, save=not dry_run) |
2255.7.69
by Robert Collins
Fix all blackbox add tests, and the add --from-ids case in the UI. |
384 |
finally: |
385 |
if base_tree is not None: |
|
386 |
base_tree.unlock() |
|
1185.46.8
by Aaron Bentley
bzr add reports ignored patterns. |
387 |
if len(ignored) > 0: |
1711.1.2
by Robert Collins
'bzr add' is now less verbose in telling you what ignore globs were |
388 |
if verbose: |
389 |
for glob in sorted(ignored.keys()): |
|
1185.46.9
by Aaron Bentley
Added verbose option to bzr add, to list all ignored files. |
390 |
for path in ignored[glob]: |
1185.85.22
by John Arbash Meinel
Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run() |
391 |
self.outf.write("ignored %s matching \"%s\"\n" |
392 |
% (path, glob)) |
|
1711.1.2
by Robert Collins
'bzr add' is now less verbose in telling you what ignore globs were |
393 |
else: |
394 |
match_len = 0 |
|
395 |
for glob, paths in ignored.items(): |
|
396 |
match_len += len(paths) |
|
1685.1.69
by Wouter van Heyst
merge bzr.dev 1740 |
397 |
self.outf.write("ignored %d file(s).\n" % match_len) |
1185.85.22
by John Arbash Meinel
Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run() |
398 |
self.outf.write("If you wish to add some of these files," |
399 |
" please add them by name.\n") |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
400 |
|
401 |
||
402 |
class cmd_mkdir(Command): |
|
403 |
"""Create a new versioned directory. |
|
404 |
||
405 |
This is equivalent to creating the directory and then adding it.
|
|
406 |
"""
|
|
1685.1.80
by Wouter van Heyst
more code cleanup |
407 |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
408 |
takes_args = ['dir+'] |
1185.85.22
by John Arbash Meinel
Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run() |
409 |
encoding_type = 'replace' |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
410 |
|
411 |
def run(self, dir_list): |
|
412 |
for d in dir_list: |
|
413 |
os.mkdir(d) |
|
1508.1.4
by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing |
414 |
wt, dd = WorkingTree.open_containing(d) |
1508.1.5
by Robert Collins
Move add from Branch to WorkingTree. |
415 |
wt.add([dd]) |
1685.1.80
by Wouter van Heyst
more code cleanup |
416 |
self.outf.write('added %s\n' % d) |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
417 |
|
418 |
||
419 |
class cmd_relpath(Command): |
|
420 |
"""Show path of a file relative to root""" |
|
1685.1.80
by Wouter van Heyst
more code cleanup |
421 |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
422 |
takes_args = ['filename'] |
423 |
hidden = True |
|
424 |
||
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
425 |
@display_command
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
426 |
def run(self, filename): |
1185.85.19
by John Arbash Meinel
Updated bzr relpath |
427 |
# TODO: jam 20050106 Can relpath return a munged path if
|
428 |
# sys.stdout encoding cannot represent it?
|
|
1508.1.4
by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing |
429 |
tree, relpath = WorkingTree.open_containing(filename) |
1185.85.22
by John Arbash Meinel
Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run() |
430 |
self.outf.write(relpath) |
431 |
self.outf.write('\n') |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
432 |
|
433 |
||
434 |
class cmd_inventory(Command): |
|
1185.33.33
by Martin Pool
[patch] add 'bzr inventory --kind directory'; remove 'bzr directories' |
435 |
"""Show inventory of the current working copy or a revision. |
436 |
||
437 |
It is possible to limit the output to a particular entry
|
|
2027.4.2
by John Arbash Meinel
Fix bug #3631, allow 'bzr inventory filename' |
438 |
type using the --kind option. For example: --kind file.
|
439 |
||
440 |
It is also possible to restrict the list of files to a specific
|
|
441 |
set. For example: bzr inventory --show-ids this/file
|
|
1185.33.33
by Martin Pool
[patch] add 'bzr inventory --kind directory'; remove 'bzr directories' |
442 |
"""
|
1685.1.80
by Wouter van Heyst
more code cleanup |
443 |
|
1551.10.13
by Aaron Bentley
Hide 'unknowns', document alterntatives to hidden commands |
444 |
hidden = True |
2425.2.3
by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins) |
445 |
_see_also = ['ls'] |
2598.1.11
by Martin Pool
Insist that all options have a help string and fix those that don't. |
446 |
takes_options = [ |
447 |
'revision', |
|
448 |
'show-ids', |
|
449 |
Option('kind', |
|
2598.1.12
by Martin Pool
Fix up --kind options |
450 |
help='List entries of a particular kind: file, directory, symlink.', |
451 |
type=unicode), |
|
2598.1.11
by Martin Pool
Insist that all options have a help string and fix those that don't. |
452 |
]
|
2027.4.2
by John Arbash Meinel
Fix bug #3631, allow 'bzr inventory filename' |
453 |
takes_args = ['file*'] |
454 |
||
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
455 |
@display_command
|
2027.4.2
by John Arbash Meinel
Fix bug #3631, allow 'bzr inventory filename' |
456 |
def run(self, revision=None, show_ids=False, kind=None, file_list=None): |
1185.33.33
by Martin Pool
[patch] add 'bzr inventory --kind directory'; remove 'bzr directories' |
457 |
if kind and kind not in ['file', 'directory', 'symlink']: |
2598.1.12
by Martin Pool
Fix up --kind options |
458 |
raise errors.BzrCommandError('invalid kind %r specified' % (kind,)) |
2027.4.3
by John Arbash Meinel
Change how 'bzr inventory' finds paths |
459 |
|
460 |
work_tree, file_list = tree_files(file_list) |
|
2255.7.24
by John Arbash Meinel
Rework cmd_inventory so that it uses paths2ids and locks the trees for read. |
461 |
work_tree.lock_read() |
462 |
try: |
|
463 |
if revision is not None: |
|
464 |
if len(revision) > 1: |
|
465 |
raise errors.BzrCommandError( |
|
466 |
'bzr inventory --revision takes exactly one revision'
|
|
467 |
' identifier') |
|
468 |
revision_id = revision[0].in_history(work_tree.branch).rev_id |
|
469 |
tree = work_tree.branch.repository.revision_tree(revision_id) |
|
470 |
||
471 |
extra_trees = [work_tree] |
|
472 |
tree.lock_read() |
|
473 |
else: |
|
474 |
tree = work_tree |
|
475 |
extra_trees = [] |
|
476 |
||
477 |
if file_list is not None: |
|
478 |
file_ids = tree.paths2ids(file_list, trees=extra_trees, |
|
479 |
require_versioned=True) |
|
480 |
# find_ids_across_trees may include some paths that don't
|
|
481 |
# exist in 'tree'.
|
|
482 |
entries = sorted((tree.id2path(file_id), tree.inventory[file_id]) |
|
483 |
for file_id in file_ids if file_id in tree) |
|
484 |
else: |
|
485 |
entries = tree.inventory.entries() |
|
486 |
finally: |
|
487 |
tree.unlock() |
|
488 |
if tree is not work_tree: |
|
489 |
work_tree.unlock() |
|
2027.4.2
by John Arbash Meinel
Fix bug #3631, allow 'bzr inventory filename' |
490 |
|
491 |
for path, entry in entries: |
|
1185.33.33
by Martin Pool
[patch] add 'bzr inventory --kind directory'; remove 'bzr directories' |
492 |
if kind and kind != entry.kind: |
493 |
continue
|
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
494 |
if show_ids: |
1185.85.22
by John Arbash Meinel
Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run() |
495 |
self.outf.write('%-50s %s\n' % (path, entry.file_id)) |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
496 |
else: |
1185.85.22
by John Arbash Meinel
Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run() |
497 |
self.outf.write(path) |
498 |
self.outf.write('\n') |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
499 |
|
500 |
||
501 |
class cmd_mv(Command): |
|
502 |
"""Move or rename a file. |
|
503 |
||
504 |
usage:
|
|
505 |
bzr mv OLDNAME NEWNAME
|
|
506 |
bzr mv SOURCE... DESTINATION
|
|
507 |
||
508 |
If the last argument is a versioned directory, all the other names
|
|
509 |
are moved into it. Otherwise, there must be exactly two arguments
|
|
2123.3.1
by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system |
510 |
and the file is changed to a new name.
|
511 |
||
512 |
If OLDNAME does not exist on the filesystem but is versioned and
|
|
513 |
NEWNAME does exist on the filesystem but is not versioned, mv
|
|
514 |
assumes that the file has been manually moved and only updates
|
|
515 |
its internal inventory to reflect that change.
|
|
516 |
The same is valid when moving many SOURCE files to a DESTINATION.
|
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
517 |
|
518 |
Files cannot be moved between branches.
|
|
519 |
"""
|
|
1685.1.80
by Wouter van Heyst
more code cleanup |
520 |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
521 |
takes_args = ['names*'] |
2598.1.1
by Martin Pool
Add test for and documentation of option style, fix up existing options to comply |
522 |
takes_options = [Option("after", help="Move only the bzr identifier" |
523 |
" of the file, because the file has already been moved."), |
|
524 |
]
|
|
1616.1.8
by Martin Pool
Unify 'mv', 'move', 'rename'. (#5379, Matthew Fuller) |
525 |
aliases = ['move', 'rename'] |
1185.85.26
by John Arbash Meinel
bzr mv should succeed even if it can't display the paths. |
526 |
encoding_type = 'replace' |
527 |
||
2123.3.1
by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system |
528 |
def run(self, names_list, after=False): |
1846.1.1
by Wouter van Heyst
Don't fail on 'bzr mv', extract move tests from OldTests. |
529 |
if names_list is None: |
530 |
names_list = [] |
|
531 |
||
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
532 |
if len(names_list) < 2: |
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
533 |
raise errors.BzrCommandError("missing file argument") |
1508.1.4
by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing |
534 |
tree, rel_names = tree_files(names_list) |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
535 |
|
536 |
if os.path.isdir(names_list[-1]): |
|
537 |
# move into existing directory
|
|
2123.3.5
by Steffen Eichenberg
specifying named parameters |
538 |
for pair in tree.move(rel_names[:-1], rel_names[-1], after=after): |
1185.85.25
by John Arbash Meinel
updated 'bzr mv' |
539 |
self.outf.write("%s => %s\n" % pair) |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
540 |
else: |
541 |
if len(names_list) != 2: |
|
2123.3.1
by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system |
542 |
raise errors.BzrCommandError('to mv multiple files the' |
543 |
' destination must be a versioned'
|
|
544 |
' directory') |
|
2123.3.5
by Steffen Eichenberg
specifying named parameters |
545 |
tree.rename_one(rel_names[0], rel_names[1], after=after) |
1185.85.25
by John Arbash Meinel
updated 'bzr mv' |
546 |
self.outf.write("%s => %s\n" % (rel_names[0], rel_names[1])) |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
547 |
|
548 |
||
549 |
class cmd_pull(Command): |
|
1649.1.1
by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two |
550 |
"""Turn this branch into a mirror of another branch. |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
551 |
|
552 |
This command only works on branches that have not diverged. Branches are
|
|
1649.1.1
by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two |
553 |
considered diverged if the destination branch's most recent commit is one
|
554 |
that has not been merged (directly or indirectly) into the parent.
|
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
555 |
|
1661.1.1
by Martin Pool
[merge] olaf's --remember changes |
556 |
If branches have diverged, you can use 'bzr merge' to integrate the changes
|
557 |
from one into the other. Once one branch has merged, the other should
|
|
558 |
be able to pull it again.
|
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
559 |
|
1185.12.92
by Aaron Bentley
Fixed pull help, renamed clobber to overwrite |
560 |
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 |
561 |
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 |
562 |
|
563 |
If there is no default location set, the first pull will set it. After
|
|
564 |
that, you can omit the location to use the default. To change the
|
|
1785.1.4
by John Arbash Meinel
Update help for the new --remember semantics. |
565 |
default, use --remember. The value will only be saved if the remote
|
566 |
location can be accessed.
|
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
567 |
"""
|
1685.1.80
by Wouter van Heyst
more code cleanup |
568 |
|
2520.1.6
by Daniel Watkins
Fixed 'pull' help. |
569 |
_see_also = ['push', 'update', 'status-flags'] |
2220.2.8
by Martin Pool
Add -d option to push, pull, merge commands. |
570 |
takes_options = ['remember', 'overwrite', 'revision', 'verbose', |
571 |
Option('directory', |
|
2598.1.1
by Martin Pool
Add test for and documentation of option style, fix up existing options to comply |
572 |
help='Branch to pull into, ' |
573 |
'rather than the one containing the working directory.', |
|
2220.2.8
by Martin Pool
Add -d option to push, pull, merge commands. |
574 |
short_name='d', |
575 |
type=unicode, |
|
576 |
),
|
|
577 |
]
|
|
2520.1.6
by Daniel Watkins
Fixed 'pull' help. |
578 |
takes_args = ['location?'] |
1185.85.27
by John Arbash Meinel
Updated bzr branch and bzr pull |
579 |
encoding_type = 'replace' |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
580 |
|
1551.11.10
by Aaron Bentley
Add change reporting to pull |
581 |
def run(self, location=None, remember=False, overwrite=False, |
2220.2.8
by Martin Pool
Add -d option to push, pull, merge commands. |
582 |
revision=None, verbose=False, |
583 |
directory=None): |
|
2220.2.30
by Martin Pool
split out tag-merging code and add some tests |
584 |
from bzrlib.tag import _merge_tags_if_possible |
1558.5.6
by Aaron Bentley
Renamed make-repo init-repo |
585 |
# FIXME: too much stuff is in the command class
|
1551.14.11
by Aaron Bentley
rename rev_id and other_rev_id |
586 |
revision_id = None |
1551.14.7
by Aaron Bentley
test suite fixes |
587 |
mergeable = None |
2220.2.8
by Martin Pool
Add -d option to push, pull, merge commands. |
588 |
if directory is None: |
589 |
directory = u'.' |
|
1558.5.6
by Aaron Bentley
Renamed make-repo init-repo |
590 |
try: |
2220.2.8
by Martin Pool
Add -d option to push, pull, merge commands. |
591 |
tree_to = WorkingTree.open_containing(directory)[0] |
1558.5.6
by Aaron Bentley
Renamed make-repo init-repo |
592 |
branch_to = tree_to.branch |
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
593 |
except errors.NoWorkingTree: |
1558.5.6
by Aaron Bentley
Renamed make-repo init-repo |
594 |
tree_to = None |
2220.2.8
by Martin Pool
Add -d option to push, pull, merge commands. |
595 |
branch_to = Branch.open_containing(directory)[0] |
1711.3.3
by John Arbash Meinel
Allow pull to use a bundle as a target, |
596 |
|
597 |
reader = None |
|
598 |
if location is not None: |
|
599 |
try: |
|
1551.14.4
by Aaron Bentley
Change bundle reader and merge directive to both be 'mergeables' |
600 |
mergeable = bundle.read_mergeable_from_url( |
1551.14.1
by Aaron Bentley
Allow pull from a merge directive |
601 |
location) |
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
602 |
except errors.NotABundle: |
1711.3.3
by John Arbash Meinel
Allow pull to use a bundle as a target, |
603 |
pass # Continue on considering this url a Branch |
604 |
||
1558.5.6
by Aaron Bentley
Renamed make-repo init-repo |
605 |
stored_loc = branch_to.get_parent() |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
606 |
if location is None: |
607 |
if stored_loc is None: |
|
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
608 |
raise errors.BzrCommandError("No pull location known or" |
609 |
" specified.") |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
610 |
else: |
1685.1.58
by Martin Pool
urlutils.unescape_for_display should return Unicode |
611 |
display_url = urlutils.unescape_for_display(stored_loc, |
612 |
self.outf.encoding) |
|
613 |
self.outf.write("Using saved location: %s\n" % display_url) |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
614 |
location = stored_loc |
1185.56.1
by Michael Ellerman
Simplify handling of DivergedBranches in cmd_pull() |
615 |
|
1551.14.4
by Aaron Bentley
Change bundle reader and merge directive to both be 'mergeables' |
616 |
if mergeable is not None: |
617 |
if revision is not None: |
|
618 |
raise errors.BzrCommandError( |
|
619 |
'Cannot use -r with merge directives or bundles') |
|
2520.4.109
by Aaron Bentley
start work on directive cherry-picking |
620 |
mergeable.install_revisions(branch_to.repository) |
621 |
base_revision_id, revision_id, verified = \ |
|
622 |
mergeable.get_merge_request(branch_to.repository) |
|
1711.3.3
by John Arbash Meinel
Allow pull to use a bundle as a target, |
623 |
branch_from = branch_to |
624 |
else: |
|
625 |
branch_from = Branch.open(location) |
|
626 |
||
627 |
if branch_to.get_parent() is None or remember: |
|
628 |
branch_to.set_parent(branch_from.base) |
|
629 |
||
1551.14.4
by Aaron Bentley
Change bundle reader and merge directive to both be 'mergeables' |
630 |
if revision is not None: |
631 |
if len(revision) == 1: |
|
1551.14.11
by Aaron Bentley
rename rev_id and other_rev_id |
632 |
revision_id = revision[0].in_history(branch_from).rev_id |
1551.14.4
by Aaron Bentley
Change bundle reader and merge directive to both be 'mergeables' |
633 |
else: |
634 |
raise errors.BzrCommandError( |
|
635 |
'bzr pull --revision takes one value.') |
|
1185.76.1
by Erik Bågfors
Support for --revision in pull |
636 |
|
2625.2.1
by Robert Collins
* ``bzr pull`` and ``bzr push`` no longer do a complete walk of the |
637 |
if verbose: |
638 |
old_rh = branch_to.revision_history() |
|
1558.5.6
by Aaron Bentley
Renamed make-repo init-repo |
639 |
if tree_to is not None: |
1551.14.11
by Aaron Bentley
rename rev_id and other_rev_id |
640 |
result = tree_to.pull(branch_from, overwrite, revision_id, |
1551.10.25
by Aaron Bentley
Make ChangeReporter private |
641 |
delta._ChangeReporter(unversioned_filter=tree_to.is_ignored)) |
1558.5.6
by Aaron Bentley
Renamed make-repo init-repo |
642 |
else: |
1551.14.11
by Aaron Bentley
rename rev_id and other_rev_id |
643 |
result = branch_to.pull(branch_from, overwrite, revision_id) |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
644 |
|
2220.2.39
by Martin Pool
Pull also merges tags and warns if they conflict |
645 |
result.report(self.outf) |
646 |
if verbose: |
|
2297.1.1
by Martin Pool
Pull now returns a PullResult rather than just an integer. |
647 |
from bzrlib.log import show_changed_revisions |
1558.5.6
by Aaron Bentley
Renamed make-repo init-repo |
648 |
new_rh = branch_to.revision_history() |
1551.14.4
by Aaron Bentley
Change bundle reader and merge directive to both be 'mergeables' |
649 |
show_changed_revisions(branch_to, old_rh, new_rh, |
650 |
to_file=self.outf) |
|
1185.31.5
by John Arbash Meinel
Merged pull --verbose changes |
651 |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
652 |
|
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
653 |
class cmd_push(Command): |
1649.1.1
by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two |
654 |
"""Update a mirror of this branch. |
655 |
|
|
656 |
The target branch will not have its working tree populated because this
|
|
657 |
is both expensive, and is not supported on remote file systems.
|
|
658 |
|
|
659 |
Some smart servers or protocols *may* put the working tree in place in
|
|
660 |
the future.
|
|
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
661 |
|
662 |
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 |
663 |
considered diverged if the destination branch's most recent commit is one
|
664 |
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. |
665 |
|
666 |
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 |
667 |
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. |
668 |
|
669 |
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 |
670 |
do a merge (see bzr help merge) from the other branch, and commit that.
|
671 |
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 |
672 |
|
673 |
If there is no default push location set, the first push will set it.
|
|
674 |
After that, you can omit the location to use the default. To change the
|
|
1785.1.4
by John Arbash Meinel
Update help for the new --remember semantics. |
675 |
default, use --remember. The value will only be saved if the remote
|
676 |
location can be accessed.
|
|
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
677 |
"""
|
1685.1.80
by Wouter van Heyst
more code cleanup |
678 |
|
2485.1.2
by James Westby
Update with comments from review, thanks to John and Aaron. |
679 |
_see_also = ['pull', 'update', 'working-trees'] |
1185.85.31
by John Arbash Meinel
Updated bzr push, including bringing in the unused --verbose flag. |
680 |
takes_options = ['remember', 'overwrite', 'verbose', |
2279.3.1
by mbp at sourcefrog
Add a -d option to push, pull, merge (ported from tags branch) |
681 |
Option('create-prefix', |
2220.2.8
by Martin Pool
Add -d option to push, pull, merge commands. |
682 |
help='Create the path leading up to the branch ' |
2598.1.1
by Martin Pool
Add test for and documentation of option style, fix up existing options to comply |
683 |
'if it does not already exist.'), |
2220.2.8
by Martin Pool
Add -d option to push, pull, merge commands. |
684 |
Option('directory', |
2598.1.1
by Martin Pool
Add test for and documentation of option style, fix up existing options to comply |
685 |
help='Branch to push from, ' |
686 |
'rather than the one containing the working directory.', |
|
2220.2.8
by Martin Pool
Add -d option to push, pull, merge commands. |
687 |
short_name='d', |
688 |
type=unicode, |
|
689 |
),
|
|
2279.3.1
by mbp at sourcefrog
Add a -d option to push, pull, merge (ported from tags branch) |
690 |
Option('use-existing-dir', |
691 |
help='By default push will fail if the target' |
|
692 |
' directory exists, but does not already'
|
|
2598.1.1
by Martin Pool
Add test for and documentation of option style, fix up existing options to comply |
693 |
' have a control directory. This flag will'
|
2279.3.1
by mbp at sourcefrog
Add a -d option to push, pull, merge (ported from tags branch) |
694 |
' allow push to proceed.'), |
695 |
]
|
|
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
696 |
takes_args = ['location?'] |
1185.85.31
by John Arbash Meinel
Updated bzr push, including bringing in the unused --verbose flag. |
697 |
encoding_type = 'replace' |
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
698 |
|
1495
by Robert Collins
Add a --create-prefix to the new push command. |
699 |
def run(self, location=None, remember=False, overwrite=False, |
2220.2.8
by Martin Pool
Add -d option to push, pull, merge commands. |
700 |
create_prefix=False, verbose=False, |
2279.3.1
by mbp at sourcefrog
Add a -d option to push, pull, merge (ported from tags branch) |
701 |
use_existing_dir=False, |
702 |
directory=None): |
|
1185.33.45
by Martin Pool
[merge] refactoring of branch vs working tree, etc (robertc) |
703 |
# FIXME: Way too big! Put this into a function called from the
|
704 |
# command.
|
|
2220.2.8
by Martin Pool
Add -d option to push, pull, merge commands. |
705 |
if directory is None: |
706 |
directory = '.' |
|
707 |
br_from = Branch.open_containing(directory)[0] |
|
1692.3.1
by Robert Collins
Fix push to work with just a branch, no need for a working tree. |
708 |
stored_loc = br_from.get_push_location() |
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
709 |
if location is None: |
710 |
if stored_loc is None: |
|
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
711 |
raise errors.BzrCommandError("No push location known or specified.") |
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
712 |
else: |
1685.1.59
by Martin Pool
[broken] Fix up & refactor display of remembered urls to unescape properly |
713 |
display_url = urlutils.unescape_for_display(stored_loc, |
714 |
self.outf.encoding) |
|
1785.1.1
by John Arbash Meinel
Fix the output of 'bzr push' so that it prints the location correctly. |
715 |
self.outf.write("Using saved location: %s\n" % display_url) |
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
716 |
location = stored_loc |
1685.1.22
by John Arbash Meinel
cmd_push was passing the location directly to relpath, rather than a URL |
717 |
|
1830.4.7
by Wouter van Heyst
review fixes, rename transport variable to to_transport |
718 |
to_transport = transport.get_transport(location) |
1685.1.70
by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken |
719 |
|
2227.3.1
by John Arbash Meinel
Allow push to create Branch when necessary, and add --use-existing |
720 |
br_to = repository_to = dir_to = None |
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
721 |
try: |
2018.5.26
by Andrew Bennetts
Extract a simple SmartClient class from RemoteTransport, and a hack to avoid VFS operations when probing for a bzrdir over a smart transport. |
722 |
dir_to = bzrdir.BzrDir.open_from_transport(to_transport) |
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
723 |
except errors.NotBranchError: |
2227.3.1
by John Arbash Meinel
Allow push to create Branch when necessary, and add --use-existing |
724 |
pass # Didn't find anything |
725 |
else: |
|
726 |
# If we can open a branch, use its direct repository, otherwise see
|
|
727 |
# if there is a repository without a branch.
|
|
728 |
try: |
|
729 |
br_to = dir_to.open_branch() |
|
730 |
except errors.NotBranchError: |
|
731 |
# Didn't find a branch, can we find a repository?
|
|
1495
by Robert Collins
Add a --create-prefix to the new push command. |
732 |
try: |
2227.3.1
by John Arbash Meinel
Allow push to create Branch when necessary, and add --use-existing |
733 |
repository_to = dir_to.find_repository() |
734 |
except errors.NoRepositoryPresent: |
|
735 |
pass
|
|
1495
by Robert Collins
Add a --create-prefix to the new push command. |
736 |
else: |
2227.3.1
by John Arbash Meinel
Allow push to create Branch when necessary, and add --use-existing |
737 |
# Found a branch, so we must have found a repository
|
738 |
repository_to = br_to.repository |
|
2297.1.4
by Martin Pool
Push now returns a PushResult rather than just an integer. |
739 |
push_result = None |
2625.2.1
by Robert Collins
* ``bzr pull`` and ``bzr push`` no longer do a complete walk of the |
740 |
if verbose: |
741 |
old_rh = [] |
|
2227.3.1
by John Arbash Meinel
Allow push to create Branch when necessary, and add --use-existing |
742 |
if dir_to is None: |
2297.1.4
by Martin Pool
Push now returns a PushResult rather than just an integer. |
743 |
# The destination doesn't exist; create it.
|
2227.3.1
by John Arbash Meinel
Allow push to create Branch when necessary, and add --use-existing |
744 |
# XXX: Refactor the create_prefix/no_create_prefix code into a
|
745 |
# common helper function
|
|
746 |
try: |
|
747 |
to_transport.mkdir('.') |
|
748 |
except errors.FileExists: |
|
2227.3.4
by John Arbash Meinel
Switch back to --use-existing-dir |
749 |
if not use_existing_dir: |
2227.3.1
by John Arbash Meinel
Allow push to create Branch when necessary, and add --use-existing |
750 |
raise errors.BzrCommandError("Target directory %s" |
2227.3.4
by John Arbash Meinel
Switch back to --use-existing-dir |
751 |
" already exists, but does not have a valid .bzr"
|
752 |
" directory. Supply --use-existing-dir to push"
|
|
753 |
" there anyway." % location) |
|
2227.3.1
by John Arbash Meinel
Allow push to create Branch when necessary, and add --use-existing |
754 |
except errors.NoSuchFile: |
755 |
if not create_prefix: |
|
756 |
raise errors.BzrCommandError("Parent directory of %s" |
|
757 |
" does not exist."
|
|
758 |
"\nYou may supply --create-prefix to create all" |
|
759 |
" leading parent directories."
|
|
760 |
% location) |
|
2524.1.1
by Aaron Bentley
Revert broken changes |
761 |
_create_prefix(to_transport) |
2475.3.3
by John Arbash Meinel
Change calls to try/mkdir('.')/except FileExists to ensure_base() |
762 |
|
2227.3.1
by John Arbash Meinel
Allow push to create Branch when necessary, and add --use-existing |
763 |
# Now the target directory exists, but doesn't have a .bzr
|
764 |
# directory. So we need to create it, along with any work to create
|
|
765 |
# all of the dependent branches, etc.
|
|
2475.3.1
by John Arbash Meinel
Fix bug #75721. Update the BzrDir api to add clone_on_transport() |
766 |
dir_to = br_from.bzrdir.clone_on_transport(to_transport, |
1711.2.3
by John Arbash Meinel
Fix push to only push revisions in the current ancestry. (bug???) |
767 |
revision_id=br_from.last_revision()) |
1563.2.38
by Robert Collins
make push preserve tree formats. |
768 |
br_to = dir_to.open_branch() |
2297.1.4
by Martin Pool
Push now returns a PushResult rather than just an integer. |
769 |
# TODO: Some more useful message about what was copied
|
770 |
note('Created new branch.') |
|
1785.1.2
by John Arbash Meinel
Push should only save the location if it can actually connect (doesn't need to succeed) |
771 |
# We successfully created the target, remember it
|
772 |
if br_from.get_push_location() is None or remember: |
|
773 |
br_from.set_push_location(br_to.base) |
|
2227.3.1
by John Arbash Meinel
Allow push to create Branch when necessary, and add --use-existing |
774 |
elif repository_to is None: |
775 |
# we have a bzrdir but no branch or repository
|
|
776 |
# XXX: Figure out what to do other than complain.
|
|
777 |
raise errors.BzrCommandError("At %s you have a valid .bzr control" |
|
2227.3.2
by John Arbash Meinel
Fix error message as suggested by Martin. |
778 |
" directory, but not a branch or repository. This is an"
|
779 |
" unsupported configuration. Please move the target directory"
|
|
780 |
" out of the way and try again."
|
|
2227.3.1
by John Arbash Meinel
Allow push to create Branch when necessary, and add --use-existing |
781 |
% location) |
782 |
elif br_to is None: |
|
783 |
# We have a repository but no branch, copy the revisions, and then
|
|
784 |
# create a branch.
|
|
785 |
last_revision_id = br_from.last_revision() |
|
786 |
repository_to.fetch(br_from.repository, |
|
787 |
revision_id=last_revision_id) |
|
788 |
br_to = br_from.clone(dir_to, revision_id=last_revision_id) |
|
2297.1.4
by Martin Pool
Push now returns a PushResult rather than just an integer. |
789 |
note('Created new branch.') |
2227.3.1
by John Arbash Meinel
Allow push to create Branch when necessary, and add --use-existing |
790 |
if br_from.get_push_location() is None or remember: |
791 |
br_from.set_push_location(br_to.base) |
|
792 |
else: # We have a valid to branch |
|
1785.1.2
by John Arbash Meinel
Push should only save the location if it can actually connect (doesn't need to succeed) |
793 |
# We were able to connect to the remote location, so remember it
|
794 |
# we don't need to successfully push because of possible divergence.
|
|
795 |
if br_from.get_push_location() is None or remember: |
|
796 |
br_from.set_push_location(br_to.base) |
|
2625.2.1
by Robert Collins
* ``bzr pull`` and ``bzr push`` no longer do a complete walk of the |
797 |
if verbose: |
798 |
old_rh = br_to.revision_history() |
|
1185.49.26
by John Arbash Meinel
Adding tests for remote sftp branches without working trees, plus a bugfix to allow push to still work with a warning. |
799 |
try: |
1692.3.6
by Robert Collins
Show the correct number of revisions pushed when pushing a new branch (Robert Collins). |
800 |
try: |
801 |
tree_to = dir_to.open_workingtree() |
|
802 |
except errors.NotLocalUrl: |
|
2485.1.2
by James Westby
Update with comments from review, thanks to John and Aaron. |
803 |
warning("This transport does not update the working " |
804 |
"tree of: %s. See 'bzr help working-trees' for " |
|
805 |
"more information." % br_to.base) |
|
2297.1.4
by Martin Pool
Push now returns a PushResult rather than just an integer. |
806 |
push_result = br_from.push(br_to, overwrite) |
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
807 |
except errors.NoWorkingTree: |
2297.1.4
by Martin Pool
Push now returns a PushResult rather than just an integer. |
808 |
push_result = br_from.push(br_to, overwrite) |
1692.3.6
by Robert Collins
Show the correct number of revisions pushed when pushing a new branch (Robert Collins). |
809 |
else: |
2245.2.2
by Robert Collins
Update cmd_push to invoke the correct 'push' method on branch, rather than pull. This does not alter tests because the behaviour for push and pull is still symmetrical. |
810 |
tree_to.lock_write() |
811 |
try: |
|
2297.1.4
by Martin Pool
Push now returns a PushResult rather than just an integer. |
812 |
push_result = br_from.push(tree_to.branch, overwrite) |
2245.2.2
by Robert Collins
Update cmd_push to invoke the correct 'push' method on branch, rather than pull. This does not alter tests because the behaviour for push and pull is still symmetrical. |
813 |
tree_to.update() |
814 |
finally: |
|
815 |
tree_to.unlock() |
|
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
816 |
except errors.DivergedBranches: |
1996.3.36
by John Arbash Meinel
[merge] bzr.dev 2070 |
817 |
raise errors.BzrCommandError('These branches have diverged.' |
818 |
' Try using "merge" and then "push".') |
|
2297.1.4
by Martin Pool
Push now returns a PushResult rather than just an integer. |
819 |
if push_result is not None: |
2220.2.37
by Martin Pool
Report conflicting tags from push. |
820 |
push_result.report(self.outf) |
2297.1.4
by Martin Pool
Push now returns a PushResult rather than just an integer. |
821 |
elif verbose: |
1185.31.5
by John Arbash Meinel
Merged pull --verbose changes |
822 |
new_rh = br_to.revision_history() |
823 |
if old_rh != new_rh: |
|
824 |
# Something changed
|
|
825 |
from bzrlib.log import show_changed_revisions |
|
1185.85.31
by John Arbash Meinel
Updated bzr push, including bringing in the unused --verbose flag. |
826 |
show_changed_revisions(br_to, old_rh, new_rh, |
827 |
to_file=self.outf) |
|
2297.1.4
by Martin Pool
Push now returns a PushResult rather than just an integer. |
828 |
else: |
829 |
# we probably did a clone rather than a push, so a message was
|
|
830 |
# emitted above
|
|
831 |
pass
|
|
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
832 |
|
1508.1.4
by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing |
833 |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
834 |
class cmd_branch(Command): |
835 |
"""Create a new copy of a branch. |
|
836 |
||
837 |
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
|
|
838 |
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
|
|
2512.4.1
by Ian Clatworthy
Fixes #115491 - 'branch lp:projname' now creates ./projname as exected |
839 |
If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION
|
840 |
is derived from the FROM_LOCATION by stripping a leading scheme or drive
|
|
841 |
identifier, if any. For example, "branch lp:foo-bar" will attempt to
|
|
842 |
create ./foo-bar.
|
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
843 |
|
844 |
To retrieve the branch as of a particular revision, supply the --revision
|
|
845 |
parameter, as in "branch foo/bar -r 5".
|
|
846 |
"""
|
|
2425.2.3
by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins) |
847 |
|
848 |
_see_also = ['checkout'] |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
849 |
takes_args = ['from_location', 'to_location?'] |
2387.1.1
by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins) |
850 |
takes_options = ['revision'] |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
851 |
aliases = ['get', 'clone'] |
852 |
||
2387.1.1
by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins) |
853 |
def run(self, from_location, to_location=None, revision=None): |
2220.2.30
by Martin Pool
split out tag-merging code and add some tests |
854 |
from bzrlib.tag import _merge_tags_if_possible |
1185.17.3
by Martin Pool
[pick] larger read lock scope for branch command |
855 |
if revision is None: |
856 |
revision = [None] |
|
857 |
elif len(revision) > 1: |
|
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
858 |
raise errors.BzrCommandError( |
1185.17.3
by Martin Pool
[pick] larger read lock scope for branch command |
859 |
'bzr branch --revision takes exactly 1 revision value') |
2283.1.1
by John Arbash Meinel
(John Arbash Meinel) (trivial) remove unused and incorrect code. |
860 |
|
861 |
br_from = Branch.open(from_location) |
|
1185.17.3
by Martin Pool
[pick] larger read lock scope for branch command |
862 |
br_from.lock_read() |
863 |
try: |
|
1185.8.4
by Aaron Bentley
Fixed branch -r |
864 |
if len(revision) == 1 and revision[0] is not None: |
1390
by Robert Collins
pair programming worx... merge integration and weave |
865 |
revision_id = revision[0].in_history(br_from)[1] |
1185.8.4
by Aaron Bentley
Fixed branch -r |
866 |
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. |
867 |
# FIXME - wt.last_revision, fallback to branch, fall back to
|
868 |
# None or perhaps NULL_REVISION to mean copy nothing
|
|
869 |
# RBC 20060209
|
|
870 |
revision_id = br_from.last_revision() |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
871 |
if to_location is None: |
2512.4.1
by Ian Clatworthy
Fixes #115491 - 'branch lp:projname' now creates ./projname as exected |
872 |
to_location = urlutils.derive_to_location(from_location) |
1442.1.71
by Robert Collins
'bzr branch' sets the branch-name, |
873 |
name = None |
874 |
else: |
|
875 |
name = os.path.basename(to_location) + '\n' |
|
1685.1.20
by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work |
876 |
|
1830.4.7
by Wouter van Heyst
review fixes, rename transport variable to to_transport |
877 |
to_transport = transport.get_transport(to_location) |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
878 |
try: |
1685.1.20
by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work |
879 |
to_transport.mkdir('.') |
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
880 |
except errors.FileExists: |
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
881 |
raise errors.BzrCommandError('Target directory "%s" already' |
882 |
' exists.' % to_location) |
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
883 |
except errors.NoSuchFile: |
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
884 |
raise errors.BzrCommandError('Parent of "%s" does not exist.' |
885 |
% to_location) |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
886 |
try: |
1587.1.14
by Robert Collins
Make bound branch creation happen via 'checkout' |
887 |
# preserve whatever source format we have.
|
2387.1.1
by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins) |
888 |
dir = br_from.bzrdir.sprout(to_transport.base, revision_id) |
1587.1.14
by Robert Collins
Make bound branch creation happen via 'checkout' |
889 |
branch = dir.open_branch() |
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
890 |
except errors.NoSuchRevision: |
1685.1.80
by Wouter van Heyst
more code cleanup |
891 |
to_transport.delete_tree('.') |
1466
by Robert Collins
revision may be None in cmd_branch, do not treat as an int. |
892 |
msg = "The branch %s has no revision %s." % (from_location, revision[0]) |
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
893 |
raise errors.BzrCommandError(msg) |
1442.1.71
by Robert Collins
'bzr branch' sets the branch-name, |
894 |
if name: |
1185.65.27
by Robert Collins
Tweak storage towards mergability. |
895 |
branch.control_files.put_utf8('branch-name', name) |
2220.2.30
by Martin Pool
split out tag-merging code and add some tests |
896 |
_merge_tags_if_possible(br_from, branch) |
1185.33.44
by Martin Pool
[patch] show number of revisions pushed/pulled/merged (Robey Pointer) |
897 |
note('Branched %d revision(s).' % branch.revno()) |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
898 |
finally: |
1185.17.3
by Martin Pool
[pick] larger read lock scope for branch command |
899 |
br_from.unlock() |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
900 |
|
901 |
||
1508.1.20
by Robert Collins
Create a checkout command. |
902 |
class cmd_checkout(Command): |
903 |
"""Create a new checkout of an existing branch. |
|
904 |
||
1508.1.28
by Robert Collins
Test using bzr checkout to reconstitute working trees. |
905 |
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
|
906 |
the branch found in '.'. This is useful if you have removed the working tree
|
|
907 |
or if it was never created - i.e. if you pushed the branch to its current
|
|
908 |
location using SFTP.
|
|
909 |
|
|
1508.1.20
by Robert Collins
Create a checkout command. |
910 |
If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
|
911 |
be used. In other words, "checkout ../foo/bar" will attempt to create ./bar.
|
|
2512.4.1
by Ian Clatworthy
Fixes #115491 - 'branch lp:projname' now creates ./projname as exected |
912 |
If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION
|
913 |
is derived from the BRANCH_LOCATION by stripping a leading scheme or drive
|
|
914 |
identifier, if any. For example, "checkout lp:foo-bar" will attempt to
|
|
915 |
create ./foo-bar.
|
|
1508.1.20
by Robert Collins
Create a checkout command. |
916 |
|
917 |
To retrieve the branch as of a particular revision, supply the --revision
|
|
918 |
parameter, as in "checkout foo/bar -r 5". Note that this will be immediately
|
|
919 |
out of date [so you cannot commit] but it may be useful (i.e. to examine old
|
|
920 |
code.)
|
|
2425.2.3
by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins) |
921 |
"""
|
1508.1.20
by Robert Collins
Create a checkout command. |
922 |
|
2425.2.3
by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins) |
923 |
_see_also = ['checkouts', 'branch'] |
1508.1.28
by Robert Collins
Test using bzr checkout to reconstitute working trees. |
924 |
takes_args = ['branch_location?', 'to_location?'] |
2387.1.1
by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins) |
925 |
takes_options = ['revision', |
1587.1.14
by Robert Collins
Make bound branch creation happen via 'checkout' |
926 |
Option('lightweight', |
2598.1.1
by Martin Pool
Add test for and documentation of option style, fix up existing options to comply |
927 |
help="Perform a lightweight checkout. Lightweight " |
1587.1.14
by Robert Collins
Make bound branch creation happen via 'checkout' |
928 |
"checkouts depend on access to the branch for "
|
2598.1.1
by Martin Pool
Add test for and documentation of option style, fix up existing options to comply |
929 |
"every operation. Normal checkouts can perform "
|
1587.1.14
by Robert Collins
Make bound branch creation happen via 'checkout' |
930 |
"common operations like diff and status without "
|
931 |
"such access, and also support local commits."
|
|
932 |
),
|
|
933 |
]
|
|
1733.2.8
by Michael Ellerman
Add CVS compatible aliases for checkout and annotate, from fullermd. |
934 |
aliases = ['co'] |
1508.1.20
by Robert Collins
Create a checkout command. |
935 |
|
2387.1.1
by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins) |
936 |
def run(self, branch_location=None, to_location=None, revision=None, |
1587.1.14
by Robert Collins
Make bound branch creation happen via 'checkout' |
937 |
lightweight=False): |
1508.1.20
by Robert Collins
Create a checkout command. |
938 |
if revision is None: |
939 |
revision = [None] |
|
940 |
elif len(revision) > 1: |
|
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
941 |
raise errors.BzrCommandError( |
1508.1.20
by Robert Collins
Create a checkout command. |
942 |
'bzr checkout --revision takes exactly 1 revision value') |
1508.1.28
by Robert Collins
Test using bzr checkout to reconstitute working trees. |
943 |
if branch_location is None: |
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
944 |
branch_location = osutils.getcwd() |
1508.1.28
by Robert Collins
Test using bzr checkout to reconstitute working trees. |
945 |
to_location = branch_location |
1508.1.20
by Robert Collins
Create a checkout command. |
946 |
source = Branch.open(branch_location) |
947 |
if len(revision) == 1 and revision[0] is not None: |
|
948 |
revision_id = revision[0].in_history(source)[1] |
|
949 |
else: |
|
950 |
revision_id = None |
|
951 |
if to_location is None: |
|
2512.4.1
by Ian Clatworthy
Fixes #115491 - 'branch lp:projname' now creates ./projname as exected |
952 |
to_location = urlutils.derive_to_location(branch_location) |
1508.1.28
by Robert Collins
Test using bzr checkout to reconstitute working trees. |
953 |
# if the source and to_location are the same,
|
954 |
# and there is no working tree,
|
|
955 |
# then reconstitute a branch
|
|
1997.1.4
by Robert Collins
``bzr checkout --lightweight`` now operates on readonly branches as well |
956 |
if (osutils.abspath(to_location) == |
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
957 |
osutils.abspath(branch_location)): |
1508.1.28
by Robert Collins
Test using bzr checkout to reconstitute working trees. |
958 |
try: |
959 |
source.bzrdir.open_workingtree() |
|
960 |
except errors.NoWorkingTree: |
|
961 |
source.bzrdir.create_workingtree() |
|
962 |
return
|
|
1508.1.20
by Robert Collins
Create a checkout command. |
963 |
try: |
964 |
os.mkdir(to_location) |
|
965 |
except OSError, e: |
|
966 |
if e.errno == errno.EEXIST: |
|
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
967 |
raise errors.BzrCommandError('Target directory "%s" already' |
968 |
' exists.' % to_location) |
|
1508.1.20
by Robert Collins
Create a checkout command. |
969 |
if e.errno == errno.ENOENT: |
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
970 |
raise errors.BzrCommandError('Parent of "%s" does not exist.' |
971 |
% to_location) |
|
1508.1.20
by Robert Collins
Create a checkout command. |
972 |
else: |
973 |
raise
|
|
2204.4.13
by Aaron Bentley
Update all test cases to avoid set_default_format |
974 |
source.create_checkout(to_location, revision_id, lightweight) |
1508.1.20
by Robert Collins
Create a checkout command. |
975 |
|
976 |
||
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
977 |
class cmd_renames(Command): |
978 |
"""Show list of renamed files. |
|
979 |
"""
|
|
1185.16.3
by Martin Pool
- remove all TODOs from bzr help messages |
980 |
# TODO: Option to show renames between two historical versions.
|
981 |
||
982 |
# TODO: Only show renames under dir, rather than in the whole branch.
|
|
2425.2.3
by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins) |
983 |
_see_also = ['status'] |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
984 |
takes_args = ['dir?'] |
985 |
||
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
986 |
@display_command
|
1185.33.66
by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko) |
987 |
def run(self, dir=u'.'): |
1508.1.4
by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing |
988 |
tree = WorkingTree.open_containing(dir)[0] |
2255.7.63
by Robert Collins
Fix cmd_renames to lock around inventory access. |
989 |
tree.lock_read() |
990 |
try: |
|
991 |
new_inv = tree.inventory |
|
992 |
old_tree = tree.basis_tree() |
|
993 |
old_tree.lock_read() |
|
994 |
try: |
|
995 |
old_inv = old_tree.inventory |
|
996 |
renames = list(_mod_tree.find_renames(old_inv, new_inv)) |
|
997 |
renames.sort() |
|
998 |
for old_name, new_name in renames: |
|
999 |
self.outf.write("%s => %s\n" % (old_name, new_name)) |
|
1000 |
finally: |
|
1001 |
old_tree.unlock() |
|
1002 |
finally: |
|
1003 |
tree.unlock() |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1004 |
|
1005 |
||
1508.1.24
by Robert Collins
Add update command for use with checkouts. |
1006 |
class cmd_update(Command): |
1007 |
"""Update a tree to have the latest code committed to its branch. |
|
1008 |
|
|
1009 |
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. |
1010 |
conflicts. If you have any local changes, you will still
|
1011 |
need to commit them after the update for the update to be complete.
|
|
1012 |
|
|
1013 |
If you want to discard your local changes, you can just do a
|
|
1014 |
'bzr revert' instead of 'bzr commit' after the update.
|
|
1508.1.24
by Robert Collins
Add update command for use with checkouts. |
1015 |
"""
|
2425.2.3
by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins) |
1016 |
|
2485.1.2
by James Westby
Update with comments from review, thanks to John and Aaron. |
1017 |
_see_also = ['pull', 'working-trees'] |
1508.1.24
by Robert Collins
Add update command for use with checkouts. |
1018 |
takes_args = ['dir?'] |
1815.3.1
by Stefan (metze) Metzmacher
add 'up' as alias for 'update' |
1019 |
aliases = ['up'] |
1508.1.24
by Robert Collins
Add update command for use with checkouts. |
1020 |
|
1021 |
def run(self, dir='.'): |
|
1022 |
tree = WorkingTree.open_containing(dir)[0] |
|
2084.2.1
by Aaron Bentley
Support updating lightweight checkouts of readonly branches |
1023 |
master = tree.branch.get_master_branch() |
1024 |
if master is not None: |
|
1025 |
tree.lock_write() |
|
1026 |
else: |
|
1027 |
tree.lock_tree_write() |
|
1508.1.24
by Robert Collins
Add update command for use with checkouts. |
1028 |
try: |
2014.1.1
by John Arbash Meinel
Stop using pending_merges() in 'bzr update' |
1029 |
existing_pending_merges = tree.get_parent_ids()[1:] |
2598.5.4
by Aaron Bentley
Restore original Branch.last_revision behavior, fix bits that care |
1030 |
last_rev = _mod_revision.ensure_null(tree.last_revision()) |
1031 |
if last_rev == _mod_revision.ensure_null( |
|
1032 |
tree.branch.last_revision()): |
|
1587.1.11
by Robert Collins
Local commits appear to be working properly. |
1033 |
# may be up to date, check master too.
|
1034 |
master = tree.branch.get_master_branch() |
|
2598.5.4
by Aaron Bentley
Restore original Branch.last_revision behavior, fix bits that care |
1035 |
if master is None or last_rev == _mod_revision.ensure_null( |
1036 |
master.last_revision()): |
|
1830.1.1
by John Arbash Meinel
Print up to date even if bound, also always print out current revno. |
1037 |
revno = tree.branch.revision_id_to_revno(last_rev) |
1038 |
note("Tree is up to date at revision %d." % (revno,)) |
|
1039 |
return 0 |
|
2504.2.4
by Daniel Watkins
Reformatted code to fit in 79 columns. |
1040 |
conflicts = tree.update(delta._ChangeReporter( |
1041 |
unversioned_filter=tree.is_ignored)) |
|
2598.5.4
by Aaron Bentley
Restore original Branch.last_revision behavior, fix bits that care |
1042 |
revno = tree.branch.revision_id_to_revno( |
1043 |
_mod_revision.ensure_null(tree.last_revision())) |
|
1830.1.1
by John Arbash Meinel
Print up to date even if bound, also always print out current revno. |
1044 |
note('Updated to revision %d.' % (revno,)) |
2014.1.1
by John Arbash Meinel
Stop using pending_merges() in 'bzr update' |
1045 |
if tree.get_parent_ids()[1:] != existing_pending_merges: |
1711.2.108
by John Arbash Meinel
Assert that update informs the user about where their local commits went. |
1046 |
note('Your local commits will now show as pending merges with ' |
1878.3.2
by Adeodato Simó
Update with suggestions from John Arbash Meinel. |
1047 |
"'bzr status', and can be committed with 'bzr commit'.") |
1508.1.24
by Robert Collins
Add update command for use with checkouts. |
1048 |
if conflicts != 0: |
1049 |
return 1 |
|
1050 |
else: |
|
1051 |
return 0 |
|
1052 |
finally: |
|
1053 |
tree.unlock() |
|
1054 |
||
1055 |
||
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1056 |
class cmd_info(Command): |
1694.2.6
by Martin Pool
[merge] bzr.dev |
1057 |
"""Show information about a working tree, branch or repository. |
1058 |
||
1059 |
This command will show all known locations and formats associated to the
|
|
1060 |
tree, branch or repository. Statistical information is included with
|
|
1061 |
each report.
|
|
1062 |
||
1063 |
Branches and working trees will also report any missing revisions.
|
|
1064 |
"""
|
|
2485.1.2
by James Westby
Update with comments from review, thanks to John and Aaron. |
1065 |
_see_also = ['revno', 'working-trees', 'repositories'] |
1694.2.6
by Martin Pool
[merge] bzr.dev |
1066 |
takes_args = ['location?'] |
1624.3.21
by Olaf Conradi
Make bzr info command work on both local and remote locations. Support |
1067 |
takes_options = ['verbose'] |
1694.2.6
by Martin Pool
[merge] bzr.dev |
1068 |
|
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
1069 |
@display_command
|
2363.5.7
by Aaron Bentley
Make verbose mean what I want |
1070 |
def run(self, location=None, verbose=0): |
1694.2.6
by Martin Pool
[merge] bzr.dev |
1071 |
from bzrlib.info import show_bzrdir_info |
1072 |
show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0], |
|
2363.5.16
by Aaron Bentley
remove spurious change |
1073 |
verbose=verbose) |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1074 |
|
1075 |
||
2292.1.13
by Marius Kruger
* merge the unversion command back into the remove command, |
1076 |
class cmd_remove(Command): |
2292.1.24
by Marius Kruger
minor text cleanups |
1077 |
"""Remove files or directories. |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1078 |
|
2292.1.13
by Marius Kruger
* merge the unversion command back into the remove command, |
1079 |
This makes bzr stop tracking changes to the specified files and
|
1080 |
delete them if they can easily be recovered using revert.
|
|
1551.6.26
by Aaron Bentley
Add support for remove --new |
1081 |
|
1082 |
You can specify one or more files, and/or --new. If you specify --new,
|
|
2292.1.30
by Marius Kruger
* Minor text fixes. |
1083 |
only 'added' files will be removed. If you specify both, then new files
|
2292.1.18
by Marius Kruger
revert wrapping change |
1084 |
in the specified directories will be removed. If the directories are
|
2292.1.13
by Marius Kruger
* merge the unversion command back into the remove command, |
1085 |
also new, they will also be removed.
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1086 |
"""
|
1551.6.26
by Aaron Bentley
Add support for remove --new |
1087 |
takes_args = ['file*'] |
2292.1.30
by Marius Kruger
* Minor text fixes. |
1088 |
takes_options = ['verbose', |
2598.1.1
by Martin Pool
Add test for and documentation of option style, fix up existing options to comply |
1089 |
Option('new', help='Remove newly-added files.'), |
2292.1.28
by Marius Kruger
* NEWS |
1090 |
RegistryOption.from_kwargs('file-deletion-strategy', |
1091 |
'The file deletion mode to be used', |
|
1092 |
title='Deletion Strategy', value_switches=True, enum_switch=False, |
|
2292.1.30
by Marius Kruger
* Minor text fixes. |
1093 |
safe='Only delete files if they can be' |
1094 |
' safely recovered (default).', |
|
2292.1.28
by Marius Kruger
* NEWS |
1095 |
keep="Don't delete any files.", |
1096 |
force='Delete all the specified files, even if they can not be ' |
|
1097 |
'recovered and even if they are non-empty directories.')] |
|
2292.1.13
by Marius Kruger
* merge the unversion command back into the remove command, |
1098 |
aliases = ['rm'] |
1685.1.77
by Wouter van Heyst
WorkingTree.remove takes an optional output file |
1099 |
encoding_type = 'replace' |
2292.1.1
by Marius Kruger
"bzr remove" and "bzr rm" will now remove the working file. |
1100 |
|
2292.1.30
by Marius Kruger
* Minor text fixes. |
1101 |
def run(self, file_list, verbose=False, new=False, |
2292.1.28
by Marius Kruger
* NEWS |
1102 |
file_deletion_strategy='safe'): |
1508.1.4
by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing |
1103 |
tree, file_list = tree_files(file_list) |
2292.1.1
by Marius Kruger
"bzr remove" and "bzr rm" will now remove the working file. |
1104 |
|
1105 |
if file_list is not None: |
|
1106 |
file_list = [f for f in file_list if f != ''] |
|
1107 |
elif not new: |
|
2292.1.17
by Marius Kruger
Remove redundant __init__ and object variable. |
1108 |
raise errors.BzrCommandError('Specify one or more files to' |
1109 |
' remove, or use --new.') |
|
2292.1.1
by Marius Kruger
"bzr remove" and "bzr rm" will now remove the working file. |
1110 |
|
1111 |
if new: |
|
1852.10.3
by Robert Collins
Remove all uses of compare_trees and replace with Tree.changes_from throughout bzrlib. |
1112 |
added = tree.changes_from(tree.basis_tree(), |
1113 |
specific_files=file_list).added |
|
1114 |
file_list = sorted([f[0] for f in added], reverse=True) |
|
1551.6.26
by Aaron Bentley
Add support for remove --new |
1115 |
if len(file_list) == 0: |
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
1116 |
raise errors.BzrCommandError('No matching files.') |
2292.1.1
by Marius Kruger
"bzr remove" and "bzr rm" will now remove the working file. |
1117 |
tree.remove(file_list, verbose=verbose, to_file=self.outf, |
2292.1.30
by Marius Kruger
* Minor text fixes. |
1118 |
keep_files=file_deletion_strategy=='keep', |
2292.1.28
by Marius Kruger
* NEWS |
1119 |
force=file_deletion_strategy=='force') |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1120 |
|
1121 |
||
1122 |
class cmd_file_id(Command): |
|
1123 |
"""Print file_id of a particular file or directory. |
|
1124 |
||
1125 |
The file_id is assigned when the file is first added and remains the
|
|
1126 |
same through all revisions where the file exists, even when it is
|
|
1127 |
moved or renamed.
|
|
1128 |
"""
|
|
1685.1.80
by Wouter van Heyst
more code cleanup |
1129 |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1130 |
hidden = True |
2425.2.3
by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins) |
1131 |
_see_also = ['inventory', 'ls'] |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1132 |
takes_args = ['filename'] |
1185.85.35
by John Arbash Meinel
Updated file-path |
1133 |
|
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
1134 |
@display_command
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1135 |
def run(self, filename): |
1508.1.4
by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing |
1136 |
tree, relpath = WorkingTree.open_containing(filename) |
2255.7.39
by Robert Collins
Remove gratuitous references to inventory.path2id from builtins.py, allowing more commands to work on dirstate trees. |
1137 |
i = tree.path2id(relpath) |
1963.2.6
by Robey Pointer
pychecker is on crack; go back to using 'is None'. |
1138 |
if i is None: |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1139 |
raise errors.NotVersionedError(filename) |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1140 |
else: |
1685.1.80
by Wouter van Heyst
more code cleanup |
1141 |
self.outf.write(i + '\n') |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1142 |
|
1143 |
||
1144 |
class cmd_file_path(Command): |
|
1145 |
"""Print path of file_ids to a file or directory. |
|
1146 |
||
1147 |
This prints one line for each directory down to the target,
|
|
1185.85.35
by John Arbash Meinel
Updated file-path |
1148 |
starting at the branch root.
|
1149 |
"""
|
|
1685.1.80
by Wouter van Heyst
more code cleanup |
1150 |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1151 |
hidden = True |
1152 |
takes_args = ['filename'] |
|
1185.85.35
by John Arbash Meinel
Updated file-path |
1153 |
|
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
1154 |
@display_command
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1155 |
def run(self, filename): |
1508.1.4
by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing |
1156 |
tree, relpath = WorkingTree.open_containing(filename) |
2255.7.39
by Robert Collins
Remove gratuitous references to inventory.path2id from builtins.py, allowing more commands to work on dirstate trees. |
1157 |
fid = tree.path2id(relpath) |
1963.2.6
by Robey Pointer
pychecker is on crack; go back to using 'is None'. |
1158 |
if fid is None: |
2067.3.1
by Martin Pool
Clean up BzrNewError, other exception classes and users. |
1159 |
raise errors.NotVersionedError(filename) |
2255.7.39
by Robert Collins
Remove gratuitous references to inventory.path2id from builtins.py, allowing more commands to work on dirstate trees. |
1160 |
segments = osutils.splitpath(relpath) |
1161 |
for pos in range(1, len(segments) + 1): |
|
1162 |
path = osutils.joinpath(segments[:pos]) |
|
1163 |
self.outf.write("%s\n" % tree.path2id(path)) |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1164 |
|
1165 |
||
1570.1.2
by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.' |
1166 |
class cmd_reconcile(Command): |
1167 |
"""Reconcile bzr metadata in a branch. |
|
1168 |
||
1169 |
This can correct data mismatches that may have been caused by
|
|
1170 |
previous ghost operations or bzr upgrades. You should only
|
|
1171 |
need to run this command if 'bzr check' or a bzr developer
|
|
1172 |
advises you to run it.
|
|
1173 |
||
1174 |
If a second branch is provided, cross-branch reconciliation is
|
|
1175 |
also attempted, which will check that data like the tree root
|
|
1176 |
id which was not present in very early bzr versions is represented
|
|
1177 |
correctly in both branches.
|
|
1178 |
||
1179 |
At the same time it is run it may recompress data resulting in
|
|
1180 |
a potential saving in disk space or performance gain.
|
|
1181 |
||
1182 |
The branch *MUST* be on a listable system such as local disk or sftp.
|
|
1183 |
"""
|
|
2425.2.3
by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins) |
1184 |
|
1185 |
_see_also = ['check'] |
|
1570.1.2
by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.' |
1186 |
takes_args = ['branch?'] |
1187 |
||
1188 |
def run(self, branch="."): |
|
1189 |
from bzrlib.reconcile import reconcile |
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
1190 |
dir = bzrdir.BzrDir.open(branch) |
1570.1.2
by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.' |
1191 |
reconcile(dir) |
1192 |
||
1193 |
||
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1194 |
class cmd_revision_history(Command): |
1733.2.1
by Michael Ellerman
Add an optional location parameter to the 'revision-history' command. |
1195 |
"""Display the list of revision ids on a branch.""" |
2425.2.3
by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins) |
1196 |
|
1197 |
_see_also = ['log'] |
|
1733.2.1
by Michael Ellerman
Add an optional location parameter to the 'revision-history' command. |
1198 |
takes_args = ['location?'] |
1199 |
||
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1200 |
hidden = True |
1185.85.36
by John Arbash Meinel
Working on tests for revision-history, ancestry, and diff |
1201 |
|
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
1202 |
@display_command
|
1733.2.1
by Michael Ellerman
Add an optional location parameter to the 'revision-history' command. |
1203 |
def run(self, location="."): |
1204 |
branch = Branch.open_containing(location)[0] |
|
1205 |
for revid in branch.revision_history(): |
|
1733.2.4
by Michael Ellerman
Merge bzr.dev, fix minor conflict in cmd_revision_history(). |
1206 |
self.outf.write(revid) |
1185.85.36
by John Arbash Meinel
Working on tests for revision-history, ancestry, and diff |
1207 |
self.outf.write('\n') |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1208 |
|
1209 |
||
1225
by Martin Pool
- branch now tracks ancestry - all merged revisions |
1210 |
class cmd_ancestry(Command): |
1211 |
"""List all revisions merged into this branch.""" |
|
2425.2.3
by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins) |
1212 |
|
1213 |
_see_also = ['log', 'revision-history'] |
|
1733.2.2
by Michael Ellerman
Add optional location to ancestry and fix behaviour for checkouts. |
1214 |
takes_args = ['location?'] |
1215 |
||
1225
by Martin Pool
- branch now tracks ancestry - all merged revisions |
1216 |
hidden = True |
1185.85.36
by John Arbash Meinel
Working on tests for revision-history, ancestry, and diff |
1217 |
|
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
1218 |
@display_command
|
1733.2.2
by Michael Ellerman
Add optional location to ancestry and fix behaviour for checkouts. |
1219 |
def run(self, location="."): |
1220 |
try: |
|
1221 |
wt = WorkingTree.open_containing(location)[0] |
|
1222 |
except errors.NoWorkingTree: |
|
1223 |
b = Branch.open(location) |
|
1224 |
last_revision = b.last_revision() |
|
1225 |
else: |
|
1226 |
b = wt.branch |
|
1227 |
last_revision = wt.last_revision() |
|
1228 |
||
1229 |
revision_ids = b.repository.get_ancestry(last_revision) |
|
1963.2.6
by Robey Pointer
pychecker is on crack; go back to using 'is None'. |
1230 |
assert revision_ids[0] is None |
1668.1.14
by Martin Pool
merge olaf - InvalidRevisionId fixes |
1231 |
revision_ids.pop(0) |
1232 |
for revision_id in revision_ids: |
|
1685.1.69
by Wouter van Heyst
merge bzr.dev 1740 |
1233 |
self.outf.write(revision_id + '\n') |
1225
by Martin Pool
- branch now tracks ancestry - all merged revisions |
1234 |
|
1235 |
||
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1236 |
class cmd_init(Command): |
1237 |
"""Make a directory into a versioned branch. |
|
1238 |
||
1239 |
Use this to create an empty branch, or before importing an
|
|
1240 |
existing project.
|
|
1241 |
||
1662.1.19
by Martin Pool
Better error message when initting existing tree |
1242 |
If there is a repository in a parent directory of the location, then
|
1243 |
the history of the branch will be stored in the repository. Otherwise
|
|
2374.1.2
by Ian Clatworthy
Improved after feedback from reviewers |
1244 |
init creates a standalone branch which carries its own history
|
1245 |
in the .bzr directory.
|
|
1662.1.19
by Martin Pool
Better error message when initting existing tree |
1246 |
|
1247 |
If there is already a branch at the location but it has no working tree,
|
|
1248 |
the tree can be populated with 'bzr checkout'.
|
|
1249 |
||
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1250 |
Recipe for importing a tree of files:
|
1251 |
cd ~/project
|
|
1252 |
bzr init
|
|
1185.12.93
by Aaron Bentley
Fixed obsolete help |
1253 |
bzr add .
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1254 |
bzr status
|
1255 |
bzr commit -m 'imported project'
|
|
1256 |
"""
|
|
2425.2.3
by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins) |
1257 |
|
1258 |
_see_also = ['init-repo', 'branch', 'checkout'] |
|
1185.16.138
by Martin Pool
[patch] 'bzr init DIR' (John) |
1259 |
takes_args = ['location?'] |
1857.1.20
by Aaron Bentley
Strip out all the EnumOption stuff |
1260 |
takes_options = [ |
2524.1.1
by Aaron Bentley
Revert broken changes |
1261 |
Option('create-prefix', |
1262 |
help='Create the path leading up to the branch ' |
|
2598.1.1
by Martin Pool
Add test for and documentation of option style, fix up existing options to comply |
1263 |
'if it does not already exist.'), |
2241.1.4
by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo. |
1264 |
RegistryOption('format', |
1265 |
help='Specify a format for this branch. ' |
|
1266 |
'See "help formats".', |
|
1267 |
registry=bzrdir.format_registry, |
|
2241.1.19
by mbp at sourcefrog
(merge) trunk |
1268 |
converter=bzrdir.format_registry.make_bzrdir, |
1269 |
value_switches=True, |
|
1270 |
title="Branch Format", |
|
1271 |
),
|
|
2230.3.42
by Aaron Bentley
add --append-revisions-only option to init |
1272 |
Option('append-revisions-only', |
1273 |
help='Never change revnos or the existing log.' |
|
1274 |
' Append revisions to it only.') |
|
2241.1.4
by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo. |
1275 |
]
|
2524.1.1
by Aaron Bentley
Revert broken changes |
1276 |
def run(self, location=None, format=None, append_revisions_only=False, |
1277 |
create_prefix=False): |
|
1857.1.20
by Aaron Bentley
Strip out all the EnumOption stuff |
1278 |
if format is None: |
2204.5.5
by Aaron Bentley
Remove RepositoryFormat.set_default_format, deprecate get_format_type |
1279 |
format = bzrdir.format_registry.make_bzrdir('default') |
1185.16.138
by Martin Pool
[patch] 'bzr init DIR' (John) |
1280 |
if location is None: |
1185.33.66
by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko) |
1281 |
location = u'.' |
1830.4.5
by Wouter van Heyst
cleanup |
1282 |
|
1830.4.7
by Wouter van Heyst
review fixes, rename transport variable to to_transport |
1283 |
to_transport = transport.get_transport(location) |
1830.4.5
by Wouter van Heyst
cleanup |
1284 |
|
1285 |
# The path has to exist to initialize a
|
|
1286 |
# branch inside of it.
|
|
1287 |
# Just using os.mkdir, since I don't
|
|
1288 |
# believe that we want to create a bunch of
|
|
1289 |
# locations if the user supplies an extended path
|
|
2524.1.1
by Aaron Bentley
Revert broken changes |
1290 |
try: |
1291 |
to_transport.ensure_base() |
|
1292 |
except errors.NoSuchFile: |
|
1293 |
if not create_prefix: |
|
1294 |
raise errors.BzrCommandError("Parent directory of %s" |
|
1295 |
" does not exist."
|
|
1296 |
"\nYou may supply --create-prefix to create all" |
|
1297 |
" leading parent directories."
|
|
1298 |
% location) |
|
1299 |
_create_prefix(to_transport) |
|
2504.1.3
by Daniel Watkins
Implemented --create-prefix for 'init'. |
1300 |
|
1654.1.4
by Robert Collins
Teach `bzr init` how to init at the root of a repository. |
1301 |
try: |
1662.1.19
by Martin Pool
Better error message when initting existing tree |
1302 |
existing_bzrdir = bzrdir.BzrDir.open(location) |
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
1303 |
except errors.NotBranchError: |
1662.1.19
by Martin Pool
Better error message when initting existing tree |
1304 |
# really a NotBzrDir error...
|
2294.2.1
by Alexander Belchenko
Bugfix #85599: ``bzr init`` works with unicode argument LOCATION |
1305 |
branch = bzrdir.BzrDir.create_branch_convenience(to_transport.base, |
2230.3.42
by Aaron Bentley
add --append-revisions-only option to init |
1306 |
format=format) |
1654.1.4
by Robert Collins
Teach `bzr init` how to init at the root of a repository. |
1307 |
else: |
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
1308 |
from bzrlib.transport.local import LocalTransport |
1662.1.19
by Martin Pool
Better error message when initting existing tree |
1309 |
if existing_bzrdir.has_branch(): |
1830.4.8
by Wouter van Heyst
clean up imports (and get if collapsing right) |
1310 |
if (isinstance(to_transport, LocalTransport) |
1311 |
and not existing_bzrdir.has_workingtree()): |
|
1830.4.1
by Wouter van Heyst
Allow bzr init to create remote branches |
1312 |
raise errors.BranchExistsWithoutWorkingTree(location) |
1313 |
raise errors.AlreadyBranchError(location) |
|
1654.1.4
by Robert Collins
Teach `bzr init` how to init at the root of a repository. |
1314 |
else: |
2230.3.42
by Aaron Bentley
add --append-revisions-only option to init |
1315 |
branch = existing_bzrdir.create_branch() |
1662.1.19
by Martin Pool
Better error message when initting existing tree |
1316 |
existing_bzrdir.create_workingtree() |
2230.3.42
by Aaron Bentley
add --append-revisions-only option to init |
1317 |
if append_revisions_only: |
1318 |
try: |
|
1319 |
branch.set_append_revisions_only(True) |
|
1320 |
except errors.UpgradeRequired: |
|
1321 |
raise errors.BzrCommandError('This branch format cannot be set' |
|
1322 |
' to append-revisions-only. Try --experimental-branch6') |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1323 |
|
1324 |
||
1558.5.6
by Aaron Bentley
Renamed make-repo init-repo |
1325 |
class cmd_init_repository(Command): |
1658.1.6
by Martin Pool
init-repo shouldn't insist on creating a new directory (Malone #38331) |
1326 |
"""Create a shared repository to hold branches. |
1327 |
||
2485.1.2
by James Westby
Update with comments from review, thanks to John and Aaron. |
1328 |
New branches created under the repository directory will store their
|
1329 |
revisions in the repository, not in the branch directory.
|
|
1330 |
||
1331 |
If the --no-trees option is used then the branches in the repository
|
|
1332 |
will not have working trees by default.
|
|
1658.1.6
by Martin Pool
init-repo shouldn't insist on creating a new directory (Malone #38331) |
1333 |
|
1662.1.11
by Martin Pool
Better help for init-repo (Erik) |
1334 |
example:
|
2485.1.2
by James Westby
Update with comments from review, thanks to John and Aaron. |
1335 |
bzr init-repo --no-trees repo
|
1662.1.11
by Martin Pool
Better help for init-repo (Erik) |
1336 |
bzr init repo/trunk
|
1337 |
bzr checkout --lightweight repo/trunk trunk-checkout
|
|
1338 |
cd trunk-checkout
|
|
1658.1.6
by Martin Pool
init-repo shouldn't insist on creating a new directory (Malone #38331) |
1339 |
(add files here)
|
2401.2.1
by James Westby
Add a help topic for repositories. |
1340 |
|
1341 |
See 'bzr help repositories' for more information.
|
|
1658.1.6
by Martin Pool
init-repo shouldn't insist on creating a new directory (Malone #38331) |
1342 |
"""
|
2353.2.1
by John Arbash Meinel
(Wouter van Heyst) switch 'bzr init-repo' to default to '--no-trees' |
1343 |
|
2425.2.3
by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins) |
1344 |
_see_also = ['init', 'branch', 'checkout'] |
2241.1.4
by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo. |
1345 |
takes_args = ["location"] |
2221.4.9
by Aaron Bentley
Zap trailing whitespace |
1346 |
takes_options = [RegistryOption('format', |
2221.4.12
by Aaron Bentley
Add option grouping to RegistryOption and clean up format options |
1347 |
help='Specify a format for this repository. See' |
2598.1.1
by Martin Pool
Add test for and documentation of option style, fix up existing options to comply |
1348 |
' "bzr help formats" for details.', |
2221.4.9
by Aaron Bentley
Zap trailing whitespace |
1349 |
registry=bzrdir.format_registry, |
2204.5.5
by Aaron Bentley
Remove RepositoryFormat.set_default_format, deprecate get_format_type |
1350 |
converter=bzrdir.format_registry.make_bzrdir, |
2221.4.12
by Aaron Bentley
Add option grouping to RegistryOption and clean up format options |
1351 |
value_switches=True, title='Repository format'), |
2257.2.1
by Wouter van Heyst
Change the ui level default for init-repo to --trees. |
1352 |
Option('no-trees', |
2353.2.1
by John Arbash Meinel
(Wouter van Heyst) switch 'bzr init-repo' to default to '--no-trees' |
1353 |
help='Branches in the repository will default to' |
2598.1.1
by Martin Pool
Add test for and documentation of option style, fix up existing options to comply |
1354 |
' not having a working tree.'), |
2353.2.1
by John Arbash Meinel
(Wouter van Heyst) switch 'bzr init-repo' to default to '--no-trees' |
1355 |
]
|
1558.5.6
by Aaron Bentley
Renamed make-repo init-repo |
1356 |
aliases = ["init-repo"] |
2353.2.1
by John Arbash Meinel
(Wouter van Heyst) switch 'bzr init-repo' to default to '--no-trees' |
1357 |
|
2257.2.2
by Wouter van Heyst
Actually test that `bzr init-repo --{no,}-trees` still works |
1358 |
def run(self, location, format=None, no_trees=False): |
1857.1.20
by Aaron Bentley
Strip out all the EnumOption stuff |
1359 |
if format is None: |
2204.5.5
by Aaron Bentley
Remove RepositoryFormat.set_default_format, deprecate get_format_type |
1360 |
format = bzrdir.format_registry.make_bzrdir('default') |
1857.1.20
by Aaron Bentley
Strip out all the EnumOption stuff |
1361 |
|
1362 |
if location is None: |
|
1363 |
location = '.' |
|
1364 |
||
1830.4.7
by Wouter van Heyst
review fixes, rename transport variable to to_transport |
1365 |
to_transport = transport.get_transport(location) |
2475.3.3
by John Arbash Meinel
Change calls to try/mkdir('.')/except FileExists to ensure_base() |
1366 |
to_transport.ensure_base() |
1830.4.5
by Wouter van Heyst
cleanup |
1367 |
|
1857.1.20
by Aaron Bentley
Strip out all the EnumOption stuff |
1368 |
newdir = format.initialize_on_transport(to_transport) |
1558.5.2
by Aaron Bentley
Created *shared* repositories... |
1369 |
repo = newdir.create_repository(shared=True) |
2257.2.2
by Wouter van Heyst
Actually test that `bzr init-repo --{no,}-trees` still works |
1370 |
repo.set_make_working_trees(not no_trees) |
1558.5.1
by Aaron Bentley
Added make-repository command |
1371 |
|
1372 |
||
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1373 |
class cmd_diff(Command): |
1850.1.1
by John Arbash Meinel
Annotate the diff examples to explain what they do |
1374 |
"""Show differences in the working tree or between revisions. |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1375 |
|
1376 |
If files are listed, only the changes in those files are listed.
|
|
1377 |
Otherwise, all changes for the tree are listed.
|
|
1378 |
||
1694.2.3
by Martin Pool
Add -p0, -p1 options for diff. |
1379 |
"bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and
|
1380 |
produces patches suitable for "patch -p1".
|
|
1381 |
||
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1382 |
examples:
|
1383 |
bzr diff
|
|
1850.1.1
by John Arbash Meinel
Annotate the diff examples to explain what they do |
1384 |
Shows the difference in the working tree versus the last commit
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1385 |
bzr diff -r1
|
1850.1.1
by John Arbash Meinel
Annotate the diff examples to explain what they do |
1386 |
Difference between the working tree and revision 1
|
1185.1.2
by Martin Pool
- merge various windows and other fixes from Ollie Rutherfurd |
1387 |
bzr diff -r1..2
|
1850.1.1
by John Arbash Meinel
Annotate the diff examples to explain what they do |
1388 |
Difference between revision 2 and revision 1
|
2324.1.1
by Dmitry Vasiliev
Small fixes for bzr diff |
1389 |
bzr diff --prefix old/:new/
|
1850.1.1
by John Arbash Meinel
Annotate the diff examples to explain what they do |
1390 |
Same as 'bzr diff' but prefix paths with old/ and new/
|
1694.2.4
by Martin Pool
When a diff prefix is given, don't show it in === summary lines, only on the diffs themselves. |
1391 |
bzr diff bzr.mine bzr.dev
|
1850.1.1
by John Arbash Meinel
Annotate the diff examples to explain what they do |
1392 |
Show the differences between the two working trees
|
1694.2.4
by Martin Pool
When a diff prefix is given, don't show it in === summary lines, only on the diffs themselves. |
1393 |
bzr diff foo.c
|
1850.1.1
by John Arbash Meinel
Annotate the diff examples to explain what they do |
1394 |
Show just the differences for 'foo.c'
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1395 |
"""
|
1185.16.3
by Martin Pool
- remove all TODOs from bzr help messages |
1396 |
# TODO: Option to use external diff command; could be GNU diff, wdiff,
|
1397 |
# or a graphical diff.
|
|
1398 |
||
1399 |
# TODO: Python difflib is not exactly the same as unidiff; should
|
|
1400 |
# either fix it up or prefer to use an external diff.
|
|
1401 |
||
1402 |
# TODO: Selected-file diff is inefficient and doesn't show you
|
|
1403 |
# deleted files.
|
|
1404 |
||
1405 |
# TODO: This probably handles non-Unix newlines poorly.
|
|
2197.2.1
by Martin Pool
Refactor cmd_diff |
1406 |
|
2425.2.3
by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins) |
1407 |
_see_also = ['status'] |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1408 |
takes_args = ['file*'] |
2598.1.10
by Martin Pool
Clean up options that are registered globally and used once or not at all. |
1409 |
takes_options = [ |
2598.1.11
by Martin Pool
Insist that all options have a help string and fix those that don't. |
1410 |
Option('diff-options', type=str, |
1411 |
help='Pass these options to the external diff program.'), |
|
2193.3.1
by Martin Pool
Finish removal of global short-option table |
1412 |
Option('prefix', type=str, |
1413 |
short_name='p', |
|
2190.2.1
by Martin Pool
remove global registration of short options |
1414 |
help='Set prefixes to added to old and new filenames, as ' |
2598.1.1
by Martin Pool
Add test for and documentation of option style, fix up existing options to comply |
1415 |
'two values separated by a colon. (eg "old/:new/").'), |
2598.1.11
by Martin Pool
Insist that all options have a help string and fix those that don't. |
1416 |
'revision', |
2190.2.1
by Martin Pool
remove global registration of short options |
1417 |
]
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1418 |
aliases = ['di', 'dif'] |
1185.85.36
by John Arbash Meinel
Working on tests for revision-history, ancestry, and diff |
1419 |
encoding_type = 'exact' |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1420 |
|
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
1421 |
@display_command
|
1684.1.6
by Martin Pool
(patch) --diff-prefix option (goffredo, alexander) |
1422 |
def run(self, revision=None, file_list=None, diff_options=None, |
1694.2.3
by Martin Pool
Add -p0, -p1 options for diff. |
1423 |
prefix=None): |
1551.2.15
by Aaron Bentley
Rename cmd_show_diff to diff_cmd_helper |
1424 |
from bzrlib.diff import diff_cmd_helper, show_diff_trees |
1684.1.6
by Martin Pool
(patch) --diff-prefix option (goffredo, alexander) |
1425 |
|
1694.2.3
by Martin Pool
Add -p0, -p1 options for diff. |
1426 |
if (prefix is None) or (prefix == '0'): |
1427 |
# diff -p0 format
|
|
1694.2.1
by Martin Pool
Remove 'a/', 'b/' default prefixes on diff output. |
1428 |
old_label = '' |
1429 |
new_label = '' |
|
1694.2.3
by Martin Pool
Add -p0, -p1 options for diff. |
1430 |
elif prefix == '1': |
1431 |
old_label = 'old/' |
|
1432 |
new_label = 'new/' |
|
2197.2.1
by Martin Pool
Refactor cmd_diff |
1433 |
elif ':' in prefix: |
1694.2.3
by Martin Pool
Add -p0, -p1 options for diff. |
1434 |
old_label, new_label = prefix.split(":") |
2197.2.1
by Martin Pool
Refactor cmd_diff |
1435 |
else: |
2324.1.1
by Dmitry Vasiliev
Small fixes for bzr diff |
1436 |
raise errors.BzrCommandError( |
2325.1.2
by John Arbash Meinel
Add (eg "old/:new/") to errors to make it a little clearer. |
1437 |
'--prefix expects two values separated by a colon'
|
1438 |
' (eg "old/:new/")') |
|
2197.2.1
by Martin Pool
Refactor cmd_diff |
1439 |
|
1440 |
if revision and len(revision) > 2: |
|
1441 |
raise errors.BzrCommandError('bzr diff --revision takes exactly' |
|
1442 |
' one or two revision specifiers') |
|
2325.1.2
by John Arbash Meinel
Add (eg "old/:new/") to errors to make it a little clearer. |
1443 |
|
1185.35.28
by Aaron Bentley
Support diff with two branches as input. |
1444 |
try: |
1551.2.13
by Aaron Bentley
Got diff working properly with checkouts |
1445 |
tree1, file_list = internal_tree_files(file_list) |
1446 |
tree2 = None |
|
1508.1.15
by Robert Collins
Merge from mpool. |
1447 |
b = None |
1185.35.28
by Aaron Bentley
Support diff with two branches as input. |
1448 |
b2 = None |
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
1449 |
except errors.FileInWrongBranch: |
1185.35.28
by Aaron Bentley
Support diff with two branches as input. |
1450 |
if len(file_list) != 2: |
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
1451 |
raise errors.BzrCommandError("Files are in different branches") |
1185.35.28
by Aaron Bentley
Support diff with two branches as input. |
1452 |
|
1551.2.13
by Aaron Bentley
Got diff working properly with checkouts |
1453 |
tree1, file1 = WorkingTree.open_containing(file_list[0]) |
1454 |
tree2, file2 = WorkingTree.open_containing(file_list[1]) |
|
1185.35.28
by Aaron Bentley
Support diff with two branches as input. |
1455 |
if file1 != "" or file2 != "": |
1508.1.15
by Robert Collins
Merge from mpool. |
1456 |
# FIXME diff those two files. rbc 20051123
|
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
1457 |
raise errors.BzrCommandError("Files are in different branches") |
1185.35.28
by Aaron Bentley
Support diff with two branches as input. |
1458 |
file_list = None |
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
1459 |
except errors.NotBranchError: |
1881.1.2
by Matthieu Moy
Formatting and style for the last patch. |
1460 |
if (revision is not None and len(revision) == 2 |
1881.1.4
by Matthieu Moy
needs_tree -> needs_branch |
1461 |
and not revision[0].needs_branch() |
1462 |
and not revision[1].needs_branch()): |
|
1711.2.100
by John Arbash Meinel
clean up comment. |
1463 |
# If both revision specs include a branch, we can
|
1464 |
# diff them without needing a local working tree
|
|
1881.1.2
by Matthieu Moy
Formatting and style for the last patch. |
1465 |
tree1, tree2 = None, None |
1881.1.1
by Matthieu Moy
Fixed and tested "bzr diff" outside a working tree. |
1466 |
else: |
1467 |
raise
|
|
2197.2.1
by Martin Pool
Refactor cmd_diff |
1468 |
|
1469 |
if tree2 is not None: |
|
1470 |
if revision is not None: |
|
1471 |
# FIXME: but there should be a clean way to diff between
|
|
1472 |
# non-default versions of two trees, it's not hard to do
|
|
1473 |
# internally...
|
|
1474 |
raise errors.BzrCommandError( |
|
1475 |
"Sorry, diffing arbitrary revisions across branches "
|
|
1476 |
"is not implemented yet") |
|
1477 |
return show_diff_trees(tree1, tree2, sys.stdout, |
|
1478 |
specific_files=file_list, |
|
1479 |
external_diff_options=diff_options, |
|
1480 |
old_label=old_label, new_label=new_label) |
|
1481 |
||
1482 |
return diff_cmd_helper(tree1, file_list, diff_options, |
|
1483 |
revision_specs=revision, |
|
1484 |
old_label=old_label, new_label=new_label) |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1485 |
|
1486 |
||
1487 |
class cmd_deleted(Command): |
|
1488 |
"""List files deleted in the working tree. |
|
1489 |
"""
|
|
1185.16.3
by Martin Pool
- remove all TODOs from bzr help messages |
1490 |
# TODO: Show files deleted since a previous revision, or
|
1491 |
# between two revisions.
|
|
1492 |
# TODO: Much more efficient way to do this: read in new
|
|
1493 |
# directories with readdir, rather than stating each one. Same
|
|
1494 |
# level of effort but possibly much less IO. (Or possibly not,
|
|
1495 |
# if the directories are very large...)
|
|
2425.2.3
by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins) |
1496 |
_see_also = ['status', 'ls'] |
1185.85.49
by John Arbash Meinel
Updated cmd_deleted, including adding --show-ids option. |
1497 |
takes_options = ['show-ids'] |
1498 |
||
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
1499 |
@display_command
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1500 |
def run(self, show_ids=False): |
1185.33.66
by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko) |
1501 |
tree = WorkingTree.open_containing(u'.')[0] |
2255.7.72
by Robert Collins
Update cmd_deleted to lock around inventory access. |
1502 |
tree.lock_read() |
1503 |
try: |
|
1504 |
old = tree.basis_tree() |
|
1505 |
old.lock_read() |
|
1506 |
try: |
|
1507 |
for path, ie in old.inventory.iter_entries(): |
|
1508 |
if not tree.has_id(ie.file_id): |
|
1509 |
self.outf.write(path) |
|
1510 |
if show_ids: |
|
1511 |
self.outf.write(' ') |
|
1512 |
self.outf.write(ie.file_id) |
|
1513 |
self.outf.write('\n') |
|
1514 |
finally: |
|
1515 |
old.unlock() |
|
1516 |
finally: |
|
1517 |
tree.unlock() |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1518 |
|
1519 |
||
1520 |
class cmd_modified(Command): |
|
1551.10.13
by Aaron Bentley
Hide 'unknowns', document alterntatives to hidden commands |
1521 |
"""List files modified in working tree. |
1522 |
"""
|
|
1551.10.14
by Aaron Bentley
Add some blank lines |
1523 |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1524 |
hidden = True |
2425.2.3
by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins) |
1525 |
_see_also = ['status', 'ls'] |
1551.10.14
by Aaron Bentley
Add some blank lines |
1526 |
|
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
1527 |
@display_command
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1528 |
def run(self): |
1185.33.66
by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko) |
1529 |
tree = WorkingTree.open_containing(u'.')[0] |
1852.10.3
by Robert Collins
Remove all uses of compare_trees and replace with Tree.changes_from throughout bzrlib. |
1530 |
td = tree.changes_from(tree.basis_tree()) |
1398
by Robert Collins
integrate in Gustavos x-bit patch |
1531 |
for path, id, kind, text_modified, meta_modified in td.modified: |
1685.1.80
by Wouter van Heyst
more code cleanup |
1532 |
self.outf.write(path + '\n') |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1533 |
|
1534 |
||
1535 |
class cmd_added(Command): |
|
1551.10.13
by Aaron Bentley
Hide 'unknowns', document alterntatives to hidden commands |
1536 |
"""List files added in working tree. |
1537 |
"""
|
|
1551.10.14
by Aaron Bentley
Add some blank lines |
1538 |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1539 |
hidden = True |
2425.2.3
by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins) |
1540 |
_see_also = ['status', 'ls'] |
1551.10.14
by Aaron Bentley
Add some blank lines |
1541 |
|
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
1542 |
@display_command
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1543 |
def run(self): |
1185.33.66
by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko) |
1544 |
wt = WorkingTree.open_containing(u'.')[0] |
2255.7.69
by Robert Collins
Fix all blackbox add tests, and the add --from-ids case in the UI. |
1545 |
wt.lock_read() |
1546 |
try: |
|
1547 |
basis = wt.basis_tree() |
|
1548 |
basis.lock_read() |
|
1549 |
try: |
|
1550 |
basis_inv = basis.inventory |
|
1551 |
inv = wt.inventory |
|
1552 |
for file_id in inv: |
|
1553 |
if file_id in basis_inv: |
|
1554 |
continue
|
|
1555 |
if inv.is_root(file_id) and len(basis_inv) == 0: |
|
1556 |
continue
|
|
1557 |
path = inv.id2path(file_id) |
|
1558 |
if not os.access(osutils.abspath(path), os.F_OK): |
|
1559 |
continue
|
|
1560 |
self.outf.write(path + '\n') |
|
1561 |
finally: |
|
1562 |
basis.unlock() |
|
1563 |
finally: |
|
1564 |
wt.unlock() |
|
1185.85.53
by John Arbash Meinel
Updated cmd_root |
1565 |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1566 |
|
1567 |
class cmd_root(Command): |
|
1568 |
"""Show the tree root directory. |
|
1569 |
||
1570 |
The root is the nearest enclosing directory with a .bzr control
|
|
1571 |
directory."""
|
|
2425.2.3
by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins) |
1572 |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1573 |
takes_args = ['filename?'] |
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
1574 |
@display_command
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1575 |
def run(self, filename=None): |
1576 |
"""Print the branch root.""" |
|
1508.1.4
by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing |
1577 |
tree = WorkingTree.open_containing(filename)[0] |
1685.1.80
by Wouter van Heyst
more code cleanup |
1578 |
self.outf.write(tree.basedir + '\n') |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1579 |
|
1580 |
||
2466.9.1
by Kent Gibson
add bzr log --limit |
1581 |
def _parse_limit(limitstring): |
1582 |
try: |
|
1583 |
return int(limitstring) |
|
1584 |
except ValueError: |
|
1585 |
msg = "The limit argument must be an integer." |
|
1586 |
raise errors.BzrCommandError(msg) |
|
1587 |
||
1588 |
||
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1589 |
class cmd_log(Command): |
1626.1.2
by Martin Pool
Better help message for log command. |
1590 |
"""Show log of a branch, file, or directory. |
1591 |
||
1592 |
By default show the log of the branch containing the working directory.
|
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1593 |
|
1185.16.153
by Martin Pool
[patch] fix help for bzr log (Matthieu) |
1594 |
To request a range of logs, you can use the command -r begin..end
|
1595 |
-r revision requests a specific revision, -r ..end or -r begin.. are
|
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1596 |
also valid.
|
1626.1.2
by Martin Pool
Better help message for log command. |
1597 |
|
1598 |
examples:
|
|
1599 |
bzr log
|
|
1600 |
bzr log foo.c
|
|
1601 |
bzr log -r -10.. http://server/branch
|
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1602 |
"""
|
1603 |
||
1393.1.55
by Martin Pool
doc |
1604 |
# TODO: Make --revision support uuid: and hash: [future tag:] notation.
|
1605 |
||
1626.1.2
by Martin Pool
Better help message for log command. |
1606 |
takes_args = ['location?'] |
2598.1.3
by Martin Pool
Option help improvements (thanks jamesw) |
1607 |
takes_options = [ |
1608 |
Option('forward', |
|
1609 |
help='Show from oldest to newest.'), |
|
2598.1.10
by Martin Pool
Clean up options that are registered globally and used once or not at all. |
1610 |
Option('timezone', |
1611 |
type=str, |
|
1612 |
help='Display timezone as local, original, or utc.'), |
|
2598.1.3
by Martin Pool
Option help improvements (thanks jamesw) |
1613 |
Option('verbose', |
1614 |
short_name='v', |
|
1615 |
help='Show files changed in each revision.'), |
|
1616 |
'show-ids', |
|
1617 |
'revision', |
|
1618 |
'log-format', |
|
1619 |
Option('message', |
|
1620 |
short_name='m', |
|
1621 |
help='Show revisions whose message matches this ' |
|
1622 |
'regular expression.', |
|
1623 |
type=str), |
|
1624 |
Option('limit', |
|
1625 |
help='Limit the output to the first N revisions.', |
|
1626 |
argname='N', |
|
1627 |
type=_parse_limit), |
|
1628 |
]
|
|
1185.85.22
by John Arbash Meinel
Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run() |
1629 |
encoding_type = 'replace' |
1630 |
||
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
1631 |
@display_command
|
1626.1.2
by Martin Pool
Better help message for log command. |
1632 |
def run(self, location=None, timezone='original', |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1633 |
verbose=False, |
1634 |
show_ids=False, |
|
1635 |
forward=False, |
|
1636 |
revision=None, |
|
1553.2.1
by Erik Bågfors
Support for plugins to register log formatters and set default formatter |
1637 |
log_format=None, |
2466.9.1
by Kent Gibson
add bzr log --limit |
1638 |
message=None, |
1639 |
limit=None): |
|
2221.4.10
by Aaron Bentley
Implement log options using RegistryOption |
1640 |
from bzrlib.log import show_log |
1185.16.49
by mbp at sourcefrog
- more refactoring and tests of commandline |
1641 |
assert message is None or isinstance(message, basestring), \ |
1185.16.48
by mbp at sourcefrog
- more refactoring of and tests for option parsing |
1642 |
"invalid message argument %r" % message |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1643 |
direction = (forward and 'forward') or 'reverse' |
1644 |
||
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
1645 |
# log everything
|
1646 |
file_id = None |
|
1626.1.2
by Martin Pool
Better help message for log command. |
1647 |
if location: |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
1648 |
# find the file id to log:
|
1649 |
||
1551.10.18
by Aaron Bentley
Log works in local treeless branches (#84247) |
1650 |
tree, b, fp = bzrdir.BzrDir.open_containing_tree_or_branch( |
1651 |
location) |
|
1442.1.64
by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path). |
1652 |
if fp != '': |
1551.10.18
by Aaron Bentley
Log works in local treeless branches (#84247) |
1653 |
if tree is None: |
1654 |
tree = b.basis_tree() |
|
2255.7.39
by Robert Collins
Remove gratuitous references to inventory.path2id from builtins.py, allowing more commands to work on dirstate trees. |
1655 |
file_id = tree.path2id(fp) |
2100.1.1
by wang
Running ``bzr log`` on nonexistent file gives an error instead of the |
1656 |
if file_id is None: |
1657 |
raise errors.BzrCommandError( |
|
1658 |
"Path does not have any revision history: %s" % |
|
1659 |
location) |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1660 |
else: |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
1661 |
# local dir only
|
1662 |
# FIXME ? log the current subdir only RBC 20060203
|
|
1907.4.10
by Matthieu Moy
Cut long lines, prevent "path" component from being used in revno:branch/path. |
1663 |
if revision is not None \ |
1664 |
and len(revision) > 0 and revision[0].get_branch(): |
|
1907.4.2
by Matthieu Moy
Make log work nicely with revno:N:path too. |
1665 |
location = revision[0].get_branch() |
1666 |
else: |
|
1667 |
location = '.' |
|
1668 |
dir, relpath = bzrdir.BzrDir.open_containing(location) |
|
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
1669 |
b = dir.open_branch() |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1670 |
|
2230.4.1
by Aaron Bentley
Get log as fast branch5 |
1671 |
b.lock_read() |
1672 |
try: |
|
1673 |
if revision is None: |
|
1674 |
rev1 = None |
|
1675 |
rev2 = None |
|
1676 |
elif len(revision) == 1: |
|
2466.12.1
by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions. |
1677 |
rev1 = rev2 = revision[0].in_history(b) |
2230.4.1
by Aaron Bentley
Get log as fast branch5 |
1678 |
elif len(revision) == 2: |
1679 |
if revision[1].get_branch() != revision[0].get_branch(): |
|
1680 |
# b is taken from revision[0].get_branch(), and
|
|
1681 |
# show_log will use its revision_history. Having
|
|
1682 |
# different branches will lead to weird behaviors.
|
|
1683 |
raise errors.BzrCommandError( |
|
1684 |
"Log doesn't accept two revisions in different"
|
|
1685 |
" branches.") |
|
2466.12.1
by Kent Gibson
Fix ``bzr log -r`` to support selecting merge revisions. |
1686 |
rev1 = revision[0].in_history(b) |
1687 |
rev2 = revision[1].in_history(b) |
|
2230.4.1
by Aaron Bentley
Get log as fast branch5 |
1688 |
else: |
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
1689 |
raise errors.BzrCommandError( |
2230.4.1
by Aaron Bentley
Get log as fast branch5 |
1690 |
'bzr log --revision takes one or two values.') |
1691 |
||
1692 |
if log_format is None: |
|
1693 |
log_format = log.log_formatter_registry.get_default(b) |
|
2388.1.8
by Erik Bagfors
Redo based on input from Alexander |
1694 |
|
2230.4.1
by Aaron Bentley
Get log as fast branch5 |
1695 |
lf = log_format(show_ids=show_ids, to_file=self.outf, |
2388.1.8
by Erik Bagfors
Redo based on input from Alexander |
1696 |
show_timezone=timezone) |
2230.4.1
by Aaron Bentley
Get log as fast branch5 |
1697 |
|
1698 |
show_log(b, |
|
1699 |
lf, |
|
1700 |
file_id, |
|
1701 |
verbose=verbose, |
|
1702 |
direction=direction, |
|
1703 |
start_revision=rev1, |
|
1704 |
end_revision=rev2, |
|
2466.9.1
by Kent Gibson
add bzr log --limit |
1705 |
search=message, |
1706 |
limit=limit) |
|
2230.4.1
by Aaron Bentley
Get log as fast branch5 |
1707 |
finally: |
1708 |
b.unlock() |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1709 |
|
1185.85.4
by John Arbash Meinel
currently broken, trying to fix things up. |
1710 |
|
1857.1.20
by Aaron Bentley
Strip out all the EnumOption stuff |
1711 |
def get_log_format(long=False, short=False, line=False, default='long'): |
1712 |
log_format = default |
|
1713 |
if long: |
|
1714 |
log_format = 'long' |
|
1715 |
if short: |
|
1716 |
log_format = 'short' |
|
1717 |
if line: |
|
1718 |
log_format = 'line' |
|
1719 |
return log_format |
|
1720 |
||
1721 |
||
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1722 |
class cmd_touching_revisions(Command): |
1723 |
"""Return revision-ids which affected a particular file. |
|
1724 |
||
1685.1.80
by Wouter van Heyst
more code cleanup |
1725 |
A more user-friendly interface is "bzr log FILE".
|
1726 |
"""
|
|
1727 |
||
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1728 |
hidden = True |
1729 |
takes_args = ["filename"] |
|
1185.85.55
by John Arbash Meinel
Updated cmd_touching_revisions |
1730 |
|
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
1731 |
@display_command
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1732 |
def run(self, filename): |
1508.1.4
by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing |
1733 |
tree, relpath = WorkingTree.open_containing(filename) |
1734 |
b = tree.branch |
|
2255.7.39
by Robert Collins
Remove gratuitous references to inventory.path2id from builtins.py, allowing more commands to work on dirstate trees. |
1735 |
file_id = tree.path2id(relpath) |
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
1736 |
for revno, revision_id, what in log.find_touching_revisions(b, file_id): |
1185.85.55
by John Arbash Meinel
Updated cmd_touching_revisions |
1737 |
self.outf.write("%6d %s\n" % (revno, what)) |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1738 |
|
1739 |
||
1740 |
class cmd_ls(Command): |
|
1741 |
"""List files in a tree. |
|
1742 |
"""
|
|
1551.9.24
by Aaron Bentley
Unhide ls, add kind flag |
1743 |
|
2425.2.3
by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins) |
1744 |
_see_also = ['status', 'cat'] |
2215.3.1
by Aaron Bentley
Allow ls to take a PATH |
1745 |
takes_args = ['path?'] |
1185.16.3
by Martin Pool
- remove all TODOs from bzr help messages |
1746 |
# TODO: Take a revision or remote path and list that tree instead.
|
2598.1.2
by Martin Pool
Also check that option help ends in a period, and fix those that don't |
1747 |
takes_options = [ |
1748 |
'verbose', |
|
1749 |
'revision', |
|
1750 |
Option('non-recursive', |
|
1751 |
help='Don\'t recurse into subdirectories.'), |
|
1752 |
Option('from-root', |
|
2598.1.3
by Martin Pool
Option help improvements (thanks jamesw) |
1753 |
help='Print paths relative to the root of the branch.'), |
2598.1.2
by Martin Pool
Also check that option help ends in a period, and fix those that don't |
1754 |
Option('unknown', help='Print unknown files.'), |
1755 |
Option('versioned', help='Print versioned files.'), |
|
1756 |
Option('ignored', help='Print ignored files.'), |
|
1757 |
Option('null', |
|
1758 |
help='Write an ascii NUL (\\0) separator ' |
|
1759 |
'between files rather than a newline.'), |
|
2598.1.11
by Martin Pool
Insist that all options have a help string and fix those that don't. |
1760 |
Option('kind', |
2598.1.12
by Martin Pool
Fix up --kind options |
1761 |
help='List entries of a particular kind: file, directory, symlink.', |
1762 |
type=unicode), |
|
2598.1.2
by Martin Pool
Also check that option help ends in a period, and fix those that don't |
1763 |
'show-ids', |
1764 |
]
|
|
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
1765 |
@display_command
|
2598.1.12
by Martin Pool
Fix up --kind options |
1766 |
def run(self, revision=None, verbose=False, |
1185.26.1
by John Arbash Meinel
Made ls work again, and take extra arguments. |
1767 |
non_recursive=False, from_root=False, |
1768 |
unknown=False, versioned=False, ignored=False, |
|
2215.3.1
by Aaron Bentley
Allow ls to take a PATH |
1769 |
null=False, kind=None, show_ids=False, path=None): |
1551.9.24
by Aaron Bentley
Unhide ls, add kind flag |
1770 |
|
1771 |
if kind and kind not in ('file', 'directory', 'symlink'): |
|
1772 |
raise errors.BzrCommandError('invalid kind specified') |
|
1185.26.1
by John Arbash Meinel
Made ls work again, and take extra arguments. |
1773 |
|
1774 |
if verbose and null: |
|
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
1775 |
raise errors.BzrCommandError('Cannot set both --verbose and --null') |
1551.6.36
by Aaron Bentley
Revert --debris/--detritus changes |
1776 |
all = not (unknown or versioned or ignored) |
1185.26.1
by John Arbash Meinel
Made ls work again, and take extra arguments. |
1777 |
|
1551.6.36
by Aaron Bentley
Revert --debris/--detritus changes |
1778 |
selection = {'I':ignored, '?':unknown, 'V':versioned} |
1185.26.1
by John Arbash Meinel
Made ls work again, and take extra arguments. |
1779 |
|
2215.3.1
by Aaron Bentley
Allow ls to take a PATH |
1780 |
if path is None: |
1781 |
fs_path = '.' |
|
1782 |
prefix = '' |
|
1783 |
else: |
|
1784 |
if from_root: |
|
1785 |
raise errors.BzrCommandError('cannot specify both --from-root' |
|
1786 |
' and PATH') |
|
1787 |
fs_path = path |
|
1788 |
prefix = path |
|
2215.3.3
by Aaron Bentley
Get ls working on branches |
1789 |
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch( |
1790 |
fs_path) |
|
1185.26.1
by John Arbash Meinel
Made ls work again, and take extra arguments. |
1791 |
if from_root: |
1185.33.66
by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko) |
1792 |
relpath = u'' |
1185.26.1
by John Arbash Meinel
Made ls work again, and take extra arguments. |
1793 |
elif relpath: |
1794 |
relpath += '/' |
|
1508.1.4
by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing |
1795 |
if revision is not None: |
2215.3.3
by Aaron Bentley
Get ls working on branches |
1796 |
tree = branch.repository.revision_tree( |
1797 |
revision[0].in_history(branch).rev_id) |
|
1798 |
elif tree is None: |
|
1799 |
tree = branch.basis_tree() |
|
1551.6.36
by Aaron Bentley
Revert --debris/--detritus changes |
1800 |
|
2255.2.61
by John Arbash Meinel
Find callers of list_files() and make sure the tree is always locked. |
1801 |
tree.lock_read() |
1802 |
try: |
|
1803 |
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False): |
|
1804 |
if fp.startswith(relpath): |
|
1805 |
fp = osutils.pathjoin(prefix, fp[len(relpath):]) |
|
1806 |
if non_recursive and '/' in fp: |
|
1807 |
continue
|
|
1808 |
if not all and not selection[fc]: |
|
1809 |
continue
|
|
1810 |
if kind is not None and fkind != kind: |
|
1811 |
continue
|
|
1812 |
if verbose: |
|
1813 |
kindch = entry.kind_character() |
|
1814 |
outstring = '%-8s %s%s' % (fc, fp, kindch) |
|
1815 |
if show_ids and fid is not None: |
|
1816 |
outstring = "%-50s %s" % (outstring, fid) |
|
1817 |
self.outf.write(outstring + '\n') |
|
1818 |
elif null: |
|
1819 |
self.outf.write(fp + '\0') |
|
1820 |
if show_ids: |
|
1821 |
if fid is not None: |
|
1822 |
self.outf.write(fid) |
|
1823 |
self.outf.write('\0') |
|
1824 |
self.outf.flush() |
|
1825 |
else: |
|
1551.9.27
by Aaron Bentley
Implement show-ids for all output formats |
1826 |
if fid is not None: |
2255.2.61
by John Arbash Meinel
Find callers of list_files() and make sure the tree is always locked. |
1827 |
my_id = fid |
1828 |
else: |
|
1829 |
my_id = '' |
|
1830 |
if show_ids: |
|
1831 |
self.outf.write('%-50s %s\n' % (fp, my_id)) |
|
1832 |
else: |
|
1833 |
self.outf.write(fp + '\n') |
|
1834 |
finally: |
|
1835 |
tree.unlock() |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1836 |
|
1837 |
||
1838 |
class cmd_unknowns(Command): |
|
1551.10.13
by Aaron Bentley
Hide 'unknowns', document alterntatives to hidden commands |
1839 |
"""List unknown files. |
1840 |
"""
|
|
1551.10.14
by Aaron Bentley
Add some blank lines |
1841 |
|
1551.10.13
by Aaron Bentley
Hide 'unknowns', document alterntatives to hidden commands |
1842 |
hidden = True |
2425.2.3
by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins) |
1843 |
_see_also = ['ls'] |
1551.10.14
by Aaron Bentley
Add some blank lines |
1844 |
|
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
1845 |
@display_command
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1846 |
def run(self): |
1185.33.66
by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko) |
1847 |
for f in WorkingTree.open_containing(u'.')[0].unknowns(): |
1773.4.2
by Martin Pool
Cleanup of imports; undeprecate all_revision_ids() |
1848 |
self.outf.write(osutils.quotefn(f) + '\n') |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1849 |
|
1850 |
||
1851 |
class cmd_ignore(Command): |
|
2063.5.1
by wang
"bzr ignore" takes multiple arguments. Fixes bug 29488. |
1852 |
"""Ignore specified files or patterns. |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1853 |
|
1854 |
To remove patterns from the ignore list, edit the .bzrignore file.
|
|
1855 |
||
2077.1.2
by Kent Gibson
Strip trailing slashes from ignore patterns (#4559). |
1856 |
Trailing slashes on patterns are ignored.
|
2135.2.2
by Kent Gibson
Ignore pattern matcher (glob.py) patches: |
1857 |
If the pattern contains a slash or is a regular expression, it is compared
|
1858 |
to the whole path from the branch root. Otherwise, it is compared to only
|
|
1859 |
the last component of the path. To match a file only in the root
|
|
1860 |
directory, prepend './'.
|
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1861 |
|
2077.1.2
by Kent Gibson
Strip trailing slashes from ignore patterns (#4559). |
1862 |
Ignore patterns specifying absolute paths are not allowed.
|
1863 |
||
2135.2.2
by Kent Gibson
Ignore pattern matcher (glob.py) patches: |
1864 |
Ignore patterns may include globbing wildcards such as:
|
1865 |
? - Matches any single character except '/'
|
|
1866 |
* - Matches 0 or more characters except '/'
|
|
1867 |
/**/ - Matches 0 or more directories in a path
|
|
1868 |
[a-z] - Matches a single character from within a group of characters
|
|
1869 |
|
|
1870 |
Ignore patterns may also be Python regular expressions.
|
|
1871 |
Regular expression ignore patterns are identified by a 'RE:' prefix
|
|
1872 |
followed by the regular expression. Regular expression ignore patterns
|
|
1873 |
may not include named or numbered groups.
|
|
1874 |
||
1875 |
Note: ignore patterns containing shell wildcards must be quoted from
|
|
1876 |
the shell on Unix.
|
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1877 |
|
1878 |
examples:
|
|
1879 |
bzr ignore ./Makefile
|
|
1880 |
bzr ignore '*.class'
|
|
2135.2.2
by Kent Gibson
Ignore pattern matcher (glob.py) patches: |
1881 |
bzr ignore 'lib/**/*.o'
|
1882 |
bzr ignore 'RE:lib/.*\.o'
|
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1883 |
"""
|
2425.2.3
by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins) |
1884 |
|
1885 |
_see_also = ['status', 'ignored'] |
|
2063.5.1
by wang
"bzr ignore" takes multiple arguments. Fixes bug 29488. |
1886 |
takes_args = ['name_pattern*'] |
1765.1.1
by Robert Collins
Remove the default ignores list from bzr, lowering the minimum overhead in bzr add. |
1887 |
takes_options = [ |
2598.1.1
by Martin Pool
Add test for and documentation of option style, fix up existing options to comply |
1888 |
Option('old-default-rules', |
1889 |
help='Write out the ignore rules bzr < 0.9 always used.') |
|
1890 |
]
|
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1891 |
|
2063.5.2
by wang
Don't use mutable values as default argument definitions. |
1892 |
def run(self, name_pattern_list=None, old_default_rules=None): |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1893 |
from bzrlib.atomicfile import AtomicFile |
1765.1.1
by Robert Collins
Remove the default ignores list from bzr, lowering the minimum overhead in bzr add. |
1894 |
if old_default_rules is not None: |
1895 |
# dump the rules and exit
|
|
1836.1.12
by John Arbash Meinel
Move ignores into a file of their own, make DEFAULT_IGNORE a deprecated list. Create deprecated_list in symbol versioning. |
1896 |
for pattern in ignores.OLD_DEFAULTS: |
1765.1.1
by Robert Collins
Remove the default ignores list from bzr, lowering the minimum overhead in bzr add. |
1897 |
print pattern |
1898 |
return
|
|
2077.1.2
by Kent Gibson
Strip trailing slashes from ignore patterns (#4559). |
1899 |
if not name_pattern_list: |
2063.5.5
by wang
resolve a conflict |
1900 |
raise errors.BzrCommandError("ignore requires at least one " |
2063.5.4
by wang
Copy Kent Gibson's changes that incorporates John Arbash Meinel's |
1901 |
"NAME_PATTERN or --old-default-rules") |
2298.8.4
by Kent Gibson
Fix whitespace and alignment. |
1902 |
name_pattern_list = [globbing.normalize_pattern(p) |
1903 |
for p in name_pattern_list] |
|
2077.1.2
by Kent Gibson
Strip trailing slashes from ignore patterns (#4559). |
1904 |
for name_pattern in name_pattern_list: |
2298.8.1
by Kent Gibson
Normalise ignore patterns to use '/' path separator. |
1905 |
if (name_pattern[0] == '/' or |
1906 |
(len(name_pattern) > 1 and name_pattern[1] == ':')): |
|
2077.1.2
by Kent Gibson
Strip trailing slashes from ignore patterns (#4559). |
1907 |
raise errors.BzrCommandError( |
1908 |
"NAME_PATTERN should not be an absolute path") |
|
1185.33.66
by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko) |
1909 |
tree, relpath = WorkingTree.open_containing(u'.') |
1508.1.4
by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing |
1910 |
ifn = tree.abspath('.bzrignore') |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1911 |
if os.path.exists(ifn): |
1912 |
f = open(ifn, 'rt') |
|
1913 |
try: |
|
1914 |
igns = f.read().decode('utf-8') |
|
1915 |
finally: |
|
1916 |
f.close() |
|
1917 |
else: |
|
1918 |
igns = '' |
|
1919 |
||
1920 |
# TODO: If the file already uses crlf-style termination, maybe
|
|
1921 |
# we should use that for the newly added lines?
|
|
1922 |
||
1923 |
if igns and igns[-1] != '\n': |
|
1924 |
igns += '\n' |
|
2063.5.3
by wang
Change error message. Use spaces instead of tabs. |
1925 |
for name_pattern in name_pattern_list: |
2298.8.1
by Kent Gibson
Normalise ignore patterns to use '/' path separator. |
1926 |
igns += name_pattern + '\n' |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1927 |
|
2063.5.4
by wang
Copy Kent Gibson's changes that incorporates John Arbash Meinel's |
1928 |
f = AtomicFile(ifn, 'wb') |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1929 |
try: |
1930 |
f.write(igns.encode('utf-8')) |
|
1931 |
f.commit() |
|
1932 |
finally: |
|
1933 |
f.close() |
|
1934 |
||
2255.7.39
by Robert Collins
Remove gratuitous references to inventory.path2id from builtins.py, allowing more commands to work on dirstate trees. |
1935 |
if not tree.path2id('.bzrignore'): |
1508.1.5
by Robert Collins
Move add from Branch to WorkingTree. |
1936 |
tree.add(['.bzrignore']) |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1937 |
|
1938 |
||
1939 |
class cmd_ignored(Command): |
|
1940 |
"""List ignored files and the patterns that matched them. |
|
2425.2.3
by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins) |
1941 |
"""
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1942 |
|
2425.2.3
by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins) |
1943 |
_see_also = ['ignore'] |
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
1944 |
@display_command
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1945 |
def run(self): |
1185.33.66
by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko) |
1946 |
tree = WorkingTree.open_containing(u'.')[0] |
2255.2.61
by John Arbash Meinel
Find callers of list_files() and make sure the tree is always locked. |
1947 |
tree.lock_read() |
1948 |
try: |
|
1949 |
for path, file_class, kind, file_id, entry in tree.list_files(): |
|
1950 |
if file_class != 'I': |
|
1951 |
continue
|
|
1952 |
## XXX: Slightly inefficient since this was already calculated
|
|
1953 |
pat = tree.is_ignored(path) |
|
1954 |
print '%-50s %s' % (path, pat) |
|
1955 |
finally: |
|
1956 |
tree.unlock() |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1957 |
|
1958 |
||
1959 |
class cmd_lookup_revision(Command): |
|
1960 |
"""Lookup the revision-id from a revision-number |
|
1961 |
||
1962 |
example:
|
|
1963 |
bzr lookup-revision 33
|
|
1964 |
"""
|
|
1965 |
hidden = True |
|
1966 |
takes_args = ['revno'] |
|
1967 |
||
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
1968 |
@display_command
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1969 |
def run(self, revno): |
1970 |
try: |
|
1971 |
revno = int(revno) |
|
1972 |
except ValueError: |
|
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
1973 |
raise errors.BzrCommandError("not a valid revision-number: %r" % revno) |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1974 |
|
1185.33.66
by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko) |
1975 |
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno) |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1976 |
|
1977 |
||
1978 |
class cmd_export(Command): |
|
2374.1.1
by Ian Clatworthy
Help and man page fixes |
1979 |
"""Export current or past revision to a destination directory or archive. |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
1980 |
|
1981 |
If no revision is specified this exports the last committed revision.
|
|
1982 |
||
1983 |
Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
|
|
1984 |
given, try to find the format with the extension. If no extension
|
|
1985 |
is found exports to a directory (equivalent to --format=dir).
|
|
1986 |
||
2374.1.4
by Ian Clatworthy
Include feedback from mailing list. |
1987 |
If root is supplied, it will be used as the root directory inside
|
1988 |
container formats (tar, zip, etc). If it is not supplied it will default
|
|
1989 |
to the exported filename. The root option has no effect for 'dir' format.
|
|
1185.31.11
by John Arbash Meinel
Merging Alexander's zip export patch |
1990 |
|
2374.1.2
by Ian Clatworthy
Improved after feedback from reviewers |
1991 |
If branch is omitted then the branch containing the current working
|
1992 |
directory will be used.
|
|
2099.1.1
by Daniel Silverstone
Add source branch support to export command |
1993 |
|
2374.1.3
by Ian Clatworthy
Minor man page fixes for add, commit, export |
1994 |
Note: Export of tree with non-ASCII filenames to zip is not supported.
|
1185.31.11
by John Arbash Meinel
Merging Alexander's zip export patch |
1995 |
|
1551.3.11
by Aaron Bentley
Merge from Robert |
1996 |
Supported formats Autodetected by extension
|
1997 |
----------------- -------------------------
|
|
1185.31.11
by John Arbash Meinel
Merging Alexander's zip export patch |
1998 |
dir -
|
1999 |
tar .tar
|
|
2000 |
tbz2 .tar.bz2, .tbz2
|
|
2001 |
tgz .tar.gz, .tgz
|
|
2002 |
zip .zip
|
|
2003 |
"""
|
|
2099.1.1
by Daniel Silverstone
Add source branch support to export command |
2004 |
takes_args = ['dest', 'branch?'] |
2598.1.10
by Martin Pool
Clean up options that are registered globally and used once or not at all. |
2005 |
takes_options = [ |
2006 |
Option('format', |
|
2007 |
help="Type of file to export to.", |
|
2008 |
type=unicode), |
|
2009 |
'revision', |
|
2010 |
Option('root', |
|
2011 |
type=str, |
|
2012 |
help="Name of the root directory inside the exported file."), |
|
2013 |
]
|
|
2099.1.1
by Daniel Silverstone
Add source branch support to export command |
2014 |
def run(self, dest, branch=None, revision=None, format=None, root=None): |
1185.31.12
by John Arbash Meinel
Refactored the export code to make it easier to add new export formats. |
2015 |
from bzrlib.export import export |
2099.1.1
by Daniel Silverstone
Add source branch support to export command |
2016 |
|
2017 |
if branch is None: |
|
2018 |
tree = WorkingTree.open_containing(u'.')[0] |
|
2019 |
b = tree.branch |
|
2020 |
else: |
|
2021 |
b = Branch.open(branch) |
|
2022 |
||
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2023 |
if revision is None: |
1508.1.4
by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing |
2024 |
# should be tree.last_revision FIXME
|
1241
by Martin Pool
- rename last_patch to last_revision |
2025 |
rev_id = b.last_revision() |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2026 |
else: |
2027 |
if len(revision) != 1: |
|
2067.3.3
by Martin Pool
merge bzr.dev and reconcile several changes, also some test fixes |
2028 |
raise errors.BzrCommandError('bzr export --revision takes exactly 1 argument') |
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
2029 |
rev_id = revision[0].in_history(b).rev_id |
1185.67.2
by Aaron Bentley
Renamed Branch.storage to Branch.repository |
2030 |
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. |
2031 |
try: |
2032 |
export(t, dest, format, root) |
|
2033 |
except errors.NoSuchExportFormat, e: |
|
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
2034 |
raise errors.BzrCommandError('Unsupported export format: %s' % e.format) |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2035 |
|
2036 |
||
2037 |
class cmd_cat(Command): |
|
2374.1.1
by Ian Clatworthy
Help and man page fixes |
2038 |
"""Write the contents of a file as of a given revision to standard output. |
2039 |
||
2040 |
If no revision is nominated, the last revision is used.
|
|
2041 |
||
2374.1.2
by Ian Clatworthy
Improved after feedback from reviewers |
2042 |
Note: Take care to redirect standard output when using this command on a
|
2043 |
binary file.
|
|
2374.1.1
by Ian Clatworthy
Help and man page fixes |
2044 |
"""
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2045 |
|
2425.2.3
by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins) |
2046 |
_see_also = ['ls'] |
2598.1.10
by Martin Pool
Clean up options that are registered globally and used once or not at all. |
2047 |
takes_options = [ |
2048 |
Option('name-from-revision', help='The path name in the old tree.'), |
|
2049 |
'revision', |
|
2050 |
]
|
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2051 |
takes_args = ['filename'] |
2178.4.4
by Alexander Belchenko
encoding_type = 'exact' force sys.stdout to be binary stream on win32 |
2052 |
encoding_type = 'exact' |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2053 |
|
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
2054 |
@display_command
|
2073.2.3
by wang
Change option name to --name-from-revision. Always make new tree the |
2055 |
def run(self, filename, revision=None, name_from_revision=False): |
1185.50.9
by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision |
2056 |
if revision is not None and len(revision) != 1: |
2073.2.1
by wang
``bzr cat`` can look up contents of removed or renamed files. If the |
2057 |
raise errors.BzrCommandError("bzr cat --revision takes exactly" |
2058 |
" one number") |
|
2073.2.3
by wang
Change option name to --name-from-revision. Always make new tree the |
2059 |
|
1508.1.4
by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing |
2060 |
tree = None |
1907.4.5
by Matthieu Moy
Make bzr cat -r revno:N:foo consistant with bzr cat -r branch:foo. |
2061 |
try: |
2309.1.2
by James Westby
Use BzrDir.open_containing_tree_or_branch as suggested by Aaron. |
2062 |
tree, b, relpath = \ |
2063 |
bzrdir.BzrDir.open_containing_tree_or_branch(filename) |
|
2064 |
except errors.NotBranchError: |
|
1907.4.5
by Matthieu Moy
Make bzr cat -r revno:N:foo consistant with bzr cat -r branch:foo. |
2065 |
pass
|
2066 |
||
2158.1.1
by Wouter van Heyst
Fix #73500 mostly by catching a NotLocalUrl exception in cmd_cat. |
2067 |
if revision is not None and revision[0].get_branch() is not None: |
2068 |
b = Branch.open(revision[0].get_branch()) |
|
1907.4.5
by Matthieu Moy
Make bzr cat -r revno:N:foo consistant with bzr cat -r branch:foo. |
2069 |
if tree is None: |
2158.1.1
by Wouter van Heyst
Fix #73500 mostly by catching a NotLocalUrl exception in cmd_cat. |
2070 |
tree = b.basis_tree() |
1185.50.9
by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision |
2071 |
if revision is None: |
2072 |
revision_id = b.last_revision() |
|
2073 |
else: |
|
2074 |
revision_id = revision[0].in_history(b).rev_id |
|
2073.2.1
by wang
``bzr cat`` can look up contents of removed or renamed files. If the |
2075 |
|
2076 |
cur_file_id = tree.path2id(relpath) |
|
2077 |
rev_tree = b.repository.revision_tree(revision_id) |
|
2078 |
old_file_id = rev_tree.path2id(relpath) |
|
2079 |
||
2073.2.3
by wang
Change option name to --name-from-revision. Always make new tree the |
2080 |
if name_from_revision: |
2073.2.1
by wang
``bzr cat`` can look up contents of removed or renamed files. If the |
2081 |
if old_file_id is None: |
2082 |
raise errors.BzrCommandError("%r is not present in revision %s" |
|
2083 |
% (filename, revision_id)) |
|
2084 |
else: |
|
2085 |
rev_tree.print_file(old_file_id) |
|
2073.2.2
by wang
Make the decision tree a little clearer. Add more tests for exceptions. |
2086 |
elif cur_file_id is not None: |
2073.2.3
by wang
Change option name to --name-from-revision. Always make new tree the |
2087 |
rev_tree.print_file(cur_file_id) |
2073.2.1
by wang
``bzr cat`` can look up contents of removed or renamed files. If the |
2088 |
elif old_file_id is not None: |
2089 |
rev_tree.print_file(old_file_id) |
|
2090 |
else: |
|
2091 |
raise errors.BzrCommandError("%r is not present in revision %s" % |
|
2092 |
(filename, revision_id)) |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2093 |
|
2094 |
||
2095 |
class cmd_local_time_offset(Command): |
|
2096 |
"""Show the offset in seconds from GMT to local time.""" |
|
2097 |
hidden = True |
|
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
2098 |
@display_command
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2099 |
def run(self): |
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
2100 |
print osutils.local_time_offset() |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2101 |
|
2102 |
||
2103 |
||
2104 |
class cmd_commit(Command): |
|
2105 |
"""Commit changes into a new revision. |
|
2106 |
|
|
2107 |
If no arguments are given, the entire tree is committed.
|
|
2108 |
||
2109 |
If selected files are specified, only changes to those files are
|
|
2110 |
committed. If a directory is specified then the directory and everything
|
|
2111 |
within it is committed.
|
|
2112 |
||
2374.1.5
by Ian Clatworthy
explained selected fail commit failure by design |
2113 |
A selected-file commit may fail in some cases where the committed
|
2114 |
tree would be invalid. Consider::
|
|
2115 |
||
2116 |
bzr init foo
|
|
2117 |
mkdir foo/bar
|
|
2118 |
bzr add foo/bar
|
|
2119 |
bzr commit foo -m "committing foo"
|
|
2374.1.6
by Ian Clatworthy
explained selected fail commit failure by design |
2120 |
bzr mv foo/bar foo/baz
|
2374.1.5
by Ian Clatworthy
explained selected fail commit failure by design |
2121 |
mkdir foo/bar
|
2122 |
bzr add foo/bar
|
|
2374.1.6
by Ian Clatworthy
explained selected fail commit failure by design |
2123 |
bzr commit foo/bar -m "committing bar but not baz"
|
2374.1.5
by Ian Clatworthy
explained selected fail commit failure by design |
2124 |
|
2125 |
In the example above, the last commit will fail by design. This gives
|
|
2126 |
the user the opportunity to decide whether they want to commit the
|
|
2127 |
rename at the same time, separately first, or not at all. (As a general
|
|
2128 |
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
|
|
2129 |
||
2374.1.3
by Ian Clatworthy
Minor man page fixes for add, commit, export |
2130 |
Note: A selected-file commit after a merge is not yet supported.
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2131 |
"""
|
1185.16.3
by Martin Pool
- remove all TODOs from bzr help messages |
2132 |
# TODO: Run hooks on tree to-be-committed, and after commit.
|
2133 |
||
1185.16.65
by mbp at sourcefrog
- new commit --strict option |
2134 |
# TODO: Strict commit that fails if there are deleted files.
|
2135 |
# (what does "deleted files" mean ??)
|
|
2136 |
||
1185.16.3
by Martin Pool
- remove all TODOs from bzr help messages |
2137 |
# TODO: Give better message for -s, --summary, used by tla people
|
2138 |
||
2139 |
# XXX: verbose currently does nothing
|
|
2140 |
||
2376.4.36
by Jonathan Lange
Provide really basic help topic for our bug tracker support. |
2141 |
_see_also = ['bugs', 'uncommit'] |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2142 |
takes_args = ['selected*'] |
2598.1.1
by Martin Pool
Add test for and documentation of option style, fix up existing options to comply |
2143 |
takes_options = [ |
2598.1.10
by Martin Pool
Clean up options that are registered globally and used once or not at all. |
2144 |
Option('message', type=unicode, |
2145 |
short_name='m', |
|
2146 |
help="Description of the new revision."), |
|
2598.1.1
by Martin Pool
Add test for and documentation of option style, fix up existing options to comply |
2147 |
'verbose', |
2148 |
Option('unchanged', |
|
2149 |
help='Commit even if nothing has changed.'), |
|
2150 |
Option('file', type=str, |
|
2151 |
short_name='F', |
|
2152 |
argname='msgfile', |
|
2153 |
help='Take commit message from this file.'), |
|
2154 |
Option('strict', |
|
2155 |
help="Refuse to commit if there are unknown " |
|
2156 |
"files in the working tree."), |
|
2157 |
ListOption('fixes', type=str, |
|
2158 |
help="Mark a bug as being fixed by this revision."), |
|
2159 |
Option('local', |
|
2160 |
help="Perform a local commit in a bound " |
|
2161 |
"branch. Local commits are not pushed to "
|
|
2162 |
"the master branch until a normal commit "
|
|
2163 |
"is performed."
|
|
2164 |
),
|
|
2165 |
]
|
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2166 |
aliases = ['ci', 'checkin'] |
2167 |
||
2376.4.7
by jml at canonical
- Add docstrings to tests. |
2168 |
def _get_bug_fix_properties(self, fixes, branch): |
2376.4.18
by Jonathan Lange
Store all bug fix URLs in a single property. |
2169 |
properties = [] |
2376.4.7
by jml at canonical
- Add docstrings to tests. |
2170 |
# Configure the properties for bug fixing attributes.
|
2171 |
for fixed_bug in fixes: |
|
2172 |
tokens = fixed_bug.split(':') |
|
2173 |
if len(tokens) != 2: |
|
2174 |
raise errors.BzrCommandError( |
|
2175 |
"Invalid bug %s. Must be in the form of 'tag:id'. " |
|
2176 |
"Commit refused." % fixed_bug) |
|
2177 |
tag, bug_id = tokens |
|
2178 |
try: |
|
2376.4.22
by Jonathan Lange
Variety of whitespace cleanups, tightening of tests and docstring changes in |
2179 |
bug_url = bugtracker.get_bug_url(tag, branch, bug_id) |
2376.4.26
by Jonathan Lange
Tests for MalformedBugIdentifier and new error UnknownBugTrackerAbbreviation. |
2180 |
except errors.UnknownBugTrackerAbbreviation: |
2376.4.7
by jml at canonical
- Add docstrings to tests. |
2181 |
raise errors.BzrCommandError( |
2182 |
'Unrecognized bug %s. Commit refused.' % fixed_bug) |
|
2183 |
except errors.MalformedBugIdentifier: |
|
2184 |
raise errors.BzrCommandError( |
|
2185 |
"Invalid bug identifier for %s. Commit refused." |
|
2186 |
% fixed_bug) |
|
2376.4.18
by Jonathan Lange
Store all bug fix URLs in a single property. |
2187 |
properties.append('%s fixed' % bug_url) |
2376.4.21
by Jonathan Lange
Change the bugs separator to \n from , |
2188 |
return '\n'.join(properties) |
2376.4.7
by jml at canonical
- Add docstrings to tests. |
2189 |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2190 |
def run(self, message=None, file=None, verbose=True, selected_list=None, |
2376.4.1
by jml at canonical
Blackbox-driven --fixes option to commit. |
2191 |
unchanged=False, strict=False, local=False, fixes=None): |
1607.1.5
by Robert Collins
Make commit verbose mode work!. |
2192 |
from bzrlib.commit import (NullCommitReporter, ReportCommitToLog) |
1185.16.65
by mbp at sourcefrog
- new commit --strict option |
2193 |
from bzrlib.errors import (PointlessCommit, ConflictsInTree, |
2194 |
StrictCommitFailed) |
|
1185.33.76
by Martin Pool
Fix import error. |
2195 |
from bzrlib.msgeditor import edit_commit_message, \ |
2196 |
make_commit_message_template
|
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2197 |
|
1185.33.77
by Martin Pool
doc |
2198 |
# TODO: Need a blackbox test for invoking the external editor; may be
|
2199 |
# slightly problematic to run this cross-platform.
|
|
2200 |
||
1185.33.72
by Martin Pool
Fix commit message template for non-ascii files, and add test for handling of |
2201 |
# TODO: do more checks that the commit will succeed before
|
2202 |
# spending the user's valuable time typing a commit message.
|
|
2376.4.2
by jml at canonical
More sophisticated error handling for --fixes option |
2203 |
|
2204 |
properties = {} |
|
2205 |
||
1508.1.4
by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing |
2206 |
tree, selected_list = tree_files(selected_list) |
1704.2.11
by Martin Pool
Handle 'bzr commit DIR' when dir contains pending merges. |
2207 |
if selected_list == ['']: |
2208 |
# workaround - commit of root of tree should be exactly the same
|
|
2209 |
# as just default commit in that tree, and succeed even though
|
|
2210 |
# selected-file merge commit is not done yet
|
|
2211 |
selected_list = [] |
|
2212 |
||
2453.2.1
by Martin Pool
Don't set the bugs property unless bugs are actually set |
2213 |
bug_property = self._get_bug_fix_properties(fixes, tree.branch) |
2214 |
if bug_property: |
|
2215 |
properties['bugs'] = bug_property |
|
2376.4.7
by jml at canonical
- Add docstrings to tests. |
2216 |
|
1587.1.8
by Robert Collins
Local commits on unbound branches fail. |
2217 |
if local and not tree.branch.get_bound_location(): |
2218 |
raise errors.LocalRequiresBoundBranch() |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2219 |
|
2149.1.4
by Aaron Bentley
Add additional test that callback is called with a Commit instance |
2220 |
def get_message(commit_obj): |
2149.1.2
by Aaron Bentley
Defer getting the commit message until the revision is almost-committed |
2221 |
"""Callback to get commit message""" |
2222 |
my_message = message |
|
2223 |
if my_message is None and not file: |
|
2224 |
template = make_commit_message_template(tree, selected_list) |
|
2225 |
my_message = edit_commit_message(template) |
|
2226 |
if my_message is None: |
|
2227 |
raise errors.BzrCommandError("please specify a commit" |
|
2228 |
" message with either --message or --file") |
|
2229 |
elif my_message and file: |
|
2230 |
raise errors.BzrCommandError( |
|
2231 |
"please specify either --message or --file") |
|
2232 |
if file: |
|
2233 |
my_message = codecs.open(file, 'rt', |
|
2234 |
bzrlib.user_encoding).read() |
|
2235 |
if my_message == "": |
|
2236 |
raise errors.BzrCommandError("empty commit message specified") |
|
2237 |
return my_message |
|
2376.4.2
by jml at canonical
More sophisticated error handling for --fixes option |
2238 |
|
1607.1.5
by Robert Collins
Make commit verbose mode work!. |
2239 |
if verbose: |
2240 |
reporter = ReportCommitToLog() |
|
2241 |
else: |
|
2242 |
reporter = NullCommitReporter() |
|
2089.1.1
by wang
If a commit fails, the commit message is stored in a file at the root of |
2243 |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2244 |
try: |
2149.1.2
by Aaron Bentley
Defer getting the commit message until the revision is almost-committed |
2245 |
tree.commit(message_callback=get_message, |
2246 |
specific_files=selected_list, |
|
1607.1.5
by Robert Collins
Make commit verbose mode work!. |
2247 |
allow_pointless=unchanged, strict=strict, local=local, |
2376.4.1
by jml at canonical
Blackbox-driven --fixes option to commit. |
2248 |
reporter=reporter, revprops=properties) |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2249 |
except PointlessCommit: |
2250 |
# FIXME: This should really happen before the file is read in;
|
|
2251 |
# perhaps prepare the commit; get the message; then actually commit
|
|
1551.9.5
by Aaron Bentley
Revert broken save-commit-message code |
2252 |
raise errors.BzrCommandError("no changes to commit." |
2253 |
" use --unchanged to commit anyhow") |
|
1185.14.10
by Aaron Bentley
Commit aborts with conflicts in the tree. |
2254 |
except ConflictsInTree: |
1551.9.5
by Aaron Bentley
Revert broken save-commit-message code |
2255 |
raise errors.BzrCommandError('Conflicts detected in working ' |
2256 |
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
|
|
2257 |
' resolve.') |
|
1185.16.65
by mbp at sourcefrog
- new commit --strict option |
2258 |
except StrictCommitFailed: |
1551.9.5
by Aaron Bentley
Revert broken save-commit-message code |
2259 |
raise errors.BzrCommandError("Commit refused because there are" |
2260 |
" unknown 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 |
2261 |
except errors.BoundBranchOutOfDate, e: |
1551.9.5
by Aaron Bentley
Revert broken save-commit-message code |
2262 |
raise errors.BzrCommandError(str(e) + "\n" |
2263 |
'To commit to master branch, run update and then commit.\n' |
|
2264 |
'You can also pass --local to commit to continue working '
|
|
2265 |
'disconnected.') |
|
2111.1.1
by Martin Pool
Fix #32054, save message if commit fails. |
2266 |
|
2267 |
||
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2268 |
class cmd_check(Command): |
2269 |
"""Validate consistency of branch history. |
|
2270 |
||
2271 |
This command checks various invariants about the branch storage to
|
|
2272 |
detect data corruption or bzr bugs.
|
|
2273 |
"""
|
|
2425.2.3
by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins) |
2274 |
|
2275 |
_see_also = ['reconcile'] |
|
1512
by Robert Collins
Merge from Martin. Adjust check to work with HTTP again. |
2276 |
takes_args = ['branch?'] |
1449
by Robert Collins
teach check about ghosts |
2277 |
takes_options = ['verbose'] |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2278 |
|
1512
by Robert Collins
Merge from Martin. Adjust check to work with HTTP again. |
2279 |
def run(self, branch=None, verbose=False): |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2280 |
from bzrlib.check import check |
1512
by Robert Collins
Merge from Martin. Adjust check to work with HTTP again. |
2281 |
if branch is None: |
2282 |
tree = WorkingTree.open_containing()[0] |
|
2283 |
branch = tree.branch |
|
2284 |
else: |
|
2285 |
branch = Branch.open(branch) |
|
2286 |
check(branch, verbose) |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2287 |
|
2288 |
||
2289 |
class cmd_upgrade(Command): |
|
2290 |
"""Upgrade branch storage to current format. |
|
2291 |
||
2292 |
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. |
2293 |
this command. When the default format has changed you may also be warned
|
2294 |
during other operations to upgrade.
|
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2295 |
"""
|
2425.2.3
by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins) |
2296 |
|
2297 |
_see_also = ['check'] |
|
1534.4.13
by Robert Collins
Give a reasonable warning on attempts to upgrade a readonly url. |
2298 |
takes_args = ['url?'] |
1857.1.20
by Aaron Bentley
Strip out all the EnumOption stuff |
2299 |
takes_options = [ |
2221.4.9
by Aaron Bentley
Zap trailing whitespace |
2300 |
RegistryOption('format', |
2221.4.12
by Aaron Bentley
Add option grouping to RegistryOption and clean up format options |
2301 |
help='Upgrade to a specific format. See "bzr help' |
2598.1.1
by Martin Pool
Add test for and documentation of option style, fix up existing options to comply |
2302 |
' formats" for details.', |
2221.4.9
by Aaron Bentley
Zap trailing whitespace |
2303 |
registry=bzrdir.format_registry, |
2204.5.5
by Aaron Bentley
Remove RepositoryFormat.set_default_format, deprecate get_format_type |
2304 |
converter=bzrdir.format_registry.make_bzrdir, |
2221.4.12
by Aaron Bentley
Add option grouping to RegistryOption and clean up format options |
2305 |
value_switches=True, title='Branch format'), |
1857.1.20
by Aaron Bentley
Strip out all the EnumOption stuff |
2306 |
]
|
2307 |
||
2308 |
def run(self, url='.', format=None): |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2309 |
from bzrlib.upgrade import upgrade |
1857.1.20
by Aaron Bentley
Strip out all the EnumOption stuff |
2310 |
if format is None: |
2204.5.5
by Aaron Bentley
Remove RepositoryFormat.set_default_format, deprecate get_format_type |
2311 |
format = bzrdir.format_registry.make_bzrdir('default') |
1857.1.20
by Aaron Bentley
Strip out all the EnumOption stuff |
2312 |
upgrade(url, format) |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2313 |
|
2314 |
||
2315 |
class cmd_whoami(Command): |
|
1816.2.4
by Robey Pointer
flesh out 'whoami' docs a little, and don't display the identity after setting it |
2316 |
"""Show or set bzr user id. |
2317 |
|
|
2318 |
examples:
|
|
2319 |
bzr whoami --email
|
|
2320 |
bzr whoami 'Frank Chu <fchu@example.com>'
|
|
2321 |
"""
|
|
1816.2.2
by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity |
2322 |
takes_options = [ Option('email', |
2598.1.1
by Martin Pool
Add test for and documentation of option style, fix up existing options to comply |
2323 |
help='Display email address only.'), |
1816.2.2
by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity |
2324 |
Option('branch', |
2598.1.1
by Martin Pool
Add test for and documentation of option style, fix up existing options to comply |
2325 |
help='Set identity for the current branch instead of ' |
2326 |
'globally.'), |
|
1816.2.2
by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity |
2327 |
]
|
2328 |
takes_args = ['name?'] |
|
2329 |
encoding_type = 'replace' |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2330 |
|
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
2331 |
@display_command
|
1816.2.2
by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity |
2332 |
def run(self, email=False, branch=False, name=None): |
2333 |
if name is None: |
|
2334 |
# use branch if we're inside one; otherwise global config
|
|
2335 |
try: |
|
1816.2.10
by Robey Pointer
code style changes |
2336 |
c = Branch.open_containing('.')[0].get_config() |
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
2337 |
except errors.NotBranchError: |
1816.2.2
by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity |
2338 |
c = config.GlobalConfig() |
1816.2.4
by Robey Pointer
flesh out 'whoami' docs a little, and don't display the identity after setting it |
2339 |
if email: |
1816.2.10
by Robey Pointer
code style changes |
2340 |
self.outf.write(c.user_email() + '\n') |
1816.2.2
by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity |
2341 |
else: |
1816.2.10
by Robey Pointer
code style changes |
2342 |
self.outf.write(c.username() + '\n') |
1816.2.4
by Robey Pointer
flesh out 'whoami' docs a little, and don't display the identity after setting it |
2343 |
return
|
1816.2.2
by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity |
2344 |
|
1840.1.2
by Robey Pointer
instead of raising an error, just display an exception if 'whoami' is given a name that doesn't look like it contains an email address |
2345 |
# display a warning if an email address isn't included in the given name.
|
2346 |
try: |
|
2347 |
config.extract_email_address(name) |
|
2055.2.2
by John Arbash Meinel
Switch extract_email_address() to use a more specific exception |
2348 |
except errors.NoEmailInUsername, e: |
1840.1.5
by Robey Pointer
change the warning message for a 'whoami' with no email address, on jam's recommendation |
2349 |
warning('"%s" does not seem to contain an email address. ' |
2350 |
'This is allowed, but not recommended.', name) |
|
1840.1.1
by Robey Pointer
raise an exception if 'whoami' is given a name without a decodable email address |
2351 |
|
1816.2.4
by Robey Pointer
flesh out 'whoami' docs a little, and don't display the identity after setting it |
2352 |
# use global config unless --branch given
|
2353 |
if branch: |
|
1816.2.10
by Robey Pointer
code style changes |
2354 |
c = Branch.open_containing('.')[0].get_config() |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2355 |
else: |
1816.2.4
by Robey Pointer
flesh out 'whoami' docs a little, and don't display the identity after setting it |
2356 |
c = config.GlobalConfig() |
2357 |
c.set_user_option('email', name) |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2358 |
|
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. |
2359 |
|
1185.35.14
by Aaron Bentley
Implemented nick command |
2360 |
class cmd_nick(Command): |
1551.3.11
by Aaron Bentley
Merge from Robert |
2361 |
"""Print or set the branch nickname. |
2362 |
||
1185.35.14
by Aaron Bentley
Implemented nick command |
2363 |
If unset, the tree root directory name is used as the nickname
|
2364 |
To print the current nickname, execute with no argument.
|
|
2365 |
"""
|
|
2425.2.3
by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins) |
2366 |
|
2367 |
_see_also = ['info'] |
|
1185.35.14
by Aaron Bentley
Implemented nick command |
2368 |
takes_args = ['nickname?'] |
2369 |
def run(self, nickname=None): |
|
1185.33.66
by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko) |
2370 |
branch = Branch.open_containing(u'.')[0] |
1185.35.14
by Aaron Bentley
Implemented nick command |
2371 |
if nickname is None: |
2372 |
self.printme(branch) |
|
2373 |
else: |
|
2374 |
branch.nick = nickname |
|
2375 |
||
2376 |
@display_command
|
|
2377 |
def printme(self, branch): |
|
2367.1.8
by Robert Collins
Whitespace. |
2378 |
print branch.nick |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2379 |
|
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. |
2380 |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2381 |
class cmd_selftest(Command): |
1393.1.46
by Martin Pool
- bzr selftest arguments can be partial ids of tests to run |
2382 |
"""Run internal test suite. |
2383 |
|
|
2213.2.1
by Martin Pool
Add selftest --first flag |
2384 |
If arguments are given, they are regular expressions that say which tests
|
2385 |
should run. Tests matching any expression are run, and other tests are
|
|
2386 |
not run.
|
|
2387 |
||
2388 |
Alternatively if --first is given, matching tests are run first and then
|
|
2389 |
all other tests are run. This is useful if you have been working in a
|
|
2390 |
particular area, but want to make sure nothing else was broken.
|
|
1552
by Martin Pool
Improved help text for bzr selftest |
2391 |
|
2394.2.2
by Ian Clatworthy
Add --randomize and update help |
2392 |
If --exclude is given, tests that match that regular expression are
|
2394.2.9
by Ian Clatworthy
update NEWS and help to reflect removal of comma support |
2393 |
excluded, regardless of whether they match --first or not.
|
2394.2.2
by Ian Clatworthy
Add --randomize and update help |
2394 |
|
2395 |
To help catch accidential dependencies between tests, the --randomize
|
|
2396 |
option is useful. In most cases, the argument used is the word 'now'.
|
|
2397 |
Note that the seed used for the random number generator is displayed
|
|
2398 |
when this option is used. The seed can be explicitly passed as the
|
|
2399 |
argument to this option if required. This enables reproduction of the
|
|
2400 |
actual ordering used if and when an order sensitive problem is encountered.
|
|
2401 |
||
2402 |
If --list-only is given, the tests that would be run are listed. This is
|
|
2403 |
useful when combined with --first, --exclude and/or --randomize to
|
|
2404 |
understand their impact. The test harness reports "Listed nn tests in ..."
|
|
2405 |
instead of "Ran nn tests in ..." when list mode is enabled.
|
|
2406 |
||
1552
by Martin Pool
Improved help text for bzr selftest |
2407 |
If the global option '--no-plugins' is given, plugins are not loaded
|
2408 |
before running the selftests. This has two effects: features provided or
|
|
2409 |
modified by plugins will not be tested, and tests provided by plugins will
|
|
2410 |
not be run.
|
|
2411 |
||
2598.4.1
by Martin Pool
Remove obsolete --clean-output, --keep-output, --numbered-dirs selftest options (thanks Alexander) |
2412 |
Tests that need working space on disk use a common temporary directory,
|
2413 |
typically inside $TMPDIR or /tmp.
|
|
2414 |
||
2213.2.1
by Martin Pool
Add selftest --first flag |
2415 |
examples::
|
1552
by Martin Pool
Improved help text for bzr selftest |
2416 |
bzr selftest ignore
|
2213.2.1
by Martin Pool
Add selftest --first flag |
2417 |
run only tests relating to 'ignore'
|
1552
by Martin Pool
Improved help text for bzr selftest |
2418 |
bzr --no-plugins selftest -v
|
2213.2.1
by Martin Pool
Add selftest --first flag |
2419 |
disable plugins and list tests as they're run
|
1185.16.58
by mbp at sourcefrog
- run all selftests by default |
2420 |
"""
|
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. |
2421 |
# NB: this is used from the class without creating an instance, which is
|
2422 |
# why it does not have a self parameter.
|
|
2423 |
def get_transport_type(typestring): |
|
2424 |
"""Parse and return a transport specifier.""" |
|
2425 |
if typestring == "sftp": |
|
2426 |
from bzrlib.transport.sftp import SFTPAbsoluteServer |
|
2427 |
return SFTPAbsoluteServer |
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
2428 |
if typestring == "memory": |
2429 |
from bzrlib.transport.memory import MemoryServer |
|
2430 |
return MemoryServer |
|
1558.10.1
by Aaron Bentley
Handle lockdirs over NFS properly |
2431 |
if typestring == "fakenfs": |
1558.10.2
by Robert Collins
Refactor the FakeNFS support into a TransportDecorator. |
2432 |
from bzrlib.transport.fakenfs import FakeNFSServer |
1558.10.1
by Aaron Bentley
Handle lockdirs over NFS properly |
2433 |
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. |
2434 |
msg = "No known transport type %s. Supported types are: sftp\n" %\ |
2435 |
(typestring) |
|
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
2436 |
raise errors.BzrCommandError(msg) |
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. |
2437 |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2438 |
hidden = True |
1185.1.57
by Robert Collins
nuke --pattern to selftest, replace with regexp.search calls. |
2439 |
takes_args = ['testspecs*'] |
1552
by Martin Pool
Improved help text for bzr selftest |
2440 |
takes_options = ['verbose', |
2418.2.2
by Martin Pool
Add -1 option to selftest |
2441 |
Option('one', |
2598.1.1
by Martin Pool
Add test for and documentation of option style, fix up existing options to comply |
2442 |
help='Stop when one test fails.', |
2418.2.2
by Martin Pool
Add -1 option to selftest |
2443 |
short_name='1', |
2444 |
),
|
|
2333.1.1
by Dmitry Vasiliev
Fixed typo and removed some trailing whitespaces |
2445 |
Option('transport', |
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. |
2446 |
help='Use a different transport by default ' |
2447 |
'throughout the test suite.', |
|
2448 |
type=get_transport_type), |
|
2598.1.1
by Martin Pool
Add test for and documentation of option style, fix up existing options to comply |
2449 |
Option('benchmark', |
2450 |
help='Run the benchmarks rather than selftests.'), |
|
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
2451 |
Option('lsprof-timed', |
2598.1.1
by Martin Pool
Add test for and documentation of option style, fix up existing options to comply |
2452 |
help='Generate lsprof output for benchmarked' |
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
2453 |
' sections of code.'), |
1908.2.4
by John Arbash Meinel
Add the ability to specify a benchmark cache directory. |
2454 |
Option('cache-dir', type=str, |
2598.1.1
by Martin Pool
Add test for and documentation of option style, fix up existing options to comply |
2455 |
help='Cache intermediate benchmark output in this ' |
2456 |
'directory.'), |
|
2213.2.1
by Martin Pool
Add selftest --first flag |
2457 |
Option('first', |
2598.1.1
by Martin Pool
Add test for and documentation of option style, fix up existing options to comply |
2458 |
help='Run all tests, but run specified tests first.', |
2418.2.1
by Martin Pool
Add -f alias for selftest --first |
2459 |
short_name='f', |
2321.2.1
by Alexander Belchenko
`bzr selftest --numbered-dirs` use numbered dirs for TestCaseInTempDir |
2460 |
),
|
2394.2.1
by Ian Clatworthy
--list and --exclude first cut |
2461 |
Option('list-only', |
2598.1.1
by Martin Pool
Add test for and documentation of option style, fix up existing options to comply |
2462 |
help='List the tests instead of running them.'), |
2394.2.2
by Ian Clatworthy
Add --randomize and update help |
2463 |
Option('randomize', type=str, argname="SEED", |
2598.1.1
by Martin Pool
Add test for and documentation of option style, fix up existing options to comply |
2464 |
help='Randomize the order of tests using the given' |
2465 |
' seed or "now" for the current time.'), |
|
2394.2.2
by Ian Clatworthy
Add --randomize and update help |
2466 |
Option('exclude', type=str, argname="PATTERN", |
2394.2.6
by Ian Clatworthy
completed blackbox tests |
2467 |
short_name='x', |
2598.1.1
by Martin Pool
Add test for and documentation of option style, fix up existing options to comply |
2468 |
help='Exclude tests that match this regular' |
2469 |
' expression.'), |
|
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
2470 |
]
|
2204.3.4
by Alexander Belchenko
Command 'selftest' use 'replace' encoding_type to prevent sudden traceback |
2471 |
encoding_type = 'replace' |
1185.16.58
by mbp at sourcefrog
- run all selftests by default |
2472 |
|
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
2473 |
def run(self, testspecs_list=None, verbose=None, one=False, |
2598.4.1
by Martin Pool
Remove obsolete --clean-output, --keep-output, --numbered-dirs selftest options (thanks Alexander) |
2474 |
transport=None, benchmark=None, |
2475 |
lsprof_timed=None, cache_dir=None, |
|
2476 |
first=False, list_only=False, |
|
2394.2.2
by Ian Clatworthy
Add --randomize and update help |
2477 |
randomize=None, exclude=None): |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2478 |
import bzrlib.ui |
1707.2.2
by Robert Collins
Start on bench_add, an add benchtest. |
2479 |
from bzrlib.tests import selftest |
2480 |
import bzrlib.benchmarks as benchmarks |
|
1908.2.16
by John Arbash Meinel
Move all the new TreeCreator classes into separate files. |
2481 |
from bzrlib.benchmarks import tree_creator |
2606.1.1
by Martin Pool
Show bzr version, python version, etc when running tests |
2482 |
from bzrlib.version import show_version |
2321.2.1
by Alexander Belchenko
`bzr selftest --numbered-dirs` use numbered dirs for TestCaseInTempDir |
2483 |
|
1908.2.4
by John Arbash Meinel
Add the ability to specify a benchmark cache directory. |
2484 |
if cache_dir is not None: |
1908.2.16
by John Arbash Meinel
Move all the new TreeCreator classes into separate files. |
2485 |
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir) |
2606.1.3
by Martin Pool
Update tests for new version display |
2486 |
if not list_only: |
2487 |
show_version(show_config=False, show_copyright=False) |
|
1707.2.1
by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest. |
2488 |
print
|
2095.4.1
by Martin Pool
Better progress bars during tests |
2489 |
if testspecs_list is not None: |
2490 |
pattern = '|'.join(testspecs_list) |
|
2491 |
else: |
|
2492 |
pattern = ".*" |
|
2493 |
if benchmark: |
|
2494 |
test_suite_factory = benchmarks.test_suite |
|
2495 |
if verbose is None: |
|
2496 |
verbose = True |
|
2497 |
# TODO: should possibly lock the history file...
|
|
2197.1.1
by Martin Pool
Use line buffering to write .perf_history |
2498 |
benchfile = open(".perf_history", "at", buffering=1) |
2095.4.1
by Martin Pool
Better progress bars during tests |
2499 |
else: |
2500 |
test_suite_factory = None |
|
2501 |
if verbose is None: |
|
2502 |
verbose = False |
|
2503 |
benchfile = None |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2504 |
try: |
2598.4.1
by Martin Pool
Remove obsolete --clean-output, --keep-output, --numbered-dirs selftest options (thanks Alexander) |
2505 |
result = selftest(verbose=verbose, |
2095.4.1
by Martin Pool
Better progress bars during tests |
2506 |
pattern=pattern, |
2598.4.1
by Martin Pool
Remove obsolete --clean-output, --keep-output, --numbered-dirs selftest options (thanks Alexander) |
2507 |
stop_on_failure=one, |
2095.4.1
by Martin Pool
Better progress bars during tests |
2508 |
transport=transport, |
2509 |
test_suite_factory=test_suite_factory, |
|
2510 |
lsprof_timed=lsprof_timed, |
|
2213.2.1
by Martin Pool
Add selftest --first flag |
2511 |
bench_history=benchfile, |
2512 |
matching_tests_first=first, |
|
2394.2.1
by Ian Clatworthy
--list and --exclude first cut |
2513 |
list_only=list_only, |
2394.2.2
by Ian Clatworthy
Add --randomize and update help |
2514 |
random_seed=randomize, |
2394.2.8
by Ian Clatworthy
incorporate feedback from jam |
2515 |
exclude_pattern=exclude |
2213.2.1
by Martin Pool
Add selftest --first flag |
2516 |
)
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2517 |
finally: |
2095.4.1
by Martin Pool
Better progress bars during tests |
2518 |
if benchfile is not None: |
2519 |
benchfile.close() |
|
2520 |
if result: |
|
2521 |
info('tests passed') |
|
2522 |
else: |
|
2523 |
info('tests failed') |
|
2524 |
return int(not result) |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2525 |
|
2526 |
||
2527 |
class cmd_version(Command): |
|
2528 |
"""Show version of bzr.""" |
|
1871.1.1
by Robert Collins
Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py. |
2529 |
|
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
2530 |
@display_command
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2531 |
def run(self): |
1819.1.8
by Martin Pool
Improved reporting of bzrlib revision_id |
2532 |
from bzrlib.version import show_version |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2533 |
show_version() |
2534 |
||
1871.1.1
by Robert Collins
Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py. |
2535 |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2536 |
class cmd_rocks(Command): |
2537 |
"""Statement of optimism.""" |
|
1871.1.1
by Robert Collins
Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py. |
2538 |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2539 |
hidden = True |
1871.1.1
by Robert Collins
Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py. |
2540 |
|
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
2541 |
@display_command
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2542 |
def run(self): |
2227.4.1
by v.ladeuil+lp at free
Fix #78026. |
2543 |
print "It sure does!" |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2544 |
|
2545 |
||
2546 |
class cmd_find_merge_base(Command): |
|
1871.1.1
by Robert Collins
Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py. |
2547 |
"""Find and print a base revision for merging two branches.""" |
1185.16.3
by Martin Pool
- remove all TODOs from bzr help messages |
2548 |
# TODO: Options to specify revisions on either side, as if
|
2549 |
# merging only part of the history.
|
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2550 |
takes_args = ['branch', 'other'] |
2551 |
hidden = True |
|
2552 |
||
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
2553 |
@display_command
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2554 |
def run(self, branch, other): |
2490.2.28
by Aaron Bentley
Fix handling of null revision |
2555 |
from bzrlib.revision import ensure_null, MultipleRevisionSources |
1155
by Martin Pool
- update find-merge-base to use new common_ancestor code |
2556 |
|
1442.1.64
by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path). |
2557 |
branch1 = Branch.open_containing(branch)[0] |
2558 |
branch2 = Branch.open_containing(other)[0] |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2559 |
|
2490.2.28
by Aaron Bentley
Fix handling of null revision |
2560 |
last1 = ensure_null(branch1.last_revision()) |
2561 |
last2 = ensure_null(branch2.last_revision()) |
|
1155
by Martin Pool
- update find-merge-base to use new common_ancestor code |
2562 |
|
2490.2.21
by Aaron Bentley
Rename graph to deprecated_graph |
2563 |
graph = branch1.repository.get_graph(branch2.repository) |
2564 |
base_rev_id = graph.find_unique_lca(last1, last2) |
|
1155
by Martin Pool
- update find-merge-base to use new common_ancestor code |
2565 |
|
2566 |
print 'merge base is revision %s' % base_rev_id |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2567 |
|
2568 |
||
2569 |
class cmd_merge(Command): |
|
2570 |
"""Perform a three-way merge. |
|
2571 |
|
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
2572 |
The branch is the branch you will merge from. By default, it will merge
|
2573 |
the latest revision. If you specify a revision, that revision will be
|
|
2574 |
merged. If you specify two revisions, the first will be used as a BASE,
|
|
2575 |
and the second one as OTHER. Revision numbers are always relative to the
|
|
2576 |
specified branch.
|
|
1172
by Martin Pool
- better explanation when merge fails with AmbiguousBase |
2577 |
|
1551.2.19
by Aaron Bentley
Added See Conflicts to merge help |
2578 |
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 |
2579 |
branch, automatically determining an appropriate base. If this
|
2580 |
fails, you may need to give an explicit base.
|
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2581 |
|
1551.2.18
by Aaron Bentley
Updated docs to clarify conflict handling |
2582 |
Merge will do its best to combine the changes in two branches, but there
|
2583 |
are some kinds of problems only a human can fix. When it encounters those,
|
|
2584 |
it will mark a conflict. A conflict means that you need to fix something,
|
|
2585 |
before you should commit.
|
|
2586 |
||
1551.2.19
by Aaron Bentley
Added See Conflicts to merge help |
2587 |
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 |
2588 |
|
1614.2.4
by Olaf Conradi
Renamed argument location in command merge back to branch. |
2589 |
If there is no default branch set, the first merge will set it. After
|
2590 |
that, you can omit the branch to use the default. To change the
|
|
1785.1.4
by John Arbash Meinel
Update help for the new --remember semantics. |
2591 |
default, use --remember. The value will only be saved if the remote
|
2592 |
location can be accessed.
|
|
1614.2.2
by Olaf Conradi
Merge command: |
2593 |
|
2220.2.8
by Martin Pool
Add -d option to push, pull, merge commands. |
2594 |
The results of the merge are placed into the destination working
|
2595 |
directory, where they can be reviewed (with bzr diff), tested, and then
|
|
2596 |
committed to record the result of the merge.
|
|
2597 |
||
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2598 |
Examples:
|
2599 |
||
2374.1.3
by Ian Clatworthy
Minor man page fixes for add, commit, export |
2600 |
To merge the latest revision from bzr.dev:
|
2601 |
bzr merge ../bzr.dev
|
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2602 |
|
2374.1.3
by Ian Clatworthy
Minor man page fixes for add, commit, export |
2603 |
To merge changes up to and including revision 82 from bzr.dev:
|
2604 |
bzr merge -r 82 ../bzr.dev
|
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2605 |
|
2606 |
To merge the changes introduced by 82, without previous changes:
|
|
2374.1.3
by Ian Clatworthy
Minor man page fixes for add, commit, export |
2607 |
bzr merge -r 81..82 ../bzr.dev
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2608 |
|
2609 |
merge refuses to run if there are any uncommitted changes, unless
|
|
2610 |
--force is given.
|
|
2611 |
"""
|
|
2425.2.3
by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins) |
2612 |
|
2520.1.5
by Daniel Watkins
'help merge' now points to 'help status-flags'. |
2613 |
_see_also = ['update', 'remerge', 'status-flags'] |
1614.2.4
by Olaf Conradi
Renamed argument location in command merge back to branch. |
2614 |
takes_args = ['branch?'] |
2598.1.10
by Martin Pool
Clean up options that are registered globally and used once or not at all. |
2615 |
takes_options = [ |
2616 |
'revision', |
|
2617 |
Option('force', |
|
2618 |
help='Merge even if the destination tree has uncommitted changes.'), |
|
2619 |
'merge-type', |
|
2620 |
'reprocess', |
|
2621 |
'remember', |
|
2220.2.8
by Martin Pool
Add -d option to push, pull, merge commands. |
2622 |
Option('show-base', help="Show base revision text in " |
2598.1.1
by Martin Pool
Add test for and documentation of option style, fix up existing options to comply |
2623 |
"conflicts."), |
2220.2.8
by Martin Pool
Add -d option to push, pull, merge commands. |
2624 |
Option('uncommitted', help='Apply uncommitted changes' |
2598.1.1
by Martin Pool
Add test for and documentation of option style, fix up existing options to comply |
2625 |
' from a working copy, instead of branch changes.'), |
2220.2.8
by Martin Pool
Add -d option to push, pull, merge commands. |
2626 |
Option('pull', help='If the destination is already' |
2627 |
' completely merged into the source, pull from the'
|
|
2598.1.1
by Martin Pool
Add test for and documentation of option style, fix up existing options to comply |
2628 |
' source rather than merging. When this happens,'
|
2220.2.8
by Martin Pool
Add -d option to push, pull, merge commands. |
2629 |
' you do not need to commit the result.'), |
2630 |
Option('directory', |
|
2598.1.10
by Martin Pool
Clean up options that are registered globally and used once or not at all. |
2631 |
help='Branch to merge into, ' |
2632 |
'rather than the one containing the working directory.', |
|
2633 |
short_name='d', |
|
2634 |
type=unicode, |
|
2635 |
),
|
|
2220.2.8
by Martin Pool
Add -d option to push, pull, merge commands. |
2636 |
]
|
1551.6.22
by Aaron Bentley
Improved help for remerge and merge |
2637 |
|
1614.2.4
by Olaf Conradi
Renamed argument location in command merge back to branch. |
2638 |
def run(self, branch=None, revision=None, force=False, merge_type=None, |
2279.3.1
by mbp at sourcefrog
Add a -d option to push, pull, merge (ported from tags branch) |
2639 |
show_base=False, reprocess=False, remember=False, |
2220.2.8
by Martin Pool
Add -d option to push, pull, merge commands. |
2640 |
uncommitted=False, pull=False, |
2641 |
directory=None, |
|
2642 |
):
|
|
2220.2.30
by Martin Pool
split out tag-merging code and add some tests |
2643 |
from bzrlib.tag import _merge_tags_if_possible |
1551.14.11
by Aaron Bentley
rename rev_id and other_rev_id |
2644 |
other_revision_id = None |
2520.4.110
by Aaron Bentley
Implement cherrypick support for merge directives |
2645 |
base_revision_id = None |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2646 |
if merge_type is None: |
1996.3.5
by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again. |
2647 |
merge_type = _mod_merge.Merge3Merger |
1614.2.2
by Olaf Conradi
Merge command: |
2648 |
|
2220.2.8
by Martin Pool
Add -d option to push, pull, merge commands. |
2649 |
if directory is None: directory = u'.' |
2255.7.1
by John Arbash Meinel
_iter_changes should return Unicode paths. |
2650 |
# XXX: jam 20070225 WorkingTree should be locked before you extract its
|
2651 |
# inventory. Because merge is a mutating operation, it really
|
|
2652 |
# should be a lock_write() for the whole cmd_merge operation.
|
|
2653 |
# However, cmd_merge open's its own tree in _merge_helper, which
|
|
2654 |
# means if we lock here, the later lock_write() will always block.
|
|
2655 |
# Either the merge helper code should be updated to take a tree,
|
|
2255.7.96
by Robert Collins
Change _iter_changes interface to yield both old and new paths. |
2656 |
# (What about tree.merge_from_branch?)
|
2220.2.8
by Martin Pool
Add -d option to push, pull, merge commands. |
2657 |
tree = WorkingTree.open_containing(directory)[0] |
1551.10.25
by Aaron Bentley
Make ChangeReporter private |
2658 |
change_reporter = delta._ChangeReporter( |
2255.7.98
by Robert Collins
Merge bzr.dev. |
2659 |
unversioned_filter=tree.is_ignored) |
1685.1.69
by Wouter van Heyst
merge bzr.dev 1740 |
2660 |
|
1711.3.3
by John Arbash Meinel
Allow pull to use a bundle as a target, |
2661 |
if branch is not None: |
2662 |
try: |
|
1551.14.4
by Aaron Bentley
Change bundle reader and merge directive to both be 'mergeables' |
2663 |
mergeable = bundle.read_mergeable_from_url( |
1551.14.2
by Aaron Bentley
Support manual merge from merge directives |
2664 |
branch) |
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
2665 |
except errors.NotABundle: |
1711.3.3
by John Arbash Meinel
Allow pull to use a bundle as a target, |
2666 |
pass # Continue on considering this url a Branch |
1185.82.25
by Aaron Bentley
Added changeset-merging functionality |
2667 |
else: |
1551.14.4
by Aaron Bentley
Change bundle reader and merge directive to both be 'mergeables' |
2668 |
if revision is not None: |
2669 |
raise errors.BzrCommandError( |
|
2670 |
'Cannot use -r with merge directives or bundles') |
|
2520.4.109
by Aaron Bentley
start work on directive cherry-picking |
2671 |
mergeable.install_revisions(tree.branch.repository) |
2672 |
base_revision_id, other_revision_id, verified =\ |
|
2673 |
mergeable.get_merge_request(tree.branch.repository) |
|
2520.4.110
by Aaron Bentley
Implement cherrypick support for merge directives |
2674 |
if base_revision_id in tree.branch.repository.get_ancestry( |
2520.4.109
by Aaron Bentley
start work on directive cherry-picking |
2675 |
tree.branch.last_revision(), topo_sorted=False): |
2520.4.110
by Aaron Bentley
Implement cherrypick support for merge directives |
2676 |
base_revision_id = None |
2677 |
other_branch = None |
|
2678 |
path = '' |
|
2679 |
other = None |
|
2680 |
base = None |
|
2681 |
||
2682 |
if other_revision_id is None: |
|
2520.5.5
by Aaron Bentley
Fix merge-from-branch |
2683 |
verified = 'inapplicable' |
2520.4.110
by Aaron Bentley
Implement cherrypick support for merge directives |
2684 |
if revision is None \ |
2685 |
or len(revision) < 1 or revision[0].needs_branch(): |
|
2686 |
branch = self._get_remembered_parent(tree, branch, |
|
2687 |
'Merging from') |
|
2688 |
||
2689 |
if revision is None or len(revision) < 1: |
|
2690 |
if uncommitted: |
|
2691 |
base = [branch, -1] |
|
2692 |
other = [branch, None] |
|
2693 |
else: |
|
2694 |
base = [None, None] |
|
2695 |
other = [branch, -1] |
|
2696 |
other_branch, path = Branch.open_containing(branch) |
|
1910.1.1
by Aaron Bentley
Merge takes --uncommitted parameter |
2697 |
else: |
2520.4.110
by Aaron Bentley
Implement cherrypick support for merge directives |
2698 |
if uncommitted: |
2699 |
raise errors.BzrCommandError('Cannot use --uncommitted and' |
|
2700 |
' --revision at the same time.') |
|
2701 |
branch = revision[0].get_branch() or branch |
|
2702 |
if len(revision) == 1: |
|
2703 |
base = [None, None] |
|
1551.14.4
by Aaron Bentley
Change bundle reader and merge directive to both be 'mergeables' |
2704 |
other_branch, path = Branch.open_containing(branch) |
2705 |
revno = revision[0].in_history(other_branch).revno |
|
2706 |
other = [branch, revno] |
|
2520.4.110
by Aaron Bentley
Implement cherrypick support for merge directives |
2707 |
else: |
2708 |
assert len(revision) == 2 |
|
2709 |
if None in revision: |
|
2710 |
raise errors.BzrCommandError( |
|
2711 |
"Merge doesn't permit empty revision specifier.") |
|
2712 |
base_branch, path = Branch.open_containing(branch) |
|
2713 |
branch1 = revision[1].get_branch() or branch |
|
2714 |
other_branch, path1 = Branch.open_containing(branch1) |
|
2715 |
if revision[0].get_branch() is not None: |
|
2716 |
# then path was obtained from it, and is None.
|
|
2717 |
path = path1 |
|
1685.1.19
by John Arbash Meinel
pull/merge/branch/missing should all save the absolute path to the other branch, not the relative one |
2718 |
|
2520.4.110
by Aaron Bentley
Implement cherrypick support for merge directives |
2719 |
base = [branch, revision[0].in_history(base_branch).revno] |
2720 |
other = [branch1, |
|
2721 |
revision[1].in_history(other_branch).revno] |
|
1685.1.19
by John Arbash Meinel
pull/merge/branch/missing should all save the absolute path to the other branch, not the relative one |
2722 |
|
1551.14.7
by Aaron Bentley
test suite fixes |
2723 |
if ((tree.branch.get_parent() is None or remember) and |
2724 |
other_branch is not None): |
|
1685.1.19
by John Arbash Meinel
pull/merge/branch/missing should all save the absolute path to the other branch, not the relative one |
2725 |
tree.branch.set_parent(other_branch.base) |
2726 |
||
2220.2.8
by Martin Pool
Add -d option to push, pull, merge commands. |
2727 |
# pull tags now... it's a bit inconsistent to do it ahead of copying
|
2728 |
# the history but that's done inside the merge code
|
|
1551.14.4
by Aaron Bentley
Change bundle reader and merge directive to both be 'mergeables' |
2729 |
if other_branch is not None: |
2730 |
_merge_tags_if_possible(other_branch, tree.branch) |
|
2220.2.8
by Martin Pool
Add -d option to push, pull, merge commands. |
2731 |
|
1645.1.1
by Aaron Bentley
Implement single-file merge |
2732 |
if path != "": |
2733 |
interesting_files = [path] |
|
2734 |
else: |
|
2735 |
interesting_files = None |
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
2736 |
pb = ui.ui_factory.nested_progress_bar() |
1172
by Martin Pool
- better explanation when merge fails with AmbiguousBase |
2737 |
try: |
1551.2.25
by Aaron Bentley
Stop using deprecated methods in merge and revert |
2738 |
try: |
1996.3.1
by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms |
2739 |
conflict_count = _merge_helper( |
1551.14.11
by Aaron Bentley
rename rev_id and other_rev_id |
2740 |
other, base, other_rev_id=other_revision_id, |
2520.4.110
by Aaron Bentley
Implement cherrypick support for merge directives |
2741 |
base_rev_id=base_revision_id, |
1551.14.4
by Aaron Bentley
Change bundle reader and merge directive to both be 'mergeables' |
2742 |
check_clean=(not force), |
1996.3.1
by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms |
2743 |
merge_type=merge_type, |
2744 |
reprocess=reprocess, |
|
2745 |
show_base=show_base, |
|
2149.2.1
by Jan Hudec
Option --pull for merge command. |
2746 |
pull=pull, |
2220.2.8
by Martin Pool
Add -d option to push, pull, merge commands. |
2747 |
this_dir=directory, |
1551.11.13
by Aaron Bentley
Merge bzr.dev |
2748 |
pb=pb, file_list=interesting_files, |
1551.11.9
by Aaron Bentley
Apply change reporting to merge |
2749 |
change_reporter=change_reporter) |
1551.2.25
by Aaron Bentley
Stop using deprecated methods in merge and revert |
2750 |
finally: |
2751 |
pb.finished() |
|
2520.4.111
by Aaron Bentley
Ensure that damaged preview patches produce a warning in merge |
2752 |
if verified == 'failed': |
2753 |
warning('Preview patch does not match changes') |
|
1476
by Robert Collins
Merge now has a retcode of 1 when conflicts occur. (Robert Collins) |
2754 |
if conflict_count != 0: |
2755 |
return 1 |
|
2756 |
else: |
|
2757 |
return 0 |
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
2758 |
except errors.AmbiguousBase, e: |
1173
by Martin Pool
- message typo |
2759 |
m = ("sorry, bzr can't determine the right merge base yet\n" |
1172
by Martin Pool
- better explanation when merge fails with AmbiguousBase |
2760 |
"candidates are:\n " |
2761 |
+ "\n ".join(e.bases) |
|
2762 |
+ "\n" |
|
2763 |
"please specify an explicit base with -r,\n" |
|
2764 |
"and (if you want) report this to the bzr developers\n") |
|
2765 |
log_error(m) |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2766 |
|
1685.1.59
by Martin Pool
[broken] Fix up & refactor display of remembered urls to unescape properly |
2767 |
# TODO: move up to common parent; this isn't merge-specific anymore.
|
2768 |
def _get_remembered_parent(self, tree, supplied_location, verb_string): |
|
2769 |
"""Use tree.branch's parent if none was supplied. |
|
2770 |
||
2771 |
Report if the remembered location was used.
|
|
2772 |
"""
|
|
2773 |
if supplied_location is not None: |
|
2774 |
return supplied_location |
|
2775 |
stored_location = tree.branch.get_parent() |
|
1685.1.71
by Wouter van Heyst
change branch.{get,set}_parent to store a relative path but return full urls |
2776 |
mutter("%s", stored_location) |
1685.1.59
by Martin Pool
[broken] Fix up & refactor display of remembered urls to unescape properly |
2777 |
if stored_location is None: |
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
2778 |
raise errors.BzrCommandError("No location specified or remembered") |
1685.1.59
by Martin Pool
[broken] Fix up & refactor display of remembered urls to unescape properly |
2779 |
display_url = urlutils.unescape_for_display(stored_location, self.outf.encoding) |
2780 |
self.outf.write("%s remembered location %s\n" % (verb_string, display_url)) |
|
2781 |
return stored_location |
|
2782 |
||
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2783 |
|
1185.35.4
by Aaron Bentley
Implemented remerge |
2784 |
class cmd_remerge(Command): |
2785 |
"""Redo a merge. |
|
1551.6.22
by Aaron Bentley
Improved help for remerge and merge |
2786 |
|
2787 |
Use this if you want to try a different merge technique while resolving
|
|
2788 |
conflicts. Some merge techniques are better than others, and remerge
|
|
2789 |
lets you try different ones on different files.
|
|
2790 |
||
2791 |
The options for remerge have the same meaning and defaults as the ones for
|
|
2792 |
merge. The difference is that remerge can (only) be run when there is a
|
|
2793 |
pending merge, and it lets you specify particular files.
|
|
2794 |
||
2795 |
Examples:
|
|
2374.1.3
by Ian Clatworthy
Minor man page fixes for add, commit, export |
2796 |
|
1551.6.22
by Aaron Bentley
Improved help for remerge and merge |
2797 |
$ bzr remerge --show-base
|
2798 |
Re-do the merge of all conflicted files, and show the base text in
|
|
2799 |
conflict regions, in addition to the usual THIS and OTHER texts.
|
|
2800 |
||
2801 |
$ bzr remerge --merge-type weave --reprocess foobar
|
|
2802 |
Re-do the merge of "foobar", using the weave merge algorithm, with
|
|
2803 |
additional processing to reduce the size of conflict regions.
|
|
2374.1.1
by Ian Clatworthy
Help and man page fixes |
2804 |
"""
|
1185.35.4
by Aaron Bentley
Implemented remerge |
2805 |
takes_args = ['file*'] |
2598.1.1
by Martin Pool
Add test for and documentation of option style, fix up existing options to comply |
2806 |
takes_options = [ |
2807 |
'merge-type', |
|
2808 |
'reprocess', |
|
2809 |
Option('show-base', |
|
2810 |
help="Show base revision text in conflicts."), |
|
2811 |
]
|
|
1185.35.4
by Aaron Bentley
Implemented remerge |
2812 |
|
2813 |
def run(self, file_list=None, merge_type=None, show_base=False, |
|
2814 |
reprocess=False): |
|
2815 |
if merge_type is None: |
|
1996.3.5
by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again. |
2816 |
merge_type = _mod_merge.Merge3Merger |
1508.1.15
by Robert Collins
Merge from mpool. |
2817 |
tree, file_list = tree_files(file_list) |
2818 |
tree.lock_write() |
|
1185.35.4
by Aaron Bentley
Implemented remerge |
2819 |
try: |
1908.6.8
by Robert Collins
Remove remerges dependence on pending_merges, also makes it simpler. |
2820 |
parents = tree.get_parent_ids() |
2821 |
if len(parents) != 2: |
|
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
2822 |
raise errors.BzrCommandError("Sorry, remerge only works after normal" |
2823 |
" merges. Not cherrypicking or"
|
|
2824 |
" multi-merges.") |
|
1185.67.2
by Aaron Bentley
Renamed Branch.storage to Branch.repository |
2825 |
repository = tree.branch.repository |
2490.2.21
by Aaron Bentley
Rename graph to deprecated_graph |
2826 |
graph = repository.get_graph() |
2827 |
base_revision = graph.find_unique_lca(parents[0], parents[1]) |
|
1185.67.2
by Aaron Bentley
Renamed Branch.storage to Branch.repository |
2828 |
base_tree = repository.revision_tree(base_revision) |
1908.6.8
by Robert Collins
Remove remerges dependence on pending_merges, also makes it simpler. |
2829 |
other_tree = repository.revision_tree(parents[1]) |
1185.35.4
by Aaron Bentley
Implemented remerge |
2830 |
interesting_ids = None |
1551.7.10
by Aaron Bentley
Remerge doesn't clear unrelated conflicts |
2831 |
new_conflicts = [] |
2832 |
conflicts = tree.conflicts() |
|
1185.35.4
by Aaron Bentley
Implemented remerge |
2833 |
if file_list is not None: |
2834 |
interesting_ids = set() |
|
2835 |
for filename in file_list: |
|
1508.1.15
by Robert Collins
Merge from mpool. |
2836 |
file_id = tree.path2id(filename) |
1558.2.1
by Aaron Bentley
Ensure remerge errors when file-id is None |
2837 |
if file_id is None: |
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
2838 |
raise errors.NotVersionedError(filename) |
1185.35.4
by Aaron Bentley
Implemented remerge |
2839 |
interesting_ids.add(file_id) |
1508.1.15
by Robert Collins
Merge from mpool. |
2840 |
if tree.kind(file_id) != "directory": |
1185.35.4
by Aaron Bentley
Implemented remerge |
2841 |
continue
|
1185.35.13
by Aaron Bentley
Merged Martin |
2842 |
|
1508.1.15
by Robert Collins
Merge from mpool. |
2843 |
for name, ie in tree.inventory.iter_entries(file_id): |
1185.35.4
by Aaron Bentley
Implemented remerge |
2844 |
interesting_ids.add(ie.file_id) |
1551.7.10
by Aaron Bentley
Remerge doesn't clear unrelated conflicts |
2845 |
new_conflicts = conflicts.select_conflicts(tree, file_list)[0] |
2080.2.1
by John Arbash Meinel
Make 'bzr remerge' not use deprecated WorkingTree.iter_conflicts |
2846 |
else: |
2080.2.3
by John Arbash Meinel
remerge only supports text or content conflicts |
2847 |
# Remerge only supports resolving contents conflicts
|
2848 |
allowed_conflicts = ('text conflict', 'contents conflict') |
|
2849 |
restore_files = [c.path for c in conflicts |
|
2850 |
if c.typestring in allowed_conflicts] |
|
1996.3.5
by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again. |
2851 |
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids) |
1551.7.10
by Aaron Bentley
Remerge doesn't clear unrelated conflicts |
2852 |
tree.set_conflicts(ConflictList(new_conflicts)) |
2080.2.1
by John Arbash Meinel
Make 'bzr remerge' not use deprecated WorkingTree.iter_conflicts |
2853 |
if file_list is not None: |
1185.35.4
by Aaron Bentley
Implemented remerge |
2854 |
restore_files = file_list |
2855 |
for filename in restore_files: |
|
2856 |
try: |
|
1508.1.15
by Robert Collins
Merge from mpool. |
2857 |
restore(tree.abspath(filename)) |
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
2858 |
except errors.NotConflicted: |
1185.35.4
by Aaron Bentley
Implemented remerge |
2859 |
pass
|
1996.3.5
by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again. |
2860 |
conflicts = _mod_merge.merge_inner( |
2861 |
tree.branch, other_tree, base_tree, |
|
2862 |
this_tree=tree, |
|
2863 |
interesting_ids=interesting_ids, |
|
2864 |
other_rev_id=parents[1], |
|
2865 |
merge_type=merge_type, |
|
2866 |
show_base=show_base, |
|
2867 |
reprocess=reprocess) |
|
1185.35.4
by Aaron Bentley
Implemented remerge |
2868 |
finally: |
1508.1.15
by Robert Collins
Merge from mpool. |
2869 |
tree.unlock() |
1185.35.4
by Aaron Bentley
Implemented remerge |
2870 |
if conflicts > 0: |
2871 |
return 1 |
|
2872 |
else: |
|
2873 |
return 0 |
|
2874 |
||
2023.1.1
by ghigo
add topics help |
2875 |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2876 |
class cmd_revert(Command): |
1551.8.27
by Aaron Bentley
Update docs again |
2877 |
"""Revert files to a previous revision. |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2878 |
|
1551.8.27
by Aaron Bentley
Update docs again |
2879 |
Giving a list of files will revert only those files. Otherwise, all files
|
2880 |
will be reverted. If the revision is not specified with '--revision', the
|
|
2881 |
last committed revision is used.
|
|
1551.8.26
by Aaron Bentley
Update revert help text |
2882 |
|
2883 |
To remove only some changes, without reverting to a prior version, use
|
|
2884 |
merge instead. For example, "merge . --r-2..-3" will remove the changes
|
|
2885 |
introduced by -2, without affecting the changes introduced by -1. Or
|
|
2886 |
to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
|
|
2887 |
|
|
2888 |
By default, any files that have been manually changed will be backed up
|
|
2889 |
first. (Files changed only by merge are not backed up.) Backup files have
|
|
1551.8.27
by Aaron Bentley
Update docs again |
2890 |
'.~#~' appended to their name, where # is a number.
|
2891 |
||
2892 |
When you provide files, you can use their current pathname or the pathname
|
|
2893 |
from the target revision. So you can use revert to "undelete" a file by
|
|
2894 |
name. If you name a directory, all the contents of that directory will be
|
|
2895 |
reverted.
|
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2896 |
"""
|
2425.2.3
by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins) |
2897 |
|
2898 |
_see_also = ['cat', 'export'] |
|
2598.1.6
by Martin Pool
Add help for --no-backup |
2899 |
takes_options = [ |
2900 |
'revision', |
|
2901 |
Option('no-backup', "Do not save backups of reverted files."), |
|
2902 |
]
|
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2903 |
takes_args = ['file*'] |
2904 |
||
2905 |
def run(self, revision=None, no_backup=False, file_list=None): |
|
2906 |
if file_list is not None: |
|
2907 |
if len(file_list) == 0: |
|
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
2908 |
raise errors.BzrCommandError("No files specified") |
1457.1.9
by Robert Collins
Change cmd_revert implementation to call workingtree.Revert. |
2909 |
else: |
2910 |
file_list = [] |
|
1185.50.53
by John Arbash Meinel
[patch] Aaron Bentley: make revert work in a subdirectory. |
2911 |
|
2912 |
tree, file_list = tree_files(file_list) |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2913 |
if revision is None: |
1508.1.4
by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing |
2914 |
# FIXME should be tree.last_revision
|
1558.4.2
by Aaron Bentley
Revert in checkout works properly |
2915 |
rev_id = tree.last_revision() |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2916 |
elif len(revision) != 1: |
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
2917 |
raise errors.BzrCommandError('bzr revert --revision takes exactly 1 argument') |
1185.5.8
by John Arbash Meinel
Fixed bzr revert with the new RevisionSpec code. |
2918 |
else: |
1508.1.4
by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing |
2919 |
rev_id = revision[0].in_history(tree.branch).rev_id |
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
2920 |
pb = ui.ui_factory.nested_progress_bar() |
1551.2.25
by Aaron Bentley
Stop using deprecated methods in merge and revert |
2921 |
try: |
2922 |
tree.revert(file_list, |
|
2923 |
tree.branch.repository.revision_tree(rev_id), |
|
2225.1.1
by Aaron Bentley
Added revert change display, with tests |
2924 |
not no_backup, pb, report_changes=True) |
1551.2.25
by Aaron Bentley
Stop using deprecated methods in merge and revert |
2925 |
finally: |
2926 |
pb.finished() |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2927 |
|
2928 |
||
2929 |
class cmd_assert_fail(Command): |
|
2930 |
"""Test reporting of assertion failures""" |
|
2090.2.1
by Martin Pool
Fix some code which relies on assertions and breaks under python -O |
2931 |
# intended just for use in testing
|
2932 |
||
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2933 |
hidden = True |
2090.2.1
by Martin Pool
Fix some code which relies on assertions and breaks under python -O |
2934 |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2935 |
def run(self): |
2090.2.1
by Martin Pool
Fix some code which relies on assertions and breaks under python -O |
2936 |
raise AssertionError("always fails") |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2937 |
|
2938 |
||
2939 |
class cmd_help(Command): |
|
2940 |
"""Show help on a command or other topic. |
|
2425.2.3
by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins) |
2941 |
"""
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2942 |
|
2425.2.3
by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins) |
2943 |
_see_also = ['topics'] |
2598.1.1
by Martin Pool
Add test for and documentation of option style, fix up existing options to comply |
2944 |
takes_options = [ |
2945 |
Option('long', 'Show help on all commands.'), |
|
2946 |
]
|
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2947 |
takes_args = ['topic?'] |
1616.1.15
by Martin Pool
Handle 'bzr ?', etc. |
2948 |
aliases = ['?', '--help', '-?', '-h'] |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2949 |
|
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
2950 |
@display_command
|
1993.4.6
by John Arbash Meinel
Cleanup the cmd_help class |
2951 |
def run(self, topic=None, long=False): |
2023.1.1
by ghigo
add topics help |
2952 |
import bzrlib.help |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2953 |
if topic is None and long: |
2954 |
topic = "commands" |
|
2023.1.1
by ghigo
add topics help |
2955 |
bzrlib.help.help(topic) |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2956 |
|
2957 |
||
2958 |
class cmd_shell_complete(Command): |
|
2959 |
"""Show appropriate completions for context. |
|
2960 |
||
2023.1.1
by ghigo
add topics help |
2961 |
For a list of all available commands, say 'bzr shell-complete'.
|
2962 |
"""
|
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2963 |
takes_args = ['context?'] |
2964 |
aliases = ['s-c'] |
|
2965 |
hidden = True |
|
2966 |
||
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
2967 |
@display_command
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2968 |
def run(self, context=None): |
2969 |
import shellcomplete |
|
2970 |
shellcomplete.shellcomplete(context) |
|
2971 |
||
2972 |
||
1228
by Martin Pool
- add fetch command as builtin |
2973 |
class cmd_fetch(Command): |
2974 |
"""Copy in history from another branch but don't merge it. |
|
2975 |
||
2023.1.1
by ghigo
add topics help |
2976 |
This is an internal method used for pull and merge.
|
2977 |
"""
|
|
1228
by Martin Pool
- add fetch command as builtin |
2978 |
hidden = True |
2979 |
takes_args = ['from_branch', 'to_branch'] |
|
2980 |
def run(self, from_branch, to_branch): |
|
2981 |
from bzrlib.fetch import Fetcher |
|
1185.16.100
by mbp at sourcefrog
Update fetch command for new Branch constructors. |
2982 |
from_b = Branch.open(from_branch) |
2983 |
to_b = Branch.open(to_branch) |
|
1185.65.27
by Robert Collins
Tweak storage towards mergability. |
2984 |
Fetcher(to_b, from_b) |
1228
by Martin Pool
- add fetch command as builtin |
2985 |
|
2986 |
||
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
2987 |
class cmd_missing(Command): |
1185.54.3
by Aaron Bentley
Factored out find_unmerged |
2988 |
"""Show unmerged/unpulled revisions between two branches. |
2528.1.1
by Martin Pool
Better option names for missing (elliot) |
2989 |
|
2023.1.1
by ghigo
add topics help |
2990 |
OTHER_BRANCH may be local or remote.
|
2991 |
"""
|
|
2425.2.3
by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins) |
2992 |
|
2993 |
_see_also = ['merge', 'pull'] |
|
1185.54.1
by Aaron Bentley
Import Kinnison's plugin |
2994 |
takes_args = ['other_branch?'] |
2598.1.1
by Martin Pool
Add test for and documentation of option style, fix up existing options to comply |
2995 |
takes_options = [ |
2996 |
Option('reverse', 'Reverse the order of revisions.'), |
|
2997 |
Option('mine-only', |
|
2998 |
'Display changes in the local branch only.'), |
|
2999 |
Option('this' , 'Same as --mine-only.'), |
|
3000 |
Option('theirs-only', |
|
3001 |
'Display changes in the remote branch only.'), |
|
3002 |
Option('other', 'Same as --theirs-only.'), |
|
3003 |
'log-format', |
|
3004 |
'show-ids', |
|
3005 |
'verbose'
|
|
3006 |
]
|
|
1816.1.2
by Alexander Belchenko
fix non-ascii messages handling in 'missing' command |
3007 |
encoding_type = 'replace' |
1185.54.1
by Aaron Bentley
Import Kinnison's plugin |
3008 |
|
1816.1.2
by Alexander Belchenko
fix non-ascii messages handling in 'missing' command |
3009 |
@display_command
|
1185.54.1
by Aaron Bentley
Import Kinnison's plugin |
3010 |
def run(self, other_branch=None, reverse=False, mine_only=False, |
1857.1.20
by Aaron Bentley
Strip out all the EnumOption stuff |
3011 |
theirs_only=False, log_format=None, long=False, short=False, line=False, |
2528.1.1
by Martin Pool
Better option names for missing (elliot) |
3012 |
show_ids=False, verbose=False, this=False, other=False): |
2466.8.1
by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. |
3013 |
from bzrlib.missing import find_unmerged, iter_log_revisions |
1185.54.12
by Aaron Bentley
Added log formatter selection and show-ids to missing |
3014 |
from bzrlib.log import log_formatter |
2528.1.1
by Martin Pool
Better option names for missing (elliot) |
3015 |
|
3016 |
if this: |
|
3017 |
mine_only = this |
|
3018 |
if other: |
|
3019 |
theirs_only = other |
|
3020 |
||
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
3021 |
local_branch = Branch.open_containing(u".")[0] |
1185.54.16
by Aaron Bentley
fixed location handling to match old missing |
3022 |
parent = local_branch.get_parent() |
1185.54.1
by Aaron Bentley
Import Kinnison's plugin |
3023 |
if other_branch is None: |
1185.54.16
by Aaron Bentley
fixed location handling to match old missing |
3024 |
other_branch = parent |
3025 |
if other_branch is None: |
|
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
3026 |
raise errors.BzrCommandError("No peer location known or specified.") |
2193.4.1
by Alexander Belchenko
'bzr missing' without specifying location show remembered location unescaped |
3027 |
display_url = urlutils.unescape_for_display(parent, |
3028 |
self.outf.encoding) |
|
3029 |
print "Using last location: " + display_url |
|
3030 |
||
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
3031 |
remote_branch = Branch.open(other_branch) |
1551.2.46
by abentley
Made bzr missing . work on win32 |
3032 |
if remote_branch.base == local_branch.base: |
3033 |
remote_branch = local_branch |
|
1666.1.5
by Robert Collins
Merge bound branch test performance improvements. |
3034 |
local_branch.lock_read() |
1594.3.6
by Robert Collins
Take out appropriate locks for missing. |
3035 |
try: |
1551.2.46
by abentley
Made bzr missing . work on win32 |
3036 |
remote_branch.lock_read() |
1594.3.6
by Robert Collins
Take out appropriate locks for missing. |
3037 |
try: |
3038 |
local_extra, remote_extra = find_unmerged(local_branch, remote_branch) |
|
1963.2.6
by Robey Pointer
pychecker is on crack; go back to using 'is None'. |
3039 |
if (log_format is None): |
2221.4.10
by Aaron Bentley
Implement log options using RegistryOption |
3040 |
log_format = log.log_formatter_registry.get_default( |
3041 |
local_branch) |
|
3042 |
lf = log_format(to_file=self.outf, |
|
3043 |
show_ids=show_ids, |
|
3044 |
show_timezone='original') |
|
1594.3.6
by Robert Collins
Take out appropriate locks for missing. |
3045 |
if reverse is False: |
3046 |
local_extra.reverse() |
|
3047 |
remote_extra.reverse() |
|
3048 |
if local_extra and not theirs_only: |
|
3049 |
print "You have %d extra revision(s):" % len(local_extra) |
|
2466.8.1
by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. |
3050 |
for revision in iter_log_revisions(local_extra, |
3051 |
local_branch.repository, |
|
3052 |
verbose): |
|
3053 |
lf.log_revision(revision) |
|
1594.3.6
by Robert Collins
Take out appropriate locks for missing. |
3054 |
printed_local = True |
3055 |
else: |
|
3056 |
printed_local = False |
|
3057 |
if remote_extra and not mine_only: |
|
3058 |
if printed_local is True: |
|
3059 |
print "\n\n" |
|
3060 |
print "You are missing %d revision(s):" % len(remote_extra) |
|
2466.8.1
by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters. |
3061 |
for revision in iter_log_revisions(remote_extra, |
3062 |
remote_branch.repository, |
|
3063 |
verbose): |
|
3064 |
lf.log_revision(revision) |
|
1594.3.6
by Robert Collins
Take out appropriate locks for missing. |
3065 |
if not remote_extra and not local_extra: |
3066 |
status_code = 0 |
|
3067 |
print "Branches are up to date." |
|
3068 |
else: |
|
3069 |
status_code = 1 |
|
3070 |
finally: |
|
1666.1.5
by Robert Collins
Merge bound branch test performance improvements. |
3071 |
remote_branch.unlock() |
3072 |
finally: |
|
3073 |
local_branch.unlock() |
|
3074 |
if not status_code and parent is None and other_branch is not None: |
|
3075 |
local_branch.lock_write() |
|
3076 |
try: |
|
3077 |
# handle race conditions - a parent might be set while we run.
|
|
3078 |
if local_branch.get_parent() is None: |
|
1685.1.19
by John Arbash Meinel
pull/merge/branch/missing should all save the absolute path to the other branch, not the relative one |
3079 |
local_branch.set_parent(remote_branch.base) |
1594.3.6
by Robert Collins
Take out appropriate locks for missing. |
3080 |
finally: |
3081 |
local_branch.unlock() |
|
1666.1.5
by Robert Collins
Merge bound branch test performance improvements. |
3082 |
return status_code |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
3083 |
|
3084 |
||
2604.2.1
by Robert Collins
(robertc) Introduce a pack command. |
3085 |
class cmd_pack(Command): |
3086 |
"""Compress the data within a repository.""" |
|
3087 |
||
3088 |
_see_also = ['repositories'] |
|
3089 |
takes_args = ['branch_or_repo?'] |
|
3090 |
||
3091 |
def run(self, branch_or_repo='.'): |
|
3092 |
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0] |
|
3093 |
try: |
|
3094 |
branch = dir.open_branch() |
|
3095 |
repository = branch.repository |
|
3096 |
except errors.NotBranchError: |
|
3097 |
repository = dir.open_repository() |
|
3098 |
repository.pack() |
|
3099 |
||
3100 |
||
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
3101 |
class cmd_plugins(Command): |
2617.3.1
by Ian Clatworthy
Make the plugins command public with better help |
3102 |
"""List the installed plugins. |
3103 |
|
|
3104 |
This command displays the list of installed plugins including the
|
|
3105 |
path where each one is located and a short description of each.
|
|
3106 |
||
3107 |
A plugin is an external component for Bazaar that extends the
|
|
3108 |
revision control system, by adding or replacing code in Bazaar.
|
|
3109 |
Plugins can do a variety of things, including overriding commands,
|
|
3110 |
adding new commands, providing additional network transports and
|
|
3111 |
customizing log output.
|
|
3112 |
||
3113 |
See the Bazaar web site, http://bazaar-vcs.org, for further
|
|
3114 |
information on plugins including where to find them and how to
|
|
3115 |
install them. Instructions are also provided there on how to
|
|
3116 |
write new plugins using the Python programming language.
|
|
3117 |
"""
|
|
2629.1.1
by Ian Clatworthy
(Ian Clatworthy) Tweak the 'make plugins public' change following feedback from lifeless |
3118 |
|
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
3119 |
@display_command
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
3120 |
def run(self): |
3121 |
import bzrlib.plugin |
|
3122 |
from inspect import getdoc |
|
1516
by Robert Collins
* bzrlib.plugin.all_plugins has been changed from an attribute to a |
3123 |
for name, plugin in bzrlib.plugin.all_plugins().items(): |
1963.2.6
by Robey Pointer
pychecker is on crack; go back to using 'is None'. |
3124 |
if getattr(plugin, '__path__', None) is not None: |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
3125 |
print plugin.__path__[0] |
1963.2.6
by Robey Pointer
pychecker is on crack; go back to using 'is None'. |
3126 |
elif getattr(plugin, '__file__', None) is not None: |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
3127 |
print plugin.__file__ |
3128 |
else: |
|
1963.2.4
by Robey Pointer
remove usage of hasattr |
3129 |
print repr(plugin) |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
3130 |
|
3131 |
d = getdoc(plugin) |
|
3132 |
if d: |
|
3133 |
print '\t', d.split('\n')[0] |
|
3134 |
||
3135 |
||
1185.16.24
by Martin Pool
- add and test 'testament' builtin command |
3136 |
class cmd_testament(Command): |
3137 |
"""Show testament (signing-form) of a revision.""" |
|
2598.1.1
by Martin Pool
Add test for and documentation of option style, fix up existing options to comply |
3138 |
takes_options = [ |
3139 |
'revision', |
|
3140 |
Option('long', help='Produce long-format testament.'), |
|
3141 |
Option('strict', |
|
3142 |
help='Produce a strict-format testament.')] |
|
1185.16.24
by Martin Pool
- add and test 'testament' builtin command |
3143 |
takes_args = ['branch?'] |
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
3144 |
@display_command
|
1551.7.1
by Aaron Bentley
Implement --strict at commandline, fix up strict format |
3145 |
def run(self, branch=u'.', revision=None, long=False, strict=False): |
3146 |
from bzrlib.testament import Testament, StrictTestament |
|
3147 |
if strict is True: |
|
3148 |
testament_class = StrictTestament |
|
3149 |
else: |
|
3150 |
testament_class = Testament |
|
1508.1.4
by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing |
3151 |
b = WorkingTree.open_containing(branch)[0].branch |
1185.16.24
by Martin Pool
- add and test 'testament' builtin command |
3152 |
b.lock_read() |
3153 |
try: |
|
3154 |
if revision is None: |
|
3155 |
rev_id = b.last_revision() |
|
3156 |
else: |
|
3157 |
rev_id = revision[0].in_history(b).rev_id |
|
1551.7.1
by Aaron Bentley
Implement --strict at commandline, fix up strict format |
3158 |
t = testament_class.from_revision(b.repository, rev_id) |
1185.16.24
by Martin Pool
- add and test 'testament' builtin command |
3159 |
if long: |
3160 |
sys.stdout.writelines(t.as_text_lines()) |
|
3161 |
else: |
|
3162 |
sys.stdout.write(t.as_short_text()) |
|
3163 |
finally: |
|
3164 |
b.unlock() |
|
1185.16.32
by Martin Pool
- add a basic annotate built-in command |
3165 |
|
3166 |
||
3167 |
class cmd_annotate(Command): |
|
3168 |
"""Show the origin of each line in a file. |
|
3169 |
||
1185.16.53
by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests |
3170 |
This prints out the given file with an annotation on the left side
|
3171 |
indicating which revision, author and date introduced the change.
|
|
3172 |
||
3173 |
If the origin is the same for a run of consecutive lines, it is
|
|
3174 |
shown only at the top, unless the --all option is given.
|
|
1185.16.32
by Martin Pool
- add a basic annotate built-in command |
3175 |
"""
|
3176 |
# TODO: annotate directories; showing when each file was last changed
|
|
1185.16.53
by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests |
3177 |
# TODO: if the working copy is modified, show annotations on that
|
3178 |
# with new uncommitted lines marked
|
|
1733.2.8
by Michael Ellerman
Add CVS compatible aliases for checkout and annotate, from fullermd. |
3179 |
aliases = ['ann', 'blame', 'praise'] |
1185.16.32
by Martin Pool
- add a basic annotate built-in command |
3180 |
takes_args = ['filename'] |
2598.1.1
by Martin Pool
Add test for and documentation of option style, fix up existing options to comply |
3181 |
takes_options = [Option('all', help='Show annotations on all lines.'), |
3182 |
Option('long', help='Show commit date in annotations.'), |
|
2182.3.1
by John Arbash Meinel
Annotate now shows dotted revnos instead of plain revnos. |
3183 |
'revision', |
3184 |
'show-ids', |
|
1185.16.53
by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests |
3185 |
]
|
2593.1.1
by Adeodato Simó
Improve annotate to prevent unicode exceptions in certain situations. |
3186 |
encoding_type = 'exact' |
1185.16.32
by Martin Pool
- add a basic annotate built-in command |
3187 |
|
1185.12.56
by Aaron Bentley
Prevented display commands from printing broken pipe errors |
3188 |
@display_command
|
2182.3.1
by John Arbash Meinel
Annotate now shows dotted revnos instead of plain revnos. |
3189 |
def run(self, filename, all=False, long=False, revision=None, |
3190 |
show_ids=False): |
|
1185.16.32
by Martin Pool
- add a basic annotate built-in command |
3191 |
from bzrlib.annotate import annotate_file |
1508.1.4
by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing |
3192 |
tree, relpath = WorkingTree.open_containing(filename) |
3193 |
branch = tree.branch |
|
3194 |
branch.lock_read() |
|
1185.16.32
by Martin Pool
- add a basic annotate built-in command |
3195 |
try: |
1694.2.6
by Martin Pool
[merge] bzr.dev |
3196 |
if revision is None: |
1558.14.5
by Aaron Bentley
Changed rev_id to revision_id in cmd_annotate |
3197 |
revision_id = branch.last_revision() |
1694.2.6
by Martin Pool
[merge] bzr.dev |
3198 |
elif len(revision) != 1: |
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
3199 |
raise errors.BzrCommandError('bzr annotate --revision takes exactly 1 argument') |
1694.2.6
by Martin Pool
[merge] bzr.dev |
3200 |
else: |
1558.14.5
by Aaron Bentley
Changed rev_id to revision_id in cmd_annotate |
3201 |
revision_id = revision[0].in_history(branch).rev_id |
2255.7.39
by Robert Collins
Remove gratuitous references to inventory.path2id from builtins.py, allowing more commands to work on dirstate trees. |
3202 |
file_id = tree.path2id(relpath) |
2561.2.1
by James Westby
Display a useful error message when annotating a non-existant file (#122656) |
3203 |
if file_id is None: |
2561.2.2
by James Westby
Fix up with comments from Aaron. |
3204 |
raise errors.NotVersionedError(filename) |
1558.14.5
by Aaron Bentley
Changed rev_id to revision_id in cmd_annotate |
3205 |
tree = branch.repository.revision_tree(revision_id) |
1185.16.32
by Martin Pool
- add a basic annotate built-in command |
3206 |
file_version = tree.inventory[file_id].revision |
2593.1.1
by Adeodato Simó
Improve annotate to prevent unicode exceptions in certain situations. |
3207 |
annotate_file(branch, file_version, file_id, long, all, self.outf, |
2182.3.1
by John Arbash Meinel
Annotate now shows dotted revnos instead of plain revnos. |
3208 |
show_ids=show_ids) |
1185.16.32
by Martin Pool
- add a basic annotate built-in command |
3209 |
finally: |
1508.1.4
by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing |
3210 |
branch.unlock() |
1185.16.33
by Martin Pool
- move 'conflict' and 'resolved' from shipped plugin to regular builtins |
3211 |
|
1442.1.59
by Robert Collins
Add re-sign command to generate a digital signature on a single revision. |
3212 |
|
3213 |
class cmd_re_sign(Command): |
|
3214 |
"""Create a digital signature for an existing revision.""" |
|
3215 |
# TODO be able to replace existing ones.
|
|
3216 |
||
3217 |
hidden = True # is this right ? |
|
1185.78.1
by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests |
3218 |
takes_args = ['revision_id*'] |
1442.1.59
by Robert Collins
Add re-sign command to generate a digital signature on a single revision. |
3219 |
takes_options = ['revision'] |
3220 |
||
1185.78.1
by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests |
3221 |
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. |
3222 |
import bzrlib.gpg as gpg |
1185.78.1
by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests |
3223 |
if revision_id_list is not None and revision is not None: |
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
3224 |
raise errors.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 |
3225 |
if revision_id_list is None and revision is None: |
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
3226 |
raise errors.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) |
3227 |
b = WorkingTree.open_containing(u'.')[0].branch |
1770.2.9
by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers |
3228 |
gpg_strategy = gpg.GPGStrategy(b.get_config()) |
1185.78.1
by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests |
3229 |
if revision_id_list is not None: |
3230 |
for revision_id in revision_id_list: |
|
3231 |
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. |
3232 |
elif revision is not None: |
1483
by Robert Collins
BUGFIX: re-sign should accept ranges |
3233 |
if len(revision) == 1: |
3234 |
revno, rev_id = revision[0].in_history(b) |
|
1185.67.2
by Aaron Bentley
Renamed Branch.storage to Branch.repository |
3235 |
b.repository.sign_revision(rev_id, gpg_strategy) |
1483
by Robert Collins
BUGFIX: re-sign should accept ranges |
3236 |
elif len(revision) == 2: |
3237 |
# are they both on rh- if so we can walk between them
|
|
3238 |
# might be nice to have a range helper for arbitrary
|
|
3239 |
# revision paths. hmm.
|
|
3240 |
from_revno, from_revid = revision[0].in_history(b) |
|
3241 |
to_revno, to_revid = revision[1].in_history(b) |
|
3242 |
if to_revid is None: |
|
3243 |
to_revno = b.revno() |
|
3244 |
if from_revno is None or to_revno is None: |
|
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
3245 |
raise errors.BzrCommandError('Cannot sign a range of non-revision-history revisions') |
1483
by Robert Collins
BUGFIX: re-sign should accept ranges |
3246 |
for revno in range(from_revno, to_revno + 1): |
1185.67.2
by Aaron Bentley
Renamed Branch.storage to Branch.repository |
3247 |
b.repository.sign_revision(b.get_rev_id(revno), |
3248 |
gpg_strategy) |
|
1483
by Robert Collins
BUGFIX: re-sign should accept ranges |
3249 |
else: |
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
3250 |
raise errors.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. |
3251 |
|
1505.1.22
by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge |
3252 |
|
1505.1.2
by John Arbash Meinel
(broken) working on implementing bound branches. |
3253 |
class cmd_bind(Command): |
2270.1.2
by John Arbash Meinel
Tweak the help text for bind/unbind according to Robert's suggestions. |
3254 |
"""Convert the current branch into a checkout of the supplied branch. |
1505.1.2
by John Arbash Meinel
(broken) working on implementing bound branches. |
3255 |
|
2270.1.2
by John Arbash Meinel
Tweak the help text for bind/unbind according to Robert's suggestions. |
3256 |
Once converted into a checkout, commits must succeed on the master branch
|
3257 |
before they will be applied to the local branch.
|
|
1505.1.2
by John Arbash Meinel
(broken) working on implementing bound branches. |
3258 |
"""
|
3259 |
||
2425.2.3
by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins) |
3260 |
_see_also = ['checkouts', 'unbind'] |
2230.3.31
by Aaron Bentley
Implement re-binding previously-bound branches |
3261 |
takes_args = ['location?'] |
1505.1.2
by John Arbash Meinel
(broken) working on implementing bound branches. |
3262 |
takes_options = [] |
3263 |
||
3264 |
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 |
3265 |
b, relpath = Branch.open_containing(u'.') |
2230.3.31
by Aaron Bentley
Implement re-binding previously-bound branches |
3266 |
if location is None: |
3267 |
try: |
|
3268 |
location = b.get_old_bound_location() |
|
3269 |
except errors.UpgradeRequired: |
|
3270 |
raise errors.BzrCommandError('No location supplied. ' |
|
3271 |
'This format does not remember old locations.') |
|
3272 |
else: |
|
3273 |
if location is None: |
|
2230.3.45
by Aaron Bentley
Change error message (mpool) |
3274 |
raise errors.BzrCommandError('No location supplied and no ' |
3275 |
'previous location known') |
|
1505.1.2
by John Arbash Meinel
(broken) working on implementing bound branches. |
3276 |
b_other = Branch.open(location) |
1505.1.3
by John Arbash Meinel
(broken) Adding more tests, and some functionality |
3277 |
try: |
3278 |
b.bind(b_other) |
|
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
3279 |
except errors.DivergedBranches: |
3280 |
raise errors.BzrCommandError('These branches have diverged.' |
|
3281 |
' Try merging, and then bind again.') |
|
1505.1.2
by John Arbash Meinel
(broken) working on implementing bound branches. |
3282 |
|
1505.1.22
by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge |
3283 |
|
1505.1.2
by John Arbash Meinel
(broken) working on implementing bound branches. |
3284 |
class cmd_unbind(Command): |
2270.1.2
by John Arbash Meinel
Tweak the help text for bind/unbind according to Robert's suggestions. |
3285 |
"""Convert the current checkout into a regular branch. |
1505.1.2
by John Arbash Meinel
(broken) working on implementing bound branches. |
3286 |
|
2270.1.2
by John Arbash Meinel
Tweak the help text for bind/unbind according to Robert's suggestions. |
3287 |
After unbinding, the local branch is considered independent and subsequent
|
3288 |
commits will be local only.
|
|
1505.1.2
by John Arbash Meinel
(broken) working on implementing bound branches. |
3289 |
"""
|
3290 |
||
2425.2.3
by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins) |
3291 |
_see_also = ['checkouts', 'bind'] |
1505.1.2
by John Arbash Meinel
(broken) working on implementing bound branches. |
3292 |
takes_args = [] |
3293 |
takes_options = [] |
|
3294 |
||
3295 |
def run(self): |
|
1505.1.22
by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge |
3296 |
b, relpath = Branch.open_containing(u'.') |
3297 |
if not b.unbind(): |
|
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
3298 |
raise errors.BzrCommandError('Local branch is not bound') |
1505.1.22
by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge |
3299 |
|
1442.1.59
by Robert Collins
Add re-sign command to generate a digital signature on a single revision. |
3300 |
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
3301 |
class cmd_uncommit(Command): |
1185.31.24
by John Arbash Meinel
[merge] Added the uncommit plugin |
3302 |
"""Remove the last committed revision. |
3303 |
||
3304 |
--verbose will print out what is being removed.
|
|
3305 |
--dry-run will go through all the motions, but not actually
|
|
3306 |
remove anything.
|
|
3307 |
|
|
1185.82.130
by Aaron Bentley
Rename changesets to revision bundles |
3308 |
In the future, uncommit will create a revision bundle, which can then
|
1185.31.24
by John Arbash Meinel
[merge] Added the uncommit plugin |
3309 |
be re-applied.
|
1553.5.34
by Martin Pool
Stub lock-breaking command |
3310 |
"""
|
1185.62.11
by John Arbash Meinel
Added TODO for bzr uncommit to remove unreferenced information. |
3311 |
|
1553.5.34
by Martin Pool
Stub lock-breaking command |
3312 |
# TODO: jam 20060108 Add an option to allow uncommit to remove
|
1759.2.1
by Jelmer Vernooij
Fix some types (found using aspell). |
3313 |
# unreferenced information in 'branch-as-repository' branches.
|
1553.5.34
by Martin Pool
Stub lock-breaking command |
3314 |
# TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
|
3315 |
# information in shared branches as well.
|
|
2425.2.3
by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins) |
3316 |
_see_also = ['commit'] |
1185.62.10
by John Arbash Meinel
Removed --all from bzr uncommit, it was broken anyway. |
3317 |
takes_options = ['verbose', 'revision', |
2598.1.1
by Martin Pool
Add test for and documentation of option style, fix up existing options to comply |
3318 |
Option('dry-run', help='Don\'t actually make changes.'), |
1185.31.24
by John Arbash Meinel
[merge] Added the uncommit plugin |
3319 |
Option('force', help='Say yes to all questions.')] |
3320 |
takes_args = ['location?'] |
|
3321 |
aliases = [] |
|
3322 |
||
1850.3.2
by John Arbash Meinel
Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10 |
3323 |
def run(self, location=None, |
1185.31.24
by John Arbash Meinel
[merge] Added the uncommit plugin |
3324 |
dry_run=False, verbose=False, |
3325 |
revision=None, force=False): |
|
1850.3.2
by John Arbash Meinel
Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10 |
3326 |
from bzrlib.log import log_formatter, show_log |
1185.31.24
by John Arbash Meinel
[merge] Added the uncommit plugin |
3327 |
import sys |
3328 |
from bzrlib.uncommit import uncommit |
|
3329 |
||
3330 |
if location is None: |
|
1185.33.66
by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko) |
3331 |
location = u'.' |
1558.1.12
by Aaron Bentley
Got uncommit working properly with checkouts |
3332 |
control, relpath = bzrdir.BzrDir.open_containing(location) |
3333 |
try: |
|
3334 |
tree = control.open_workingtree() |
|
1558.9.1
by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking |
3335 |
b = tree.branch |
1558.1.12
by Aaron Bentley
Got uncommit working properly with checkouts |
3336 |
except (errors.NoWorkingTree, errors.NotLocalUrl): |
3337 |
tree = None |
|
1558.9.1
by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking |
3338 |
b = control.open_branch() |
1185.31.24
by John Arbash Meinel
[merge] Added the uncommit plugin |
3339 |
|
1850.3.2
by John Arbash Meinel
Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10 |
3340 |
rev_id = None |
1185.31.24
by John Arbash Meinel
[merge] Added the uncommit plugin |
3341 |
if revision is None: |
3342 |
revno = b.revno() |
|
3343 |
else: |
|
1850.3.2
by John Arbash Meinel
Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10 |
3344 |
# 'bzr uncommit -r 10' actually means uncommit
|
3345 |
# so that the final tree is at revno 10.
|
|
3346 |
# but bzrlib.uncommit.uncommit() actually uncommits
|
|
3347 |
# the revisions that are supplied.
|
|
3348 |
# So we need to offset it by one
|
|
3349 |
revno = revision[0].in_history(b).revno+1 |
|
3350 |
||
3351 |
if revno <= b.revno(): |
|
3352 |
rev_id = b.get_rev_id(revno) |
|
1185.31.24
by John Arbash Meinel
[merge] Added the uncommit plugin |
3353 |
if rev_id is None: |
1850.3.2
by John Arbash Meinel
Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10 |
3354 |
self.outf.write('No revisions to uncommit.\n') |
3355 |
return 1 |
|
3356 |
||
3357 |
lf = log_formatter('short', |
|
3358 |
to_file=self.outf, |
|
3359 |
show_timezone='original') |
|
3360 |
||
3361 |
show_log(b, |
|
3362 |
lf, |
|
3363 |
verbose=False, |
|
3364 |
direction='forward', |
|
3365 |
start_revision=revno, |
|
3366 |
end_revision=b.revno()) |
|
1185.31.24
by John Arbash Meinel
[merge] Added the uncommit plugin |
3367 |
|
3368 |
if dry_run: |
|
3369 |
print 'Dry-run, pretending to remove the above revisions.' |
|
3370 |
if not force: |
|
3371 |
val = raw_input('Press <enter> to continue') |
|
3372 |
else: |
|
3373 |
print 'The above revision(s) will be removed.' |
|
3374 |
if not force: |
|
3375 |
val = raw_input('Are you sure [y/N]? ') |
|
3376 |
if val.lower() not in ('y', 'yes'): |
|
3377 |
print 'Canceled' |
|
3378 |
return 0 |
|
3379 |
||
1558.1.12
by Aaron Bentley
Got uncommit working properly with checkouts |
3380 |
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose, |
1185.31.24
by John Arbash Meinel
[merge] Added the uncommit plugin |
3381 |
revno=revno) |
3382 |
||
3383 |
||
1553.5.34
by Martin Pool
Stub lock-breaking command |
3384 |
class cmd_break_lock(Command): |
3385 |
"""Break a dead lock on a repository, branch or working directory. |
|
3386 |
||
1553.5.35
by Martin Pool
Start break-lock --show |
3387 |
CAUTION: Locks should only be broken when you are sure that the process
|
1553.5.34
by Martin Pool
Stub lock-breaking command |
3388 |
holding the lock has been stopped.
|
1687.1.12
by Robert Collins
Hook in the full break-lock ui. |
3389 |
|
3390 |
You can get information on what locks are open via the 'bzr info' command.
|
|
1553.5.35
by Martin Pool
Start break-lock --show |
3391 |
|
3392 |
example:
|
|
1687.1.12
by Robert Collins
Hook in the full break-lock ui. |
3393 |
bzr break-lock
|
1553.5.34
by Martin Pool
Stub lock-breaking command |
3394 |
"""
|
1687.1.12
by Robert Collins
Hook in the full break-lock ui. |
3395 |
takes_args = ['location?'] |
3396 |
||
3397 |
def run(self, location=None, show=False): |
|
3398 |
if location is None: |
|
3399 |
location = u'.' |
|
3400 |
control, relpath = bzrdir.BzrDir.open_containing(location) |
|
1687.1.17
by Robert Collins
Test break lock on old format branches. |
3401 |
try: |
3402 |
control.break_lock() |
|
3403 |
except NotImplementedError: |
|
3404 |
pass
|
|
1687.1.12
by Robert Collins
Hook in the full break-lock ui. |
3405 |
|
1553.5.35
by Martin Pool
Start break-lock --show |
3406 |
|
1910.17.2
by Andrew Bennetts
Add start_bzr_subprocess and stop_bzr_subprocess to allow test code to continue |
3407 |
class cmd_wait_until_signalled(Command): |
3408 |
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal. |
|
3409 |
||
3410 |
This just prints a line to signal when it is ready, then blocks on stdin.
|
|
3411 |
"""
|
|
3412 |
||
3413 |
hidden = True |
|
3414 |
||
3415 |
def run(self): |
|
1910.17.6
by Andrew Bennetts
Use sys.stdout consistently, rather than mixed with print. |
3416 |
sys.stdout.write("running\n") |
1910.17.2
by Andrew Bennetts
Add start_bzr_subprocess and stop_bzr_subprocess to allow test code to continue |
3417 |
sys.stdout.flush() |
3418 |
sys.stdin.readline() |
|
3419 |
||
1553.5.35
by Martin Pool
Start break-lock --show |
3420 |
|
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
3421 |
class cmd_serve(Command): |
2020.1.1
by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`. |
3422 |
"""Run the bzr server.""" |
3423 |
||
3424 |
aliases = ['server'] |
|
3425 |
||
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
3426 |
takes_options = [ |
3427 |
Option('inet', |
|
2598.1.1
by Martin Pool
Add test for and documentation of option style, fix up existing options to comply |
3428 |
help='Serve on stdin/out for use from inetd or sshd.'), |
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
3429 |
Option('port', |
2598.1.1
by Martin Pool
Add test for and documentation of option style, fix up existing options to comply |
3430 |
help='Listen for connections on nominated port of the form ' |
3431 |
'[hostname:]portnumber. Passing 0 as the port number will '
|
|
3432 |
'result in a dynamically allocated port. The default port is '
|
|
2298.4.1
by Andrew Bennetts
Give bzr:// a default port of 4155. |
3433 |
'4155.', |
1910.19.7
by Andrew Bennetts
Allow specifying the host/interface to bzr serve, and use the new test |
3434 |
type=str), |
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
3435 |
Option('directory', |
2598.1.1
by Martin Pool
Add test for and documentation of option style, fix up existing options to comply |
3436 |
help='Serve contents of this directory.', |
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
3437 |
type=unicode), |
2020.1.1
by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`. |
3438 |
Option('allow-writes', |
2598.1.1
by Martin Pool
Add test for and documentation of option style, fix up existing options to comply |
3439 |
help='By default the server is a readonly server. Supplying ' |
2020.1.1
by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`. |
3440 |
'--allow-writes enables write access to the contents of '
|
2598.1.1
by Martin Pool
Add test for and documentation of option style, fix up existing options to comply |
3441 |
'the served directory and below.'
|
2020.1.1
by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`. |
3442 |
),
|
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
3443 |
]
|
3444 |
||
2020.1.1
by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`. |
3445 |
def run(self, port=None, inet=False, directory=None, allow_writes=False): |
2018.5.22
by Andrew Bennetts
Fix cmd_serve after move of bzrlib.transport.smart |
3446 |
from bzrlib.smart import medium, server |
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
3447 |
from bzrlib.transport import get_transport |
2018.5.121
by Andrew Bennetts
Fix cmd_serve. |
3448 |
from bzrlib.transport.chroot import ChrootServer |
2443.1.2
by Robert Collins
``bzr serve`` now listens on interface 0.0.0.0 by default, making it serve |
3449 |
from bzrlib.transport.remote import BZR_DEFAULT_PORT, BZR_DEFAULT_INTERFACE |
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
3450 |
if directory is None: |
3451 |
directory = os.getcwd() |
|
2044.2.1
by Lukáš Lalinský
Use urlutils.local_path_to_url to get an URL from the directory path. |
3452 |
url = urlutils.local_path_to_url(directory) |
2020.1.1
by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`. |
3453 |
if not allow_writes: |
3454 |
url = 'readonly+' + url |
|
2018.5.121
by Andrew Bennetts
Fix cmd_serve. |
3455 |
chroot_server = ChrootServer(get_transport(url)) |
3456 |
chroot_server.setUp() |
|
3457 |
t = get_transport(chroot_server.get_url()) |
|
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
3458 |
if inet: |
2018.5.121
by Andrew Bennetts
Fix cmd_serve. |
3459 |
smart_server = medium.SmartServerPipeStreamMedium( |
2018.5.14
by Andrew Bennetts
Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py. |
3460 |
sys.stdin, sys.stdout, t) |
2298.4.1
by Andrew Bennetts
Give bzr:// a default port of 4155. |
3461 |
else: |
2443.1.2
by Robert Collins
``bzr serve`` now listens on interface 0.0.0.0 by default, making it serve |
3462 |
host = BZR_DEFAULT_INTERFACE |
2298.4.1
by Andrew Bennetts
Give bzr:// a default port of 4155. |
3463 |
if port is None: |
2018.5.121
by Andrew Bennetts
Fix cmd_serve. |
3464 |
port = BZR_DEFAULT_PORT |
2298.4.1
by Andrew Bennetts
Give bzr:// a default port of 4155. |
3465 |
else: |
3466 |
if ':' in port: |
|
3467 |
host, port = port.split(':') |
|
3468 |
port = int(port) |
|
2018.5.121
by Andrew Bennetts
Fix cmd_serve. |
3469 |
smart_server = server.SmartTCPServer(t, host=host, port=port) |
2018.5.15
by Andrew Bennetts
Tidy some imports, and bugs introduced when adding server.py |
3470 |
print 'listening on port: ', smart_server.port |
1910.19.7
by Andrew Bennetts
Allow specifying the host/interface to bzr serve, and use the new test |
3471 |
sys.stdout.flush() |
2018.5.69
by Robert Collins
Prevent the smart server sending cruft over stderr to the client. |
3472 |
# for the duration of this server, no UI output is permitted.
|
3473 |
# note that this may cause problems with blackbox tests. This should
|
|
3474 |
# be changed with care though, as we dont want to use bandwidth sending
|
|
3475 |
# progress over stderr to smart server clients!
|
|
3476 |
old_factory = ui.ui_factory |
|
3477 |
try: |
|
3478 |
ui.ui_factory = ui.SilentUIFactory() |
|
3479 |
smart_server.serve() |
|
3480 |
finally: |
|
3481 |
ui.ui_factory = old_factory |
|
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
3482 |
|
2425.2.3
by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins) |
3483 |
|
1731.2.7
by Aaron Bentley
Add join command |
3484 |
class cmd_join(Command): |
3485 |
"""Combine a subtree into its containing tree. |
|
3486 |
|
|
2338.3.1
by Aaron Bentley
Hide nested-tree commands and improve their docs |
3487 |
This command is for experimental use only. It requires the target tree
|
3488 |
to be in dirstate-with-subtree format, which cannot be converted into
|
|
3489 |
earlier formats.
|
|
3490 |
||
3491 |
The TREE argument should be an independent tree, inside another tree, but
|
|
3492 |
not part of it. (Such trees can be produced by "bzr split", but also by
|
|
3493 |
running "bzr branch" with the target inside a tree.)
|
|
3494 |
||
3495 |
The result is a combined tree, with the subtree no longer an independant
|
|
3496 |
part. This is marked as a merge of the subtree into the containing tree,
|
|
3497 |
and all history is preserved.
|
|
3498 |
||
3499 |
If --reference is specified, the subtree retains its independence. It can
|
|
3500 |
be branched by itself, and can be part of multiple projects at the same
|
|
3501 |
time. But operations performed in the containing tree, such as commit
|
|
3502 |
and merge, will recurse into the subtree.
|
|
1731.2.7
by Aaron Bentley
Add join command |
3503 |
"""
|
3504 |
||
2425.2.3
by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins) |
3505 |
_see_also = ['split'] |
1731.2.7
by Aaron Bentley
Add join command |
3506 |
takes_args = ['tree'] |
2598.1.1
by Martin Pool
Add test for and documentation of option style, fix up existing options to comply |
3507 |
takes_options = [ |
3508 |
Option('reference', help='Join by reference.'), |
|
3509 |
]
|
|
2338.3.1
by Aaron Bentley
Hide nested-tree commands and improve their docs |
3510 |
hidden = True |
1731.2.7
by Aaron Bentley
Add join command |
3511 |
|
2100.3.11
by Aaron Bentley
Add join --reference support |
3512 |
def run(self, tree, reference=False): |
1731.2.7
by Aaron Bentley
Add join command |
3513 |
sub_tree = WorkingTree.open(tree) |
3514 |
parent_dir = osutils.dirname(sub_tree.basedir) |
|
3515 |
containing_tree = WorkingTree.open_containing(parent_dir)[0] |
|
2255.2.235
by Martin Pool
Add blackbox test that join gives clean error when the repository doesn't support rich roots |
3516 |
repo = containing_tree.branch.repository |
3517 |
if not repo.supports_rich_root(): |
|
3518 |
raise errors.BzrCommandError( |
|
3519 |
"Can't join trees because %s doesn't support rich root data.\n" |
|
3520 |
"You can use bzr upgrade on the repository."
|
|
3521 |
% (repo,)) |
|
2100.3.11
by Aaron Bentley
Add join --reference support |
3522 |
if reference: |
2255.2.219
by Martin Pool
fix unbound local error in cmd_join |
3523 |
try: |
2100.3.11
by Aaron Bentley
Add join --reference support |
3524 |
containing_tree.add_reference(sub_tree) |
2255.2.219
by Martin Pool
fix unbound local error in cmd_join |
3525 |
except errors.BadReferenceTarget, e: |
2255.2.235
by Martin Pool
Add blackbox test that join gives clean error when the repository doesn't support rich roots |
3526 |
# XXX: Would be better to just raise a nicely printable
|
3527 |
# exception from the real origin. Also below. mbp 20070306
|
|
2255.2.219
by Martin Pool
fix unbound local error in cmd_join |
3528 |
raise errors.BzrCommandError("Cannot join %s. %s" % |
2100.3.11
by Aaron Bentley
Add join --reference support |
3529 |
(tree, e.reason)) |
3530 |
else: |
|
3531 |
try: |
|
3532 |
containing_tree.subsume(sub_tree) |
|
3533 |
except errors.BadSubsumeSource, e: |
|
3534 |
raise errors.BzrCommandError("Cannot join %s. %s" % |
|
3535 |
(tree, e.reason)) |
|
1553.5.35
by Martin Pool
Start break-lock --show |
3536 |
|
1731.2.22
by Aaron Bentley
Initial work on split command |
3537 |
|
3538 |
class cmd_split(Command): |
|
3539 |
"""Split a tree into two trees. |
|
2338.3.1
by Aaron Bentley
Hide nested-tree commands and improve their docs |
3540 |
|
3541 |
This command is for experimental use only. It requires the target tree
|
|
3542 |
to be in dirstate-with-subtree format, which cannot be converted into
|
|
3543 |
earlier formats.
|
|
3544 |
||
3545 |
The TREE argument should be a subdirectory of a working tree. That
|
|
3546 |
subdirectory will be converted into an independent tree, with its own
|
|
3547 |
branch. Commits in the top-level tree will not apply to the new subtree.
|
|
3548 |
If you want that behavior, do "bzr join --reference TREE".
|
|
1731.2.22
by Aaron Bentley
Initial work on split command |
3549 |
"""
|
3550 |
||
2425.2.3
by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins) |
3551 |
_see_also = ['join'] |
1731.2.22
by Aaron Bentley
Initial work on split command |
3552 |
takes_args = ['tree'] |
3553 |
||
2338.3.1
by Aaron Bentley
Hide nested-tree commands and improve their docs |
3554 |
hidden = True |
3555 |
||
1731.2.22
by Aaron Bentley
Initial work on split command |
3556 |
def run(self, tree): |
3557 |
containing_tree, subdir = WorkingTree.open_containing(tree) |
|
3558 |
sub_id = containing_tree.path2id(subdir) |
|
3559 |
if sub_id is None: |
|
3560 |
raise errors.NotVersionedError(subdir) |
|
1731.2.23
by Aaron Bentley
Throw user-friendly error splitting in shared repo with wrong format |
3561 |
try: |
3562 |
containing_tree.extract(sub_id) |
|
3563 |
except errors.RootNotRich: |
|
3564 |
raise errors.UpgradeRequired(containing_tree.branch.base) |
|
1731.2.22
by Aaron Bentley
Initial work on split command |
3565 |
|
3566 |
||
3567 |
||
1551.12.8
by Aaron Bentley
Add merge-directive command |
3568 |
class cmd_merge_directive(Command): |
1551.12.32
by Aaron Bentley
Improve merge directive help |
3569 |
"""Generate a merge directive for auto-merge tools. |
3570 |
||
3571 |
A directive requests a merge to be performed, and also provides all the
|
|
3572 |
information necessary to do so. This means it must either include a
|
|
3573 |
revision bundle, or the location of a branch containing the desired
|
|
3574 |
revision.
|
|
3575 |
||
3576 |
A submit branch (the location to merge into) must be supplied the first
|
|
3577 |
time the command is issued. After it has been supplied once, it will
|
|
3578 |
be remembered as the default.
|
|
3579 |
||
3580 |
A public branch is optional if a revision bundle is supplied, but required
|
|
3581 |
if --diff or --plain is specified. It will be remembered as the default
|
|
3582 |
after the first use.
|
|
3583 |
"""
|
|
1551.12.20
by Aaron Bentley
Pull directive registry into command class |
3584 |
|
1551.12.14
by Aaron Bentley
Get merge-directive command basically working |
3585 |
takes_args = ['submit_branch?', 'public_branch?'] |
3586 |
||
2520.5.4
by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command |
3587 |
hidden = True |
3588 |
||
2520.4.121
by Aaron Bentley
Polish up submit command |
3589 |
_see_also = ['submit'] |
3590 |
||
1551.12.43
by Aaron Bentley
Misc changes from review |
3591 |
takes_options = [ |
3592 |
RegistryOption.from_kwargs('patch-type', |
|
3593 |
'The type of patch to include in the directive', |
|
2598.1.2
by Martin Pool
Also check that option help ends in a period, and fix those that don't |
3594 |
title='Patch type', |
3595 |
value_switches=True, |
|
3596 |
enum_switch=False, |
|
3597 |
bundle='Bazaar revision bundle (default).', |
|
3598 |
diff='Normal unified diff.', |
|
3599 |
plain='No patch, just directive.'), |
|
3600 |
Option('sign', help='GPG-sign the directive.'), 'revision', |
|
1551.12.26
by Aaron Bentley
Get email working, with optional message |
3601 |
Option('mail-to', type=str, |
2598.1.2
by Martin Pool
Also check that option help ends in a period, and fix those that don't |
3602 |
help='Instead of printing the directive, email to this address.'), |
1551.12.27
by Aaron Bentley
support custom message everywhere |
3603 |
Option('message', type=str, short_name='m', |
2598.1.2
by Martin Pool
Also check that option help ends in a period, and fix those that don't |
3604 |
help='Message to use when committing this merge.') |
1551.12.27
by Aaron Bentley
support custom message everywhere |
3605 |
]
|
1551.12.14
by Aaron Bentley
Get merge-directive command basically working |
3606 |
|
2530.2.1
by Adeodato Simó
Add encoding_type = 'exact' to cmd_merge_directive. (LP #120591) |
3607 |
encoding_type = 'exact' |
3608 |
||
1551.12.16
by Aaron Bentley
Enable signing merge directives |
3609 |
def run(self, submit_branch=None, public_branch=None, patch_type='bundle', |
1551.12.27
by Aaron Bentley
support custom message everywhere |
3610 |
sign=False, revision=None, mail_to=None, message=None): |
2490.2.28
by Aaron Bentley
Fix handling of null revision |
3611 |
from bzrlib.revision import ensure_null, NULL_REVISION |
2520.5.4
by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command |
3612 |
include_patch, include_bundle = { |
3613 |
'plain': (False, False), |
|
3614 |
'diff': (True, False), |
|
3615 |
'bundle': (True, True), |
|
3616 |
}[patch_type] |
|
1551.12.8
by Aaron Bentley
Add merge-directive command |
3617 |
branch = Branch.open('.') |
1551.12.44
by Aaron Bentley
Add (set|get)_public_branch |
3618 |
stored_submit_branch = branch.get_submit_branch() |
1551.12.14
by Aaron Bentley
Get merge-directive command basically working |
3619 |
if submit_branch is None: |
1551.12.44
by Aaron Bentley
Add (set|get)_public_branch |
3620 |
submit_branch = stored_submit_branch |
1551.12.14
by Aaron Bentley
Get merge-directive command basically working |
3621 |
else: |
1551.12.44
by Aaron Bentley
Add (set|get)_public_branch |
3622 |
if stored_submit_branch is None: |
1551.12.14
by Aaron Bentley
Get merge-directive command basically working |
3623 |
branch.set_submit_branch(submit_branch) |
3624 |
if submit_branch is None: |
|
3625 |
submit_branch = branch.get_parent() |
|
3626 |
if submit_branch is None: |
|
3627 |
raise errors.BzrCommandError('No submit branch specified or known') |
|
1551.12.44
by Aaron Bentley
Add (set|get)_public_branch |
3628 |
|
3629 |
stored_public_branch = branch.get_public_branch() |
|
1551.12.14
by Aaron Bentley
Get merge-directive command basically working |
3630 |
if public_branch is None: |
1551.12.44
by Aaron Bentley
Add (set|get)_public_branch |
3631 |
public_branch = stored_public_branch |
3632 |
elif stored_public_branch is None: |
|
3633 |
branch.set_public_branch(public_branch) |
|
2520.5.4
by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command |
3634 |
if not include_bundle and public_branch is None: |
1551.12.24
by Aaron Bentley
Add RegistryOption.from_swargs to simplify simple registry options |
3635 |
raise errors.BzrCommandError('No public branch specified or' |
3636 |
' known') |
|
2520.4.112
by Aaron Bentley
Make cherry-pick merge directives possible |
3637 |
base_revision_id = None |
1551.12.17
by Aaron Bentley
add revision selection to mergedirective |
3638 |
if revision is not None: |
2520.4.112
by Aaron Bentley
Make cherry-pick merge directives possible |
3639 |
if len(revision) > 2: |
1551.12.17
by Aaron Bentley
add revision selection to mergedirective |
3640 |
raise errors.BzrCommandError('bzr merge-directive takes ' |
2520.4.112
by Aaron Bentley
Make cherry-pick merge directives possible |
3641 |
'at most two one revision identifiers') |
3642 |
revision_id = revision[-1].in_history(branch).rev_id |
|
3643 |
if len(revision) == 2: |
|
3644 |
base_revision_id = revision[0].in_history(branch).rev_id |
|
3645 |
base_revision_id = ensure_null(base_revision_id) |
|
1551.12.17
by Aaron Bentley
add revision selection to mergedirective |
3646 |
else: |
3647 |
revision_id = branch.last_revision() |
|
2490.2.28
by Aaron Bentley
Fix handling of null revision |
3648 |
revision_id = ensure_null(revision_id) |
3649 |
if revision_id == NULL_REVISION: |
|
3650 |
raise errors.BzrCommandError('No revisions to bundle.') |
|
2520.4.73
by Aaron Bentley
Implement new merge directive format |
3651 |
directive = merge_directive.MergeDirective2.from_objects( |
1551.12.17
by Aaron Bentley
add revision selection to mergedirective |
3652 |
branch.repository, revision_id, time.time(), |
1551.12.8
by Aaron Bentley
Add merge-directive command |
3653 |
osutils.local_time_offset(), submit_branch, |
2520.5.4
by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command |
3654 |
public_branch=public_branch, include_patch=include_patch, |
3655 |
include_bundle=include_bundle, message=message, |
|
3656 |
base_revision_id=base_revision_id) |
|
1551.12.26
by Aaron Bentley
Get email working, with optional message |
3657 |
if mail_to is None: |
3658 |
if sign: |
|
3659 |
self.outf.write(directive.to_signed(branch)) |
|
3660 |
else: |
|
3661 |
self.outf.writelines(directive.to_lines()) |
|
1551.12.16
by Aaron Bentley
Enable signing merge directives |
3662 |
else: |
1551.12.26
by Aaron Bentley
Get email working, with optional message |
3663 |
message = directive.to_email(mail_to, branch, sign) |
2535.2.1
by Adeodato Simó
New SMTPConnection class, a reduced version of that in bzr-email. |
3664 |
s = SMTPConnection(branch.get_config()) |
3665 |
s.send_email(message) |
|
1551.12.8
by Aaron Bentley
Add merge-directive command |
3666 |
|
1551.12.14
by Aaron Bentley
Get merge-directive command basically working |
3667 |
|
2520.5.4
by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command |
3668 |
class cmd_submit(Command): |
3669 |
"""Create a merge-directive for submiting changes. |
|
3670 |
||
3671 |
A merge directive provides many things needed for requesting merges:
|
|
3672 |
- A machine-readable description of the merge to perform
|
|
3673 |
- An optional patch that is a preview of the changes requested
|
|
3674 |
- An optional bundle of revision data, so that the changes can be applied
|
|
3675 |
directly from the merge directive, without retrieving data from a
|
|
3676 |
branch.
|
|
3677 |
||
3678 |
If --no-bundle is specified, then public_branch is needed (and must be
|
|
3679 |
up-to-date), so that the receiver can perform the merge using the
|
|
3680 |
public_branch. The public_branch is always included if known, so that
|
|
3681 |
people can check it later.
|
|
3682 |
||
3683 |
The submit branch defaults to the parent, but can be overridden. Both
|
|
3684 |
submit branch and public branch will be remembered if supplied.
|
|
3685 |
||
3686 |
If a public_branch is known for the submit_branch, that public submit
|
|
3687 |
branch is used in the merge instructions. This means that a local mirror
|
|
2520.4.122
by Aaron Bentley
Clarify doc |
3688 |
can be used as your actual submit branch, once you have set public_branch
|
3689 |
for that mirror.
|
|
2520.5.4
by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command |
3690 |
"""
|
3691 |
||
3692 |
encoding_type = 'exact' |
|
3693 |
||
3694 |
aliases = ['bundle', 'bundle-revisions'] |
|
3695 |
||
2520.4.121
by Aaron Bentley
Polish up submit command |
3696 |
_see_also = ['merge'] |
3697 |
||
2520.5.4
by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command |
3698 |
takes_args = ['submit_branch?', 'public_branch?'] |
2520.4.121
by Aaron Bentley
Polish up submit command |
3699 |
takes_options = [ |
3700 |
Option('no-bundle', |
|
2520.4.132
by Aaron Bentley
Merge from bzr.dev |
3701 |
help='Do not include a bundle in the merge directive.'), |
2520.4.121
by Aaron Bentley
Polish up submit command |
3702 |
Option('no-patch', help='Do not include a preview patch in the merge' |
2520.4.132
by Aaron Bentley
Merge from bzr.dev |
3703 |
' directive.'), |
2520.4.121
by Aaron Bentley
Polish up submit command |
3704 |
Option('remember', |
2520.4.132
by Aaron Bentley
Merge from bzr.dev |
3705 |
help='Remember submit and public branch.'), |
2520.4.121
by Aaron Bentley
Polish up submit command |
3706 |
Option('from', |
2520.4.132
by Aaron Bentley
Merge from bzr.dev |
3707 |
help='Branch to generate the submission from, ' |
3708 |
'rather than the one containing the working directory.', |
|
2520.4.121
by Aaron Bentley
Polish up submit command |
3709 |
short_name='f', |
3710 |
type=unicode), |
|
2520.4.132
by Aaron Bentley
Merge from bzr.dev |
3711 |
Option('output', short_name='o', help='Write directive to this file.', |
2520.4.121
by Aaron Bentley
Polish up submit command |
3712 |
type=unicode), |
3713 |
'revision', |
|
3714 |
]
|
|
2520.5.4
by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command |
3715 |
|
3716 |
def run(self, submit_branch=None, public_branch=None, no_bundle=False, |
|
2520.4.121
by Aaron Bentley
Polish up submit command |
3717 |
no_patch=False, revision=None, remember=False, output=None, |
3718 |
**kwargs): |
|
2520.5.4
by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command |
3719 |
from bzrlib.revision import ensure_null, NULL_REVISION |
2520.4.121
by Aaron Bentley
Polish up submit command |
3720 |
if output is None: |
3721 |
outfile = self.outf |
|
2520.5.4
by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command |
3722 |
else: |
2520.4.121
by Aaron Bentley
Polish up submit command |
3723 |
outfile = open(output, 'wb') |
3724 |
try: |
|
3725 |
from_ = kwargs.get('from', '.') |
|
3726 |
branch = Branch.open_containing(from_)[0] |
|
3727 |
if remember and submit_branch is None: |
|
3728 |
raise errors.BzrCommandError( |
|
3729 |
'--remember requires a branch to be specified.') |
|
3730 |
stored_submit_branch = branch.get_submit_branch() |
|
3731 |
remembered_submit_branch = False |
|
3732 |
if submit_branch is None: |
|
3733 |
submit_branch = stored_submit_branch |
|
3734 |
remembered_submit_branch = True |
|
3735 |
else: |
|
3736 |
if stored_submit_branch is None or remember: |
|
3737 |
branch.set_submit_branch(submit_branch) |
|
3738 |
if submit_branch is None: |
|
3739 |
submit_branch = branch.get_parent() |
|
3740 |
remembered_submit_branch = True |
|
3741 |
if submit_branch is None: |
|
3742 |
raise errors.BzrCommandError('No submit branch known or' |
|
3743 |
' specified') |
|
3744 |
if remembered_submit_branch: |
|
3745 |
note('Using saved location: %s', submit_branch) |
|
2520.5.4
by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command |
3746 |
|
2520.4.121
by Aaron Bentley
Polish up submit command |
3747 |
stored_public_branch = branch.get_public_branch() |
3748 |
if public_branch is None: |
|
3749 |
public_branch = stored_public_branch |
|
3750 |
elif stored_public_branch is None or remember: |
|
3751 |
branch.set_public_branch(public_branch) |
|
3752 |
if no_bundle and public_branch is None: |
|
3753 |
raise errors.BzrCommandError('No public branch specified or' |
|
3754 |
' known') |
|
3755 |
base_revision_id = None |
|
3756 |
if revision is not None: |
|
3757 |
if len(revision) > 2: |
|
3758 |
raise errors.BzrCommandError('bzr submit takes ' |
|
3759 |
'at most two one revision identifiers') |
|
3760 |
revision_id = revision[-1].in_history(branch).rev_id |
|
3761 |
if len(revision) == 2: |
|
3762 |
base_revision_id = revision[0].in_history(branch).rev_id |
|
3763 |
base_revision_id = ensure_null(base_revision_id) |
|
3764 |
else: |
|
3765 |
revision_id = branch.last_revision() |
|
3766 |
revision_id = ensure_null(revision_id) |
|
3767 |
if revision_id == NULL_REVISION: |
|
3768 |
raise errors.BzrCommandError('No revisions to submit.') |
|
3769 |
directive = merge_directive.MergeDirective2.from_objects( |
|
3770 |
branch.repository, revision_id, time.time(), |
|
3771 |
osutils.local_time_offset(), submit_branch, |
|
3772 |
public_branch=public_branch, include_patch=not no_patch, |
|
3773 |
include_bundle=not no_bundle, message=None, |
|
3774 |
base_revision_id=base_revision_id) |
|
3775 |
outfile.writelines(directive.to_lines()) |
|
3776 |
finally: |
|
3777 |
if output is not None: |
|
3778 |
outfile.close() |
|
2520.5.4
by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command |
3779 |
|
2220.2.2
by Martin Pool
Add tag command and basic implementation |
3780 |
class cmd_tag(Command): |
2220.2.8
by Martin Pool
Add -d option to push, pull, merge commands. |
3781 |
"""Create a tag naming a revision. |
3782 |
|
|
3783 |
Tags give human-meaningful names to revisions. Commands that take a -r
|
|
3784 |
(--revision) option can be given -rtag:X, where X is any previously
|
|
3785 |
created tag.
|
|
3786 |
||
2220.2.41
by Martin Pool
Fix tag help (fullermd) |
3787 |
Tags are stored in the branch. Tags are copied from one branch to another
|
3788 |
along when you branch, push, pull or merge.
|
|
2220.2.42
by Martin Pool
Tag command refuses to replace existing tags unless you force it. |
3789 |
|
3790 |
It is an error to give a tag name that already exists unless you pass
|
|
3791 |
--force, in which case the tag is moved to point to the new revision.
|
|
2220.2.8
by Martin Pool
Add -d option to push, pull, merge commands. |
3792 |
"""
|
2220.2.2
by Martin Pool
Add tag command and basic implementation |
3793 |
|
2425.2.3
by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins) |
3794 |
_see_also = ['commit', 'tags'] |
2220.2.2
by Martin Pool
Add tag command and basic implementation |
3795 |
takes_args = ['tag_name'] |
3796 |
takes_options = [ |
|
2220.2.21
by Martin Pool
Add tag --delete command and implementation |
3797 |
Option('delete', |
2220.2.42
by Martin Pool
Tag command refuses to replace existing tags unless you force it. |
3798 |
help='Delete this tag rather than placing it.', |
3799 |
),
|
|
3800 |
Option('directory', |
|
3801 |
help='Branch in which to place the tag.', |
|
3802 |
short_name='d', |
|
3803 |
type=unicode, |
|
3804 |
),
|
|
3805 |
Option('force', |
|
2598.1.2
by Martin Pool
Also check that option help ends in a period, and fix those that don't |
3806 |
help='Replace existing tags.', |
2220.2.21
by Martin Pool
Add tag --delete command and implementation |
3807 |
),
|
2220.2.6
by Martin Pool
Add tag -r option |
3808 |
'revision', |
2220.2.2
by Martin Pool
Add tag command and basic implementation |
3809 |
]
|
3810 |
||
2220.2.42
by Martin Pool
Tag command refuses to replace existing tags unless you force it. |
3811 |
def run(self, tag_name, |
3812 |
delete=None, |
|
3813 |
directory='.', |
|
3814 |
force=None, |
|
2220.2.21
by Martin Pool
Add tag --delete command and implementation |
3815 |
revision=None, |
2220.2.42
by Martin Pool
Tag command refuses to replace existing tags unless you force it. |
3816 |
):
|
2220.2.2
by Martin Pool
Add tag command and basic implementation |
3817 |
branch, relpath = Branch.open_containing(directory) |
2220.2.42
by Martin Pool
Tag command refuses to replace existing tags unless you force it. |
3818 |
branch.lock_write() |
3819 |
try: |
|
3820 |
if delete: |
|
3821 |
branch.tags.delete_tag(tag_name) |
|
3822 |
self.outf.write('Deleted tag %s.\n' % tag_name) |
|
2220.2.21
by Martin Pool
Add tag --delete command and implementation |
3823 |
else: |
2220.2.42
by Martin Pool
Tag command refuses to replace existing tags unless you force it. |
3824 |
if revision: |
3825 |
if len(revision) != 1: |
|
3826 |
raise errors.BzrCommandError( |
|
3827 |
"Tags can only be placed on a single revision, "
|
|
3828 |
"not on a range") |
|
3829 |
revision_id = revision[0].in_history(branch).rev_id |
|
3830 |
else: |
|
3831 |
revision_id = branch.last_revision() |
|
3832 |
if (not force) and branch.tags.has_tag(tag_name): |
|
3833 |
raise errors.TagAlreadyExists(tag_name) |
|
3834 |
branch.tags.set_tag(tag_name, revision_id) |
|
3835 |
self.outf.write('Created tag %s.\n' % tag_name) |
|
3836 |
finally: |
|
3837 |
branch.unlock() |
|
2220.2.2
by Martin Pool
Add tag command and basic implementation |
3838 |
|
3839 |
||
2220.2.24
by Martin Pool
Add tags command |
3840 |
class cmd_tags(Command): |
3841 |
"""List tags. |
|
3842 |
||
3843 |
This tag shows a table of tag names and the revisions they reference.
|
|
3844 |
"""
|
|
3845 |
||
2425.2.3
by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins) |
3846 |
_see_also = ['tag'] |
2220.2.24
by Martin Pool
Add tags command |
3847 |
takes_options = [ |
3848 |
Option('directory', |
|
2598.1.2
by Martin Pool
Also check that option help ends in a period, and fix those that don't |
3849 |
help='Branch whose tags should be displayed.', |
2220.2.24
by Martin Pool
Add tags command |
3850 |
short_name='d', |
3851 |
type=unicode, |
|
3852 |
),
|
|
3853 |
]
|
|
3854 |
||
3855 |
@display_command
|
|
3856 |
def run(self, |
|
3857 |
directory='.', |
|
3858 |
):
|
|
3859 |
branch, relpath = Branch.open_containing(directory) |
|
3860 |
for tag_name, target in sorted(branch.tags.get_tag_dict().items()): |
|
2220.2.45
by Martin Pool
Make tags output less wide |
3861 |
self.outf.write('%-20s %s\n' % (tag_name, target)) |
2220.2.24
by Martin Pool
Add tags command |
3862 |
|
3863 |
||
1553.5.35
by Martin Pool
Start break-lock --show |
3864 |
# command-line interpretation helper for merge-related commands
|
1996.3.1
by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms |
3865 |
def _merge_helper(other_revision, base_revision, |
3866 |
check_clean=True, ignore_zero=False, |
|
3867 |
this_dir=None, backup_files=False, |
|
1996.3.7
by John Arbash Meinel
lazy import versionedfile, late-load bzrlib.merge |
3868 |
merge_type=None, |
1996.3.1
by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms |
3869 |
file_list=None, show_base=False, reprocess=False, |
2149.2.1
by Jan Hudec
Option --pull for merge command. |
3870 |
pull=False, |
1551.11.9
by Aaron Bentley
Apply change reporting to merge |
3871 |
pb=DummyProgress(), |
1551.14.4
by Aaron Bentley
Change bundle reader and merge directive to both be 'mergeables' |
3872 |
change_reporter=None, |
2520.4.110
by Aaron Bentley
Implement cherrypick support for merge directives |
3873 |
other_rev_id=None, base_rev_id=None): |
1545.2.9
by Aaron Bentley
Moved merge.merge to builtins |
3874 |
"""Merge changes into a tree. |
3875 |
||
3876 |
base_revision
|
|
3877 |
list(path, revno) Base for three-way merge.
|
|
3878 |
If [None, None] then a base will be automatically determined.
|
|
3879 |
other_revision
|
|
3880 |
list(path, revno) Other revision for three-way merge.
|
|
3881 |
this_dir
|
|
3882 |
Directory to merge changes into; '.' by default.
|
|
3883 |
check_clean
|
|
3884 |
If true, this_dir must have no uncommitted changes before the
|
|
3885 |
merge begins.
|
|
3886 |
ignore_zero - If true, suppress the "zero conflicts" message when
|
|
3887 |
there are no conflicts; should be set when doing something we expect
|
|
3888 |
to complete perfectly.
|
|
3889 |
file_list - If supplied, merge only changes to selected files.
|
|
3890 |
||
3891 |
All available ancestors of other_revision and base_revision are
|
|
3892 |
automatically pulled into the branch.
|
|
3893 |
||
3894 |
The revno may be -1 to indicate the last revision on the branch, which is
|
|
3895 |
the typical case.
|
|
3896 |
||
3897 |
This function is intended for use from the command line; programmatic
|
|
3898 |
clients might prefer to call merge.merge_inner(), which has less magic
|
|
3899 |
behavior.
|
|
3900 |
"""
|
|
1996.3.7
by John Arbash Meinel
lazy import versionedfile, late-load bzrlib.merge |
3901 |
# Loading it late, so that we don't always have to import bzrlib.merge
|
3902 |
if merge_type is None: |
|
3903 |
merge_type = _mod_merge.Merge3Merger |
|
1545.2.9
by Aaron Bentley
Moved merge.merge to builtins |
3904 |
if this_dir is None: |
3905 |
this_dir = u'.' |
|
1534.4.28
by Robert Collins
first cut at merge from integration. |
3906 |
this_tree = WorkingTree.open_containing(this_dir)[0] |
1996.3.5
by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again. |
3907 |
if show_base and not merge_type is _mod_merge.Merge3Merger: |
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
3908 |
raise errors.BzrCommandError("Show-base is not supported for this merge" |
3909 |
" type. %s" % merge_type) |
|
1551.6.8
by Aaron Bentley
Implemented reprocess for weave |
3910 |
if reprocess and not merge_type.supports_reprocess: |
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
3911 |
raise errors.BzrCommandError("Conflict reduction is not supported for merge" |
3912 |
" type %s." % merge_type) |
|
1545.2.9
by Aaron Bentley
Moved merge.merge to builtins |
3913 |
if reprocess and show_base: |
1996.3.34
by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run |
3914 |
raise errors.BzrCommandError("Cannot do conflict reduction and show base.") |
2255.7.12
by John Arbash Meinel
Some comments on merge code, fix merge tests that |
3915 |
# TODO: jam 20070226 We should really lock these trees earlier. However, we
|
3916 |
# only want to take out a lock_tree_write() if we don't have to pull
|
|
3917 |
# any ancestry. But merge might fetch ancestry in the middle, in
|
|
3918 |
# which case we would need a lock_write().
|
|
3919 |
# Because we cannot upgrade locks, for now we live with the fact that
|
|
3920 |
# the tree will be locked multiple times during a merge. (Maybe
|
|
3921 |
# read-only some of the time, but it means things will get read
|
|
3922 |
# multiple times.)
|
|
1551.2.32
by Aaron Bentley
Handle progress phases more nicely in merge |
3923 |
try: |
1996.3.5
by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again. |
3924 |
merger = _mod_merge.Merger(this_tree.branch, this_tree=this_tree, |
1551.11.9
by Aaron Bentley
Apply change reporting to merge |
3925 |
pb=pb, change_reporter=change_reporter) |
1551.2.32
by Aaron Bentley
Handle progress phases more nicely in merge |
3926 |
merger.pp = ProgressPhase("Merge phase", 5, pb) |
3927 |
merger.pp.next_phase() |
|
3928 |
merger.check_basis(check_clean) |
|
1551.14.4
by Aaron Bentley
Change bundle reader and merge directive to both be 'mergeables' |
3929 |
if other_rev_id is not None: |
3930 |
merger.set_other_revision(other_rev_id, this_tree.branch) |
|
3931 |
else: |
|
3932 |
merger.set_other(other_revision) |
|
1551.2.32
by Aaron Bentley
Handle progress phases more nicely in merge |
3933 |
merger.pp.next_phase() |
2520.4.110
by Aaron Bentley
Implement cherrypick support for merge directives |
3934 |
if base_rev_id is not None: |
3935 |
merger.set_base_revision(base_rev_id, this_tree.branch) |
|
3936 |
elif base_revision is not None: |
|
3937 |
merger.set_base(base_revision) |
|
3938 |
else: |
|
3939 |
merger.find_base() |
|
1551.2.32
by Aaron Bentley
Handle progress phases more nicely in merge |
3940 |
if merger.base_rev_id == merger.other_rev_id: |
3941 |
note('Nothing to do.') |
|
3942 |
return 0 |
|
2149.2.1
by Jan Hudec
Option --pull for merge command. |
3943 |
if file_list is None: |
3944 |
if pull and merger.base_rev_id == merger.this_rev_id: |
|
2297.1.1
by Martin Pool
Pull now returns a PullResult rather than just an integer. |
3945 |
# FIXME: deduplicate with pull
|
3946 |
result = merger.this_tree.pull(merger.this_branch, |
|
2149.2.1
by Jan Hudec
Option --pull for merge command. |
3947 |
False, merger.other_rev_id) |
2297.1.1
by Martin Pool
Pull now returns a PullResult rather than just an integer. |
3948 |
if result.old_revid == result.new_revid: |
3949 |
note('No revisions to pull.') |
|
3950 |
else: |
|
3951 |
note('Now on revision %d.' % result.new_revno) |
|
2149.2.1
by Jan Hudec
Option --pull for merge command. |
3952 |
return 0 |
1551.2.32
by Aaron Bentley
Handle progress phases more nicely in merge |
3953 |
merger.backup_files = backup_files |
3954 |
merger.merge_type = merge_type |
|
3955 |
merger.set_interesting_files(file_list) |
|
3956 |
merger.show_base = show_base |
|
3957 |
merger.reprocess = reprocess |
|
3958 |
conflicts = merger.do_merge() |
|
1645.1.1
by Aaron Bentley
Implement single-file merge |
3959 |
if file_list is None: |
3960 |
merger.set_pending() |
|
1551.2.32
by Aaron Bentley
Handle progress phases more nicely in merge |
3961 |
finally: |
3962 |
pb.clear() |
|
1545.2.9
by Aaron Bentley
Moved merge.merge to builtins |
3963 |
return conflicts |
3964 |
||
3965 |
||
2524.1.1
by Aaron Bentley
Revert broken changes |
3966 |
def _create_prefix(cur_transport): |
3967 |
needed = [cur_transport] |
|
3968 |
# Recurse upwards until we can create a directory successfully
|
|
3969 |
while True: |
|
3970 |
new_transport = cur_transport.clone('..') |
|
3971 |
if new_transport.base == cur_transport.base: |
|
2604.1.1
by Martin Pool
Fix unbound variable in _create_prefix (thanks vila) |
3972 |
raise errors.BzrCommandError( |
3973 |
"Failed to create path prefix for %s." |
|
3974 |
% cur_transport.base) |
|
2524.1.1
by Aaron Bentley
Revert broken changes |
3975 |
try: |
3976 |
new_transport.mkdir('.') |
|
3977 |
except errors.NoSuchFile: |
|
3978 |
needed.append(new_transport) |
|
3979 |
cur_transport = new_transport |
|
3980 |
else: |
|
3981 |
break
|
|
3982 |
# Now we only need to create child directories
|
|
3983 |
while needed: |
|
3984 |
cur_transport = needed.pop() |
|
3985 |
cur_transport.ensure_base() |
|
3986 |
||
2604.1.1
by Martin Pool
Fix unbound variable in _create_prefix (thanks vila) |
3987 |
|
1996.3.5
by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again. |
3988 |
# Compatibility
|
3989 |
merge = _merge_helper |
|
3990 |
||
3991 |
||
1185.16.33
by Martin Pool
- move 'conflict' and 'resolved' from shipped plugin to regular builtins |
3992 |
# these get imported and then picked up by the scan for cmd_*
|
3993 |
# TODO: Some more consistent way to split command definitions across files;
|
|
3994 |
# 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'. |
3995 |
# aliases. ideally we would avoid loading the implementation until the
|
3996 |
# details were needed.
|
|
2022.1.2
by John Arbash Meinel
rename version_info => cmd_version_info |
3997 |
from bzrlib.cmd_version_info import cmd_version_info |
1185.35.4
by Aaron Bentley
Implemented remerge |
3998 |
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore |
2520.4.35
by Aaron Bentley
zap obsolete changeset commands, add bundle-info command |
3999 |
from bzrlib.bundle.commands import ( |
4000 |
cmd_bundle_info, |
|
4001 |
)
|
|
1185.78.6
by John Arbash Meinel
Adding sign-my-commits as a builtin, along with some simple tests. |
4002 |
from bzrlib.sign_my_commits import cmd_sign_my_commits |
1551.15.24
by Aaron Bentley
Make list-weave list knits, rename to list-versionedfile |
4003 |
from bzrlib.weave_commands import cmd_versionedfile_list, cmd_weave_join, \ |
1616.1.17
by Martin Pool
New 'weave-plan-merge' and 'weave-merge-text' commands lifted from weave.py |
4004 |
cmd_weave_plan_merge, cmd_weave_merge_text |