/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
1704.2.2 by Martin Pool
Detect terminal width using ioctl
1
IN DEVELOPMENT
2
3
  IMPROVEMENTS:
4
1685.1.81 by John Arbash Meinel
Update NEWS with all of the bugs that this fixes.
5
   * Tests updates to ensure proper URL handling, UNICODE support, and
6
     proper printing when the user's terminal encoding cannot display 
7
     the path of a file that has been versioned.
8
     ``bzr branch`` can take a target URL rather than only a local directory.
9
     Branch.get_parent()/set_parent() now save a relative path if possible,
10
     and normalize the parent based on root, allowing access across
11
     different transports. (John Arbash Meinel, Wouter van Heyst, Martin Pool)
12
     (Malone #48906, #42699, #40675, #5281, #3980, #36363, #43689,
13
      #42517, #42514)
14
1704.2.2 by Martin Pool
Detect terminal width using ioctl
15
   * On Unix, detect terminal width using an ioctl not just $COLUMNS.
16
     Use terminal width for single-line logs from ``bzr log --line`` and
17
     pending-merge display.  (Robert Widhopf-Fenk, Gustavo Niemeyer)
18
     (Malone #3507)
19
1713.1.1 by Robert Collins
Merge benchmark framework.
20
   * On Windows, detect terminal width using GetConsoleScreenBufferInfo.
1704.2.3 by Martin Pool
(win32) Detect terminal width using GetConsoleScreenBufferInfo (Alexander)
21
     (Alexander Belchenko)
1688.2.5 by Guillaume Pinot
Merge With main tree, move the NEWS entry to the good place.
22
1688.2.6 by Guillaume Pinot
Merge with main tree.
23
   * Speedup improvement for 'date:'-revision search. (Guillaume Pinot).
24
1713.1.4 by Robert Collins
Make the test test_time_creates_benchmark_in_result more robust to timing variation.
25
   * Show the correct number of revisions pushed when pushing a new branch.
26
     (Robert Collins).
27
1692.3.6 by Robert Collins
Show the correct number of revisions pushed when pushing a new branch (Robert Collins).
28
   * 'bzr selftest' now shows a progress bar with the number of tests, and 
29
     progress made. 'make check' shows tests in -v mode, to be more useful
30
     for the PQM status window. (Robert Collins).
31
1707.2.1 by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest.
32
   * 'bzr selftest --benchmark' will run a new benchmarking selftest.
1728.1.1 by Robert Collins
(rbc)Merge in benchmark --lsprof-timed lsprofiling feature. (Robert Collins, Martin Pool).
33
     'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
34
     profile data for the individual profiled calls, allowing for fine
35
     grained analysis of performance.
1707.2.1 by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest.
36
     (Robert Collins, Martin Pool).
37
1711.1.1 by Robert Collins
'bzr commit' shows a progress bar. This is useful for commits over sftp
38
   * 'bzr commit' shows a progress bar. This is useful for commits over sftp
39
     where commit can take an appreciable time. (Robert Collins)
1624.3.48 by Olaf Conradi
Add info on standalone branches without a working tree.
40
1711.1.2 by Robert Collins
'bzr add' is now less verbose in telling you what ignore globs were
41
   * 'bzr add' is now less verbose in telling you what ignore globs were
42
     matched by files being ignored. Instead it just tells you how many 
43
     were ignored (because you might reasonably be expecting none to be
44
     ignored). 'bzr add -v' is unchanged and will report every ignored
45
     file. (Robert Collins).
46
1704.2.28 by Martin Pool
[merge] bzr.dev
47
   * ftp now has a test server if medusa is installed. As part of testing,
48
     ftp support has been improved, including support for supplying a
49
     non-standard port. (John Arbash Meinel).
1707.3.22 by John Arbash Meinel
[merge] bzr.dev 1708
50
1740.2.5 by Aaron Bentley
Merge from bzr.dev
51
   * 'bzr log --line' shows the revision number, and uses only the
52
     first line of the log message (#5162, Alexander Belchenko;
53
     Matthieu Moy)
1777.1.1 by Robert Collins
(robertc)Remove --all option from status and deprecate the underlying api.
54
55
   * 'bzr status' has had the --all option removed. The 'bzr ls' command
56
     should be used to retrieve all versioned files. (Robert Collins)
1704.2.20 by Martin Pool
log --line shows revision numbers (Alexander)
57
1704.2.18 by Martin Pool
Remove duplicated TestLocationConfig and update previously hidden tests. (#32587)
58
  BUG FIXES:
59
60
    * Fix shadowed definition of TestLocationConfig that caused some 
61
      tests not to run.  (#32587, Erik Bågfors, Michael Ellerman, 
62
      Martin Pool)
63
1732.2.7 by Martin Pool
Update NEWS for check-related changes
64
    * Fix unnecessary requirement of sign-my-commits that it be run from
65
      a working directory.  (Martin Pool, Robert Collins)
66
1713.2.4 by Robert Collins
Combine the ignore rules into a single regex rather than looping over them
67
  INTERNALS:
68
69
    * Combine the ignore rules into a single regex rather than looping over
1713.2.6 by Robert Collins
Fixup is_ignored patch as per Jan Hudecs review.
70
      them to reduce the threshold where  N^2 behaviour occurs in operations
71
      like status. (Jan Hudec, Robert Collins).
1713.2.4 by Robert Collins
Combine the ignore rules into a single regex rather than looping over them
72
1711.2.3 by John Arbash Meinel
Fix push to only push revisions in the current ancestry. (bug???)
73
    * 'bzr push' should only push the ancestry of the current revision, not
74
      all of the history in the repository. This is especially important for
75
      shared repositories. (John Arbash Meinel)
76
1711.2.27 by John Arbash Meinel
added NEWS entry for compare_trees changes.
77
    * bzrlib.delta.compare_trees now iterates in alphabetically sorted order,
78
      rather than randomly walking the inventories. (John Arbash Meinel)
79
1732.2.7 by Martin Pool
Update NEWS for check-related changes
80
    * Split ``check`` into separate methods on the branch and on the repository,
81
      so that it can be specialized in ways that are useful or efficient for
82
      different formats.  (Martin Pool, Robert Collins)
83
84
    * Deprecate Repository.all_revision_ids; most methods don't really need
85
      the global revision graph but only that part leading up to a particular
86
      revision.  (Martin Pool, Robert Collins)
87
1769.1.1 by Robert Collins
Merge the new ControlFormat core logic to support .hg, .svn etc formats. (Robert Collins, Jelmer Vernooij)
88
    * Add a BzrDirFormat control_formats list which allows for control formats
89
      that do not use '.bzr' to store their data - i.e. '.svn', '.hg' etc.
90
      (Robert Collins, Jelmer Vernooij).
91
1668.1.15 by Martin Pool
Fix setup.py to install launchpad plugin
92
bzr 0.8.2  2006-05-17
93
  
94
  BUG FIXES:
95
   
96
    * setup.py failed to install launchpad plugin.  (Martin Pool)
97
1668.1.14 by Martin Pool
merge olaf - InvalidRevisionId fixes
98
bzr 0.8.1  2006-05-16
1668.1.4 by Martin Pool
Bump version to 0.8.1, update NEWS
99
100
  BUG FIXES:
101
102
    * Fix failure to commit a merge in a checkout.  (Martin Pool, 
103
      Robert Collins, Erik Bågfors, #43959)
104
1668.1.5 by Martin Pool
[broken] fix up display of files changed by a commit
105
    * Nicer messages from 'commit' in the case of renames, and correct
106
      messages when a merge has occured. (Robert Collins, Martin Pool)
107
1668.1.14 by Martin Pool
merge olaf - InvalidRevisionId fixes
108
    * Separate functionality from assert statements as they are skipped in
109
      optimized mode of python. Add the same check to pending merges.
110
      (#44443, Olaf Conradi)
111
112
  CHANGES:
113
114
    * Do not show the None revision in output of bzr ancestry. (Olaf Conradi)
115
1668.3.1 by Olaf Conradi
Backport bzr info improvements to bzr 0.8.
116
    * Add info on standalone branches without a working tree.
117
      (#44155, Olaf Conradi)
118
1668.5.1 by Olaf Conradi
Fix bug in knits when raising InvalidRevisionId without the required
119
    * Fix bug in knits when raising InvalidRevisionId. (#44284, Olaf Conradi)
120
1668.4.1 by Olaf Conradi
Make msgeditor invocation comply with Debian Policy.
121
  CHANGES:
122
123
    * Make editor invocation comply with Debian Policy. First check
124
      environment variables VISUAL and EDITOR, then try editor from
125
      alternatives system. If that all fails, fall back to the pre-defined
126
      list of editors. (#42904, Olaf Conradi)
127
1668.1.10 by Martin Pool
Add register-branch to NEWS
128
  NEW FEATURES:
129
130
    * New 'register-branch' command registers a public branch into 
131
      Launchpad.net, where it can be associated with bugs, etc.
132
      (Martin Pool, Bjorn Tillenius, Robert Collins)
133
1668.1.5 by Martin Pool
[broken] fix up display of files changed by a commit
134
  INTERNALS:
135
136
    * New public api in InventoryEntry - 'describe_change(old, new)' which
137
      provides a human description of the changes between two old and
138
      new. (Robert Collins, Martin Pool)
1185.50.97 by John Arbash Meinel
[merge] bzr.dev 1707
139
1668.3.1 by Olaf Conradi
Backport bzr info improvements to bzr 0.8.
140
  TESTING:
141
142
    * Fix test case for bzr info in upgrading a standalone branch to metadir,
143
      uses bzrlib api now. (Olaf Conradi)
1185.50.97 by John Arbash Meinel
[merge] bzr.dev 1707
144
1702.1.2 by Martin Pool
Prepare for 0.8 release
145
bzr 0.8  2006-05-08
1692.7.8 by Martin Pool
Add additional explanation to NEWS
146
147
  NOTES WHEN UPGRADING:
148
149
    Release 0.8 of bzr introduces a new format for history storage, called
150
    'knit', as an evolution of to the 'weave' format used in 0.7.  Local 
1692.7.10 by Martin Pool
Typo in NEWS
151
    and remote operations are faster using knits than weaves.  Several
1692.7.8 by Martin Pool
Add additional explanation to NEWS
152
    operations including 'init', 'init-repo', and 'upgrade' take a 
153
    --format option that controls this.  Branching from an existing branch
154
    will keep the same format.
155
156
    It is possible to merge, pull and push between branches of different
157
    formats but this is slower than moving data between homogenous
158
    branches.  It is therefore recommended (but not required) that you
159
    upgrade all branches for a project at the same time.  Information on
160
    formats is shown by 'bzr info'.
161
162
    bzr 0.8 now allows creation of 'repositories', which hold the history 
163
    of files and revisions for several branches.  Previously bzr kept all
164
    the history for a branch within the .bzr directory at the root of the
165
    branch, and this is still the default.  To create a repository, use
166
    the new 'bzr init-repo' command.  Branches exist as directories under
167
    the repository and contain just a small amount of information
168
    indicating the current revision of the branch.
169
170
    bzr 0.8 also supports 'checkouts', which are similar to in cvs and
171
    subversion.  Checkouts are associated with a branch (optionally in a
172
    repository), which contains all the historical information.  The
173
    result is that a checkout can be deleted without losing any
1692.7.11 by Martin Pool
(patch) Mention update command in NEWS (Matthieu Moy)
174
    already-committed revisions.  A new 'update' command is also available. 
1692.7.8 by Martin Pool
Add additional explanation to NEWS
175
176
    Repositories and checkouts are not supported with the 0.7 storage
177
    format.  To use them you must upgrad to either knits, or to the
178
    'metaweave' format, which uses weaves but changes the .bzr directory
179
    arrangement.
180
    
1185.65.29 by Robert Collins
Implement final review suggestions.
181
1185.72.17 by Matthieu Moy
Updated the NEWS file
182
  IMPROVEMENTS:
183
1556.1.1 by Robert Collins
Move the SFTP URL change for relative and absolute paths to the right place in NEWS.
184
    * Sftp paths can now be relative, or local, according to the lftp
185
      convention. Paths now take the form:
186
      sftp://user:pass@host:port/~/relative/path
187
      or
188
      sftp://user:pass@host:port/absolute/path
189
1185.72.18 by Matthieu Moy
Credit myself in NEWS. Mentionned FTP connections reuse.
190
    * The FTP transport now tries to reconnect after a temporary
191
      failure. ftp put is made atomic. (Matthieu Moy)
192
193
    * The FTP transport now maintains a pool of connections, and
194
      reuses them to avoid multiple connections to the same host (like
195
      sftp did). (Daniel Silverstone)
1185.72.17 by Matthieu Moy
Updated the NEWS file
196
1551.3.11 by Aaron Bentley
Merge from Robert
197
    * The bzr_man.py file has been removed. To create the man page now,
198
      use ./generate_docs.py man. The new program can also create other files.
199
      Run "python generate_docs.py --help" for usage information. (Hans
200
      Ulrich Niedermann & James Blackwell).
201
202
    * Man Page now gives full help (James Blackwell). Help also updated to 
203
      reflect user config now being stored in .bazaar (Hans Ulrich
204
      Niedermann)
205
1553.6.5 by Erik Bågfors
restructured NEWS
206
    * It's now possible to set aliases in bazaar.conf (Erik Bågfors)
207
208
    * Pull now accepts a --revision argument (Erik Bågfors)
209
1185.78.2 by John Arbash Meinel
Updated NEWS
210
    * 'bzr re-sign' now allows multiple revisions to be supplied on the command
211
      line. You can now use the following command to sign all of your old commits.
212
        find .bzr/revision-store// -name my@email-* \
213
          | sed 's/.*\/\/..\///' \
214
          | xargs bzr re-sign
215
1534.1.22 by Robert Collins
* Two new commands 'bzr checkout' and 'bzr update' allow for CVS/SVN-alike
216
    * Upgrade can now upgrade over the network. (Robert Collins)
217
218
    * Two new commands 'bzr checkout' and 'bzr update' allow for CVS/SVN-alike
1616.1.12 by Martin Pool
Improved news message for checkouts
219
      behaviour.  By default they will cache history in the checkout, but
220
      with --lightweight almost all data is kept in the master branch.
221
      (Robert Collins)
1534.1.22 by Robert Collins
* Two new commands 'bzr checkout' and 'bzr update' allow for CVS/SVN-alike
222
1534.7.174 by Aaron Bentley
Updated NEWS re Tree Transform
223
    * 'revert' unversions newly-versioned files, instead of deleting them.
224
225
    * 'merge' is more robust.  Conflict messages have changed.
226
227
    * 'merge' and 'revert' no longer clobber existing files that end in '~' or
228
      '.moved'.
229
1553.2.13 by Erik Bågfors
reformat NEWS
230
    * Default log format can be set in configuration and plugins can register
231
      their own formatters. (Erik Bågfors)
232
1587.1.1 by Robert Collins
* New 'reconcile' command will check branch consistency and repair indexes
233
    * New 'reconcile' command will check branch consistency and repair indexes
234
      that can become out of sync in pre 0.8 formats. (Robert Collins,
1558.5.10 by Aaron Bentley
Update NEWS
235
      Daniel Silverstone)
1587.1.1 by Robert Collins
* New 'reconcile' command will check branch consistency and repair indexes
236
1553.5.78 by Martin Pool
New bzr init --format option and test
237
    * New 'bzr init --format' and 'bzr upgrade --format' option to control 
238
      what storage format is created or produced.  (Robert Collins, 
239
      Martin Pool)
240
1611.1.1 by Olaf Conradi
Add parent location to info command (Closes feature bug #33364).
241
    * Add parent location to 'bzr info', if there is one.  (Olaf Conradi)
242
1616.1.7 by Martin Pool
New developer commands 'weave-list' and 'weave-join'.
243
    * New developer commands 'weave-list' and 'weave-join'.  (Martin Pool)
244
1558.5.10 by Aaron Bentley
Update NEWS
245
    * New 'init-repository' command, plus support for repositories in 'init'
1654.1.4 by Robert Collins
Teach `bzr init` how to init at the root of a repository.
246
      and 'branch' (Aaron Bentley, Erik Bågfors, Robert Collins)
1558.5.10 by Aaron Bentley
Update NEWS
247
1624.3.21 by Olaf Conradi
Make bzr info command work on both local and remote locations. Support
248
    * Improve output of 'info' command. Show all relevant locations related to
249
      working tree, branch and repository. Use kibibytes for binary quantities.
250
      Fix off-by-one error in missing revisions of working tree.  Make 'info'
1694.2.6 by Martin Pool
[merge] bzr.dev
251
      work on branches, repositories and remote locations.  Show locations
252
      relative to the shared repository, if applicable.  Show locking status
253
      of locations.  (Olaf Conradi)
1624.3.16 by Olaf Conradi
Add NEWS entry.
254
1558.15.9 by Aaron Bentley
Added NEWS entry
255
    * Diff and merge now safely handle binary files. (Aaron Bentley)
256
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
257
    * 'pull' and 'push' now normalise the revision history, so that any two
258
      branches with the same tip revision will have the same output from 'log'.
259
      (Robert Collins)
260
1614.2.12 by Olaf Conradi
Merge bzr.dev
261
    * 'merge' accepts --remember option to store parent location, like 'push'
262
      and 'pull'. (Olaf Conradi)
263
1662.1.13 by Martin Pool
Fix up blackbox test for error on status of nonexistent files
264
    * bzr status and diff when files given as arguments do not exist
265
      in the relevant trees.  (Martin Pool, #3619)
266
1662.1.15 by Martin Pool
Add .hg to default ignore list
267
    * Add '.hg' to the default ignore list.  (Martin Pool)
268
1666.1.6 by Robert Collins
Make knit the default format.
269
    * 'knit' is now the default disk format. This improves disk performance and
270
      utilization, increases incremental pull performance, robustness with SFTP
1666.1.15 by Robert Collins
Mention Johan Rydberg!
271
      and allows checkouts over SFTP to perform acceptably. 
272
      The initial Knit code was contributed by Johan Rydberg based on a
273
      specification by Martin Pool.
1704.2.5 by Martin Pool
Typo
274
      (Robert Collins, Aaron Bentley, Johan Rydberg, Martin Pool).
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
275
1662.1.17 by Martin Pool
[patch] html manual generator (Alexander Belchenko)
276
    * New tool to generate all-in-one html version of the manual.  (Alexander
277
      Belchenko)
278
1666.1.13 by Robert Collins
Update NEWS with SFTP-Ctrl-C fix.
279
    * Hitting CTRL-C while doing an SFTP push will no longer cause stale locks
280
      to be left in the SFTP repository. (Robert Collins, Martin Pool).
281
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
282
    * New option 'diff --prefix' to control how files are named in diff
283
      output, with shortcuts '-p0' and '-p1' corresponding to the options for 
284
      GNU patch.  (Alexander Belchenko, Goffredo Baroncelli, Martin Pool)
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
285
1694.2.6 by Martin Pool
[merge] bzr.dev
286
    * Add --revision option to 'annotate' command.  (Olaf Conradi)
287
1692.5.3 by Olaf Conradi
Add NEWS entry.
288
    * Add --revision option to 'annotate' command.  (Olaf Conradi)
289
1692.1.2 by Robert Collins
Teach reconcile to check the left-most parent is correct in the revision graph.
290
    * If bzr shows an unexpected revision-history after pulling (perhaps due
291
      to a reweave) it can now be corrected by 'bzr reconcile'.
292
      (Robert Collins)
293
1616.1.4 by Martin Pool
Verbose commit shouldn't talk about every unchanged file.
294
  CHANGES:
295
296
    * Commit is now verbose by default, and shows changed filenames and the 
297
      new revision number.  (Robert Collins, Martin Pool)
298
1616.1.8 by Martin Pool
Unify 'mv', 'move', 'rename'. (#5379, Matthew Fuller)
299
    * Unify 'mv', 'move', 'rename'.  (#5379, Matthew Fuller)
300
1616.1.13 by Martin Pool
Fix 'bzr -h' to show help (#35940)
301
    * 'bzr -h' shows help.  (#35940, Martin Pool, Ian Bicking)
302
1614.2.11 by Olaf Conradi
Add NEWS entries.
303
    * Make 'pull' and 'push' remember location on failure using --remember.
304
      (Olaf Conradi)
1614.2.1 by Olaf Conradi
Merge now accepts option --remember to set parent location (closes #35350).
305
1694.2.6 by Martin Pool
[merge] bzr.dev
306
    * For compatibility, make old format for using weaves inside metadir
307
      available as 'metaweave' format.  Rename format 'metadir' to 'default'.
308
      Clean up help for option --format in commands 'init', 'init-repo' and
309
      'upgrade'.  (Olaf Conradi)
310
1185.65.29 by Robert Collins
Implement final review suggestions.
311
  INTERNALS:
312
  
313
    * The internal storage of history, and logical branch identity have now
314
      been split into Branch, and Repository. The common locking and file 
1185.65.30 by Robert Collins
Merge integration.
315
      management routines are now in bzrlib.lockablefiles. 
316
      (Aaron Bentley, Robert Collins, Martin Pool)
1534.1.13 by Robert Collins
* SFTP tests now shortcut the SSH negotiation, reducing test overhead
317
1540.3.8 by Martin Pool
Some support for falling back between transport implementations.
318
    * Transports can now raise DependencyNotPresent if they need a library
319
      which is not installed, and then another implementation will be 
320
      tried.  (Martin Pool)
321
1540.3.6 by Martin Pool
[merge] update from bzr.dev
322
    * Remove obsolete (and no-op) `decode` parameter to `Transport.get`.  
323
      (Martin Pool)
324
1534.7.174 by Aaron Bentley
Updated NEWS re Tree Transform
325
    * Using Tree Transform for merge, revert, tree-building
326
1534.5.16 by Robert Collins
Review feedback.
327
    * WorkingTree.create, Branch.create, WorkingTree.create_standalone,
328
      Branch.initialize are now deprecated. Please see BzrDir.create_* for
329
      replacement API's. (Robert Collins)
330
331
    * New BzrDir class represents the .bzr control directory and manages
332
      formatting issues. (Robert Collins)
333
1534.1.35 by Robert Collins
Update NEWS.
334
    * New repository.InterRepository class encapsulates Repository to 
335
      Repository actions and allows for clean selection of optimised code
336
      paths. (Robert Collins)
337
338
    * bzrlib.fetch.fetch and bzrlib.fetch.greedy_fetch are now deprecated,
339
      please use 'branch.fetch' or 'repository.fetch' depending on your
340
      needs. (Robert Collins)
341
1581.1.1 by Robert Collins
Bugfix aliases to be backwards compatible with plugins providing command.run_argv.
342
    * deprecated methods now have a 'is_deprecated' flag on them that can
343
      be checked, if you need to determine whether a given callable is 
344
      deprecated at runtime. (Robert Collins)
345
1594.1.2 by Robert Collins
Update news and deprecated the old progress bar api.
346
    * Progress bars are now nested - see
347
      bzrlib.ui.ui_factory.nested_progress_bar. (Robert Collins, Robey Pointer)
348
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
349
    * New API call get_format_description() for each type of format.
350
      (Olaf Conradi)
351
1614.2.11 by Olaf Conradi
Add NEWS entries.
352
    * Changed branch.set_parent() to accept None to remove parent.
353
      (Olaf Conradi)
354
1614.2.13 by Olaf Conradi
Re-added AmbiguousBase with a deprecated warning.
355
    * Deprecated BzrError AmbiguousBase.  (Olaf Conradi)
356
1681.1.1 by Robert Collins
Make WorkingTree.branch a read only property. (Robert Collins)
357
    * WorkingTree.branch is now a read only property.  (Robert Collins)
358
1681.1.2 by Robert Collins
* bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
359
    * bzrlib.ui.text.TextUIFactory now accepts a bar_type parameter which
360
      can be None or a factory that will create a progress bar. This is
361
      useful for testing or for overriding the bzrlib.progress heuristic.
362
      (Robert Collins)
363
1694.2.6 by Martin Pool
[merge] bzr.dev
364
    * New API method get_physical_lock_status() to query locks present on a
365
      transport.  (Olaf Conradi)
366
1692.1.1 by Robert Collins
* Repository.reconcile now takes a thorough keyword parameter to allow
367
    * Repository.reconcile now takes a thorough keyword parameter to allow
368
      requesting an indepth reconciliation, rather than just a data-loss 
369
      check. (Robert Collins)
370
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
371
    * bzrlib.ui.ui_factory protocol now supports 'get_boolean' to prompt
372
      the user for yes/no style input. (Robert Collins)
373
1534.1.13 by Robert Collins
* SFTP tests now shortcut the SSH negotiation, reducing test overhead
374
  TESTING:
375
376
    * SFTP tests now shortcut the SSH negotiation, reducing test overhead
377
      for testing SFTP protocol support. (Robey Pointer)
378
1534.5.16 by Robert Collins
Review feedback.
379
    * Branch formats are now tested once per implementation (see bzrlib.
380
      tests.branch_implementations. This is analagous to the transport
381
      interface tests, and has been followed up with working tree,
382
      repository and BzrDir tests. (Robert Collins)
1185.76.8 by Erik Bågfors
update NEWS
383
1534.5.16 by Robert Collins
Review feedback.
384
    * New test base class TestCaseWithTransport provides a transport aware
385
      test environment, useful for testing any transport-interface using
386
      code. The test suite option --transport controls the transport used
387
      by this class (when its not being used as part of implementation
388
      contract testing). (Robert Collins)
1185.76.8 by Erik Bågfors
update NEWS
389
1641.2.1 by Olaf Conradi
Close logging handler on disabling the test log. This will remove the
390
    * Close logging handler on disabling the test log. This will remove the
391
      handler from the internal list inside python's logging module,
392
      preventing shutdown from closing it twice.  (Olaf Conradi)
393
1614.2.11 by Olaf Conradi
Add NEWS entries.
394
    * Move test case for uncommit to blackbox tests.  (Olaf Conradi)
1185.76.8 by Erik Bågfors
update NEWS
395
1687.1.2 by Robert Collins
Add stdin parameter to run_bzr and run_bzr_captured.
396
    * run_bzr and run_bzr_captured now accept a 'stdin="foo"' parameter which
397
      will provide String("foo") to the command as its stdin.
398
1692.7.8 by Martin Pool
Add additional explanation to NEWS
399
bzr 0.7 2006-01-09
1185.16.138 by Martin Pool
[patch] 'bzr init DIR' (John)
400
1185.33.30 by Martin Pool
[merge] jaq
401
  CHANGES:
402
403
    * .bzrignore is excluded from exports, on the grounds that it's a bzr 
404
      internal-use file and may not be wanted.  (Jamie Wilkinson)
405
1185.33.33 by Martin Pool
[patch] add 'bzr inventory --kind directory'; remove 'bzr directories'
406
    * The "bzr directories" command were removed in favor of the new
407
      --kind option to the "bzr inventory" command.  To list all 
408
      versioned directories, now use "bzr inventory --kind directory".  
409
      (Johan Rydberg)
410
1185.39.2 by Alexey Shamrin
updated NEWS to include forgotten changes
411
    * Under Windows configuration directory is now %APPDATA%\bazaar\2.0
412
      by default. (John Arbash Meinel)
413
414
    * The parent of Bzr configuration directory can be set by BZR_HOME
415
      environment variable. Now the path for it is searched in BZR_HOME, then
416
      in HOME. Under Windows the order is: BZR_HOME, APPDATA (usually
417
      points to C:\Documents and Settings\User Name\Application Data), HOME.
418
      (John Arbash Meinel)
419
1515 by Robert Collins
* Plugins with the same name in different directories in the bzr plugin
420
    * Plugins with the same name in different directories in the bzr plugin
421
      path are no longer loaded: only the first successfully loaded one is
422
      used. (Robert Collins)
423
1185.33.67 by Martin Pool
[merge] use /usr/bin/ssh if we can (jamesh)
424
    * Use systems' external ssh command to open connections if possible.  
425
      This gives better integration with user settings such as ProxyCommand.
426
      (James Henstridge)
427
1185.58.9 by John Arbash Meinel
added NEWS entry.
428
    * Permissions on files underneath .bzr/ are inherited from the .bzr 
429
      directory. So for a shared repository, simply doing 'chmod -R g+w .bzr/'
430
      will mean that future file will be created with group write permissions.
431
1185.33.101 by Martin Pool
Remove config.guess and configure.in from builtin ignore list.
432
    * configure.in and config.guess are no longer in the builtin default 
433
      ignore list.
1185.74.5 by James Blackwell
Fixing NEWS
434
1538 by Martin Pool
ignore .sw[nop] by default
435
    * '.sw[nop]' pattern ignored, to ignore vim swap files for nameless
436
      files.  (John Arbash Meinel, Martin Pool)
437
1185.35.4 by Aaron Bentley
Implemented remerge
438
  IMPROVEMENTS:
1185.16.138 by Martin Pool
[patch] 'bzr init DIR' (John)
439
440
    * "bzr INIT dir" now initializes the specified directory, and creates 
441
      it if it does not exist.  (John Arbash Meinel)
442
1185.35.4 by Aaron Bentley
Implemented remerge
443
    * New remerge command (Aaron Bentley)
444
1185.16.141 by Martin Pool
[merge] zsh improvements (Steve Borho)
445
    * Better zsh completion script.  (Steve Borho)
446
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
447
    * 'bzr diff' now returns 1 when there are changes in the working 
1492 by Robert Collins
Support decoration of commands.
448
      tree. (Robert Collins)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
449
450
    * 'bzr push' now exists and can push changes to a remote location. 
451
      This uses the transport infrastructure, and can store the remote
452
      location in the ~/.bazaar/branches.conf configuration file.
1492 by Robert Collins
Support decoration of commands.
453
      (Robert Collins)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
454
1185.35.25 by Aaron Bentley
Updated NEWS
455
    * Test directories are only kept if the test fails and the user requests
456
      that they be kept.
457
458
    * Tweaks to short log printing
459
1185.33.21 by Martin Pool
Document BZR_PDB
460
    * Added branch nicks, new nick command, printing them in log output. 
461
      (Aaron Bentley)
462
463
    * If $BZR_PDB is set, pop into the debugger when an uncaught exception 
464
      occurs.  (Martin Pool)
1185.35.25 by Aaron Bentley
Updated NEWS
465
1185.33.24 by Martin Pool
Add alias 'resolved'
466
    * Accept 'bzr resolved' (an alias for 'bzr resolve'), as this is
467
      the same as Subversion.  (Martin Pool)
468
1185.33.29 by Martin Pool
[merge] ftp transport, renamed-modified
469
    * New ftp transport support (on ftplib), for ftp:// and aftp:// 
470
      URLs.  (Daniel Silverstone)
471
1185.33.50 by Martin Pool
[patch] Commit editor temporary files now start with 'bzr_log.' (Magnus Therning)
472
    * Commit editor temporary files now start with 'bzr_log.', to allow 
473
      text editors to match the file name and set up appropriate modes or 
474
      settings.  (Magnus Therning)
475
1185.33.55 by Martin Pool
[patch] weave fetch optimizations (Goffredo Baroncelli)
476
    * Improved performance when integrating changes from a remote weave.  
477
      (Goffredo Baroncelli)
478
1185.49.20 by John Arbash Meinel
NEWS
479
    * Sftp will attempt to cache the connection, so it is more likely that
480
      a connection will be reused, rather than requiring multiple password
481
      requests.
482
1185.33.83 by Martin Pool
News entries for recent merge from John.
483
    * bzr revno now takes an optional argument indicating the branch whose
484
      revno should be printed.  (Michael Ellerman)
485
486
    * bzr cat defaults to printing the last version of the file.  
487
      (#3632, Matthieu Moy)
488
1185.33.85 by Martin Pool
New --lsprof option from Denys Duchier
489
    * New global option 'bzr --lsprof COMMAND' runs bzr under the lsprof 
490
      profiler.  (Denys Duchier)
491
1185.33.88 by Martin Pool
[patch] read only the table-of-contents of weaves to speed up commit
492
    * Faster commits by reading only the headers of affected weave files. 
493
      (Denys Duchier)
494
1529 by Robert Collins
Take Michaels nicer NEWS entry for dry-run.
495
    * 'bzr add' now takes a --dry-run parameter which shows you what would be
496
      added, but doesn't actually add anything. (Michael Ellerman)
1185.33.90 by Martin Pool
[merge] add --dry-run option (mpe)
497
1551.3.11 by Aaron Bentley
Merge from Robert
498
    * 'bzr add' now lists how many files were ignored per glob.  add --verbose
1185.46.10 by Aaron Bentley
Updated NEWS about add and ignored
499
      lists the specific files.  (Aaron Bentley)
1185.60.1 by Aaron Bentley
Updated NEWS
500
1551.3.11 by Aaron Bentley
Merge from Robert
501
    * 'bzr missing' now supports displaying changes in diverged trees and can
502
      be limited to show what either end of the comparison is missing.
503
      (Aaron Bently, with a little prompting from Daniel Silverstone)
504
1185.16.142 by Martin Pool
[merge] robert
505
  BUG FIXES:
506
507
    * SFTP can walk up to the root path without index errors. (Robert Collins)
508
1185.16.146 by Martin Pool
Fix up assert with sideeffects in CompressedTextStore._copy_one
509
    * Fix bugs in running bzr with 'python -O'.  (Martin Pool)
510
1185.35.25 by Aaron Bentley
Updated NEWS
511
    * Error when run with -OO
512
1185.16.152 by Martin Pool
Handle URLError without http error code
513
    * Fix bug in reporting http errors that don't have an http error code.
514
      (Martin Pool)
515
1185.35.25 by Aaron Bentley
Updated NEWS
516
    * Handle more cases of pipe errors in display commands
517
518
    * Change status to 3 for all errors
519
1185.35.26 by Aaron Bentley
Fixed diff and status on newly-added, newly-deleted files
520
    * Files that are added and unlinked before committing are completely
521
      ignored by diff and status
522
1508 by Robert Collins
Stores with some compressed texts and some uncompressed texts are now able to
523
    * Stores with some compressed texts and some uncompressed texts are now
524
      able to be used. (John A Meinel)
525
1185.31.18 by John Arbash Meinel
[patch] Alexey Shamrin's patch for small win32 fixes
526
    * Fix for bzr pull failing sometimes under windows
527
528
    * Fix for sftp transport under windows when using interactive auth
529
1185.33.29 by Martin Pool
[merge] ftp transport, renamed-modified
530
    * Show files which are both renamed and modified as such in 'bzr 
531
      status' output.  (#4503, Daniel Silverstone)
532
1185.33.31 by Martin Pool
Make annotate cope better with revisions committed without a valid
533
    * Make annotate cope better with revisions committed without a valid 
534
      email address.  (Marien Zwart)
535
1185.33.32 by Martin Pool
[merge] fix \t in commit messages
536
    * Fix representation of tab characters in commit messages.  (Harald 
537
      Meland)
538
1185.33.38 by Martin Pool
NEWS typo
539
    * List of plugin directories in BZR_PLUGIN_PATH environment variable is
1185.39.2 by Alexey Shamrin
updated NEWS to include forgotten changes
540
      now parsed properly under Windows. (Alexander Belchenko)
541
1185.33.44 by Martin Pool
[patch] show number of revisions pushed/pulled/merged (Robey Pointer)
542
    * Show number of revisions pushed/pulled/merged. (Robey Pointer)
543
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
544
    * Keep a cached copy of the basis inventory to speed up operations 
545
      that need to refer to it.  (Johan Rydberg, Martin Pool)
546
1185.33.71 by Martin Pool
Status tests include unicode character.
547
    * Fix bugs in bzr status display of non-ascii characters.  (Martin 
548
      Pool)
549
1537 by Martin Pool
Don't ignore Makefile.in by default (#6413)
550
    * Remove Makefile.in from default ignore list.  (#6413, Tollef Fog 
551
      Heen, Martin Pool)
552
1548 by Martin Pool
Fix 'bzr added' typo, and tests for that command.
553
    * Fix failure in 'bzr added'.  (Nathan McCallum, Martin Pool)
554
1185.16.139 by Martin Pool
[merge] fix sftp selftest and parsing of passwords in sftp urls
555
  TESTING:
556
557
    * Fix selftest asking for passwords when there are no SFTP keys.  
558
      (Robey Pointer, Jelmer Vernooij) 
559
1185.16.146 by Martin Pool
Fix up assert with sideeffects in CompressedTextStore._copy_one
560
    * Fix selftest run with 'python -O'.  (Martin Pool)
1185.44.1 by Martin Pool
Start bringing in basicio code
561
1185.39.2 by Alexey Shamrin
updated NEWS to include forgotten changes
562
    * Fix HTTP tests under Windows. (John Arbash Meinel)
563
564
    * Make tests work even if HOME is not set (Aaron Bentley)
565
566
    * Updated build_tree to use fixed line-endings for tests which read 
567
      the file cotents and compare. Make some tests use this to pass under
568
      Windows. (John Arbash Meinel)
569
570
    * Skip stat and symlink tests under Windows. (Alexander Belchenko)
571
572
    * Delay in selftest/testhashcash is now issued under win32 and Cygwin.
573
      (John Arbash Meinel)
574
1185.33.60 by Martin Pool
Use full terminal width for verbose test output.
575
    * Use terminal width to align verbose test output.  (Martin Pool)
576
1513 by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
577
    * Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
578
      If adding a new test script please add that to
579
      bzrlib.tests.blackbox.__init__. (Robert Collins)
580
1185.51.1 by Martin Pool
Better message when failing to import a test suite.
581
    * Much better error message if one of the test suites can't be 
582
      imported.  (Martin Pool)
583
1526.1.1 by Robert Collins
Run the test suite with no locale as well as the default locale. Also add a test for build_tree_shape to selftest.
584
    * Make check now runs the test suite twice - once with the default locale,
585
      and once with all locales forced to C, to expose bugs. This is not 
586
      trivially done within python, so for now its only triggered by running
587
      Make check. Integrators and packagers who wish to check for full 
1526.1.3 by Robert Collins
Merge from upstream.
588
      platform support should run 'make check' to test the source.
589
      (Robert Collins)
590
1185.33.95 by Martin Pool
New TestSkipped facility, and tests for it.
591
    * Tests can now run TestSkipped if they can't execute for any reason.
1526.1.3 by Robert Collins
Merge from upstream.
592
      (Martin Pool) (NB: TestSkipped should only be raised for correctable
593
      reasons - see the wiki spec ImprovingBzrTestSuite).
1185.33.95 by Martin Pool
New TestSkipped facility, and tests for it.
594
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
595
    * Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
596
      paths for the transport tests. Introduce blackbox remote sftp tests that
597
      test the same permutations. (Robert Collins, Robey Pointer)
598
1530.1.8 by Robert Collins
More NEWS, move sibling sftp tests into new framework, nuke legacy local transport tests.
599
    * Transport implementation tests are now independent of the local file
600
      system, which allows tests for esoteric transports, and for features
601
      not available in the local file system. They also repeat for variations
602
      on the URL scheme that can introduce issues in the transport code,
603
      see bzrlib.transport.TransportTestProviderAdapter() for this.
604
      (Robert Collins).
605
606
    * TestCase.build_tree uses the transport interface to build trees, pass
607
      in a transport parameter to give it an existing connection.
608
      (Robert Collins).
609
1185.44.1 by Martin Pool
Start bringing in basicio code
610
  INTERNALS:
611
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
612
    * WorkingTree.pull has been split across Branch and WorkingTree,
1492 by Robert Collins
Support decoration of commands.
613
      to allow Branch only pulls. (Robert Collins)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
614
615
    * commands.display_command now returns the result of the decorated 
1492 by Robert Collins
Support decoration of commands.
616
      function. (Robert Collins)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
617
618
    * LocationConfig now has a set_user_option(key, value) call to save
619
      a setting in its matching location section (a new one is created
1492 by Robert Collins
Support decoration of commands.
620
      if needed). (Robert Collins)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
621
622
    * Branch has two new methods, get_push_location and set_push_location
1492 by Robert Collins
Support decoration of commands.
623
      to respectively, get and set the push location. (Robert Collins)
624
625
    * commands.register_command now takes an optional flag to signal that
626
      the registrant is planning to decorate an existing command. When 
627
      given multiple plugins registering a command is not an error, and
628
      the original command class (whether built in or a plugin based one) is
629
      returned to the caller. There is a new error 'MustUseDecorated' for
630
      signalling when a wrapping command should switch to the original
631
      version. (Robert Collins)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
632
1495 by Robert Collins
Add a --create-prefix to the new push command.
633
    * Some option parsing errors will raise 'BzrOptionError', allowing 
634
      granular detection for decorating commands. (Robert Collins).
635
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
636
    * Branch.read_working_inventory has moved to
637
      WorkingTree.read_working_inventory. This necessitated changes to
638
      Branch.get_root_id, and a move of Branch.set_inventory to WorkingTree
639
      as well. To make it clear that a WorkingTree cannot always be obtained
640
      Branch.working_tree() will raise 'errors.NoWorkingTree' if one cannot
641
      be obtained. (Robert Collins)
642
1457.1.16 by Robert Collins
Move set_pending_merges to WorkingTree.
643
    * All pending merges operations from Branch are now on WorkingTree.
644
      (Robert Collins)
645
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
646
    * The follow operations from Branch have moved to WorkingTree:
647
      add()
648
      commit()
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
649
      move()
1508.1.7 by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins).
650
      rename_one()
1508.1.6 by Robert Collins
Move Branch.unknowns() to WorkingTree.
651
      unknowns()
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
652
      (Robert Collins)
1457.1.17 by Robert Collins
Branch.commit() has moved to WorkingTree.commit(). (Robert Collins)
653
1508.1.10 by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
654
    * bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
655
1185.47.3 by Martin Pool
Remove basic_io in favor of rio.
656
    * New "rio" serialization format, similar to rfc-822. (Martin Pool)
1185.33.54 by Martin Pool
[merge] test renames and other fixes (John)
657
658
    * Rename selftests to `bzrlib.tests.test_foo`.  (John A Meinel, Martin 
659
      Pool)
1515 by Robert Collins
* Plugins with the same name in different directories in the bzr plugin
660
1516 by Robert Collins
* bzrlib.plugin.all_plugins has been changed from an attribute to a
661
    * bzrlib.plugin.all_plugins has been changed from an attribute to a 
662
      query method. (Robert Collins)
1185.33.88 by Martin Pool
[patch] read only the table-of-contents of weaves to speed up commit
663
 
664
    * New options to read only the table-of-contents of a weave.  
665
      (Denys Duchier)
1528 by Robert Collins
* Raise NoSuchFile when someone tries to add a non-existant file.
666
667
    * Raise NoSuchFile when someone tries to add a non-existant file.
668
      (Michael Ellerman)
669
670
    * Simplify handling of DivergedBranches in cmd_pull().
671
      (Michael Ellerman)
672
		   
1185.44.1 by Martin Pool
Start bringing in basicio code
673
   
1185.65.12 by Robert Collins
Remove the only-used-once put_controlfiles, and change put_controlfile to put and put_utf8.
674
    * Branch.controlfile* logic has moved to lockablefiles.LockableFiles, which
675
      is exposed as Branch().control_files. Also this has been altered with the
676
      controlfile pre/suffix replaced by simple method names like 'get' and
677
      'put'. (Aaron Bentley, Robert Collins).
678
1534.2.4 by Robert Collins
Update NEWS and HACKING for the symbol_versioning module.
679
    * Deprecated functions and methods can now be marked as such using the 
680
      bzrlib.symbol_versioning module. Marked method have their docstring
681
      updated and will issue a DeprecationWarning using the warnings module
682
      when they are used. (Robert Collins)
683
1534.3.1 by Robert Collins
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion
684
    * bzrlib.osutils.safe_unicode now exists to provide parameter coercion
685
      for functions that need unicode strings. (Robert Collins)
686
1185.16.135 by Martin Pool
0.6 release
687
bzr 0.6 2005-10-28
1185.16.28 by Martin Pool
- note new manifest stuff
688
1442.1.3 by Robert Collins
move editor into the config file too
689
  IMPROVEMENTS:
1481 by Robert Collins
Allow the first revision on revision-history to have parents.
690
  
1185.32.3 by John Arbash Meinel
Added NEWS entry.
691
    * pull now takes --verbose to show you what revisions are added or removed
692
      (John A Meinel)
693
1185.18.1 by Aaron Bentley
Added --show-base to merge
694
    * merge now takes a --show-base option to include the base text in
695
      conflicts.
696
      (Aaron Bentley)
697
1185.12.50 by Aaron Bentley
Mentioned CO in NEWS
698
    * The config files are now read using ConfigObj, so '=' should be used as
699
      a separator, not ':'.
1185.18.1 by Aaron Bentley
Added --show-base to merge
700
      (Aaron Bentley)
1442.1.3 by Robert Collins
move editor into the config file too
701
1185.16.65 by mbp at sourcefrog
- new commit --strict option
702
    * New 'bzr commit --strict' option refuses to commit if there are 
703
      any unknown files in the tree.  To commit, make sure all files are 
704
      either ignored, added, or deleted.  (Michael Ellerman)
705
1442.1.3 by Robert Collins
move editor into the config file too
706
    * The config directory is now ~/.bazaar, and there is a single file 
707
      ~/.bazaar/bazaar.conf storing email, editor and other preferences.
1446 by Robert Collins
fixup the verbose-does-nothing for add - add a --quiet instead
708
      (Robert Collins)
709
710
    * 'bzr add' no longer takes a --verbose option, and a --quiet option
711
      has been added that suppresses all output.
1185.16.50 by mbp at sourcefrog
[patch] better zsh completion
712
713
    * Improved zsh completion support in contrib/zsh, from Clint
714
      Adams.
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
715
716
    * Builtin 'bzr annotate' command, by Martin Pool with improvements from 
717
      Goffredo Baroncelli.
1442.1.3 by Robert Collins
move editor into the config file too
718
    
1185.16.54 by Martin Pool
[merge] from robert
719
    * 'bzr check' now accepts -v for verbose reporting, and checks for
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
720
      ghosts in the branch. (Robert Collins)
1442.1.3 by Robert Collins
move editor into the config file too
721
1460 by Robert Collins
merge from martin.
722
    * New command 're-sign' which will regenerate the gpg signature for 
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
723
      a revision. (Robert Collins)
1460 by Robert Collins
merge from martin.
724
725
    * If you set check_signatures=require for a path in 
726
      ~/.bazaar/branches.conf then bzr will invoke your
727
      gpg_signing_command (defaults to gpg) and record a digital signature
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
728
      of your commit. (Robert Collins)
1460 by Robert Collins
merge from martin.
729
1185.16.80 by Martin Pool
Update news and readme
730
    * New sftp transport, based on Paramiko.  (Robey Pointer)
731
1442.1.68 by Robert Collins
'bzr pull' now accepts '--clobber'.
732
    * 'bzr pull' now accepts '--clobber' which will discard local changes
733
      and make this branch identical to the source branch. (Robert Collins)
734
1185.16.82 by mbp at sourcefrog
- give a quieter warning if a plugin can't be loaded
735
    * Just give a quieter warning if a plugin can't be loaded, and 
736
      put the details in .bzr.log.  (Martin Pool)
737
1442.1.71 by Robert Collins
'bzr branch' sets the branch-name,
738
    * 'bzr branch' will now set the branch-name to the last component of the
739
      output directory, if one was supplied.
740
1475 by Robert Collins
update NEWS for post_commit
741
    * If the option 'post_commit' is set to one (or more) python function
742
      names (must be in the bzrlib namespace), then they will be invoked
743
      after the commit has completed, with the branch and revision_id as
744
      parameters. (Robert Collins)
745
1476 by Robert Collins
Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
746
    * Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
747
1185.12.87 by Aaron Bentley
Updated NEWS, error out if --show-base supplied and unsupported
748
    * --merge-type weave is now supported for file contents.  Tree-shape
749
      changes are still three-way based.  (Martin Pool, Aaron Bentley)
750
1481 by Robert Collins
Allow the first revision on revision-history to have parents.
751
    * 'bzr check' allows the first revision on revision-history to have
752
      parents - something that is expected for cheap checkouts, and occurs
1482 by Robert Collins
'revision.revision_graph can handle having only partial history.
753
      when conversions from baz do not have all history.  (Robert Collins).
1481 by Robert Collins
Allow the first revision on revision-history to have parents.
754
1185.12.100 by Aaron Bentley
Updated news
755
   * 'bzr merge' can now graft unrelated trees together, if your specify
756
     0 as a base. (Aaron Bentley)
757
1185.12.102 by Aaron Bentley
Updated NEWS
758
   * 'bzr commit branch' and 'bzr commit branch/file1 branch/file2' now work
759
     (Aaron Bentley)
760
1185.16.111 by mbp at sourcefrog
Add .sconsign* to default ignore list
761
    * Add '.sconsign*' to default ignore list.  (Alexander Belchenko)
1481 by Robert Collins
Allow the first revision on revision-history to have parents.
762
1185.25.2 by Aaron Bentley
Updated NEWS
763
   * 'bzr merge --reprocess' minimizes conflicts
764
1185.1.57 by Robert Collins
nuke --pattern to selftest, replace with regexp.search calls.
765
  TESTING:
766
1185.16.57 by Martin Pool
[merge] from aaron
767
    * The 'bzr selftest --pattern' option for has been removed, now 
768
      test specifiers on the command line can be simple strings, or 
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
769
      regexps, or both. (Robert Collins)
1185.1.57 by Robert Collins
nuke --pattern to selftest, replace with regexp.search calls.
770
1185.1.58 by Robert Collins
make selftest -v show the elapsed time for each test run.
771
    * Passing -v to selftest will now show the time each test took to 
772
      complete, which will aid in analysing performance regressions and
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
773
      related questions. (Robert Collins)
1185.1.58 by Robert Collins
make selftest -v show the elapsed time for each test run.
774
1185.21.10 by Jelmer Vernooij
Fix typo
775
    * 'bzr selftest' runs all tests, even if one fails, unless '--one'
1185.16.61 by mbp at sourcefrog
- start introducing hct error classes
776
      is given. (Martin Pool)
1185.16.58 by mbp at sourcefrog
- run all selftests by default
777
1442.1.70 by Robert Collins
Add assertFileEqual to TestCaseInTempDir.
778
    * There is a new method for TestCaseInTempDir, assertFileEqual, which
779
      will check that a given content is equal to the content of the named
1464 by Robert Collins
Merged Martin.
780
      file. (Robert Collins)
1442.1.70 by Robert Collins
Add assertFileEqual to TestCaseInTempDir.
781
1185.16.109 by mbp at sourcefrog
Clean up test log files when tests complete.
782
    * Fix test suite's habit of leaving many temporary log files in $TMPDIR.
783
      (Martin Pool)
784
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
785
  INTERNALS:
786
1185.16.60 by Martin Pool
- update news of testaments and revprops
787
    * New 'testament' command and concept for making gpg-signatures 
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
788
      of revisions that are not tied to a particular internal
1185.16.60 by Martin Pool
- update news of testaments and revprops
789
      representation.  (Martin Pool).
790
791
    * Per-revision properties ('revprops') as key-value associated 
792
      strings on each revision created when the revision is committed.
793
      Intended mainly for the use of external tools.  (Martin Pool).
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
794
1442.1.23 by Robert Collins
Plugins are now loaded under bzrlib.plugins, not bzrlib.plugin.
795
    * Config options have moved from bzrlib.osutils to bzrlib.config.
1185.16.54 by Martin Pool
[merge] from robert
796
      (Robert Collins)
797
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
798
    * Improved command line option definitions allowing explanations
799
      for individual options, among other things.  Contributed by 
800
      Magnus Therning.
801
1185.16.54 by Martin Pool
[merge] from robert
802
    * Config options have moved from bzrlib.osutils to bzrlib.config.
1442.1.23 by Robert Collins
Plugins are now loaded under bzrlib.plugins, not bzrlib.plugin.
803
      Configuration is now done via the config.Config interface:
1442.1.19 by Robert Collins
BranchConfigs inherit signature_checking policy from their LocationConfig.
804
      Depending on whether you have a Branch, a Location or no information
805
      available, construct a *Config, and use its signature_checking,
1442.1.23 by Robert Collins
Plugins are now loaded under bzrlib.plugins, not bzrlib.plugin.
806
      username and user_email methods. (Robert Collins)
807
808
    * Plugins are now loaded under bzrlib.plugins, not bzrlib.plugin, and
809
      they are made available for other plugins to use. You should not 
810
      import other plugins during the __init__ of your plugin though, as 
811
      no ordering is guaranteed, and the plugins directory is not on the
1457.1.4 by Robert Collins
Branch.relpath has been moved to WorkingTree.relpath.
812
      python path. (Robert Collins)
813
814
    * Branch.relpath has been moved to WorkingTree.relpath. WorkingTree no
815
      no longer takes an inventory, rather it takes an option branch
816
      parameter, and if None is given will open the branch at basedir 
817
      implicitly. (Robert Collins)
1442.1.23 by Robert Collins
Plugins are now loaded under bzrlib.plugins, not bzrlib.plugin.
818
1185.16.61 by mbp at sourcefrog
- start introducing hct error classes
819
    * Cleaner exception structure and error reporting.  Suggested by 
820
      Scott James Remnant.  (Martin Pool)
821
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
822
    * Branch.remove has been moved to WorkingTree, which has also gained
823
      lock_read, lock_write and unlock methods for convenience. (Robert
824
      Collins)
825
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
826
    * Two decorators, needs_read_lock and needs_write_lock have been added
827
      to the branch module. Use these to cause a function to run in a
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
828
      read or write lock respectively. (Robert Collins)
829
830
    * Branch.open_containing now returns a tuple (Branch, relative-path),
831
      which allows direct access to the common case of 'get me this file
832
      from its branch'. (Robert Collins)
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
833
1185.16.80 by Martin Pool
Update news and readme
834
    * Transports can register using register_lazy_transport, and they 
835
      will be loaded when first used.  (Martin Pool)
836
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
837
    * 'pull' has been factored out of the command as WorkingTree.pull().
1442.1.68 by Robert Collins
'bzr pull' now accepts '--clobber'.
838
      A new option to WorkingTree.pull has been added, clobber, which will
839
      ignore diverged history and pull anyway.
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
840
      (Robert Collins)
1442.1.19 by Robert Collins
BranchConfigs inherit signature_checking policy from their LocationConfig.
841
1442.1.69 by Robert Collins
config.Config has a 'get_user_option' call that accepts an option name.
842
    * config.Config has a 'get_user_option' call that accepts an option name.
843
      This will be looked up in branches.conf and bazaar.conf as normal.
844
      It is intended that this be used by plugins to support options - 
845
      options of built in programs should have specific methods on the config.
846
      (Robert Collins)
847
1465 by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts.
848
    * merge.merge_inner now has tempdir as an optional parameter. (Robert
849
      Collins)
850
851
    * Tree.kind is not recorded at the top level of the hierarchy, as it was
852
      missing on EmptyTree, leading to a bug with merge on EmptyTrees.
853
      (Robert Collins)
854
1467 by Robert Collins
WorkingTree.__del__ has been removed.
855
    * WorkingTree.__del__ has been removed, it was non deterministic and not 
856
      doing what it was intended to. See WorkingTree.__init__ for a comment
857
      about future directions. (Robert Collins/Martin Pool)
858
1468 by Robert Collins
The HTTP transport would return NoSuchFile inappropriately.
859
    * bzrlib.transport.http has been modified so that only 404 urllib errors
860
      are returned as NoSuchFile. Other exceptions will propogate as normal.
861
      This allows debuging of actual errors. (Robert Collins)
862
1469 by Robert Collins
Change Transport.* to work with URL's.
863
    * bzrlib.transport.Transport now accepts *ONLY* url escaped relative paths
864
      to apis like 'put', 'get' and 'has'. This is to provide consistent
865
      behaviour - it operates on url's only. (Robert Collins)
866
1185.16.80 by Martin Pool
Update news and readme
867
    * Transports can register using register_lazy_transport, and they 
868
      will be loaded when first used.  (Martin Pool)
869
1476 by Robert Collins
Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
870
    * 'merge_flex' no longer calls conflict_handler.finalize(), instead that
871
      is called by merge_inner. This is so that the conflict count can be 
872
      retrieved (and potentially manipulated) before returning to the caller
873
      of merge_inner. Likewise 'merge' now returns the conflict count to the
874
      caller. (Robert Collins)
875
1482 by Robert Collins
'revision.revision_graph can handle having only partial history.
876
    * 'revision.revision_graph can handle having only partial history for
877
      a revision - that is no revisions in the graph with no parents.
878
      (Robert Collins).
879
1185.12.102 by Aaron Bentley
Updated NEWS
880
    * New builtins.branch_files uses the standard file_list rules to produce
881
      a branch and a list of paths, relative to that branch (Aaron Bentley)
882
1185.16.109 by mbp at sourcefrog
Clean up test log files when tests complete.
883
    * New TestCase.addCleanup facility.
884
1185.16.129 by Martin Pool
Add check that the bzr program and bzrlib version match.
885
    * New bzrlib.version_info tuple (similar to sys.version_info), which can
886
      be used by programs importing bzrlib.
887
1185.16.70 by Martin Pool
- improved handling of non-ascii branch names and test
888
  BUG FIXES:
889
890
    * Better handling of branches in directories with non-ascii names. 
891
      (Joel Rosdahl, Panagiotis Papadakos)
892
1487 by Robert Collins
NEWS file entry for prior commit - upgrades of trees with no revisions should not fail.
893
    * Upgrades of trees with no commits will not fail due to accessing
894
      [-1] in the revision-history. (Andres Salomon)
895
896
1185.17.4 by Martin Pool
- note cherrypicked changes
897
bzr 0.1.1 2005-10-12
898
899
  BUG FIXES:
900
901
    * Fix problem in pulling over http from machines that do not 
902
      allow directories to be listed.
903
904
    * Avoid harmless warning about invalid hash cache after 
905
      upgrading branch format.
906
907
  PERFORMANCE: 
908
  
909
    * Avoid some unnecessary http operations in branch and pull.
910
1185.16.29 by Martin Pool
[merge] config file and other things from robert
911
1185.16.10 by Martin Pool
- prepare 0.1 release
912
bzr 0.1 2005-10-11
1185.1.45 by Robert Collins
Apply Harald Meland's fix to lock with lockf for NFS compatability
913
1185.15.6 by Martin Pool
- release note limitation of branch eta
914
  NOTES:
915
916
    * 'bzr branch' over http initially gives a very high estimate
917
      of completion time but it should fall as the first few 
918
      revisions are pulled in.  branch is still slow on 
919
      high-latency connections.
920
1185.1.45 by Robert Collins
Apply Harald Meland's fix to lock with lockf for NFS compatability
921
  BUG FIXES:
922
  
923
    * bzr-man.py has been updated to work again. Contributed by
924
      Rob Weir.
925
926
    * Locking is now done with fcntl.lockf which works with NFS
927
      file systems. Contributed by Harald Meland.
928
1185.1.48 by Robert Collins
Aarons export fix and conflict on deleted and modified files fix.
929
    * When a merge encounters a file that has been deleted on
930
      one side and modified on the other, the old contents are
931
      written out to foo.BASE and foo.SIDE, where SIDE is this
932
      or OTHER. Contributed by Aaron Bentley.
933
934
    * Export was choosing incorrect file paths for the content of
935
      the tarball, this has been fixed by Aaron Bentley.
936
1414 by Robert Collins
merge in an adjusted version of Jelmer's empty-log detection patch.
937
    * Commit will no longer commit without a log message, an 
938
      error is returned instead. Contributed by Jelmer Vernooij.
939
1416 by Robert Collins
when committing a specific file, include all its parents
940
    * If you commit a specific file in a sub directory, any of its
941
      parent directories that are added but not listed will be 
942
      automatically included. Suggested by Michael Ellerman.
943
1422 by Robert Collins
merge in martins reweave, integrated to fetch, and a bugfix for commit and upgrade with executable files
944
    * bzr commit and upgrade did not correctly record new revisions
945
      for files with only a change to their executable status.
946
      bzr will correct this when it encounters it. Fixed by
947
      Robert Collins
948
1426 by Robert Collins
merge gustavos http_proxy fix for test cases.
949
    * HTTP tests now force off the use of http_proxy for the duration.
950
      Contributed by Gustavo Niemeyer.
951
1185.15.2 by Martin Pool
[merge] from robert and newformat
952
    * Fix problems in merging weave-based branches that have 
953
      different partial views of history.
954
1436 by Robert Collins
bugfix from scott for symlink support when not in the tree root.
955
    * Symlink support: working with symlinks when not in the root of a 
956
      bzr tree was broken, patch from Scott James Remnant.
957
1398 by Robert Collins
integrate in Gustavos x-bit patch
958
1185.1.45 by Robert Collins
Apply Harald Meland's fix to lock with lockf for NFS compatability
959
  IMPROVEMENTS:
960
1185.1.46 by Robert Collins
Aarons branch --basis patch
961
    * 'branch' now accepts a --basis parameter which will take advantage
962
      of local history when making a new branch. This allows faster 
963
      branching of remote branches. Contributed by Aaron Bentley.
964
1391 by Robert Collins
merge from integration
965
    * New tree format based on weave files, called version 5.
966
      Existing branches can be upgraded to this format using 
967
      'bzr upgrade'.
968
1398 by Robert Collins
integrate in Gustavos x-bit patch
969
    * Symlinks are now versionable. Initial patch by 
970
      Erik Toubro Nielsen, updated to head by Robert Collins.
971
972
    * Executable bits are tracked on files. Patch from Gustavo
973
      Niemeyer.
974
1393.1.29 by Martin Pool
- note improvement to status command in NEWS
975
    * 'bzr status' now shows unknown files inside a selected directory.
976
      Patch from Heikki Paajanen.
1398 by Robert Collins
integrate in Gustavos x-bit patch
977
1185.13.2 by Robert Collins
Merge Aarons conflict plugin for 0.1rc1
978
    * Merge conflicts are recorded in .bzr. Two new commands 'conflicts'
979
      and 'resolve' have needed added, which list and remove those 
980
      merge conflicts respectively. A conflicted tree cannot be committed
981
      in. Contributed by Aaron Bentley.
982
1424 by Robert Collins
add rm alias to remove
983
    * 'rm' is now an alias for 'remove'.
984
1430 by Robert Collins
touchup the prefixed-store patch
985
    * Stores now split out their content in a single byte prefixed hash,
986
      dropping the density of files per directory by 256. Contributed by
987
      Gustavo Niemeyer.
988
1432 by Robert Collins
branch: namespace
989
    * 'bzr diff -r branch:URL' will now perform a diff between two branches.
990
      Contributed by Robert Collins.
991
1433 by Robert Collins
merge in and make incremental Gustavo Niemeyers nested log patch, and remove all bare exceptions in store and transport packages.
992
    * 'bzr log' with the default formatter will show merged revisions,
993
      indented to the right. Initial implementation contributed by Gustavo
994
      Niemeyer, made incremental by Robert Collins.
995
1400 by Robert Collins
merge from mpool
996
1185.1.45 by Robert Collins
Apply Harald Meland's fix to lock with lockf for NFS compatability
997
  INTERNALS:
998
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
999
    * Test case failures have the exception printed after the log 
1000
      for your viewing pleasure.
1001
1400 by Robert Collins
merge from mpool
1002
    * InventoryEntry is now an abstract base class, use one of the
1003
      concrete InventoryDirectory etc classes instead.
1004
1423 by Robert Collins
merge in UnsupportedFormatError feature
1005
    * Branch raises an UnsupportedFormatError when it detects a 
1006
      bzr branch it cannot understand. This allows for precise
1007
      handling of such circumstances.
1008
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
1009
1010
  TESTING:
1011
1012
    * Removed testsweet module so that tests can be run after 
1013
      bzr installed by 'bzr selftest'.
1391 by Robert Collins
merge from integration
1014
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1015
    * 'bzr selftest' command-line arguments can now be partial ids
1016
      of tests to run, e.g. 'bzr selftest test_weave'
1017
1185.1.45 by Robert Collins
Apply Harald Meland's fix to lock with lockf for NFS compatability
1018
      
1185.9.1 by Martin Pool
- prepare for 0.0.9 release
1019
bzr 0.0.9 2005-09-23
1020
1021
  BUG FIXES:
1022
1023
    * Fixed "branch -r" option.
1024
1025
    * Fix remote access to branches containing non-compressed history.
1026
      (Robert Collins).
1027
1028
    * Better reliability of http server tests.  (John Arbash-Meinel)
1029
1030
    * Merge graph maximum distance calculation fix.  (Aaron Bentley)
1031
   
1185.1.45 by Robert Collins
Apply Harald Meland's fix to lock with lockf for NFS compatability
1032
    * Various minor bug in windows support have been fixed, largely in the
1033
      test suite. Contributed by Alexander Belchenko.
1034
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
1035
  IMPROVEMENTS:
1036
1391 by Robert Collins
merge from integration
1037
    * Status now accepts a -r argument to give status between chosen
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
1038
      revisions. Contributed by Heikki Paajanen.
1039
1185.1.39 by Robert Collins
Robey Pointers before: namespace to clear up usage of dates in revision parameters
1040
    * Revision arguments no longer use +/-/= to control ranges, instead
1041
      there is a 'before' namespace, which limits the successive namespace.
1042
      For example '$ bzr log -r date:yesterday..before:date:today' will
1043
      select everything from yesterday and before today. Contributed by
1044
      Robey Pointer
1045
1185.1.40 by Robert Collins
Merge what applied of Alexander Belchenko's win32 patch.
1046
    * There is now a bzr.bat file created by distutils when building on 
1047
      Windows. Contributed by Alexander Belchenko.
1388 by Martin Pool
- update NEWS files
1048
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
1049
  INTERNALS:
1050
1390 by Robert Collins
pair programming worx... merge integration and weave
1051
    * Removed uuid() as it was unused.
1181 by Martin Pool
- add test for deserialization from a canned XML inventory
1052
1241 by Martin Pool
- rename last_patch to last_revision
1053
    * Improved 'fetch' code for pulling revisions from one branch into
1054
      another (used by pull, merged, etc.)
1055
1056
1185.7.3 by Martin Pool
- prepare for 0.0.8 release
1057
bzr 0.0.8 2005-09-20
1181 by Martin Pool
- add test for deserialization from a canned XML inventory
1058
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
1059
  IMPROVEMENTS:
1060
1061
    * Adding a file whose parent directory is not versioned will
1062
      implicitly add the parent, and so on up to the root. This means
1063
      you should never need to explictly add a directory, they'll just
1064
      get added when you add a file in the directory.  Contributed by
1065
      Michael Ellerman.
1066
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1067
    * Ignore .DS_Store (contains Mac metadata) by default.  Patch from
1068
      Nir Soffer.
1069
1185.1.30 by Robert Collins
Accept and tweak David Clymers BZREDITOR support patch
1070
    * If you set BZR_EDITOR in the environment, it is checked in
1071
      preference to EDITOR and the config file for the interactive commit
1072
      editing program. Related to this is a bugfix where a missing program
1073
      set in EDITOR would cause editing to fail, now the fallback program
1074
      for the operating system is still tried.
1075
1185.1.32 by Robert Collins
Merge John Meinels patch to support trees with fifo/socket/block files present in the tree
1076
    * Files that are not directories/symlinks/regular files will no longer
1077
      cause bzr to fail, it will just ignore them by default. You cannot add
1078
      them to the tree though - they are not versionable.
1079
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
1080
1181 by Martin Pool
- add test for deserialization from a canned XML inventory
1081
  INTERNALS:
1082
1083
    * Refactor xml packing/unpacking.
1084
1185.1.4 by Martin Pool
- fix _find_remote_branch to avoid strange error for nonexistent branch
1085
  BUG FIXES: 
1086
1087
    * Fixed 'bzr mv' by Ollie Rutherfurd.
1088
1089
    * Fixed strange error when trying to access a nonexistent http
1090
      branch.
1091
1185.3.6 by Martin Pool
- if statcache can't be read, consider that it needs to be rewritten
1092
    * Make sure that the hashcache gets written out if it can't be
1093
      read.
1094
1185.1.4 by Martin Pool
- fix _find_remote_branch to avoid strange error for nonexistent branch
1095
1096
  PORTABILITY:
1097
1098
    * Various Windows fixes from Ollie Rutherfurd.
1099
1185.7.1 by Martin Pool
- Quieten warnings about locking; patch from Matt Lavin.
1100
    * Quieten warnings about locking; patch from Matt Lavin.
1241 by Martin Pool
- rename last_patch to last_revision
1101
1181 by Martin Pool
- add test for deserialization from a canned XML inventory
1102
1175 by Martin Pool
- make 0.0.7 release
1103
bzr-0.0.7 2005-09-02
1091 by Martin Pool
- new shell-complete command to help zsh completion
1104
1105
  NEW FEATURES:
1106
1107
    * ``bzr shell-complete`` command contributed by Clint Adams to
1108
      help with intelligent shell completion.
1109
1105 by Martin Pool
- expose 'find-merge-base' as a new expert command,
1110
    * New expert command ``bzr find-merge-base`` for debugging merges.
1111
1091 by Martin Pool
- new shell-complete command to help zsh completion
1112
1145 by Martin Pool
- additional fix for bzr plugins
1113
  ENHANCEMENTS:
1114
1115
    * Much better merge support.
1116
1148 by Martin Pool
- change conflict markers to suit smerge, etc
1117
    * merge3 conflicts are now reported with markers like '<<<<<<<'
1118
      (seven characters) which is the same as CVS and pleases things
1119
      like emacs smerge.
1120
1145 by Martin Pool
- additional fix for bzr plugins
1121
1092 by Martin Pool
- fix bug where bzr upgrade aborts when trying to fix trees that mention revisions
1122
  BUG FIXES:
1123
1124
    * ``bzr upgrade`` no longer fails when trying to fix trees that
1125
      mention revisions that are not present.
1126
1145 by Martin Pool
- additional fix for bzr plugins
1127
    * Fixed bugs in listing plugins from ``bzr plugins``.
1128
1168 by Martin Pool
- work properly when $EDITOR contains multiple words
1129
    * Fix case of $EDITOR containing options for the editor.
1130
1174 by Martin Pool
- fix off-by-one in 'bzr log -r'
1131
    * Fix log -r refusing to show the last revision.
1132
      (Patch from Goffredo Baroncelli.)
1133
1092 by Martin Pool
- fix bug where bzr upgrade aborts when trying to fix trees that mention revisions
1134
1138 by Martin Pool
- bzr log --show-ids includes parent ids
1135
  CHANGES:
1136
1137
    * ``bzr log --show-ids`` shows the revision ids of all parents.
1138
1174 by Martin Pool
- fix off-by-one in 'bzr log -r'
1139
    * Externally provided commands on your $BZRPATH no longer need
1140
      to recognize --bzr-usage to work properly, and can just handle
1141
      --help themselves.
1142
1138 by Martin Pool
- bzr log --show-ids includes parent ids
1143
1097 by Martin Pool
- send trace messages out through python logging module
1144
  LIBRARY:
1145
1146
    * Changed trace messages to go through the standard logging
1147
      framework, so that they can more easily be redirected by
1148
      libraries.
1149
1150
1151
1086 by Martin Pool
prepare 0.0.6 release
1152
bzr-0.0.6 2005-08-18
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
1153
741 by Martin Pool
- default plugin dir is ~/.bzr.conf/plugins
1154
  NEW FEATURES:
1155
1156
    * Python plugins, automatically loaded from the directories on
1157
      BZR_PLUGIN_PATH or ~/.bzr.conf/plugins by default.
1158
742 by Martin Pool
- new mkdir command
1159
    * New 'bzr mkdir' command.
1160
763 by Martin Pool
- Patch from Torsten Marek to take commit messages through an
1161
    * Commit mesage is fetched from an editor if not given on the
1162
      command line; patch from Torsten Marek.
1163
900 by Martin Pool
- patch from john to search for matching commits
1164
    * ``bzr log -m FOO`` displays commits whose message matches regexp 
1165
      FOO.
971 by Martin Pool
- update news
1166
      
1167
    * ``bzr add`` with no arguments adds everything under the current directory.
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
1168
1169
    * ``bzr mv`` does move or rename depending on its arguments, like
1170
      the Unix command.
1171
1172
    * ``bzr missing`` command shows a summary of the differences
1173
      between two trees.  (Merged from John Arbash-Meinel.)
1174
1074 by Martin Pool
- check for email address in BRANCH_ROOT/.bzr/email, so you can
1175
    * An email address for commits to a particular tree can be
1176
      specified by putting it into .bzr/email within a branch.  (Based
1177
      on a patch from Heikki Paajanen.)
1178
1094 by Martin Pool
- merge aaron's merge improvements 999..1008
1179
971 by Martin Pool
- update news
1180
  ENHANCEMENTS:
1181
1182
    * Faster working tree operations.
900 by Martin Pool
- patch from john to search for matching commits
1183
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
1184
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
1185
  CHANGES:
1186
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
1187
    * 3rd-party modules shipped with bzr are copied within the bzrlib
1188
      python package, so that they can be installed by the setup
1189
      script without clashing with anything already existing on the
1190
      system.  (Contributed by Gustavo Niemeyer.)
1191
1192
    * Moved plugins directory to bzrlib/, so that there's a standard
1193
      plugin directory which is not only installed with bzr itself but
1194
      is also available when using bzr from the development tree.
1195
      BZR_PLUGIN_PATH and DEFAULT_PLUGIN_PATH are then added to the
1196
      standard plugins directory.
1197
849 by Martin Pool
- Put files inside an exported tarball into a top-level directory rather than
1198
    * When exporting to a tarball with ``bzr export --format tgz``, put 
1199
      everything under a top directory rather than dumping it into the
1200
      current directory.   This can be overridden with the ``--root`` 
971 by Martin Pool
- update news
1201
      option.  Patch from William Dodé and John Meinel.
849 by Martin Pool
- Put files inside an exported tarball into a top-level directory rather than
1202
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
1203
    * New ``bzr upgrade`` command to upgrade the format of a branch,
1204
      replacing ``bzr check --update``.
1205
714 by Martin Pool
- files within stores are no longer made readonly
1206
    * Files within store directories are no longer marked readonly on
1207
      disk.
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
1208
796 by Martin Pool
- note bzr log changes
1209
    * Changed ``bzr log`` output to a more compact form suggested by
808 by Martin Pool
- Note new --long log options
1210
      John A Meinel.  Old format is available with the ``--long`` or
1211
      ``-l`` option, patched by William Dodé.
796 by Martin Pool
- note bzr log changes
1212
885 by Martin Pool
- commit command refuses unless something is changed or --unchanged is given
1213
    * By default the commit command refuses to record a revision with
1214
      no changes unless the ``--unchanged`` option is given.
987 by Martin Pool
- note changes to command line parsing
1215
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
1216
    * The ``--no-plugins``, ``--profile`` and ``--builtin`` command
1217
      line options must come before the command name because they 
1218
      affect what commands are available; all other options must come 
1219
      after the command name because their interpretation depends on
1220
      it.
1221
1222
    * ``branch`` and ``clone`` added as aliases for ``branch``.
1223
1224
    * Default log format is back to the long format; the compact one
1225
      is available with ``--short``.
1226
      
1227
      
1228
  BUG FIXES:
1229
  
1230
    * Fix bugs in committing only selected files or within a subdirectory.
1231
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
1232
692 by Martin Pool
0.0.5 release
1233
bzr-0.0.5  2005-06-15
448 by Martin Pool
- bzr with no command now shows help, not just an error
1234
  
1235
  CHANGES:
1236
1237
    * ``bzr`` with no command now shows help rather than giving an
1238
      error.  Suggested by Michael Ellerman.
1239
465 by Martin Pool
- Move show_status() out of Branch into a new function in
1240
    * ``bzr status`` output format changed, because svn-style output
1241
      doesn't really match the model of bzr.  Now files are grouped by
1242
      status and can be shown with their IDs.  ``bzr status --all``
1243
      shows all versioned files and unknown files but not ignored files.
1244
527 by Martin Pool
- refactor log command
1245
    * ``bzr log`` runs from most-recent to least-recent, the reverse
545 by Martin Pool
- --forward option for log
1246
      of the previous order.  The previous behaviour can be obtained
1247
      with the ``--forward`` option.
588 by Martin Pool
- change inventory command to not show ids by default
1248
        
1249
    * ``bzr inventory`` by default shows only filenames, and also ids
1250
      if ``--show-ids`` is given, in which case the id is the second
1251
      field.
527 by Martin Pool
- refactor log command
1252
286 by Martin Pool
- New bzr whoami --email option
1253
1254
  ENHANCEMENTS:
1255
1256
    * New 'bzr whoami --email' option shows only the email component
1257
      of the user identification, from Jo Vermeulen.
1258
420 by Martin Pool
Doc
1259
    * New ``bzr ignore PATTERN`` command.
310 by Martin Pool
- new 'bzr ignored' command!
1260
318 by Martin Pool
- better error message for Ctrl-c
1261
    * Nicer error message for broken pipe, interrupt and similar
1262
      conditions that don't indicate an internal error.
317 by Martin Pool
- better error message for broken pipe
1263
618 by Martin Pool
- ignore .git files as well
1264
    * Add ``.*.sw[nop] .git .*.tmp *,v`` to default ignore patterns.
348 by Martin Pool
- Add vim and RCS ignorefile patterns
1265
353 by Martin Pool
- Per-branch locks in read and write modes.
1266
    * Per-branch locks keyed on ``.bzr/branch-lock``, available in
1267
      either read or write mode.
1268
384 by Martin Pool
doc
1269
    * New option ``bzr log --show-ids`` shows revision and file ids.
367 by Martin Pool
- New --show-ids option for bzr log
1270
378 by Martin Pool
- New usage bzr log FILENAME
1271
    * New usage ``bzr log FILENAME`` shows only revisions that
1272
      affected that file.
1273
379 by Martin Pool
- Simpler compare_inventories() to possibly replace diff_trees
1274
    * Changed format for describing changes in ``bzr log -v``.
1275
389 by Martin Pool
- new commit --file option!
1276
    * New option ``bzr commit --file`` to take a message from a file,
1277
      suggested by LarstiQ.
1278
468 by Martin Pool
- Interpret arguments to bzr status
1279
    * New syntax ``bzr status [FILE...]`` contributed by Bartosz
1280
      Oler.  File may be in a branch other than the working directory.
404 by Martin Pool
- bzr status now optionally takes filenames to check
1281
416 by Martin Pool
- bzr log and bzr root now accept an http URL
1282
    * ``bzr log`` and ``bzr root`` can be given an http URL instead of
1283
      a filename.
1284
422 by Martin Pool
- External-command patch from mpe
1285
    * Commands can now be defined by external programs or scripts
1286
      in a directory on $BZRPATH.
1287
440 by Martin Pool
doc
1288
    * New "stat cache" avoids reading the contents of files if they 
1289
      haven't changed since the previous time.
1290
443 by Martin Pool
- Patch from Fredrik Lundh to check Python version and
1291
    * If the Python interpreter is too old, try to find a better one
1292
      or give an error.  Based on a patch from Fredrik Lundh.
1293
472 by Martin Pool
- Optional branch parameter to info command
1294
    * New optional parameter ``bzr info [BRANCH]``.
1295
491 by Martin Pool
- Selective commit!
1296
    * New form ``bzr commit SELECTED`` to commit only selected files.
1297
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
1298
    * New form ``bzr log -r FROM:TO`` shows changes in selected
1299
      range; contributed by John A Meinel.
1300
571 by Martin Pool
- new --diff-options to pass options through to external
1301
    * New option ``bzr diff --diff-options 'OPTS'`` allows passing
1302
      options through to an external GNU diff.
1303
594 by Martin Pool
- add --no-recurse option for add command
1304
    * New option ``bzr add --no-recurse`` to add a directory but not
1305
      their contents.
1306
607 by Martin Pool
doc
1307
    * ``bzr --version`` now shows more information if bzr is being run
1308
      from a branch.
1309
441 by Martin Pool
- Fix from Lalo for unidiff output of newly added
1310
  
1311
  BUG FIXES:
1312
1313
    * Fixed diff format so that added and removed files will be
1314
      handled properly by patch.  Fix from Lalo Martins.
1315
536 by Martin Pool
doc
1316
    * Various fixes for files whose names contain spaces or other
1317
      metacharacters.
1318
404 by Martin Pool
- bzr status now optionally takes filenames to check
1319
296 by Martin Pool
- better reports from testbzr when it fails
1320
  TESTING:
1321
340 by Martin Pool
- more testcase fixes
1322
    * Converted black-box test suites from Bourne shell into Python;
1323
      now run using ``./testbzr``.  Various structural improvements to
1324
      the tests.
297 by Martin Pool
- fix intentional testcase failure
1325
398 by Martin Pool
- testbzr finds the right version of bzr to test
1326
    * testbzr by default runs the version of bzr found in the same
1327
      directory as the tests, or the one given as the first parameter.
1328
399 by Martin Pool
- testbzr also runs selftests
1329
    * testbzr also runs the internal tests, so the only command
1330
      required to check is just ``./testbzr``.
1331
508 by Martin Pool
- new -p option for testbzr to use a different version of python
1332
    * testbzr requires python2.4, but can be used to test bzr running
1333
      under a different version.
1334
594 by Martin Pool
- add --no-recurse option for add command
1335
    * Tests added for many other changes in this release.
1336
398 by Martin Pool
- testbzr finds the right version of bzr to test
1337
314 by Martin Pool
- Update ElementTree to 1.2.6
1338
  INTERNAL:
1339
1340
    * Included ElementTree library upgraded to 1.2.6 by Fredrik Lundh.
1341
389 by Martin Pool
- new commit --file option!
1342
    * Refactor command functions into Command objects based on HCT by
1343
      Scott James Remnant.
329 by Martin Pool
- refactor command functions into command classes
1344
1345
    * Better help messages for many commands.
1346
344 by Martin Pool
- It's not an error to use the library without
1347
    * Expose bzrlib.open_tracefile() to start the tracefile; until
1348
      this is called trace messages are just discarded.
1349
375 by Martin Pool
- New command touching-revisions and function to trace
1350
    * New internal function find_touching_revisions() and hidden
1351
      command touching-revisions trace the changes to a given file.
297 by Martin Pool
- fix intentional testcase failure
1352
379 by Martin Pool
- Simpler compare_inventories() to possibly replace diff_trees
1353
    * Simpler and faster compare_inventories() function.
1354
397 by Martin Pool
- open_tracefile takes a tracefilename parameter
1355
    * bzrlib.open_tracefile() takes a tracefilename parameter.
1356
409 by Martin Pool
- New AtomicFile class
1357
    * New AtomicFile class.
440 by Martin Pool
doc
1358
1359
    * New developer commands ``added``, ``modified``.
1360
444 by Martin Pool
- cope on platforms with no urandom feature
1361
1362
  PORTABILITY:
1363
1364
    * Cope on Windows on python2.3 by using the weaker random seed.
1365
      2.4 is now only recommended.
1366
1367
280 by Martin Pool
Prepare for 0.0.4 release
1368
bzr-0.0.4  2005-04-22
184 by mbp at sourcefrog
pychecker fixups
1369
196 by mbp at sourcefrog
selected-file diff
1370
  ENHANCEMENTS:
184 by mbp at sourcefrog
pychecker fixups
1371
244 by mbp at sourcefrog
- New 'bzr log --verbose' from Sebastian Cote
1372
    * 'bzr diff' optionally takes a list of files to diff.  Still a bit
196 by mbp at sourcefrog
selected-file diff
1373
      basic.  Patch from QuantumG.
184 by mbp at sourcefrog
pychecker fixups
1374
242 by mbp at sourcefrog
Fix opening of ~/.bzr.log on Windows
1375
    * More default ignore patterns.
1376
244 by mbp at sourcefrog
- New 'bzr log --verbose' from Sebastian Cote
1377
    * New 'bzr log --verbose' shows a list of files changed in the
1378
      changeset.  Patch from Sebastian Cote.
1379
261 by Martin Pool
- auto-rollover of .bzr.log
1380
    * Roll over ~/.bzr.log if it gets too large.
1381
272 by Martin Pool
- Add command aliases
1382
    * Command abbreviations 'ci', 'st', 'stat', '?' based on a patch
1383
      by Jason Diamon.
1384
273 by Martin Pool
- New 'bzr help commands'
1385
    * New 'bzr help commands' based on a patch from Denys Duchier.
1386
235 by mbp at sourcefrog
update NEWS
1387
252 by Martin Pool
- Don't use host fqdn for default user name, because DNS tends
1388
  CHANGES:
1389
1390
    * User email is determined by looking at $BZREMAIL or ~/.bzr.email
1391
      or $EMAIL.  All are decoded by the locale preferred encoding.
1392
      If none of these are present user@hostname is used.  The host's
1393
      fully-qualified name is not used because that tends to fail when
1394
      there are DNS problems.
1395
255 by Martin Pool
- New whoami command
1396
    * New 'bzr whoami' command instead of username user-email.
1397
252 by Martin Pool
- Don't use host fqdn for default user name, because DNS tends
1398
235 by mbp at sourcefrog
update NEWS
1399
  BUG FIXES: 
1400
1401
    * Make commit safe for hardlinked bzr trees.
1402
245 by mbp at sourcefrog
- control files always in utf-8-unix format
1403
    * Some Unicode/locale fixes.
1404
278 by Martin Pool
- Better workaround for trailing newlines in diffs
1405
    * Partial workaround for difflib.unified_diff not handling
1406
      trailing newlines properly.
1407
235 by mbp at sourcefrog
update NEWS
1408
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
1409
  INTERNAL:
1410
1411
    * Allow docstrings for help to be in PEP0257 format.  Patch from
1412
      Matt Brubeck.
1413
235 by mbp at sourcefrog
update NEWS
1414
    * More tests in test.sh.
1415
239 by mbp at sourcefrog
- remove profiler temporary file when done
1416
    * Write profile data to a temporary file not into working
1417
      directory and delete it when done.
238 by mbp at sourcefrog
- Don't put profiling temp file in current directory
1418
257 by Martin Pool
- Write less startup junk to .bzr.log
1419
    * Smaller .bzr.log with process ids.
1420
184 by mbp at sourcefrog
pychecker fixups
1421
242 by mbp at sourcefrog
Fix opening of ~/.bzr.log on Windows
1422
  PORTABILITY:
1423
261 by Martin Pool
- auto-rollover of .bzr.log
1424
    * Fix opening of ~/.bzr.log on Windows.  Patch from Andrew
1425
      Bennetts.
242 by mbp at sourcefrog
Fix opening of ~/.bzr.log on Windows
1426
262 by Martin Pool
- gen_file_id: break the file on either / or \ when looking
1427
    * Some improvements in handling paths on Windows, based on a patch
1428
      from QuantumG.
1429
242 by mbp at sourcefrog
Fix opening of ~/.bzr.log on Windows
1430
181 by mbp at sourcefrog
prepare for 0.0.3 release
1431
bzr-0.0.3  2005-04-06
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
1432
156 by mbp at sourcefrog
new "directories" command
1433
  ENHANCEMENTS:
1434
1435
    * New "directories" internal command lists versioned directories
1436
      in the tree.
1437
159 by mbp at sourcefrog
bzr commit --help now works
1438
    * Can now say "bzr commit --help".
1439
174 by mbp at sourcefrog
- New 'move' command; now separated out from rename
1440
    * New "rename" command to rename one file to a different name
1441
      and/or directory.
1442
1443
    * New "move" command to move one or more files into a different
1444
      directory.
168 by mbp at sourcefrog
new "rename" command
1445
164 by mbp at sourcefrog
new 'renames' command
1446
    * New "renames" command lists files renamed since base revision.
1447
176 by mbp at sourcefrog
New cat command contributed by janmar.
1448
    * New cat command contributed by janmar.
1449
165 by mbp at sourcefrog
- put .bzr.log in /home/mbp
1450
  CHANGES:
1451
166 by mbp at sourcefrog
- Write .bzr.log in utf8
1452
    * .bzr.log is placed in $HOME (not pwd) and is always written in
1453
      UTF-8.  (Probably not a completely good long-term solution, but
1454
      will do for now.)
165 by mbp at sourcefrog
- put .bzr.log in /home/mbp
1455
162 by mbp at sourcefrog
workaround for python2.3 difflib bug
1456
  PORTABILITY:
1457
1458
    * Workaround for difflib bug in Python 2.3 that causes an
1459
      exception when comparing empty files.  Reported by Erik Toubro
1460
      Nielsen.
163 by mbp at sourcefrog
merge win32 portability fixes
1461
165 by mbp at sourcefrog
- put .bzr.log in /home/mbp
1462
  INTERNAL:
1463
1464
    * Refactored inventory storage to insert a root entry at the top.
1465
180 by mbp at sourcefrog
- mv command is gone, but renames seem to be working
1466
  TESTING:
1467
169 by mbp at sourcefrog
Start of shell-based black-box testing in test.sh
1468
    * Start of shell-based black-box testing in test.sh.
1469
163 by mbp at sourcefrog
merge win32 portability fixes
1470
1471
bzr-0.0.2.1
1472
1473
  PORTABILITY:
1474
1475
    * Win32 fixes from Steve Brown.
1476
1477
181 by mbp at sourcefrog
prepare for 0.0.3 release
1478
bzr-0.0.2  "black cube"  2005-03-31
101 by mbp at sourcefrog
change default ignore list
1479
133 by mbp at sourcefrog
- new 'ignored' command
1480
  ENHANCEMENTS:
101 by mbp at sourcefrog
change default ignore list
1481
110 by mbp at sourcefrog
Add more patterns to default ignore list
1482
    * Default ignore list extended (see bzrlib/__init__.py).
101 by mbp at sourcefrog
change default ignore list
1483
102 by mbp at sourcefrog
- cache ignore list in Tree
1484
    * Patterns in .bzrignore are now added to the default ignore list,
1485
      rather than replacing it.
1486
146 by mbp at sourcefrog
match ignore patterns like ./config.h
1487
    * Ignore list isn't reread for every file.
102 by mbp at sourcefrog
- cache ignore list in Tree
1488
110 by mbp at sourcefrog
Add more patterns to default ignore list
1489
    * More help topics.
1490
118 by mbp at sourcefrog
Update news
1491
    * Reinstate the 'bzr check' command to check invariants of the
1492
      branch.
133 by mbp at sourcefrog
- new 'ignored' command
1493
135 by mbp at sourcefrog
Simple new 'deleted' command
1494
    * New 'ignored' command lists which files are ignored and why;
1495
      'deleted' lists files deleted in the current working tree.
1496
1497
    * Performance improvements.
137 by mbp at sourcefrog
new --profile option
1498
1499
    * New global --profile option.
146 by mbp at sourcefrog
match ignore patterns like ./config.h
1500
    
1501
    * Ignore patterns like './config.h' now correctly match files in
163 by mbp at sourcefrog
merge win32 portability fixes
1502
      the root directory only.
1503
1504
99 by mbp at sourcefrog
update for release 0.0.1
1505
bzr-0.0.1  2005-03-26
72 by mbp at sourcefrog
- import a subset of elementtree for easier installation
1506
81 by mbp at sourcefrog
show space usage for various stores in the info command
1507
  ENHANCEMENTS:
1508
1509
    * More information from info command.
1510
83 by mbp at sourcefrog
Can now say "bzr help COMMAND" for more detailed help
1511
    * Can now say "bzr help COMMAND" for more detailed help.
1512
92 by mbp at sourcefrog
more performance measurement
1513
    * Less file flushing and faster performance when writing logs and
1514
      committing to stores.
1515
96 by mbp at sourcefrog
with commit -v, show committed revision number
1516
    * More useful verbose output from some commands.
1517
93 by mbp at sourcefrog
Fix inverted display of 'R' and 'M' during 'commit -v'
1518
  BUG FIXES:
1519
1520
    * Fix inverted display of 'R' and 'M' during 'commit -v'.
1521
72 by mbp at sourcefrog
- import a subset of elementtree for easier installation
1522
  PORTABILITY:
1523
1524
    * Include a subset of ElementTree-1.2.20040618 to make
1525
      installation easier.
1526
73 by mbp at sourcefrog
fix time.localtime call for python 2.3
1527
    * Fix time.localtime call to work with Python 2.3 (the minimum
1528
      supported).
1529
1530
71 by mbp at sourcefrog
Add NEWS file
1531
bzr-0.0.0.69  2005-03-22
1532
1533
  ENHANCEMENTS:
1534
1535
    * First public release.
1536
1537
    * Storage of local versions: init, add, remove, rm, info, log,
1538
      diff, status, etc.