~bzr-pqm/bzr/bzr.dev

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