5
* merge now takes a --show-base option to include the base text in
9
* The config files are now read using ConfigObj, so '=' should be used as
13
* New 'bzr commit --strict' option refuses to commit if there are
14
any unknown files in the tree. To commit, make sure all files are
15
either ignored, added, or deleted. (Michael Ellerman)
17
* The config directory is now ~/.bazaar, and there is a single file
18
~/.bazaar/bazaar.conf storing email, editor and other preferences.
21
* 'bzr add' no longer takes a --verbose option, and a --quiet option
22
has been added that suppresses all output.
24
* Improved zsh completion support in contrib/zsh, from Clint
27
* Builtin 'bzr annotate' command, by Martin Pool with improvements from
30
* 'bzr check' now accepts -v for verbose reporting, and checks for
31
ghosts in the branch. (Robert Collins)
33
* New command 're-sign' which will regenerate the gpg signature for
34
a revision. (Robert Collins)
36
* If you set check_signatures=require for a path in
37
~/.bazaar/branches.conf then bzr will invoke your
38
gpg_signing_command (defaults to gpg) and record a digital signature
39
of your commit. (Robert Collins)
41
* New sftp transport, based on Paramiko. (Robey Pointer)
43
* 'bzr pull' now accepts '--clobber' which will discard local changes
44
and make this branch identical to the source branch. (Robert Collins)
46
* Just give a quieter warning if a plugin can't be loaded, and
47
put the details in .bzr.log. (Martin Pool)
49
* 'bzr branch' will now set the branch-name to the last component of the
50
output directory, if one was supplied.
52
* New sftp transport, based on Paramiko. (Robey Pointer)
54
* If the option 'post_commit' is set to one (or more) python function
55
names (must be in the bzrlib namespace), then they will be invoked
56
after the commit has completed, with the branch and revision_id as
57
parameters. (Robert Collins)
59
* Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
61
* --merge-type weave is now supported for file contents. Tree-shape
62
changes are still three-way based. (Martin Pool, Aaron Bentley)
64
* 'bzr check' allows the first revision on revision-history to have
65
parents - something that is expected for cheap checkouts, and occurs
66
when conversions from baz do not have all history. (Robert Collins).
68
* 'bzr merge' can now graft unrelated trees together, if your specify
69
0 as a base. (Aaron Bentley)
71
* 'bzr commit branch' and 'bzr commit branch/file1 branch/file2' now work
74
* Add '.sconsign*' to default ignore list. (Alexander Belchenko)
76
* 'bzr merge --reprocess' minimizes conflicts
80
* The 'bzr selftest --pattern' option for has been removed, now
81
test specifiers on the command line can be simple strings, or
82
regexps, or both. (Robert Collins)
84
* Passing -v to selftest will now show the time each test took to
85
complete, which will aid in analysing performance regressions and
86
related questions. (Robert Collins)
88
* 'bzr selftest' runs all tests, even if one fails, unless '--one'
89
is given. (Martin Pool)
91
* There is a new method for TestCaseInTempDir, assertFileEqual, which
92
will check that a given content is equal to the content of the named
93
file. (Robert Collins)
95
* Fix test suite's habit of leaving many temporary log files in $TMPDIR.
100
* New 'testament' command and concept for making gpg-signatures
101
of revisions that are not tied to a particular internal
102
representation. (Martin Pool).
104
* Per-revision properties ('revprops') as key-value associated
105
strings on each revision created when the revision is committed.
106
Intended mainly for the use of external tools. (Martin Pool).
108
* Config options have moved from bzrlib.osutils to bzrlib.config.
111
* Improved command line option definitions allowing explanations
112
for individual options, among other things. Contributed by
115
* Config options have moved from bzrlib.osutils to bzrlib.config.
116
Configuration is now done via the config.Config interface:
117
Depending on whether you have a Branch, a Location or no information
118
available, construct a *Config, and use its signature_checking,
119
username and user_email methods. (Robert Collins)
121
* Plugins are now loaded under bzrlib.plugins, not bzrlib.plugin, and
122
they are made available for other plugins to use. You should not
123
import other plugins during the __init__ of your plugin though, as
124
no ordering is guaranteed, and the plugins directory is not on the
125
python path. (Robert Collins)
127
* Branch.relpath has been moved to WorkingTree.relpath. WorkingTree no
128
no longer takes an inventory, rather it takes an option branch
129
parameter, and if None is given will open the branch at basedir
130
implicitly. (Robert Collins)
132
* Cleaner exception structure and error reporting. Suggested by
133
Scott James Remnant. (Martin Pool)
135
* Branch.remove has been moved to WorkingTree, which has also gained
136
lock_read, lock_write and unlock methods for convenience. (Robert
139
* Two decorators, needs_read_lock and needs_write_lock have been added
140
to the branch module. Use these to cause a function to run in a
141
read or write lock respectively. (Robert Collins)
143
* Branch.open_containing now returns a tuple (Branch, relative-path),
144
which allows direct access to the common case of 'get me this file
145
from its branch'. (Robert Collins)
147
* Transports can register using register_lazy_transport, and they
148
will be loaded when first used. (Martin Pool)
150
* 'pull' has been factored out of the command as WorkingTree.pull().
151
A new option to WorkingTree.pull has been added, clobber, which will
152
ignore diverged history and pull anyway.
155
* config.Config has a 'get_user_option' call that accepts an option name.
156
This will be looked up in branches.conf and bazaar.conf as normal.
157
It is intended that this be used by plugins to support options -
158
options of built in programs should have specific methods on the config.
161
* merge.merge_inner now has tempdir as an optional parameter. (Robert
164
* Tree.kind is not recorded at the top level of the hierarchy, as it was
165
missing on EmptyTree, leading to a bug with merge on EmptyTrees.
168
* WorkingTree.__del__ has been removed, it was non deterministic and not
169
doing what it was intended to. See WorkingTree.__init__ for a comment
170
about future directions. (Robert Collins/Martin Pool)
172
* bzrlib.transport.http has been modified so that only 404 urllib errors
173
are returned as NoSuchFile. Other exceptions will propogate as normal.
174
This allows debuging of actual errors. (Robert Collins)
176
* bzrlib.transport.Transport now accepts *ONLY* url escaped relative paths
177
to apis like 'put', 'get' and 'has'. This is to provide consistent
178
behaviour - it operates on url's only. (Robert Collins)
180
* Transports can register using register_lazy_transport, and they
181
will be loaded when first used. (Martin Pool)
183
* 'merge_flex' no longer calls conflict_handler.finalize(), instead that
184
is called by merge_inner. This is so that the conflict count can be
185
retrieved (and potentially manipulated) before returning to the caller
186
of merge_inner. Likewise 'merge' now returns the conflict count to the
187
caller. (Robert Collins)
189
* 'revision.revision_graph can handle having only partial history for
190
a revision - that is no revisions in the graph with no parents.
193
* New builtins.branch_files uses the standard file_list rules to produce
194
a branch and a list of paths, relative to that branch (Aaron Bentley)
196
* New TestCase.addCleanup facility.
198
* New bzrlib.version_info tuple (similar to sys.version_info), which can
199
be used by programs importing bzrlib.
203
* Better handling of branches in directories with non-ascii names.
204
(Joel Rosdahl, Panagiotis Papadakos)
210
* Fix problem in pulling over http from machines that do not
211
allow directories to be listed.
213
* Avoid harmless warning about invalid hash cache after
214
upgrading branch format.
218
* Avoid some unnecessary http operations in branch and pull.
225
* 'bzr branch' over http initially gives a very high estimate
226
of completion time but it should fall as the first few
227
revisions are pulled in. branch is still slow on
228
high-latency connections.
232
* bzr-man.py has been updated to work again. Contributed by
235
* Locking is now done with fcntl.lockf which works with NFS
236
file systems. Contributed by Harald Meland.
238
* When a merge encounters a file that has been deleted on
239
one side and modified on the other, the old contents are
240
written out to foo.BASE and foo.SIDE, where SIDE is this
241
or OTHER. Contributed by Aaron Bentley.
243
* Export was choosing incorrect file paths for the content of
244
the tarball, this has been fixed by Aaron Bentley.
246
* Commit will no longer commit without a log message, an
247
error is returned instead. Contributed by Jelmer Vernooij.
249
* If you commit a specific file in a sub directory, any of its
250
parent directories that are added but not listed will be
251
automatically included. Suggested by Michael Ellerman.
253
* bzr commit and upgrade did not correctly record new revisions
254
for files with only a change to their executable status.
255
bzr will correct this when it encounters it. Fixed by
258
* HTTP tests now force off the use of http_proxy for the duration.
259
Contributed by Gustavo Niemeyer.
261
* Fix problems in merging weave-based branches that have
262
different partial views of history.
264
* Symlink support: working with symlinks when not in the root of a
265
bzr tree was broken, patch from Scott James Remnant.
270
* 'branch' now accepts a --basis parameter which will take advantage
271
of local history when making a new branch. This allows faster
272
branching of remote branches. Contributed by Aaron Bentley.
274
* New tree format based on weave files, called version 5.
275
Existing branches can be upgraded to this format using
278
* Symlinks are now versionable. Initial patch by
279
Erik Toubro Nielsen, updated to head by Robert Collins.
281
* Executable bits are tracked on files. Patch from Gustavo
284
* 'bzr status' now shows unknown files inside a selected directory.
285
Patch from Heikki Paajanen.
287
* Merge conflicts are recorded in .bzr. Two new commands 'conflicts'
288
and 'resolve' have needed added, which list and remove those
289
merge conflicts respectively. A conflicted tree cannot be committed
290
in. Contributed by Aaron Bentley.
292
* 'rm' is now an alias for 'remove'.
294
* Stores now split out their content in a single byte prefixed hash,
295
dropping the density of files per directory by 256. Contributed by
298
* 'bzr diff -r branch:URL' will now perform a diff between two branches.
299
Contributed by Robert Collins.
301
* 'bzr log' with the default formatter will show merged revisions,
302
indented to the right. Initial implementation contributed by Gustavo
303
Niemeyer, made incremental by Robert Collins.
308
* Test case failures have the exception printed after the log
309
for your viewing pleasure.
311
* InventoryEntry is now an abstract base class, use one of the
312
concrete InventoryDirectory etc classes instead.
314
* Branch raises an UnsupportedFormatError when it detects a
315
bzr branch it cannot understand. This allows for precise
316
handling of such circumstances.
321
* Removed testsweet module so that tests can be run after
322
bzr installed by 'bzr selftest'.
324
* 'bzr selftest' command-line arguments can now be partial ids
325
of tests to run, e.g. 'bzr selftest test_weave'
332
* Fixed "branch -r" option.
334
* Fix remote access to branches containing non-compressed history.
337
* Better reliability of http server tests. (John Arbash-Meinel)
339
* Merge graph maximum distance calculation fix. (Aaron Bentley)
341
* Various minor bug in windows support have been fixed, largely in the
342
test suite. Contributed by Alexander Belchenko.
346
* Status now accepts a -r argument to give status between chosen
347
revisions. Contributed by Heikki Paajanen.
349
* Revision arguments no longer use +/-/= to control ranges, instead
350
there is a 'before' namespace, which limits the successive namespace.
351
For example '$ bzr log -r date:yesterday..before:date:today' will
352
select everything from yesterday and before today. Contributed by
355
* There is now a bzr.bat file created by distutils when building on
356
Windows. Contributed by Alexander Belchenko.
360
* Removed uuid() as it was unused.
362
* Improved 'fetch' code for pulling revisions from one branch into
363
another (used by pull, merged, etc.)
370
* Adding a file whose parent directory is not versioned will
371
implicitly add the parent, and so on up to the root. This means
372
you should never need to explictly add a directory, they'll just
373
get added when you add a file in the directory. Contributed by
376
* Ignore .DS_Store (contains Mac metadata) by default. Patch from
379
* If you set BZR_EDITOR in the environment, it is checked in
380
preference to EDITOR and the config file for the interactive commit
381
editing program. Related to this is a bugfix where a missing program
382
set in EDITOR would cause editing to fail, now the fallback program
383
for the operating system is still tried.
385
* Files that are not directories/symlinks/regular files will no longer
386
cause bzr to fail, it will just ignore them by default. You cannot add
387
them to the tree though - they are not versionable.
added
removed
NEWS
