/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
1185.16.28 by Martin Pool
- note new manifest stuff
1
UNRELEASED CHANGES
2
1442.1.3 by Robert Collins
move editor into the config file too
3
  IMPROVEMENTS:
1481 by Robert Collins
Allow the first revision on revision-history to have parents.
4
  
1185.18.1 by Aaron Bentley
Added --show-base to merge
5
    * merge now takes a --show-base option to include the base text in
6
      conflicts.
7
      (Aaron Bentley)
8
1185.12.50 by Aaron Bentley
Mentioned CO in NEWS
9
    * The config files are now read using ConfigObj, so '=' should be used as
10
      a separator, not ':'.
1185.18.1 by Aaron Bentley
Added --show-base to merge
11
      (Aaron Bentley)
1442.1.3 by Robert Collins
move editor into the config file too
12
1185.16.65 by mbp at sourcefrog
- new commit --strict option
13
    * New 'bzr commit --strict' option refuses to commit if there are 
14
      any unknown files in the tree.  To commit, make sure all files are 
15
      either ignored, added, or deleted.  (Michael Ellerman)
16
1442.1.3 by Robert Collins
move editor into the config file too
17
    * The config directory is now ~/.bazaar, and there is a single file 
18
      ~/.bazaar/bazaar.conf storing email, editor and other preferences.
1446 by Robert Collins
fixup the verbose-does-nothing for add - add a --quiet instead
19
      (Robert Collins)
20
21
    * 'bzr add' no longer takes a --verbose option, and a --quiet option
22
      has been added that suppresses all output.
1185.16.50 by mbp at sourcefrog
[patch] better zsh completion
23
24
    * Improved zsh completion support in contrib/zsh, from Clint
25
      Adams.
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
26
27
    * Builtin 'bzr annotate' command, by Martin Pool with improvements from 
28
      Goffredo Baroncelli.
1442.1.3 by Robert Collins
move editor into the config file too
29
    
1185.16.54 by Martin Pool
[merge] from robert
30
    * '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).
31
      ghosts in the branch. (Robert Collins)
1442.1.3 by Robert Collins
move editor into the config file too
32
1460 by Robert Collins
merge from martin.
33
    * 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).
34
      a revision. (Robert Collins)
1460 by Robert Collins
merge from martin.
35
36
    * If you set check_signatures=require for a path in 
37
      ~/.bazaar/branches.conf then bzr will invoke your
38
      gpg_signing_command (defaults to gpg) and record a digital signature
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
39
      of your commit. (Robert Collins)
1460 by Robert Collins
merge from martin.
40
1442.1.68 by Robert Collins
'bzr pull' now accepts '--clobber'.
41
    * 'bzr pull' now accepts '--clobber' which will discard local changes
42
      and make this branch identical to the source branch. (Robert Collins)
43
1442.1.71 by Robert Collins
'bzr branch' sets the branch-name,
44
    * 'bzr branch' will now set the branch-name to the last component of the
45
      output directory, if one was supplied.
46
1185.16.80 by Martin Pool
Update news and readme
47
    * New sftp transport, based on Paramiko.  (Robey Pointer)
48
1475 by Robert Collins
update NEWS for post_commit
49
    * If the option 'post_commit' is set to one (or more) python function
50
      names (must be in the bzrlib namespace), then they will be invoked
51
      after the commit has completed, with the branch and revision_id as
52
      parameters. (Robert Collins)
53
1476 by Robert Collins
Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
54
    * Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
55
1481 by Robert Collins
Allow the first revision on revision-history to have parents.
56
    * 'bzr check' allows the first revision on revision-history to have
57
      parents - something that is expected for cheap checkouts, and occurs
58
      when conversions from baz do not have all history.
59
1185.1.57 by Robert Collins
nuke --pattern to selftest, replace with regexp.search calls.
60
  TESTING:
61
1185.16.57 by Martin Pool
[merge] from aaron
62
    * The 'bzr selftest --pattern' option for has been removed, now 
63
      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).
64
      regexps, or both. (Robert Collins)
1185.1.57 by Robert Collins
nuke --pattern to selftest, replace with regexp.search calls.
65
1185.1.58 by Robert Collins
make selftest -v show the elapsed time for each test run.
66
    * Passing -v to selftest will now show the time each test took to 
67
      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).
68
      related questions. (Robert Collins)
1185.1.58 by Robert Collins
make selftest -v show the elapsed time for each test run.
69
1185.16.58 by mbp at sourcefrog
- run all selftests by default
70
    * 'bzr selftest' runs all tests, even if one feels, unless '--one'
1185.16.61 by mbp at sourcefrog
- start introducing hct error classes
71
      is given. (Martin Pool)
1185.16.58 by mbp at sourcefrog
- run all selftests by default
72
1442.1.70 by Robert Collins
Add assertFileEqual to TestCaseInTempDir.
73
    * There is a new method for TestCaseInTempDir, assertFileEqual, which
74
      will check that a given content is equal to the content of the named
1464 by Robert Collins
Merged Martin.
75
      file. (Robert Collins)
1442.1.70 by Robert Collins
Add assertFileEqual to TestCaseInTempDir.
76
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
77
  INTERNALS:
78
1185.16.60 by Martin Pool
- update news of testaments and revprops
79
    * New 'testament' command and concept for making gpg-signatures 
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
80
      of revisions that are not tied to a particular internal
1185.16.60 by Martin Pool
- update news of testaments and revprops
81
      representation.  (Martin Pool).
82
83
    * Per-revision properties ('revprops') as key-value associated 
84
      strings on each revision created when the revision is committed.
85
      Intended mainly for the use of external tools.  (Martin Pool).
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
86
1442.1.23 by Robert Collins
Plugins are now loaded under bzrlib.plugins, not bzrlib.plugin.
87
    * Config options have moved from bzrlib.osutils to bzrlib.config.
1185.16.54 by Martin Pool
[merge] from robert
88
      (Robert Collins)
89
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
90
    * Improved command line option definitions allowing explanations
91
      for individual options, among other things.  Contributed by 
92
      Magnus Therning.
93
1185.16.54 by Martin Pool
[merge] from robert
94
    * 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.
95
      Configuration is now done via the config.Config interface:
1442.1.19 by Robert Collins
BranchConfigs inherit signature_checking policy from their LocationConfig.
96
      Depending on whether you have a Branch, a Location or no information
97
      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.
98
      username and user_email methods. (Robert Collins)
99
100
    * Plugins are now loaded under bzrlib.plugins, not bzrlib.plugin, and
101
      they are made available for other plugins to use. You should not 
102
      import other plugins during the __init__ of your plugin though, as 
103
      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.
104
      python path. (Robert Collins)
105
106
    * Branch.relpath has been moved to WorkingTree.relpath. WorkingTree no
107
      no longer takes an inventory, rather it takes an option branch
108
      parameter, and if None is given will open the branch at basedir 
109
      implicitly. (Robert Collins)
1442.1.23 by Robert Collins
Plugins are now loaded under bzrlib.plugins, not bzrlib.plugin.
110
1185.16.61 by mbp at sourcefrog
- start introducing hct error classes
111
    * Cleaner exception structure and error reporting.  Suggested by 
112
      Scott James Remnant.  (Martin Pool)
113
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
114
    * Branch.remove has been moved to WorkingTree, which has also gained
115
      lock_read, lock_write and unlock methods for convenience. (Robert
116
      Collins)
117
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
118
    * Two decorators, needs_read_lock and needs_write_lock have been added
119
      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).
120
      read or write lock respectively. (Robert Collins)
121
122
    * Branch.open_containing now returns a tuple (Branch, relative-path),
123
      which allows direct access to the common case of 'get me this file
124
      from its branch'. (Robert Collins)
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
125
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
126
    * 'pull' has been factored out of the command as WorkingTree.pull().
1442.1.68 by Robert Collins
'bzr pull' now accepts '--clobber'.
127
      A new option to WorkingTree.pull has been added, clobber, which will
128
      ignore diverged history and pull anyway.
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
129
      (Robert Collins)
1442.1.19 by Robert Collins
BranchConfigs inherit signature_checking policy from their LocationConfig.
130
1442.1.69 by Robert Collins
config.Config has a 'get_user_option' call that accepts an option name.
131
    * config.Config has a 'get_user_option' call that accepts an option name.
132
      This will be looked up in branches.conf and bazaar.conf as normal.
133
      It is intended that this be used by plugins to support options - 
134
      options of built in programs should have specific methods on the config.
135
      (Robert Collins)
136
1465 by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts.
137
    * merge.merge_inner now has tempdir as an optional parameter. (Robert
138
      Collins)
139
140
    * Tree.kind is not recorded at the top level of the hierarchy, as it was
141
      missing on EmptyTree, leading to a bug with merge on EmptyTrees.
142
      (Robert Collins)
143
1467 by Robert Collins
WorkingTree.__del__ has been removed.
144
    * WorkingTree.__del__ has been removed, it was non deterministic and not 
145
      doing what it was intended to. See WorkingTree.__init__ for a comment
146
      about future directions. (Robert Collins/Martin Pool)
147
1468 by Robert Collins
The HTTP transport would return NoSuchFile inappropriately.
148
    * bzrlib.transport.http has been modified so that only 404 urllib errors
149
      are returned as NoSuchFile. Other exceptions will propogate as normal.
150
      This allows debuging of actual errors. (Robert Collins)
151
1469 by Robert Collins
Change Transport.* to work with URL's.
152
    * bzrlib.transport.Transport now accepts *ONLY* url escaped relative paths
153
      to apis like 'put', 'get' and 'has'. This is to provide consistent
154
      behaviour - it operates on url's only. (Robert Collins)
155
1185.16.80 by Martin Pool
Update news and readme
156
    * Transports can register using register_lazy_transport, and they 
157
      will be loaded when first used.  (Martin Pool)
158
1476 by Robert Collins
Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
159
    * 'merge_flex' no longer calls conflict_handler.finalize(), instead that
160
      is called by merge_inner. This is so that the conflict count can be 
161
      retrieved (and potentially manipulated) before returning to the caller
162
      of merge_inner. Likewise 'merge' now returns the conflict count to the
163
      caller. (Robert Collins)
164
1185.16.70 by Martin Pool
- improved handling of non-ascii branch names and test
165
  BUG FIXES:
166
167
    * Better handling of branches in directories with non-ascii names. 
168
      (Joel Rosdahl, Panagiotis Papadakos)
169
1185.17.4 by Martin Pool
- note cherrypicked changes
170
bzr 0.1.1 2005-10-12
171
172
  BUG FIXES:
173
174
    * Fix problem in pulling over http from machines that do not 
175
      allow directories to be listed.
176
177
    * Avoid harmless warning about invalid hash cache after 
178
      upgrading branch format.
179
180
  PERFORMANCE: 
181
  
182
    * Avoid some unnecessary http operations in branch and pull.
183
1185.16.29 by Martin Pool
[merge] config file and other things from robert
184
1185.16.10 by Martin Pool
- prepare 0.1 release
185
bzr 0.1 2005-10-11
1185.1.45 by Robert Collins
Apply Harald Meland's fix to lock with lockf for NFS compatability
186
1185.15.6 by Martin Pool
- release note limitation of branch eta
187
  NOTES:
188
189
    * 'bzr branch' over http initially gives a very high estimate
190
      of completion time but it should fall as the first few 
191
      revisions are pulled in.  branch is still slow on 
192
      high-latency connections.
193
1185.1.45 by Robert Collins
Apply Harald Meland's fix to lock with lockf for NFS compatability
194
  BUG FIXES:
195
  
196
    * bzr-man.py has been updated to work again. Contributed by
197
      Rob Weir.
198
199
    * Locking is now done with fcntl.lockf which works with NFS
200
      file systems. Contributed by Harald Meland.
201
1185.1.48 by Robert Collins
Aarons export fix and conflict on deleted and modified files fix.
202
    * When a merge encounters a file that has been deleted on
203
      one side and modified on the other, the old contents are
204
      written out to foo.BASE and foo.SIDE, where SIDE is this
205
      or OTHER. Contributed by Aaron Bentley.
206
207
    * Export was choosing incorrect file paths for the content of
208
      the tarball, this has been fixed by Aaron Bentley.
209
1414 by Robert Collins
merge in an adjusted version of Jelmer's empty-log detection patch.
210
    * Commit will no longer commit without a log message, an 
211
      error is returned instead. Contributed by Jelmer Vernooij.
212
1416 by Robert Collins
when committing a specific file, include all its parents
213
    * If you commit a specific file in a sub directory, any of its
214
      parent directories that are added but not listed will be 
215
      automatically included. Suggested by Michael Ellerman.
216
1422 by Robert Collins
merge in martins reweave, integrated to fetch, and a bugfix for commit and upgrade with executable files
217
    * bzr commit and upgrade did not correctly record new revisions
218
      for files with only a change to their executable status.
219
      bzr will correct this when it encounters it. Fixed by
220
      Robert Collins
221
1426 by Robert Collins
merge gustavos http_proxy fix for test cases.
222
    * HTTP tests now force off the use of http_proxy for the duration.
223
      Contributed by Gustavo Niemeyer.
224
1185.15.2 by Martin Pool
[merge] from robert and newformat
225
    * Fix problems in merging weave-based branches that have 
226
      different partial views of history.
227
1436 by Robert Collins
bugfix from scott for symlink support when not in the tree root.
228
    * Symlink support: working with symlinks when not in the root of a 
229
      bzr tree was broken, patch from Scott James Remnant.
230
1398 by Robert Collins
integrate in Gustavos x-bit patch
231
1185.1.45 by Robert Collins
Apply Harald Meland's fix to lock with lockf for NFS compatability
232
  IMPROVEMENTS:
233
1185.1.46 by Robert Collins
Aarons branch --basis patch
234
    * 'branch' now accepts a --basis parameter which will take advantage
235
      of local history when making a new branch. This allows faster 
236
      branching of remote branches. Contributed by Aaron Bentley.
237
1391 by Robert Collins
merge from integration
238
    * New tree format based on weave files, called version 5.
239
      Existing branches can be upgraded to this format using 
240
      'bzr upgrade'.
241
1398 by Robert Collins
integrate in Gustavos x-bit patch
242
    * Symlinks are now versionable. Initial patch by 
243
      Erik Toubro Nielsen, updated to head by Robert Collins.
244
245
    * Executable bits are tracked on files. Patch from Gustavo
246
      Niemeyer.
247
1393.1.29 by Martin Pool
- note improvement to status command in NEWS
248
    * 'bzr status' now shows unknown files inside a selected directory.
249
      Patch from Heikki Paajanen.
1398 by Robert Collins
integrate in Gustavos x-bit patch
250
1185.13.2 by Robert Collins
Merge Aarons conflict plugin for 0.1rc1
251
    * Merge conflicts are recorded in .bzr. Two new commands 'conflicts'
252
      and 'resolve' have needed added, which list and remove those 
253
      merge conflicts respectively. A conflicted tree cannot be committed
254
      in. Contributed by Aaron Bentley.
255
1424 by Robert Collins
add rm alias to remove
256
    * 'rm' is now an alias for 'remove'.
257
1430 by Robert Collins
touchup the prefixed-store patch
258
    * Stores now split out their content in a single byte prefixed hash,
259
      dropping the density of files per directory by 256. Contributed by
260
      Gustavo Niemeyer.
261
1432 by Robert Collins
branch: namespace
262
    * 'bzr diff -r branch:URL' will now perform a diff between two branches.
263
      Contributed by Robert Collins.
264
1433 by Robert Collins
merge in and make incremental Gustavo Niemeyers nested log patch, and remove all bare exceptions in store and transport packages.
265
    * 'bzr log' with the default formatter will show merged revisions,
266
      indented to the right. Initial implementation contributed by Gustavo
267
      Niemeyer, made incremental by Robert Collins.
268
1400 by Robert Collins
merge from mpool
269
1185.1.45 by Robert Collins
Apply Harald Meland's fix to lock with lockf for NFS compatability
270
  INTERNALS:
271
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
272
    * Test case failures have the exception printed after the log 
273
      for your viewing pleasure.
274
1400 by Robert Collins
merge from mpool
275
    * InventoryEntry is now an abstract base class, use one of the
276
      concrete InventoryDirectory etc classes instead.
277
1423 by Robert Collins
merge in UnsupportedFormatError feature
278
    * Branch raises an UnsupportedFormatError when it detects a 
279
      bzr branch it cannot understand. This allows for precise
280
      handling of such circumstances.
281
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
282
283
  TESTING:
284
285
    * Removed testsweet module so that tests can be run after 
286
      bzr installed by 'bzr selftest'.
1391 by Robert Collins
merge from integration
287
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
288
    * 'bzr selftest' command-line arguments can now be partial ids
289
      of tests to run, e.g. 'bzr selftest test_weave'
290
1185.1.45 by Robert Collins
Apply Harald Meland's fix to lock with lockf for NFS compatability
291
      
1185.9.1 by Martin Pool
- prepare for 0.0.9 release
292
bzr 0.0.9 2005-09-23
293
294
  BUG FIXES:
295
296
    * Fixed "branch -r" option.
297
298
    * Fix remote access to branches containing non-compressed history.
299
      (Robert Collins).
300
301
    * Better reliability of http server tests.  (John Arbash-Meinel)
302
303
    * Merge graph maximum distance calculation fix.  (Aaron Bentley)
304
   
1185.1.45 by Robert Collins
Apply Harald Meland's fix to lock with lockf for NFS compatability
305
    * Various minor bug in windows support have been fixed, largely in the
306
      test suite. Contributed by Alexander Belchenko.
307
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
308
  IMPROVEMENTS:
309
1391 by Robert Collins
merge from integration
310
    * Status now accepts a -r argument to give status between chosen
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
311
      revisions. Contributed by Heikki Paajanen.
312
1185.1.39 by Robert Collins
Robey Pointers before: namespace to clear up usage of dates in revision parameters
313
    * Revision arguments no longer use +/-/= to control ranges, instead
314
      there is a 'before' namespace, which limits the successive namespace.
315
      For example '$ bzr log -r date:yesterday..before:date:today' will
316
      select everything from yesterday and before today. Contributed by
317
      Robey Pointer
318
1185.1.40 by Robert Collins
Merge what applied of Alexander Belchenko's win32 patch.
319
    * There is now a bzr.bat file created by distutils when building on 
320
      Windows. Contributed by Alexander Belchenko.
1388 by Martin Pool
- update NEWS files
321
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
322
  INTERNALS:
323
1390 by Robert Collins
pair programming worx... merge integration and weave
324
    * Removed uuid() as it was unused.
1181 by Martin Pool
- add test for deserialization from a canned XML inventory
325
1241 by Martin Pool
- rename last_patch to last_revision
326
    * Improved 'fetch' code for pulling revisions from one branch into
327
      another (used by pull, merged, etc.)
328
329
1185.7.3 by Martin Pool
- prepare for 0.0.8 release
330
bzr 0.0.8 2005-09-20
1181 by Martin Pool
- add test for deserialization from a canned XML inventory
331
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
332
  IMPROVEMENTS:
333
334
    * Adding a file whose parent directory is not versioned will
335
      implicitly add the parent, and so on up to the root. This means
336
      you should never need to explictly add a directory, they'll just
337
      get added when you add a file in the directory.  Contributed by
338
      Michael Ellerman.
339
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
340
    * Ignore .DS_Store (contains Mac metadata) by default.  Patch from
341
      Nir Soffer.
342
1185.1.30 by Robert Collins
Accept and tweak David Clymers BZREDITOR support patch
343
    * If you set BZR_EDITOR in the environment, it is checked in
344
      preference to EDITOR and the config file for the interactive commit
345
      editing program. Related to this is a bugfix where a missing program
346
      set in EDITOR would cause editing to fail, now the fallback program
347
      for the operating system is still tried.
348
1185.1.32 by Robert Collins
Merge John Meinels patch to support trees with fifo/socket/block files present in the tree
349
    * Files that are not directories/symlinks/regular files will no longer
350
      cause bzr to fail, it will just ignore them by default. You cannot add
351
      them to the tree though - they are not versionable.
352
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
353
1181 by Martin Pool
- add test for deserialization from a canned XML inventory
354
  INTERNALS:
355
356
    * Refactor xml packing/unpacking.
357
1185.1.4 by Martin Pool
- fix _find_remote_branch to avoid strange error for nonexistent branch
358
  BUG FIXES: 
359
360
    * Fixed 'bzr mv' by Ollie Rutherfurd.
361
362
    * Fixed strange error when trying to access a nonexistent http
363
      branch.
364
1185.3.6 by Martin Pool
- if statcache can't be read, consider that it needs to be rewritten
365
    * Make sure that the hashcache gets written out if it can't be
366
      read.
367
1185.1.4 by Martin Pool
- fix _find_remote_branch to avoid strange error for nonexistent branch
368
369
  PORTABILITY:
370
371
    * Various Windows fixes from Ollie Rutherfurd.
372
1185.7.1 by Martin Pool
- Quieten warnings about locking; patch from Matt Lavin.
373
    * Quieten warnings about locking; patch from Matt Lavin.
1241 by Martin Pool
- rename last_patch to last_revision
374
1181 by Martin Pool
- add test for deserialization from a canned XML inventory
375
1175 by Martin Pool
- make 0.0.7 release
376
bzr-0.0.7 2005-09-02
1091 by Martin Pool
- new shell-complete command to help zsh completion
377
378
  NEW FEATURES:
379
380
    * ``bzr shell-complete`` command contributed by Clint Adams to
381
      help with intelligent shell completion.
382
1105 by Martin Pool
- expose 'find-merge-base' as a new expert command,
383
    * New expert command ``bzr find-merge-base`` for debugging merges.
384
1091 by Martin Pool
- new shell-complete command to help zsh completion
385
1145 by Martin Pool
- additional fix for bzr plugins
386
  ENHANCEMENTS:
387
388
    * Much better merge support.
389
1148 by Martin Pool
- change conflict markers to suit smerge, etc
390
    * merge3 conflicts are now reported with markers like '<<<<<<<'
391
      (seven characters) which is the same as CVS and pleases things
392
      like emacs smerge.
393
1145 by Martin Pool
- additional fix for bzr plugins
394
1092 by Martin Pool
- fix bug where bzr upgrade aborts when trying to fix trees that mention revisions
395
  BUG FIXES:
396
397
    * ``bzr upgrade`` no longer fails when trying to fix trees that
398
      mention revisions that are not present.
399
1145 by Martin Pool
- additional fix for bzr plugins
400
    * Fixed bugs in listing plugins from ``bzr plugins``.
401
1168 by Martin Pool
- work properly when $EDITOR contains multiple words
402
    * Fix case of $EDITOR containing options for the editor.
403
1174 by Martin Pool
- fix off-by-one in 'bzr log -r'
404
    * Fix log -r refusing to show the last revision.
405
      (Patch from Goffredo Baroncelli.)
406
1092 by Martin Pool
- fix bug where bzr upgrade aborts when trying to fix trees that mention revisions
407
1138 by Martin Pool
- bzr log --show-ids includes parent ids
408
  CHANGES:
409
410
    * ``bzr log --show-ids`` shows the revision ids of all parents.
411
1174 by Martin Pool
- fix off-by-one in 'bzr log -r'
412
    * Externally provided commands on your $BZRPATH no longer need
413
      to recognize --bzr-usage to work properly, and can just handle
414
      --help themselves.
415
1138 by Martin Pool
- bzr log --show-ids includes parent ids
416
1097 by Martin Pool
- send trace messages out through python logging module
417
  LIBRARY:
418
419
    * Changed trace messages to go through the standard logging
420
      framework, so that they can more easily be redirected by
421
      libraries.
422
423
424
1086 by Martin Pool
prepare 0.0.6 release
425
bzr-0.0.6 2005-08-18
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
426
741 by Martin Pool
- default plugin dir is ~/.bzr.conf/plugins
427
  NEW FEATURES:
428
429
    * Python plugins, automatically loaded from the directories on
430
      BZR_PLUGIN_PATH or ~/.bzr.conf/plugins by default.
431
742 by Martin Pool
- new mkdir command
432
    * New 'bzr mkdir' command.
433
763 by Martin Pool
- Patch from Torsten Marek to take commit messages through an
434
    * Commit mesage is fetched from an editor if not given on the
435
      command line; patch from Torsten Marek.
436
900 by Martin Pool
- patch from john to search for matching commits
437
    * ``bzr log -m FOO`` displays commits whose message matches regexp 
438
      FOO.
971 by Martin Pool
- update news
439
      
440
    * ``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
441
442
    * ``bzr mv`` does move or rename depending on its arguments, like
443
      the Unix command.
444
445
    * ``bzr missing`` command shows a summary of the differences
446
      between two trees.  (Merged from John Arbash-Meinel.)
447
1074 by Martin Pool
- check for email address in BRANCH_ROOT/.bzr/email, so you can
448
    * An email address for commits to a particular tree can be
449
      specified by putting it into .bzr/email within a branch.  (Based
450
      on a patch from Heikki Paajanen.)
451
1094 by Martin Pool
- merge aaron's merge improvements 999..1008
452
971 by Martin Pool
- update news
453
  ENHANCEMENTS:
454
455
    * Faster working tree operations.
900 by Martin Pool
- patch from john to search for matching commits
456
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
457
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
458
  CHANGES:
459
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
460
    * 3rd-party modules shipped with bzr are copied within the bzrlib
461
      python package, so that they can be installed by the setup
462
      script without clashing with anything already existing on the
463
      system.  (Contributed by Gustavo Niemeyer.)
464
465
    * Moved plugins directory to bzrlib/, so that there's a standard
466
      plugin directory which is not only installed with bzr itself but
467
      is also available when using bzr from the development tree.
468
      BZR_PLUGIN_PATH and DEFAULT_PLUGIN_PATH are then added to the
469
      standard plugins directory.
470
849 by Martin Pool
- Put files inside an exported tarball into a top-level directory rather than
471
    * When exporting to a tarball with ``bzr export --format tgz``, put 
472
      everything under a top directory rather than dumping it into the
473
      current directory.   This can be overridden with the ``--root`` 
971 by Martin Pool
- update news
474
      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
475
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
476
    * New ``bzr upgrade`` command to upgrade the format of a branch,
477
      replacing ``bzr check --update``.
478
714 by Martin Pool
- files within stores are no longer made readonly
479
    * Files within store directories are no longer marked readonly on
480
      disk.
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
481
796 by Martin Pool
- note bzr log changes
482
    * Changed ``bzr log`` output to a more compact form suggested by
808 by Martin Pool
- Note new --long log options
483
      John A Meinel.  Old format is available with the ``--long`` or
484
      ``-l`` option, patched by William Dodé.
796 by Martin Pool
- note bzr log changes
485
885 by Martin Pool
- commit command refuses unless something is changed or --unchanged is given
486
    * By default the commit command refuses to record a revision with
487
      no changes unless the ``--unchanged`` option is given.
987 by Martin Pool
- note changes to command line parsing
488
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
489
    * The ``--no-plugins``, ``--profile`` and ``--builtin`` command
490
      line options must come before the command name because they 
491
      affect what commands are available; all other options must come 
492
      after the command name because their interpretation depends on
493
      it.
494
495
    * ``branch`` and ``clone`` added as aliases for ``branch``.
496
497
    * Default log format is back to the long format; the compact one
498
      is available with ``--short``.
499
      
500
      
501
  BUG FIXES:
502
  
503
    * Fix bugs in committing only selected files or within a subdirectory.
504
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
505
692 by Martin Pool
0.0.5 release
506
bzr-0.0.5  2005-06-15
448 by Martin Pool
- bzr with no command now shows help, not just an error
507
  
508
  CHANGES:
509
510
    * ``bzr`` with no command now shows help rather than giving an
511
      error.  Suggested by Michael Ellerman.
512
465 by Martin Pool
- Move show_status() out of Branch into a new function in
513
    * ``bzr status`` output format changed, because svn-style output
514
      doesn't really match the model of bzr.  Now files are grouped by
515
      status and can be shown with their IDs.  ``bzr status --all``
516
      shows all versioned files and unknown files but not ignored files.
517
527 by Martin Pool
- refactor log command
518
    * ``bzr log`` runs from most-recent to least-recent, the reverse
545 by Martin Pool
- --forward option for log
519
      of the previous order.  The previous behaviour can be obtained
520
      with the ``--forward`` option.
588 by Martin Pool
- change inventory command to not show ids by default
521
        
522
    * ``bzr inventory`` by default shows only filenames, and also ids
523
      if ``--show-ids`` is given, in which case the id is the second
524
      field.
527 by Martin Pool
- refactor log command
525
286 by Martin Pool
- New bzr whoami --email option
526
527
  ENHANCEMENTS:
528
529
    * New 'bzr whoami --email' option shows only the email component
530
      of the user identification, from Jo Vermeulen.
531
420 by Martin Pool
Doc
532
    * New ``bzr ignore PATTERN`` command.
310 by Martin Pool
- new 'bzr ignored' command!
533
318 by Martin Pool
- better error message for Ctrl-c
534
    * Nicer error message for broken pipe, interrupt and similar
535
      conditions that don't indicate an internal error.
317 by Martin Pool
- better error message for broken pipe
536
618 by Martin Pool
- ignore .git files as well
537
    * Add ``.*.sw[nop] .git .*.tmp *,v`` to default ignore patterns.
348 by Martin Pool
- Add vim and RCS ignorefile patterns
538
353 by Martin Pool
- Per-branch locks in read and write modes.
539
    * Per-branch locks keyed on ``.bzr/branch-lock``, available in
540
      either read or write mode.
541
384 by Martin Pool
doc
542
    * New option ``bzr log --show-ids`` shows revision and file ids.
367 by Martin Pool
- New --show-ids option for bzr log
543
378 by Martin Pool
- New usage bzr log FILENAME
544
    * New usage ``bzr log FILENAME`` shows only revisions that
545
      affected that file.
546
379 by Martin Pool
- Simpler compare_inventories() to possibly replace diff_trees
547
    * Changed format for describing changes in ``bzr log -v``.
548
389 by Martin Pool
- new commit --file option!
549
    * New option ``bzr commit --file`` to take a message from a file,
550
      suggested by LarstiQ.
551
468 by Martin Pool
- Interpret arguments to bzr status
552
    * New syntax ``bzr status [FILE...]`` contributed by Bartosz
553
      Oler.  File may be in a branch other than the working directory.
404 by Martin Pool
- bzr status now optionally takes filenames to check
554
416 by Martin Pool
- bzr log and bzr root now accept an http URL
555
    * ``bzr log`` and ``bzr root`` can be given an http URL instead of
556
      a filename.
557
422 by Martin Pool
- External-command patch from mpe
558
    * Commands can now be defined by external programs or scripts
559
      in a directory on $BZRPATH.
560
440 by Martin Pool
doc
561
    * New "stat cache" avoids reading the contents of files if they 
562
      haven't changed since the previous time.
563
443 by Martin Pool
- Patch from Fredrik Lundh to check Python version and
564
    * If the Python interpreter is too old, try to find a better one
565
      or give an error.  Based on a patch from Fredrik Lundh.
566
472 by Martin Pool
- Optional branch parameter to info command
567
    * New optional parameter ``bzr info [BRANCH]``.
568
491 by Martin Pool
- Selective commit!
569
    * New form ``bzr commit SELECTED`` to commit only selected files.
570
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
571
    * New form ``bzr log -r FROM:TO`` shows changes in selected
572
      range; contributed by John A Meinel.
573
571 by Martin Pool
- new --diff-options to pass options through to external
574
    * New option ``bzr diff --diff-options 'OPTS'`` allows passing
575
      options through to an external GNU diff.
576
594 by Martin Pool
- add --no-recurse option for add command
577
    * New option ``bzr add --no-recurse`` to add a directory but not
578
      their contents.
579
607 by Martin Pool
doc
580
    * ``bzr --version`` now shows more information if bzr is being run
581
      from a branch.
582
441 by Martin Pool
- Fix from Lalo for unidiff output of newly added
583
  
584
  BUG FIXES:
585
586
    * Fixed diff format so that added and removed files will be
587
      handled properly by patch.  Fix from Lalo Martins.
588
536 by Martin Pool
doc
589
    * Various fixes for files whose names contain spaces or other
590
      metacharacters.
591
404 by Martin Pool
- bzr status now optionally takes filenames to check
592
296 by Martin Pool
- better reports from testbzr when it fails
593
  TESTING:
594
340 by Martin Pool
- more testcase fixes
595
    * Converted black-box test suites from Bourne shell into Python;
596
      now run using ``./testbzr``.  Various structural improvements to
597
      the tests.
297 by Martin Pool
- fix intentional testcase failure
598
398 by Martin Pool
- testbzr finds the right version of bzr to test
599
    * testbzr by default runs the version of bzr found in the same
600
      directory as the tests, or the one given as the first parameter.
601
399 by Martin Pool
- testbzr also runs selftests
602
    * testbzr also runs the internal tests, so the only command
603
      required to check is just ``./testbzr``.
604
508 by Martin Pool
- new -p option for testbzr to use a different version of python
605
    * testbzr requires python2.4, but can be used to test bzr running
606
      under a different version.
607
594 by Martin Pool
- add --no-recurse option for add command
608
    * Tests added for many other changes in this release.
609
398 by Martin Pool
- testbzr finds the right version of bzr to test
610
314 by Martin Pool
- Update ElementTree to 1.2.6
611
  INTERNAL:
612
613
    * Included ElementTree library upgraded to 1.2.6 by Fredrik Lundh.
614
389 by Martin Pool
- new commit --file option!
615
    * Refactor command functions into Command objects based on HCT by
616
      Scott James Remnant.
329 by Martin Pool
- refactor command functions into command classes
617
618
    * Better help messages for many commands.
619
344 by Martin Pool
- It's not an error to use the library without
620
    * Expose bzrlib.open_tracefile() to start the tracefile; until
621
      this is called trace messages are just discarded.
622
375 by Martin Pool
- New command touching-revisions and function to trace
623
    * New internal function find_touching_revisions() and hidden
624
      command touching-revisions trace the changes to a given file.
297 by Martin Pool
- fix intentional testcase failure
625
379 by Martin Pool
- Simpler compare_inventories() to possibly replace diff_trees
626
    * Simpler and faster compare_inventories() function.
627
397 by Martin Pool
- open_tracefile takes a tracefilename parameter
628
    * bzrlib.open_tracefile() takes a tracefilename parameter.
629
409 by Martin Pool
- New AtomicFile class
630
    * New AtomicFile class.
440 by Martin Pool
doc
631
632
    * New developer commands ``added``, ``modified``.
633
444 by Martin Pool
- cope on platforms with no urandom feature
634
635
  PORTABILITY:
636
637
    * Cope on Windows on python2.3 by using the weaker random seed.
638
      2.4 is now only recommended.
639
640
280 by Martin Pool
Prepare for 0.0.4 release
641
bzr-0.0.4  2005-04-22
184 by mbp at sourcefrog
pychecker fixups
642
196 by mbp at sourcefrog
selected-file diff
643
  ENHANCEMENTS:
184 by mbp at sourcefrog
pychecker fixups
644
244 by mbp at sourcefrog
- New 'bzr log --verbose' from Sebastian Cote
645
    * 'bzr diff' optionally takes a list of files to diff.  Still a bit
196 by mbp at sourcefrog
selected-file diff
646
      basic.  Patch from QuantumG.
184 by mbp at sourcefrog
pychecker fixups
647
242 by mbp at sourcefrog
Fix opening of ~/.bzr.log on Windows
648
    * More default ignore patterns.
649
244 by mbp at sourcefrog
- New 'bzr log --verbose' from Sebastian Cote
650
    * New 'bzr log --verbose' shows a list of files changed in the
651
      changeset.  Patch from Sebastian Cote.
652
261 by Martin Pool
- auto-rollover of .bzr.log
653
    * Roll over ~/.bzr.log if it gets too large.
654
272 by Martin Pool
- Add command aliases
655
    * Command abbreviations 'ci', 'st', 'stat', '?' based on a patch
656
      by Jason Diamon.
657
273 by Martin Pool
- New 'bzr help commands'
658
    * New 'bzr help commands' based on a patch from Denys Duchier.
659
235 by mbp at sourcefrog
update NEWS
660
252 by Martin Pool
- Don't use host fqdn for default user name, because DNS tends
661
  CHANGES:
662
663
    * User email is determined by looking at $BZREMAIL or ~/.bzr.email
664
      or $EMAIL.  All are decoded by the locale preferred encoding.
665
      If none of these are present user@hostname is used.  The host's
666
      fully-qualified name is not used because that tends to fail when
667
      there are DNS problems.
668
255 by Martin Pool
- New whoami command
669
    * New 'bzr whoami' command instead of username user-email.
670
252 by Martin Pool
- Don't use host fqdn for default user name, because DNS tends
671
235 by mbp at sourcefrog
update NEWS
672
  BUG FIXES: 
673
674
    * Make commit safe for hardlinked bzr trees.
675
245 by mbp at sourcefrog
- control files always in utf-8-unix format
676
    * Some Unicode/locale fixes.
677
278 by Martin Pool
- Better workaround for trailing newlines in diffs
678
    * Partial workaround for difflib.unified_diff not handling
679
      trailing newlines properly.
680
235 by mbp at sourcefrog
update NEWS
681
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
682
  INTERNAL:
683
684
    * Allow docstrings for help to be in PEP0257 format.  Patch from
685
      Matt Brubeck.
686
235 by mbp at sourcefrog
update NEWS
687
    * More tests in test.sh.
688
239 by mbp at sourcefrog
- remove profiler temporary file when done
689
    * Write profile data to a temporary file not into working
690
      directory and delete it when done.
238 by mbp at sourcefrog
- Don't put profiling temp file in current directory
691
257 by Martin Pool
- Write less startup junk to .bzr.log
692
    * Smaller .bzr.log with process ids.
693
184 by mbp at sourcefrog
pychecker fixups
694
242 by mbp at sourcefrog
Fix opening of ~/.bzr.log on Windows
695
  PORTABILITY:
696
261 by Martin Pool
- auto-rollover of .bzr.log
697
    * Fix opening of ~/.bzr.log on Windows.  Patch from Andrew
698
      Bennetts.
242 by mbp at sourcefrog
Fix opening of ~/.bzr.log on Windows
699
262 by Martin Pool
- gen_file_id: break the file on either / or \ when looking
700
    * Some improvements in handling paths on Windows, based on a patch
701
      from QuantumG.
702
242 by mbp at sourcefrog
Fix opening of ~/.bzr.log on Windows
703
181 by mbp at sourcefrog
prepare for 0.0.3 release
704
bzr-0.0.3  2005-04-06
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
705
156 by mbp at sourcefrog
new "directories" command
706
  ENHANCEMENTS:
707
708
    * New "directories" internal command lists versioned directories
709
      in the tree.
710
159 by mbp at sourcefrog
bzr commit --help now works
711
    * Can now say "bzr commit --help".
712
174 by mbp at sourcefrog
- New 'move' command; now separated out from rename
713
    * New "rename" command to rename one file to a different name
714
      and/or directory.
715
716
    * New "move" command to move one or more files into a different
717
      directory.
168 by mbp at sourcefrog
new "rename" command
718
164 by mbp at sourcefrog
new 'renames' command
719
    * New "renames" command lists files renamed since base revision.
720
176 by mbp at sourcefrog
New cat command contributed by janmar.
721
    * New cat command contributed by janmar.
722
165 by mbp at sourcefrog
- put .bzr.log in /home/mbp
723
  CHANGES:
724
166 by mbp at sourcefrog
- Write .bzr.log in utf8
725
    * .bzr.log is placed in $HOME (not pwd) and is always written in
726
      UTF-8.  (Probably not a completely good long-term solution, but
727
      will do for now.)
165 by mbp at sourcefrog
- put .bzr.log in /home/mbp
728
162 by mbp at sourcefrog
workaround for python2.3 difflib bug
729
  PORTABILITY:
730
731
    * Workaround for difflib bug in Python 2.3 that causes an
732
      exception when comparing empty files.  Reported by Erik Toubro
733
      Nielsen.
163 by mbp at sourcefrog
merge win32 portability fixes
734
165 by mbp at sourcefrog
- put .bzr.log in /home/mbp
735
  INTERNAL:
736
737
    * Refactored inventory storage to insert a root entry at the top.
738
180 by mbp at sourcefrog
- mv command is gone, but renames seem to be working
739
  TESTING:
740
169 by mbp at sourcefrog
Start of shell-based black-box testing in test.sh
741
    * Start of shell-based black-box testing in test.sh.
742
163 by mbp at sourcefrog
merge win32 portability fixes
743
744
bzr-0.0.2.1
745
746
  PORTABILITY:
747
748
    * Win32 fixes from Steve Brown.
749
750
181 by mbp at sourcefrog
prepare for 0.0.3 release
751
bzr-0.0.2  "black cube"  2005-03-31
101 by mbp at sourcefrog
change default ignore list
752
133 by mbp at sourcefrog
- new 'ignored' command
753
  ENHANCEMENTS:
101 by mbp at sourcefrog
change default ignore list
754
110 by mbp at sourcefrog
Add more patterns to default ignore list
755
    * Default ignore list extended (see bzrlib/__init__.py).
101 by mbp at sourcefrog
change default ignore list
756
102 by mbp at sourcefrog
- cache ignore list in Tree
757
    * Patterns in .bzrignore are now added to the default ignore list,
758
      rather than replacing it.
759
146 by mbp at sourcefrog
match ignore patterns like ./config.h
760
    * Ignore list isn't reread for every file.
102 by mbp at sourcefrog
- cache ignore list in Tree
761
110 by mbp at sourcefrog
Add more patterns to default ignore list
762
    * More help topics.
763
118 by mbp at sourcefrog
Update news
764
    * Reinstate the 'bzr check' command to check invariants of the
765
      branch.
133 by mbp at sourcefrog
- new 'ignored' command
766
135 by mbp at sourcefrog
Simple new 'deleted' command
767
    * New 'ignored' command lists which files are ignored and why;
768
      'deleted' lists files deleted in the current working tree.
769
770
    * Performance improvements.
137 by mbp at sourcefrog
new --profile option
771
772
    * New global --profile option.
146 by mbp at sourcefrog
match ignore patterns like ./config.h
773
    
774
    * Ignore patterns like './config.h' now correctly match files in
163 by mbp at sourcefrog
merge win32 portability fixes
775
      the root directory only.
776
777
99 by mbp at sourcefrog
update for release 0.0.1
778
bzr-0.0.1  2005-03-26
72 by mbp at sourcefrog
- import a subset of elementtree for easier installation
779
81 by mbp at sourcefrog
show space usage for various stores in the info command
780
  ENHANCEMENTS:
781
782
    * More information from info command.
783
83 by mbp at sourcefrog
Can now say "bzr help COMMAND" for more detailed help
784
    * Can now say "bzr help COMMAND" for more detailed help.
785
92 by mbp at sourcefrog
more performance measurement
786
    * Less file flushing and faster performance when writing logs and
787
      committing to stores.
788
96 by mbp at sourcefrog
with commit -v, show committed revision number
789
    * More useful verbose output from some commands.
790
93 by mbp at sourcefrog
Fix inverted display of 'R' and 'M' during 'commit -v'
791
  BUG FIXES:
792
793
    * Fix inverted display of 'R' and 'M' during 'commit -v'.
794
72 by mbp at sourcefrog
- import a subset of elementtree for easier installation
795
  PORTABILITY:
796
797
    * Include a subset of ElementTree-1.2.20040618 to make
798
      installation easier.
799
73 by mbp at sourcefrog
fix time.localtime call for python 2.3
800
    * Fix time.localtime call to work with Python 2.3 (the minimum
801
      supported).
802
803
71 by mbp at sourcefrog
Add NEWS file
804
bzr-0.0.0.69  2005-03-22
805
806
  ENHANCEMENTS:
807
808
    * First public release.
809
810
    * Storage of local versions: init, add, remove, rm, info, log,
811
      diff, status, etc.