~bzr-pqm/bzr/bzr.dev

1181 by Martin Pool
- add test for deserialization from a canned XML inventory
1
development head
2
3
  INTERNALS:
4
5
    * Refactor xml packing/unpacking.
6
1241 by Martin Pool
- rename last_patch to last_revision
7
    * Improved 'fetch' code for pulling revisions from one branch into
8
      another (used by pull, merged, etc.)
9
10
11
  CHANGES:
12
13
    * New tree format based on weave files, called version 5.
14
15
16
  API:
17
18
    * New method-object style interface for Commit() and Fetch().
19
20
    * Renamed Branch.last_patch() to Branch.last_revision(), since
21
      we call them revisions not patches.
22
  
23
1181 by Martin Pool
- add test for deserialization from a canned XML inventory
24
1175 by Martin Pool
- make 0.0.7 release
25
bzr-0.0.7 2005-09-02
1091 by Martin Pool
- new shell-complete command to help zsh completion
26
27
  NEW FEATURES:
28
29
    * ``bzr shell-complete`` command contributed by Clint Adams to
30
      help with intelligent shell completion.
31
1105 by Martin Pool
- expose 'find-merge-base' as a new expert command,
32
    * New expert command ``bzr find-merge-base`` for debugging merges.
33
1091 by Martin Pool
- new shell-complete command to help zsh completion
34
1145 by Martin Pool
- additional fix for bzr plugins
35
  ENHANCEMENTS:
36
37
    * Much better merge support.
38
1148 by Martin Pool
- change conflict markers to suit smerge, etc
39
    * merge3 conflicts are now reported with markers like '<<<<<<<'
40
      (seven characters) which is the same as CVS and pleases things
41
      like emacs smerge.
42
1145 by Martin Pool
- additional fix for bzr plugins
43
1092 by Martin Pool
- fix bug where bzr upgrade aborts when trying to fix trees that mention revisions
44
  BUG FIXES:
45
46
    * ``bzr upgrade`` no longer fails when trying to fix trees that
47
      mention revisions that are not present.
48
1145 by Martin Pool
- additional fix for bzr plugins
49
    * Fixed bugs in listing plugins from ``bzr plugins``.
50
1168 by Martin Pool
- work properly when $EDITOR contains multiple words
51
    * Fix case of $EDITOR containing options for the editor.
52
1174 by Martin Pool
- fix off-by-one in 'bzr log -r'
53
    * Fix log -r refusing to show the last revision.
54
      (Patch from Goffredo Baroncelli.)
55
1092 by Martin Pool
- fix bug where bzr upgrade aborts when trying to fix trees that mention revisions
56
1138 by Martin Pool
- bzr log --show-ids includes parent ids
57
  CHANGES:
58
59
    * ``bzr log --show-ids`` shows the revision ids of all parents.
60
1174 by Martin Pool
- fix off-by-one in 'bzr log -r'
61
    * Externally provided commands on your $BZRPATH no longer need
62
      to recognize --bzr-usage to work properly, and can just handle
63
      --help themselves.
64
1138 by Martin Pool
- bzr log --show-ids includes parent ids
65
1097 by Martin Pool
- send trace messages out through python logging module
66
  LIBRARY:
67
68
    * Changed trace messages to go through the standard logging
69
      framework, so that they can more easily be redirected by
70
      libraries.
71
72
73
1086 by Martin Pool
prepare 0.0.6 release
74
bzr-0.0.6 2005-08-18
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
75
741 by Martin Pool
- default plugin dir is ~/.bzr.conf/plugins
76
  NEW FEATURES:
77
78
    * Python plugins, automatically loaded from the directories on
79
      BZR_PLUGIN_PATH or ~/.bzr.conf/plugins by default.
80
742 by Martin Pool
- new mkdir command
81
    * New 'bzr mkdir' command.
82
763 by Martin Pool
- Patch from Torsten Marek to take commit messages through an
83
    * Commit mesage is fetched from an editor if not given on the
84
      command line; patch from Torsten Marek.
85
900 by Martin Pool
- patch from john to search for matching commits
86
    * ``bzr log -m FOO`` displays commits whose message matches regexp 
87
      FOO.
971 by Martin Pool
- update news
88
      
89
    * ``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
90
91
    * ``bzr mv`` does move or rename depending on its arguments, like
92
      the Unix command.
93
94
    * ``bzr missing`` command shows a summary of the differences
95
      between two trees.  (Merged from John Arbash-Meinel.)
96
1074 by Martin Pool
- check for email address in BRANCH_ROOT/.bzr/email, so you can
97
    * An email address for commits to a particular tree can be
98
      specified by putting it into .bzr/email within a branch.  (Based
99
      on a patch from Heikki Paajanen.)
100
1094 by Martin Pool
- merge aaron's merge improvements 999..1008
101
971 by Martin Pool
- update news
102
  ENHANCEMENTS:
103
104
    * Faster working tree operations.
900 by Martin Pool
- patch from john to search for matching commits
105
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
106
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
107
  CHANGES:
108
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
109
    * 3rd-party modules shipped with bzr are copied within the bzrlib
110
      python package, so that they can be installed by the setup
111
      script without clashing with anything already existing on the
112
      system.  (Contributed by Gustavo Niemeyer.)
113
114
    * Moved plugins directory to bzrlib/, so that there's a standard
115
      plugin directory which is not only installed with bzr itself but
116
      is also available when using bzr from the development tree.
117
      BZR_PLUGIN_PATH and DEFAULT_PLUGIN_PATH are then added to the
118
      standard plugins directory.
119
849 by Martin Pool
- Put files inside an exported tarball into a top-level directory rather than
120
    * When exporting to a tarball with ``bzr export --format tgz``, put 
121
      everything under a top directory rather than dumping it into the
122
      current directory.   This can be overridden with the ``--root`` 
971 by Martin Pool
- update news
123
      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
124
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
125
    * New ``bzr upgrade`` command to upgrade the format of a branch,
126
      replacing ``bzr check --update``.
127
714 by Martin Pool
- files within stores are no longer made readonly
128
    * Files within store directories are no longer marked readonly on
129
      disk.
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
130
796 by Martin Pool
- note bzr log changes
131
    * Changed ``bzr log`` output to a more compact form suggested by
808 by Martin Pool
- Note new --long log options
132
      John A Meinel.  Old format is available with the ``--long`` or
133
      ``-l`` option, patched by William Dodé.
796 by Martin Pool
- note bzr log changes
134
885 by Martin Pool
- commit command refuses unless something is changed or --unchanged is given
135
    * By default the commit command refuses to record a revision with
136
      no changes unless the ``--unchanged`` option is given.
987 by Martin Pool
- note changes to command line parsing
137
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
138
    * The ``--no-plugins``, ``--profile`` and ``--builtin`` command
139
      line options must come before the command name because they 
140
      affect what commands are available; all other options must come 
141
      after the command name because their interpretation depends on
142
      it.
143
144
    * ``branch`` and ``clone`` added as aliases for ``branch``.
145
146
    * Default log format is back to the long format; the compact one
147
      is available with ``--short``.
148
      
149
      
150
  BUG FIXES:
151
  
152
    * Fix bugs in committing only selected files or within a subdirectory.
153
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
154
692 by Martin Pool
0.0.5 release
155
bzr-0.0.5  2005-06-15
448 by Martin Pool
- bzr with no command now shows help, not just an error
156
  
157
  CHANGES:
158
159
    * ``bzr`` with no command now shows help rather than giving an
160
      error.  Suggested by Michael Ellerman.
161
465 by Martin Pool
- Move show_status() out of Branch into a new function in
162
    * ``bzr status`` output format changed, because svn-style output
163
      doesn't really match the model of bzr.  Now files are grouped by
164
      status and can be shown with their IDs.  ``bzr status --all``
165
      shows all versioned files and unknown files but not ignored files.
166
527 by Martin Pool
- refactor log command
167
    * ``bzr log`` runs from most-recent to least-recent, the reverse
545 by Martin Pool
- --forward option for log
168
      of the previous order.  The previous behaviour can be obtained
169
      with the ``--forward`` option.
588 by Martin Pool
- change inventory command to not show ids by default
170
        
171
    * ``bzr inventory`` by default shows only filenames, and also ids
172
      if ``--show-ids`` is given, in which case the id is the second
173
      field.
527 by Martin Pool
- refactor log command
174
286 by Martin Pool
- New bzr whoami --email option
175
176
  ENHANCEMENTS:
177
178
    * New 'bzr whoami --email' option shows only the email component
179
      of the user identification, from Jo Vermeulen.
180
420 by Martin Pool
Doc
181
    * New ``bzr ignore PATTERN`` command.
310 by Martin Pool
- new 'bzr ignored' command!
182
318 by Martin Pool
- better error message for Ctrl-c
183
    * Nicer error message for broken pipe, interrupt and similar
184
      conditions that don't indicate an internal error.
317 by Martin Pool
- better error message for broken pipe
185
618 by Martin Pool
- ignore .git files as well
186
    * Add ``.*.sw[nop] .git .*.tmp *,v`` to default ignore patterns.
348 by Martin Pool
- Add vim and RCS ignorefile patterns
187
353 by Martin Pool
- Per-branch locks in read and write modes.
188
    * Per-branch locks keyed on ``.bzr/branch-lock``, available in
189
      either read or write mode.
190
384 by Martin Pool
doc
191
    * New option ``bzr log --show-ids`` shows revision and file ids.
367 by Martin Pool
- New --show-ids option for bzr log
192
378 by Martin Pool
- New usage bzr log FILENAME
193
    * New usage ``bzr log FILENAME`` shows only revisions that
194
      affected that file.
195
379 by Martin Pool
- Simpler compare_inventories() to possibly replace diff_trees
196
    * Changed format for describing changes in ``bzr log -v``.
197
389 by Martin Pool
- new commit --file option!
198
    * New option ``bzr commit --file`` to take a message from a file,
199
      suggested by LarstiQ.
200
468 by Martin Pool
- Interpret arguments to bzr status
201
    * New syntax ``bzr status [FILE...]`` contributed by Bartosz
202
      Oler.  File may be in a branch other than the working directory.
404 by Martin Pool
- bzr status now optionally takes filenames to check
203
416 by Martin Pool
- bzr log and bzr root now accept an http URL
204
    * ``bzr log`` and ``bzr root`` can be given an http URL instead of
205
      a filename.
206
422 by Martin Pool
- External-command patch from mpe
207
    * Commands can now be defined by external programs or scripts
208
      in a directory on $BZRPATH.
209
440 by Martin Pool
doc
210
    * New "stat cache" avoids reading the contents of files if they 
211
      haven't changed since the previous time.
212
443 by Martin Pool
- Patch from Fredrik Lundh to check Python version and
213
    * If the Python interpreter is too old, try to find a better one
214
      or give an error.  Based on a patch from Fredrik Lundh.
215
472 by Martin Pool
- Optional branch parameter to info command
216
    * New optional parameter ``bzr info [BRANCH]``.
217
491 by Martin Pool
- Selective commit!
218
    * New form ``bzr commit SELECTED`` to commit only selected files.
219
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
220
    * New form ``bzr log -r FROM:TO`` shows changes in selected
221
      range; contributed by John A Meinel.
222
571 by Martin Pool
- new --diff-options to pass options through to external
223
    * New option ``bzr diff --diff-options 'OPTS'`` allows passing
224
      options through to an external GNU diff.
225
594 by Martin Pool
- add --no-recurse option for add command
226
    * New option ``bzr add --no-recurse`` to add a directory but not
227
      their contents.
228
607 by Martin Pool
doc
229
    * ``bzr --version`` now shows more information if bzr is being run
230
      from a branch.
231
441 by Martin Pool
- Fix from Lalo for unidiff output of newly added
232
  
233
  BUG FIXES:
234
235
    * Fixed diff format so that added and removed files will be
236
      handled properly by patch.  Fix from Lalo Martins.
237
536 by Martin Pool
doc
238
    * Various fixes for files whose names contain spaces or other
239
      metacharacters.
240
404 by Martin Pool
- bzr status now optionally takes filenames to check
241
296 by Martin Pool
- better reports from testbzr when it fails
242
  TESTING:
243
340 by Martin Pool
- more testcase fixes
244
    * Converted black-box test suites from Bourne shell into Python;
245
      now run using ``./testbzr``.  Various structural improvements to
246
      the tests.
297 by Martin Pool
- fix intentional testcase failure
247
398 by Martin Pool
- testbzr finds the right version of bzr to test
248
    * testbzr by default runs the version of bzr found in the same
249
      directory as the tests, or the one given as the first parameter.
250
399 by Martin Pool
- testbzr also runs selftests
251
    * testbzr also runs the internal tests, so the only command
252
      required to check is just ``./testbzr``.
253
508 by Martin Pool
- new -p option for testbzr to use a different version of python
254
    * testbzr requires python2.4, but can be used to test bzr running
255
      under a different version.
256
594 by Martin Pool
- add --no-recurse option for add command
257
    * Tests added for many other changes in this release.
258
398 by Martin Pool
- testbzr finds the right version of bzr to test
259
314 by Martin Pool
- Update ElementTree to 1.2.6
260
  INTERNAL:
261
262
    * Included ElementTree library upgraded to 1.2.6 by Fredrik Lundh.
263
389 by Martin Pool
- new commit --file option!
264
    * Refactor command functions into Command objects based on HCT by
265
      Scott James Remnant.
329 by Martin Pool
- refactor command functions into command classes
266
267
    * Better help messages for many commands.
268
344 by Martin Pool
- It's not an error to use the library without
269
    * Expose bzrlib.open_tracefile() to start the tracefile; until
270
      this is called trace messages are just discarded.
271
375 by Martin Pool
- New command touching-revisions and function to trace
272
    * New internal function find_touching_revisions() and hidden
273
      command touching-revisions trace the changes to a given file.
297 by Martin Pool
- fix intentional testcase failure
274
379 by Martin Pool
- Simpler compare_inventories() to possibly replace diff_trees
275
    * Simpler and faster compare_inventories() function.
276
397 by Martin Pool
- open_tracefile takes a tracefilename parameter
277
    * bzrlib.open_tracefile() takes a tracefilename parameter.
278
409 by Martin Pool
- New AtomicFile class
279
    * New AtomicFile class.
440 by Martin Pool
doc
280
281
    * New developer commands ``added``, ``modified``.
282
444 by Martin Pool
- cope on platforms with no urandom feature
283
284
  PORTABILITY:
285
286
    * Cope on Windows on python2.3 by using the weaker random seed.
287
      2.4 is now only recommended.
288
289
280 by Martin Pool
Prepare for 0.0.4 release
290
bzr-0.0.4  2005-04-22
184 by mbp at sourcefrog
pychecker fixups
291
196 by mbp at sourcefrog
selected-file diff
292
  ENHANCEMENTS:
184 by mbp at sourcefrog
pychecker fixups
293
244 by mbp at sourcefrog
- New 'bzr log --verbose' from Sebastian Cote
294
    * 'bzr diff' optionally takes a list of files to diff.  Still a bit
196 by mbp at sourcefrog
selected-file diff
295
      basic.  Patch from QuantumG.
184 by mbp at sourcefrog
pychecker fixups
296
242 by mbp at sourcefrog
Fix opening of ~/.bzr.log on Windows
297
    * More default ignore patterns.
298
244 by mbp at sourcefrog
- New 'bzr log --verbose' from Sebastian Cote
299
    * New 'bzr log --verbose' shows a list of files changed in the
300
      changeset.  Patch from Sebastian Cote.
301
261 by Martin Pool
- auto-rollover of .bzr.log
302
    * Roll over ~/.bzr.log if it gets too large.
303
272 by Martin Pool
- Add command aliases
304
    * Command abbreviations 'ci', 'st', 'stat', '?' based on a patch
305
      by Jason Diamon.
306
273 by Martin Pool
- New 'bzr help commands'
307
    * New 'bzr help commands' based on a patch from Denys Duchier.
308
235 by mbp at sourcefrog
update NEWS
309
252 by Martin Pool
- Don't use host fqdn for default user name, because DNS tends
310
  CHANGES:
311
312
    * User email is determined by looking at $BZREMAIL or ~/.bzr.email
313
      or $EMAIL.  All are decoded by the locale preferred encoding.
314
      If none of these are present user@hostname is used.  The host's
315
      fully-qualified name is not used because that tends to fail when
316
      there are DNS problems.
317
255 by Martin Pool
- New whoami command
318
    * New 'bzr whoami' command instead of username user-email.
319
252 by Martin Pool
- Don't use host fqdn for default user name, because DNS tends
320
235 by mbp at sourcefrog
update NEWS
321
  BUG FIXES: 
322
323
    * Make commit safe for hardlinked bzr trees.
324
245 by mbp at sourcefrog
- control files always in utf-8-unix format
325
    * Some Unicode/locale fixes.
326
278 by Martin Pool
- Better workaround for trailing newlines in diffs
327
    * Partial workaround for difflib.unified_diff not handling
328
      trailing newlines properly.
329
235 by mbp at sourcefrog
update NEWS
330
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
331
  INTERNAL:
332
333
    * Allow docstrings for help to be in PEP0257 format.  Patch from
334
      Matt Brubeck.
335
235 by mbp at sourcefrog
update NEWS
336
    * More tests in test.sh.
337
239 by mbp at sourcefrog
- remove profiler temporary file when done
338
    * Write profile data to a temporary file not into working
339
      directory and delete it when done.
238 by mbp at sourcefrog
- Don't put profiling temp file in current directory
340
257 by Martin Pool
- Write less startup junk to .bzr.log
341
    * Smaller .bzr.log with process ids.
342
184 by mbp at sourcefrog
pychecker fixups
343
242 by mbp at sourcefrog
Fix opening of ~/.bzr.log on Windows
344
  PORTABILITY:
345
261 by Martin Pool
- auto-rollover of .bzr.log
346
    * Fix opening of ~/.bzr.log on Windows.  Patch from Andrew
347
      Bennetts.
242 by mbp at sourcefrog
Fix opening of ~/.bzr.log on Windows
348
262 by Martin Pool
- gen_file_id: break the file on either / or \ when looking
349
    * Some improvements in handling paths on Windows, based on a patch
350
      from QuantumG.
351
242 by mbp at sourcefrog
Fix opening of ~/.bzr.log on Windows
352
181 by mbp at sourcefrog
prepare for 0.0.3 release
353
bzr-0.0.3  2005-04-06
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
354
156 by mbp at sourcefrog
new "directories" command
355
  ENHANCEMENTS:
356
357
    * New "directories" internal command lists versioned directories
358
      in the tree.
359
159 by mbp at sourcefrog
bzr commit --help now works
360
    * Can now say "bzr commit --help".
361
174 by mbp at sourcefrog
- New 'move' command; now separated out from rename
362
    * New "rename" command to rename one file to a different name
363
      and/or directory.
364
365
    * New "move" command to move one or more files into a different
366
      directory.
168 by mbp at sourcefrog
new "rename" command
367
164 by mbp at sourcefrog
new 'renames' command
368
    * New "renames" command lists files renamed since base revision.
369
176 by mbp at sourcefrog
New cat command contributed by janmar.
370
    * New cat command contributed by janmar.
371
165 by mbp at sourcefrog
- put .bzr.log in /home/mbp
372
  CHANGES:
373
166 by mbp at sourcefrog
- Write .bzr.log in utf8
374
    * .bzr.log is placed in $HOME (not pwd) and is always written in
375
      UTF-8.  (Probably not a completely good long-term solution, but
376
      will do for now.)
165 by mbp at sourcefrog
- put .bzr.log in /home/mbp
377
162 by mbp at sourcefrog
workaround for python2.3 difflib bug
378
  PORTABILITY:
379
380
    * Workaround for difflib bug in Python 2.3 that causes an
381
      exception when comparing empty files.  Reported by Erik Toubro
382
      Nielsen.
163 by mbp at sourcefrog
merge win32 portability fixes
383
165 by mbp at sourcefrog
- put .bzr.log in /home/mbp
384
  INTERNAL:
385
386
    * Refactored inventory storage to insert a root entry at the top.
387
180 by mbp at sourcefrog
- mv command is gone, but renames seem to be working
388
  TESTING:
389
169 by mbp at sourcefrog
Start of shell-based black-box testing in test.sh
390
    * Start of shell-based black-box testing in test.sh.
391
163 by mbp at sourcefrog
merge win32 portability fixes
392
393
bzr-0.0.2.1
394
395
  PORTABILITY:
396
397
    * Win32 fixes from Steve Brown.
398
399
181 by mbp at sourcefrog
prepare for 0.0.3 release
400
bzr-0.0.2  "black cube"  2005-03-31
101 by mbp at sourcefrog
change default ignore list
401
133 by mbp at sourcefrog
- new 'ignored' command
402
  ENHANCEMENTS:
101 by mbp at sourcefrog
change default ignore list
403
110 by mbp at sourcefrog
Add more patterns to default ignore list
404
    * Default ignore list extended (see bzrlib/__init__.py).
101 by mbp at sourcefrog
change default ignore list
405
102 by mbp at sourcefrog
- cache ignore list in Tree
406
    * Patterns in .bzrignore are now added to the default ignore list,
407
      rather than replacing it.
408
146 by mbp at sourcefrog
match ignore patterns like ./config.h
409
    * Ignore list isn't reread for every file.
102 by mbp at sourcefrog
- cache ignore list in Tree
410
110 by mbp at sourcefrog
Add more patterns to default ignore list
411
    * More help topics.
412
118 by mbp at sourcefrog
Update news
413
    * Reinstate the 'bzr check' command to check invariants of the
414
      branch.
133 by mbp at sourcefrog
- new 'ignored' command
415
135 by mbp at sourcefrog
Simple new 'deleted' command
416
    * New 'ignored' command lists which files are ignored and why;
417
      'deleted' lists files deleted in the current working tree.
418
419
    * Performance improvements.
137 by mbp at sourcefrog
new --profile option
420
421
    * New global --profile option.
146 by mbp at sourcefrog
match ignore patterns like ./config.h
422
    
423
    * Ignore patterns like './config.h' now correctly match files in
163 by mbp at sourcefrog
merge win32 portability fixes
424
      the root directory only.
425
426
99 by mbp at sourcefrog
update for release 0.0.1
427
bzr-0.0.1  2005-03-26
72 by mbp at sourcefrog
- import a subset of elementtree for easier installation
428
81 by mbp at sourcefrog
show space usage for various stores in the info command
429
  ENHANCEMENTS:
430
431
    * More information from info command.
432
83 by mbp at sourcefrog
Can now say "bzr help COMMAND" for more detailed help
433
    * Can now say "bzr help COMMAND" for more detailed help.
434
92 by mbp at sourcefrog
more performance measurement
435
    * Less file flushing and faster performance when writing logs and
436
      committing to stores.
437
96 by mbp at sourcefrog
with commit -v, show committed revision number
438
    * More useful verbose output from some commands.
439
93 by mbp at sourcefrog
Fix inverted display of 'R' and 'M' during 'commit -v'
440
  BUG FIXES:
441
442
    * Fix inverted display of 'R' and 'M' during 'commit -v'.
443
72 by mbp at sourcefrog
- import a subset of elementtree for easier installation
444
  PORTABILITY:
445
446
    * Include a subset of ElementTree-1.2.20040618 to make
447
      installation easier.
448
73 by mbp at sourcefrog
fix time.localtime call for python 2.3
449
    * Fix time.localtime call to work with Python 2.3 (the minimum
450
      supported).
451
452
71 by mbp at sourcefrog
Add NEWS file
453
bzr-0.0.0.69  2005-03-22
454
455
  ENHANCEMENTS:
456
457
    * First public release.
458
459
    * Storage of local versions: init, add, remove, rm, info, log,
460
      diff, status, etc.