~bzr-pqm/bzr/bzr.dev

1539 by Martin Pool
Prepare for 0.7rc1 release
1
bzr 0.7rc1 2006-01-09
1185.16.138 by Martin Pool
[patch] 'bzr init DIR' (John)
2
1185.33.30 by Martin Pool
[merge] jaq
3
  CHANGES:
4
5
    * .bzrignore is excluded from exports, on the grounds that it's a bzr 
6
      internal-use file and may not be wanted.  (Jamie Wilkinson)
7
1185.33.33 by Martin Pool
[patch] add 'bzr inventory --kind directory'; remove 'bzr directories'
8
    * The "bzr directories" command were removed in favor of the new
9
      --kind option to the "bzr inventory" command.  To list all 
10
      versioned directories, now use "bzr inventory --kind directory".  
11
      (Johan Rydberg)
12
1185.39.2 by Alexey Shamrin
updated NEWS to include forgotten changes
13
    * Under Windows configuration directory is now %APPDATA%\bazaar\2.0
14
      by default. (John Arbash Meinel)
15
16
    * The parent of Bzr configuration directory can be set by BZR_HOME
17
      environment variable. Now the path for it is searched in BZR_HOME, then
18
      in HOME. Under Windows the order is: BZR_HOME, APPDATA (usually
19
      points to C:\Documents and Settings\User Name\Application Data), HOME.
20
      (John Arbash Meinel)
21
1515 by Robert Collins
* Plugins with the same name in different directories in the bzr plugin
22
    * Plugins with the same name in different directories in the bzr plugin
23
      path are no longer loaded: only the first successfully loaded one is
24
      used. (Robert Collins)
25
1185.33.67 by Martin Pool
[merge] use /usr/bin/ssh if we can (jamesh)
26
    * Use systems' external ssh command to open connections if possible.  
27
      This gives better integration with user settings such as ProxyCommand.
28
      (James Henstridge)
29
1534.1.8 by Robert Collins
Update SFTP Urls as per mailing list thread.
30
    * Sftp paths can now be relative, or local, according to the lftp
31
      convention. Paths now take the form:
32
      sftp://user:pass@host:port/~/relative/path
33
      or
34
      sftp://user:pass@host:port/absolute/path
1185.49.20 by John Arbash Meinel
NEWS
35
1185.58.9 by John Arbash Meinel
added NEWS entry.
36
    * Permissions on files underneath .bzr/ are inherited from the .bzr 
37
      directory. So for a shared repository, simply doing 'chmod -R g+w .bzr/'
38
      will mean that future file will be created with group write permissions.
39
1185.33.101 by Martin Pool
Remove config.guess and configure.in from builtin ignore list.
40
    * configure.in and config.guess are no longer in the builtin default 
41
      ignore list.
42
1538 by Martin Pool
ignore .sw[nop] by default
43
    * '.sw[nop]' pattern ignored, to ignore vim swap files for nameless
44
      files.  (John Arbash Meinel, Martin Pool)
45
1185.35.4 by Aaron Bentley
Implemented remerge
46
  IMPROVEMENTS:
1185.16.138 by Martin Pool
[patch] 'bzr init DIR' (John)
47
48
    * "bzr INIT dir" now initializes the specified directory, and creates 
49
      it if it does not exist.  (John Arbash Meinel)
50
1185.35.4 by Aaron Bentley
Implemented remerge
51
    * New remerge command (Aaron Bentley)
52
1185.16.141 by Martin Pool
[merge] zsh improvements (Steve Borho)
53
    * Better zsh completion script.  (Steve Borho)
54
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
55
    * 'bzr diff' now returns 1 when there are changes in the working 
1492 by Robert Collins
Support decoration of commands.
56
      tree. (Robert Collins)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
57
58
    * 'bzr push' now exists and can push changes to a remote location. 
59
      This uses the transport infrastructure, and can store the remote
60
      location in the ~/.bazaar/branches.conf configuration file.
1492 by Robert Collins
Support decoration of commands.
61
      (Robert Collins)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
62
1185.35.25 by Aaron Bentley
Updated NEWS
63
    * Test directories are only kept if the test fails and the user requests
64
      that they be kept.
65
66
    * Tweaks to short log printing
67
1185.33.21 by Martin Pool
Document BZR_PDB
68
    * Added branch nicks, new nick command, printing them in log output. 
69
      (Aaron Bentley)
70
71
    * If $BZR_PDB is set, pop into the debugger when an uncaught exception 
72
      occurs.  (Martin Pool)
1185.35.25 by Aaron Bentley
Updated NEWS
73
1185.33.24 by Martin Pool
Add alias 'resolved'
74
    * Accept 'bzr resolved' (an alias for 'bzr resolve'), as this is
75
      the same as Subversion.  (Martin Pool)
76
1185.33.29 by Martin Pool
[merge] ftp transport, renamed-modified
77
    * New ftp transport support (on ftplib), for ftp:// and aftp:// 
78
      URLs.  (Daniel Silverstone)
79
1185.33.50 by Martin Pool
[patch] Commit editor temporary files now start with 'bzr_log.' (Magnus Therning)
80
    * Commit editor temporary files now start with 'bzr_log.', to allow 
81
      text editors to match the file name and set up appropriate modes or 
82
      settings.  (Magnus Therning)
83
1185.33.55 by Martin Pool
[patch] weave fetch optimizations (Goffredo Baroncelli)
84
    * Improved performance when integrating changes from a remote weave.  
85
      (Goffredo Baroncelli)
86
1185.49.20 by John Arbash Meinel
NEWS
87
    * Sftp will attempt to cache the connection, so it is more likely that
88
      a connection will be reused, rather than requiring multiple password
89
      requests.
90
1185.33.83 by Martin Pool
News entries for recent merge from John.
91
    * bzr revno now takes an optional argument indicating the branch whose
92
      revno should be printed.  (Michael Ellerman)
93
94
    * bzr cat defaults to printing the last version of the file.  
95
      (#3632, Matthieu Moy)
96
1185.33.85 by Martin Pool
New --lsprof option from Denys Duchier
97
    * New global option 'bzr --lsprof COMMAND' runs bzr under the lsprof 
98
      profiler.  (Denys Duchier)
99
1185.33.88 by Martin Pool
[patch] read only the table-of-contents of weaves to speed up commit
100
    * Faster commits by reading only the headers of affected weave files. 
101
      (Denys Duchier)
102
1529 by Robert Collins
Take Michaels nicer NEWS entry for dry-run.
103
    * 'bzr add' now takes a --dry-run parameter which shows you what would be
104
      added, but doesn't actually add anything. (Michael Ellerman)
1185.33.90 by Martin Pool
[merge] add --dry-run option (mpe)
105
1185.46.10 by Aaron Bentley
Updated NEWS about add and ignored
106
    * bzr add now lists how many files were ignored per glob.  add --verbose
107
      lists the specific files.  (Aaron Bentley)
1185.60.1 by Aaron Bentley
Updated NEWS
108
1185.16.142 by Martin Pool
[merge] robert
109
  BUG FIXES:
110
111
    * SFTP can walk up to the root path without index errors. (Robert Collins)
112
1185.16.146 by Martin Pool
Fix up assert with sideeffects in CompressedTextStore._copy_one
113
    * Fix bugs in running bzr with 'python -O'.  (Martin Pool)
114
1185.35.25 by Aaron Bentley
Updated NEWS
115
    * Error when run with -OO
116
1185.16.152 by Martin Pool
Handle URLError without http error code
117
    * Fix bug in reporting http errors that don't have an http error code.
118
      (Martin Pool)
119
1185.35.25 by Aaron Bentley
Updated NEWS
120
    * Handle more cases of pipe errors in display commands
121
122
    * Change status to 3 for all errors
123
1185.35.26 by Aaron Bentley
Fixed diff and status on newly-added, newly-deleted files
124
    * Files that are added and unlinked before committing are completely
125
      ignored by diff and status
126
1508 by Robert Collins
Stores with some compressed texts and some uncompressed texts are now able to
127
    * Stores with some compressed texts and some uncompressed texts are now
128
      able to be used. (John A Meinel)
129
1185.31.18 by John Arbash Meinel
[patch] Alexey Shamrin's patch for small win32 fixes
130
    * Fix for bzr pull failing sometimes under windows
131
132
    * Fix for sftp transport under windows when using interactive auth
133
1185.33.29 by Martin Pool
[merge] ftp transport, renamed-modified
134
    * Show files which are both renamed and modified as such in 'bzr 
135
      status' output.  (#4503, Daniel Silverstone)
136
1185.33.31 by Martin Pool
Make annotate cope better with revisions committed without a valid
137
    * Make annotate cope better with revisions committed without a valid 
138
      email address.  (Marien Zwart)
139
1185.33.32 by Martin Pool
[merge] fix \t in commit messages
140
    * Fix representation of tab characters in commit messages.  (Harald 
141
      Meland)
142
1185.33.38 by Martin Pool
NEWS typo
143
    * List of plugin directories in BZR_PLUGIN_PATH environment variable is
1185.39.2 by Alexey Shamrin
updated NEWS to include forgotten changes
144
      now parsed properly under Windows. (Alexander Belchenko)
145
1185.33.44 by Martin Pool
[patch] show number of revisions pushed/pulled/merged (Robey Pointer)
146
    * Show number of revisions pushed/pulled/merged. (Robey Pointer)
147
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
148
    * Keep a cached copy of the basis inventory to speed up operations 
149
      that need to refer to it.  (Johan Rydberg, Martin Pool)
150
1185.33.71 by Martin Pool
Status tests include unicode character.
151
    * Fix bugs in bzr status display of non-ascii characters.  (Martin 
152
      Pool)
153
1537 by Martin Pool
Don't ignore Makefile.in by default (#6413)
154
    * Remove Makefile.in from default ignore list.  (#6413, Tollef Fog 
155
      Heen, Martin Pool)
156
1185.16.139 by Martin Pool
[merge] fix sftp selftest and parsing of passwords in sftp urls
157
  TESTING:
158
159
    * Fix selftest asking for passwords when there are no SFTP keys.  
160
      (Robey Pointer, Jelmer Vernooij) 
161
1185.16.146 by Martin Pool
Fix up assert with sideeffects in CompressedTextStore._copy_one
162
    * Fix selftest run with 'python -O'.  (Martin Pool)
1185.44.1 by Martin Pool
Start bringing in basicio code
163
1185.39.2 by Alexey Shamrin
updated NEWS to include forgotten changes
164
    * Fix HTTP tests under Windows. (John Arbash Meinel)
165
166
    * Make tests work even if HOME is not set (Aaron Bentley)
167
168
    * Updated build_tree to use fixed line-endings for tests which read 
169
      the file cotents and compare. Make some tests use this to pass under
170
      Windows. (John Arbash Meinel)
171
172
    * Skip stat and symlink tests under Windows. (Alexander Belchenko)
173
174
    * Delay in selftest/testhashcash is now issued under win32 and Cygwin.
175
      (John Arbash Meinel)
176
1185.33.60 by Martin Pool
Use full terminal width for verbose test output.
177
    * Use terminal width to align verbose test output.  (Martin Pool)
178
1513 by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
179
    * Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
180
      If adding a new test script please add that to
181
      bzrlib.tests.blackbox.__init__. (Robert Collins)
182
1185.51.1 by Martin Pool
Better message when failing to import a test suite.
183
    * Much better error message if one of the test suites can't be 
184
      imported.  (Martin Pool)
185
1526.1.1 by Robert Collins
Run the test suite with no locale as well as the default locale. Also add a test for build_tree_shape to selftest.
186
    * Make check now runs the test suite twice - once with the default locale,
187
      and once with all locales forced to C, to expose bugs. This is not 
188
      trivially done within python, so for now its only triggered by running
189
      Make check. Integrators and packagers who wish to check for full 
1526.1.3 by Robert Collins
Merge from upstream.
190
      platform support should run 'make check' to test the source.
191
      (Robert Collins)
192
1185.33.95 by Martin Pool
New TestSkipped facility, and tests for it.
193
    * Tests can now run TestSkipped if they can't execute for any reason.
1526.1.3 by Robert Collins
Merge from upstream.
194
      (Martin Pool) (NB: TestSkipped should only be raised for correctable
195
      reasons - see the wiki spec ImprovingBzrTestSuite).
1185.33.95 by Martin Pool
New TestSkipped facility, and tests for it.
196
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
197
    * Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
198
      paths for the transport tests. Introduce blackbox remote sftp tests that
199
      test the same permutations. (Robert Collins, Robey Pointer)
200
1530.1.8 by Robert Collins
More NEWS, move sibling sftp tests into new framework, nuke legacy local transport tests.
201
    * Transport implementation tests are now independent of the local file
202
      system, which allows tests for esoteric transports, and for features
203
      not available in the local file system. They also repeat for variations
204
      on the URL scheme that can introduce issues in the transport code,
205
      see bzrlib.transport.TransportTestProviderAdapter() for this.
206
      (Robert Collins).
207
208
    * TestCase.build_tree uses the transport interface to build trees, pass
209
      in a transport parameter to give it an existing connection.
210
      (Robert Collins).
211
1185.44.1 by Martin Pool
Start bringing in basicio code
212
  INTERNALS:
213
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
214
    * WorkingTree.pull has been split across Branch and WorkingTree,
1492 by Robert Collins
Support decoration of commands.
215
      to allow Branch only pulls. (Robert Collins)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
216
217
    * commands.display_command now returns the result of the decorated 
1492 by Robert Collins
Support decoration of commands.
218
      function. (Robert Collins)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
219
220
    * LocationConfig now has a set_user_option(key, value) call to save
221
      a setting in its matching location section (a new one is created
1492 by Robert Collins
Support decoration of commands.
222
      if needed). (Robert Collins)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
223
224
    * Branch has two new methods, get_push_location and set_push_location
1492 by Robert Collins
Support decoration of commands.
225
      to respectively, get and set the push location. (Robert Collins)
226
227
    * commands.register_command now takes an optional flag to signal that
228
      the registrant is planning to decorate an existing command. When 
229
      given multiple plugins registering a command is not an error, and
230
      the original command class (whether built in or a plugin based one) is
231
      returned to the caller. There is a new error 'MustUseDecorated' for
232
      signalling when a wrapping command should switch to the original
233
      version. (Robert Collins)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
234
1495 by Robert Collins
Add a --create-prefix to the new push command.
235
    * Some option parsing errors will raise 'BzrOptionError', allowing 
236
      granular detection for decorating commands. (Robert Collins).
237
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
238
    * Branch.read_working_inventory has moved to
239
      WorkingTree.read_working_inventory. This necessitated changes to
240
      Branch.get_root_id, and a move of Branch.set_inventory to WorkingTree
241
      as well. To make it clear that a WorkingTree cannot always be obtained
242
      Branch.working_tree() will raise 'errors.NoWorkingTree' if one cannot
243
      be obtained. (Robert Collins)
244
1457.1.16 by Robert Collins
Move set_pending_merges to WorkingTree.
245
    * All pending merges operations from Branch are now on WorkingTree.
246
      (Robert Collins)
247
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
248
    * The follow operations from Branch have moved to WorkingTree:
249
      add()
250
      commit()
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
251
      move()
1508.1.7 by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins).
252
      rename_one()
1508.1.6 by Robert Collins
Move Branch.unknowns() to WorkingTree.
253
      unknowns()
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
254
      (Robert Collins)
1457.1.17 by Robert Collins
Branch.commit() has moved to WorkingTree.commit(). (Robert Collins)
255
1508.1.10 by Robert Collins
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
256
    * bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
257
1185.47.3 by Martin Pool
Remove basic_io in favor of rio.
258
    * New "rio" serialization format, similar to rfc-822. (Martin Pool)
1185.33.54 by Martin Pool
[merge] test renames and other fixes (John)
259
260
    * Rename selftests to `bzrlib.tests.test_foo`.  (John A Meinel, Martin 
261
      Pool)
1515 by Robert Collins
* Plugins with the same name in different directories in the bzr plugin
262
1516 by Robert Collins
* bzrlib.plugin.all_plugins has been changed from an attribute to a
263
    * bzrlib.plugin.all_plugins has been changed from an attribute to a 
264
      query method. (Robert Collins)
1185.33.88 by Martin Pool
[patch] read only the table-of-contents of weaves to speed up commit
265
 
266
    * New options to read only the table-of-contents of a weave.  
267
      (Denys Duchier)
1528 by Robert Collins
* Raise NoSuchFile when someone tries to add a non-existant file.
268
269
    * Raise NoSuchFile when someone tries to add a non-existant file.
270
      (Michael Ellerman)
271
272
    * Simplify handling of DivergedBranches in cmd_pull().
273
      (Michael Ellerman)
274
		   
1534.2.4 by Robert Collins
Update NEWS and HACKING for the symbol_versioning module.
275
    * Deprecated functions and methods can now be marked as such using the 
276
      bzrlib.symbol_versioning module. Marked method have their docstring
277
      updated and will issue a DeprecationWarning using the warnings module
278
      when they are used. (Robert Collins)
279
1534.3.1 by Robert Collins
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion
280
    * bzrlib.osutils.safe_unicode now exists to provide parameter coercion
281
      for functions that need unicode strings. (Robert Collins)
282
1185.16.135 by Martin Pool
0.6 release
283
bzr 0.6 2005-10-28
1185.16.28 by Martin Pool
- note new manifest stuff
284
1442.1.3 by Robert Collins
move editor into the config file too
285
  IMPROVEMENTS:
1481 by Robert Collins
Allow the first revision on revision-history to have parents.
286
  
1185.32.3 by John Arbash Meinel
Added NEWS entry.
287
    * pull now takes --verbose to show you what revisions are added or removed
288
      (John A Meinel)
289
1185.18.1 by Aaron Bentley
Added --show-base to merge
290
    * merge now takes a --show-base option to include the base text in
291
      conflicts.
292
      (Aaron Bentley)
293
1185.12.50 by Aaron Bentley
Mentioned CO in NEWS
294
    * The config files are now read using ConfigObj, so '=' should be used as
295
      a separator, not ':'.
1185.18.1 by Aaron Bentley
Added --show-base to merge
296
      (Aaron Bentley)
1442.1.3 by Robert Collins
move editor into the config file too
297
1185.16.65 by mbp at sourcefrog
- new commit --strict option
298
    * New 'bzr commit --strict' option refuses to commit if there are 
299
      any unknown files in the tree.  To commit, make sure all files are 
300
      either ignored, added, or deleted.  (Michael Ellerman)
301
1442.1.3 by Robert Collins
move editor into the config file too
302
    * The config directory is now ~/.bazaar, and there is a single file 
303
      ~/.bazaar/bazaar.conf storing email, editor and other preferences.
1446 by Robert Collins
fixup the verbose-does-nothing for add - add a --quiet instead
304
      (Robert Collins)
305
306
    * 'bzr add' no longer takes a --verbose option, and a --quiet option
307
      has been added that suppresses all output.
1185.16.50 by mbp at sourcefrog
[patch] better zsh completion
308
309
    * Improved zsh completion support in contrib/zsh, from Clint
310
      Adams.
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
311
312
    * Builtin 'bzr annotate' command, by Martin Pool with improvements from 
313
      Goffredo Baroncelli.
1442.1.3 by Robert Collins
move editor into the config file too
314
    
1185.16.54 by Martin Pool
[merge] from robert
315
    * '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).
316
      ghosts in the branch. (Robert Collins)
1442.1.3 by Robert Collins
move editor into the config file too
317
1460 by Robert Collins
merge from martin.
318
    * 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).
319
      a revision. (Robert Collins)
1460 by Robert Collins
merge from martin.
320
321
    * If you set check_signatures=require for a path in 
322
      ~/.bazaar/branches.conf then bzr will invoke your
323
      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).
324
      of your commit. (Robert Collins)
1460 by Robert Collins
merge from martin.
325
1185.16.80 by Martin Pool
Update news and readme
326
    * New sftp transport, based on Paramiko.  (Robey Pointer)
327
1442.1.68 by Robert Collins
'bzr pull' now accepts '--clobber'.
328
    * 'bzr pull' now accepts '--clobber' which will discard local changes
329
      and make this branch identical to the source branch. (Robert Collins)
330
1185.16.82 by mbp at sourcefrog
- give a quieter warning if a plugin can't be loaded
331
    * Just give a quieter warning if a plugin can't be loaded, and 
332
      put the details in .bzr.log.  (Martin Pool)
333
1442.1.71 by Robert Collins
'bzr branch' sets the branch-name,
334
    * 'bzr branch' will now set the branch-name to the last component of the
335
      output directory, if one was supplied.
336
1475 by Robert Collins
update NEWS for post_commit
337
    * If the option 'post_commit' is set to one (or more) python function
338
      names (must be in the bzrlib namespace), then they will be invoked
339
      after the commit has completed, with the branch and revision_id as
340
      parameters. (Robert Collins)
341
1476 by Robert Collins
Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
342
    * Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
343
1185.12.87 by Aaron Bentley
Updated NEWS, error out if --show-base supplied and unsupported
344
    * --merge-type weave is now supported for file contents.  Tree-shape
345
      changes are still three-way based.  (Martin Pool, Aaron Bentley)
346
1481 by Robert Collins
Allow the first revision on revision-history to have parents.
347
    * 'bzr check' allows the first revision on revision-history to have
348
      parents - something that is expected for cheap checkouts, and occurs
1482 by Robert Collins
'revision.revision_graph can handle having only partial history.
349
      when conversions from baz do not have all history.  (Robert Collins).
1481 by Robert Collins
Allow the first revision on revision-history to have parents.
350
1185.12.100 by Aaron Bentley
Updated news
351
   * 'bzr merge' can now graft unrelated trees together, if your specify
352
     0 as a base. (Aaron Bentley)
353
1185.12.102 by Aaron Bentley
Updated NEWS
354
   * 'bzr commit branch' and 'bzr commit branch/file1 branch/file2' now work
355
     (Aaron Bentley)
356
1185.16.111 by mbp at sourcefrog
Add .sconsign* to default ignore list
357
    * Add '.sconsign*' to default ignore list.  (Alexander Belchenko)
1481 by Robert Collins
Allow the first revision on revision-history to have parents.
358
1185.25.2 by Aaron Bentley
Updated NEWS
359
   * 'bzr merge --reprocess' minimizes conflicts
360
1185.1.57 by Robert Collins
nuke --pattern to selftest, replace with regexp.search calls.
361
  TESTING:
362
1185.16.57 by Martin Pool
[merge] from aaron
363
    * The 'bzr selftest --pattern' option for has been removed, now 
364
      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).
365
      regexps, or both. (Robert Collins)
1185.1.57 by Robert Collins
nuke --pattern to selftest, replace with regexp.search calls.
366
1185.1.58 by Robert Collins
make selftest -v show the elapsed time for each test run.
367
    * Passing -v to selftest will now show the time each test took to 
368
      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).
369
      related questions. (Robert Collins)
1185.1.58 by Robert Collins
make selftest -v show the elapsed time for each test run.
370
1185.21.10 by Jelmer Vernooij
Fix typo
371
    * 'bzr selftest' runs all tests, even if one fails, unless '--one'
1185.16.61 by mbp at sourcefrog
- start introducing hct error classes
372
      is given. (Martin Pool)
1185.16.58 by mbp at sourcefrog
- run all selftests by default
373
1442.1.70 by Robert Collins
Add assertFileEqual to TestCaseInTempDir.
374
    * There is a new method for TestCaseInTempDir, assertFileEqual, which
375
      will check that a given content is equal to the content of the named
1464 by Robert Collins
Merged Martin.
376
      file. (Robert Collins)
1442.1.70 by Robert Collins
Add assertFileEqual to TestCaseInTempDir.
377
1185.16.109 by mbp at sourcefrog
Clean up test log files when tests complete.
378
    * Fix test suite's habit of leaving many temporary log files in $TMPDIR.
379
      (Martin Pool)
380
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
381
  INTERNALS:
382
1185.16.60 by Martin Pool
- update news of testaments and revprops
383
    * New 'testament' command and concept for making gpg-signatures 
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
384
      of revisions that are not tied to a particular internal
1185.16.60 by Martin Pool
- update news of testaments and revprops
385
      representation.  (Martin Pool).
386
387
    * Per-revision properties ('revprops') as key-value associated 
388
      strings on each revision created when the revision is committed.
389
      Intended mainly for the use of external tools.  (Martin Pool).
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
390
1442.1.23 by Robert Collins
Plugins are now loaded under bzrlib.plugins, not bzrlib.plugin.
391
    * Config options have moved from bzrlib.osutils to bzrlib.config.
1185.16.54 by Martin Pool
[merge] from robert
392
      (Robert Collins)
393
1185.16.41 by Martin Pool
[patch] define cli options as objects, not strings
394
    * Improved command line option definitions allowing explanations
395
      for individual options, among other things.  Contributed by 
396
      Magnus Therning.
397
1185.16.54 by Martin Pool
[merge] from robert
398
    * 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.
399
      Configuration is now done via the config.Config interface:
1442.1.19 by Robert Collins
BranchConfigs inherit signature_checking policy from their LocationConfig.
400
      Depending on whether you have a Branch, a Location or no information
401
      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.
402
      username and user_email methods. (Robert Collins)
403
404
    * Plugins are now loaded under bzrlib.plugins, not bzrlib.plugin, and
405
      they are made available for other plugins to use. You should not 
406
      import other plugins during the __init__ of your plugin though, as 
407
      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.
408
      python path. (Robert Collins)
409
410
    * Branch.relpath has been moved to WorkingTree.relpath. WorkingTree no
411
      no longer takes an inventory, rather it takes an option branch
412
      parameter, and if None is given will open the branch at basedir 
413
      implicitly. (Robert Collins)
1442.1.23 by Robert Collins
Plugins are now loaded under bzrlib.plugins, not bzrlib.plugin.
414
1185.16.61 by mbp at sourcefrog
- start introducing hct error classes
415
    * Cleaner exception structure and error reporting.  Suggested by 
416
      Scott James Remnant.  (Martin Pool)
417
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
418
    * Branch.remove has been moved to WorkingTree, which has also gained
419
      lock_read, lock_write and unlock methods for convenience. (Robert
420
      Collins)
421
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
422
    * Two decorators, needs_read_lock and needs_write_lock have been added
423
      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).
424
      read or write lock respectively. (Robert Collins)
425
426
    * Branch.open_containing now returns a tuple (Branch, relative-path),
427
      which allows direct access to the common case of 'get me this file
428
      from its branch'. (Robert Collins)
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
429
1185.16.80 by Martin Pool
Update news and readme
430
    * Transports can register using register_lazy_transport, and they 
431
      will be loaded when first used.  (Martin Pool)
432
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
433
    * 'pull' has been factored out of the command as WorkingTree.pull().
1442.1.68 by Robert Collins
'bzr pull' now accepts '--clobber'.
434
      A new option to WorkingTree.pull has been added, clobber, which will
435
      ignore diverged history and pull anyway.
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
436
      (Robert Collins)
1442.1.19 by Robert Collins
BranchConfigs inherit signature_checking policy from their LocationConfig.
437
1442.1.69 by Robert Collins
config.Config has a 'get_user_option' call that accepts an option name.
438
    * config.Config has a 'get_user_option' call that accepts an option name.
439
      This will be looked up in branches.conf and bazaar.conf as normal.
440
      It is intended that this be used by plugins to support options - 
441
      options of built in programs should have specific methods on the config.
442
      (Robert Collins)
443
1465 by Robert Collins
Bugfix the new pull --clobber to not generate spurious conflicts.
444
    * merge.merge_inner now has tempdir as an optional parameter. (Robert
445
      Collins)
446
447
    * Tree.kind is not recorded at the top level of the hierarchy, as it was
448
      missing on EmptyTree, leading to a bug with merge on EmptyTrees.
449
      (Robert Collins)
450
1467 by Robert Collins
WorkingTree.__del__ has been removed.
451
    * WorkingTree.__del__ has been removed, it was non deterministic and not 
452
      doing what it was intended to. See WorkingTree.__init__ for a comment
453
      about future directions. (Robert Collins/Martin Pool)
454
1468 by Robert Collins
The HTTP transport would return NoSuchFile inappropriately.
455
    * bzrlib.transport.http has been modified so that only 404 urllib errors
456
      are returned as NoSuchFile. Other exceptions will propogate as normal.
457
      This allows debuging of actual errors. (Robert Collins)
458
1469 by Robert Collins
Change Transport.* to work with URL's.
459
    * bzrlib.transport.Transport now accepts *ONLY* url escaped relative paths
460
      to apis like 'put', 'get' and 'has'. This is to provide consistent
461
      behaviour - it operates on url's only. (Robert Collins)
462
1185.16.80 by Martin Pool
Update news and readme
463
    * Transports can register using register_lazy_transport, and they 
464
      will be loaded when first used.  (Martin Pool)
465
1476 by Robert Collins
Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
466
    * 'merge_flex' no longer calls conflict_handler.finalize(), instead that
467
      is called by merge_inner. This is so that the conflict count can be 
468
      retrieved (and potentially manipulated) before returning to the caller
469
      of merge_inner. Likewise 'merge' now returns the conflict count to the
470
      caller. (Robert Collins)
471
1482 by Robert Collins
'revision.revision_graph can handle having only partial history.
472
    * 'revision.revision_graph can handle having only partial history for
473
      a revision - that is no revisions in the graph with no parents.
474
      (Robert Collins).
475
1185.12.102 by Aaron Bentley
Updated NEWS
476
    * New builtins.branch_files uses the standard file_list rules to produce
477
      a branch and a list of paths, relative to that branch (Aaron Bentley)
478
1185.16.109 by mbp at sourcefrog
Clean up test log files when tests complete.
479
    * New TestCase.addCleanup facility.
480
1185.16.129 by Martin Pool
Add check that the bzr program and bzrlib version match.
481
    * New bzrlib.version_info tuple (similar to sys.version_info), which can
482
      be used by programs importing bzrlib.
483
1185.16.70 by Martin Pool
- improved handling of non-ascii branch names and test
484
  BUG FIXES:
485
486
    * Better handling of branches in directories with non-ascii names. 
487
      (Joel Rosdahl, Panagiotis Papadakos)
488
1487 by Robert Collins
NEWS file entry for prior commit - upgrades of trees with no revisions should not fail.
489
    * Upgrades of trees with no commits will not fail due to accessing
490
      [-1] in the revision-history. (Andres Salomon)
491
492
1185.17.4 by Martin Pool
- note cherrypicked changes
493
bzr 0.1.1 2005-10-12
494
495
  BUG FIXES:
496
497
    * Fix problem in pulling over http from machines that do not 
498
      allow directories to be listed.
499
500
    * Avoid harmless warning about invalid hash cache after 
501
      upgrading branch format.
502
503
  PERFORMANCE: 
504
  
505
    * Avoid some unnecessary http operations in branch and pull.
506
1185.16.29 by Martin Pool
[merge] config file and other things from robert
507
1185.16.10 by Martin Pool
- prepare 0.1 release
508
bzr 0.1 2005-10-11
1185.1.45 by Robert Collins
Apply Harald Meland's fix to lock with lockf for NFS compatability
509
1185.15.6 by Martin Pool
- release note limitation of branch eta
510
  NOTES:
511
512
    * 'bzr branch' over http initially gives a very high estimate
513
      of completion time but it should fall as the first few 
514
      revisions are pulled in.  branch is still slow on 
515
      high-latency connections.
516
1185.1.45 by Robert Collins
Apply Harald Meland's fix to lock with lockf for NFS compatability
517
  BUG FIXES:
518
  
519
    * bzr-man.py has been updated to work again. Contributed by
520
      Rob Weir.
521
522
    * Locking is now done with fcntl.lockf which works with NFS
523
      file systems. Contributed by Harald Meland.
524
1185.1.48 by Robert Collins
Aarons export fix and conflict on deleted and modified files fix.
525
    * When a merge encounters a file that has been deleted on
526
      one side and modified on the other, the old contents are
527
      written out to foo.BASE and foo.SIDE, where SIDE is this
528
      or OTHER. Contributed by Aaron Bentley.
529
530
    * Export was choosing incorrect file paths for the content of
531
      the tarball, this has been fixed by Aaron Bentley.
532
1414 by Robert Collins
merge in an adjusted version of Jelmer's empty-log detection patch.
533
    * Commit will no longer commit without a log message, an 
534
      error is returned instead. Contributed by Jelmer Vernooij.
535
1416 by Robert Collins
when committing a specific file, include all its parents
536
    * If you commit a specific file in a sub directory, any of its
537
      parent directories that are added but not listed will be 
538
      automatically included. Suggested by Michael Ellerman.
539
1422 by Robert Collins
merge in martins reweave, integrated to fetch, and a bugfix for commit and upgrade with executable files
540
    * bzr commit and upgrade did not correctly record new revisions
541
      for files with only a change to their executable status.
542
      bzr will correct this when it encounters it. Fixed by
543
      Robert Collins
544
1426 by Robert Collins
merge gustavos http_proxy fix for test cases.
545
    * HTTP tests now force off the use of http_proxy for the duration.
546
      Contributed by Gustavo Niemeyer.
547
1185.15.2 by Martin Pool
[merge] from robert and newformat
548
    * Fix problems in merging weave-based branches that have 
549
      different partial views of history.
550
1436 by Robert Collins
bugfix from scott for symlink support when not in the tree root.
551
    * Symlink support: working with symlinks when not in the root of a 
552
      bzr tree was broken, patch from Scott James Remnant.
553
1398 by Robert Collins
integrate in Gustavos x-bit patch
554
1185.1.45 by Robert Collins
Apply Harald Meland's fix to lock with lockf for NFS compatability
555
  IMPROVEMENTS:
556
1185.1.46 by Robert Collins
Aarons branch --basis patch
557
    * 'branch' now accepts a --basis parameter which will take advantage
558
      of local history when making a new branch. This allows faster 
559
      branching of remote branches. Contributed by Aaron Bentley.
560
1391 by Robert Collins
merge from integration
561
    * New tree format based on weave files, called version 5.
562
      Existing branches can be upgraded to this format using 
563
      'bzr upgrade'.
564
1398 by Robert Collins
integrate in Gustavos x-bit patch
565
    * Symlinks are now versionable. Initial patch by 
566
      Erik Toubro Nielsen, updated to head by Robert Collins.
567
568
    * Executable bits are tracked on files. Patch from Gustavo
569
      Niemeyer.
570
1393.1.29 by Martin Pool
- note improvement to status command in NEWS
571
    * 'bzr status' now shows unknown files inside a selected directory.
572
      Patch from Heikki Paajanen.
1398 by Robert Collins
integrate in Gustavos x-bit patch
573
1185.13.2 by Robert Collins
Merge Aarons conflict plugin for 0.1rc1
574
    * Merge conflicts are recorded in .bzr. Two new commands 'conflicts'
575
      and 'resolve' have needed added, which list and remove those 
576
      merge conflicts respectively. A conflicted tree cannot be committed
577
      in. Contributed by Aaron Bentley.
578
1424 by Robert Collins
add rm alias to remove
579
    * 'rm' is now an alias for 'remove'.
580
1430 by Robert Collins
touchup the prefixed-store patch
581
    * Stores now split out their content in a single byte prefixed hash,
582
      dropping the density of files per directory by 256. Contributed by
583
      Gustavo Niemeyer.
584
1432 by Robert Collins
branch: namespace
585
    * 'bzr diff -r branch:URL' will now perform a diff between two branches.
586
      Contributed by Robert Collins.
587
1433 by Robert Collins
merge in and make incremental Gustavo Niemeyers nested log patch, and remove all bare exceptions in store and transport packages.
588
    * 'bzr log' with the default formatter will show merged revisions,
589
      indented to the right. Initial implementation contributed by Gustavo
590
      Niemeyer, made incremental by Robert Collins.
591
1400 by Robert Collins
merge from mpool
592
1185.1.45 by Robert Collins
Apply Harald Meland's fix to lock with lockf for NFS compatability
593
  INTERNALS:
594
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
595
    * Test case failures have the exception printed after the log 
596
      for your viewing pleasure.
597
1400 by Robert Collins
merge from mpool
598
    * InventoryEntry is now an abstract base class, use one of the
599
      concrete InventoryDirectory etc classes instead.
600
1423 by Robert Collins
merge in UnsupportedFormatError feature
601
    * Branch raises an UnsupportedFormatError when it detects a 
602
      bzr branch it cannot understand. This allows for precise
603
      handling of such circumstances.
604
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
605
606
  TESTING:
607
608
    * Removed testsweet module so that tests can be run after 
609
      bzr installed by 'bzr selftest'.
1391 by Robert Collins
merge from integration
610
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
611
    * 'bzr selftest' command-line arguments can now be partial ids
612
      of tests to run, e.g. 'bzr selftest test_weave'
613
1185.1.45 by Robert Collins
Apply Harald Meland's fix to lock with lockf for NFS compatability
614
      
1185.9.1 by Martin Pool
- prepare for 0.0.9 release
615
bzr 0.0.9 2005-09-23
616
617
  BUG FIXES:
618
619
    * Fixed "branch -r" option.
620
621
    * Fix remote access to branches containing non-compressed history.
622
      (Robert Collins).
623
624
    * Better reliability of http server tests.  (John Arbash-Meinel)
625
626
    * Merge graph maximum distance calculation fix.  (Aaron Bentley)
627
   
1185.1.45 by Robert Collins
Apply Harald Meland's fix to lock with lockf for NFS compatability
628
    * Various minor bug in windows support have been fixed, largely in the
629
      test suite. Contributed by Alexander Belchenko.
630
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
631
  IMPROVEMENTS:
632
1391 by Robert Collins
merge from integration
633
    * Status now accepts a -r argument to give status between chosen
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
634
      revisions. Contributed by Heikki Paajanen.
635
1185.1.39 by Robert Collins
Robey Pointers before: namespace to clear up usage of dates in revision parameters
636
    * Revision arguments no longer use +/-/= to control ranges, instead
637
      there is a 'before' namespace, which limits the successive namespace.
638
      For example '$ bzr log -r date:yesterday..before:date:today' will
639
      select everything from yesterday and before today. Contributed by
640
      Robey Pointer
641
1185.1.40 by Robert Collins
Merge what applied of Alexander Belchenko's win32 patch.
642
    * There is now a bzr.bat file created by distutils when building on 
643
      Windows. Contributed by Alexander Belchenko.
1388 by Martin Pool
- update NEWS files
644
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
645
  INTERNALS:
646
1390 by Robert Collins
pair programming worx... merge integration and weave
647
    * Removed uuid() as it was unused.
1181 by Martin Pool
- add test for deserialization from a canned XML inventory
648
1241 by Martin Pool
- rename last_patch to last_revision
649
    * Improved 'fetch' code for pulling revisions from one branch into
650
      another (used by pull, merged, etc.)
651
652
1185.7.3 by Martin Pool
- prepare for 0.0.8 release
653
bzr 0.0.8 2005-09-20
1181 by Martin Pool
- add test for deserialization from a canned XML inventory
654
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
655
  IMPROVEMENTS:
656
657
    * Adding a file whose parent directory is not versioned will
658
      implicitly add the parent, and so on up to the root. This means
659
      you should never need to explictly add a directory, they'll just
660
      get added when you add a file in the directory.  Contributed by
661
      Michael Ellerman.
662
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
663
    * Ignore .DS_Store (contains Mac metadata) by default.  Patch from
664
      Nir Soffer.
665
1185.1.30 by Robert Collins
Accept and tweak David Clymers BZREDITOR support patch
666
    * If you set BZR_EDITOR in the environment, it is checked in
667
      preference to EDITOR and the config file for the interactive commit
668
      editing program. Related to this is a bugfix where a missing program
669
      set in EDITOR would cause editing to fail, now the fallback program
670
      for the operating system is still tried.
671
1185.1.32 by Robert Collins
Merge John Meinels patch to support trees with fifo/socket/block files present in the tree
672
    * Files that are not directories/symlinks/regular files will no longer
673
      cause bzr to fail, it will just ignore them by default. You cannot add
674
      them to the tree though - they are not versionable.
675
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
676
1181 by Martin Pool
- add test for deserialization from a canned XML inventory
677
  INTERNALS:
678
679
    * Refactor xml packing/unpacking.
680
1185.1.4 by Martin Pool
- fix _find_remote_branch to avoid strange error for nonexistent branch
681
  BUG FIXES: 
682
683
    * Fixed 'bzr mv' by Ollie Rutherfurd.
684
685
    * Fixed strange error when trying to access a nonexistent http
686
      branch.
687
1185.3.6 by Martin Pool
- if statcache can't be read, consider that it needs to be rewritten
688
    * Make sure that the hashcache gets written out if it can't be
689
      read.
690
1185.1.4 by Martin Pool
- fix _find_remote_branch to avoid strange error for nonexistent branch
691
692
  PORTABILITY:
693
694
    * Various Windows fixes from Ollie Rutherfurd.
695
1185.7.1 by Martin Pool
- Quieten warnings about locking; patch from Matt Lavin.
696
    * Quieten warnings about locking; patch from Matt Lavin.
1241 by Martin Pool
- rename last_patch to last_revision
697
1181 by Martin Pool
- add test for deserialization from a canned XML inventory
698
1175 by Martin Pool
- make 0.0.7 release
699
bzr-0.0.7 2005-09-02
1091 by Martin Pool
- new shell-complete command to help zsh completion
700
701
  NEW FEATURES:
702
703
    * ``bzr shell-complete`` command contributed by Clint Adams to
704
      help with intelligent shell completion.
705
1105 by Martin Pool
- expose 'find-merge-base' as a new expert command,
706
    * New expert command ``bzr find-merge-base`` for debugging merges.
707
1091 by Martin Pool
- new shell-complete command to help zsh completion
708
1145 by Martin Pool
- additional fix for bzr plugins
709
  ENHANCEMENTS:
710
711
    * Much better merge support.
712
1148 by Martin Pool
- change conflict markers to suit smerge, etc
713
    * merge3 conflicts are now reported with markers like '<<<<<<<'
714
      (seven characters) which is the same as CVS and pleases things
715
      like emacs smerge.
716
1145 by Martin Pool
- additional fix for bzr plugins
717
1092 by Martin Pool
- fix bug where bzr upgrade aborts when trying to fix trees that mention revisions
718
  BUG FIXES:
719
720
    * ``bzr upgrade`` no longer fails when trying to fix trees that
721
      mention revisions that are not present.
722
1145 by Martin Pool
- additional fix for bzr plugins
723
    * Fixed bugs in listing plugins from ``bzr plugins``.
724
1168 by Martin Pool
- work properly when $EDITOR contains multiple words
725
    * Fix case of $EDITOR containing options for the editor.
726
1174 by Martin Pool
- fix off-by-one in 'bzr log -r'
727
    * Fix log -r refusing to show the last revision.
728
      (Patch from Goffredo Baroncelli.)
729
1092 by Martin Pool
- fix bug where bzr upgrade aborts when trying to fix trees that mention revisions
730
1138 by Martin Pool
- bzr log --show-ids includes parent ids
731
  CHANGES:
732
733
    * ``bzr log --show-ids`` shows the revision ids of all parents.
734
1174 by Martin Pool
- fix off-by-one in 'bzr log -r'
735
    * Externally provided commands on your $BZRPATH no longer need
736
      to recognize --bzr-usage to work properly, and can just handle
737
      --help themselves.
738
1138 by Martin Pool
- bzr log --show-ids includes parent ids
739
1097 by Martin Pool
- send trace messages out through python logging module
740
  LIBRARY:
741
742
    * Changed trace messages to go through the standard logging
743
      framework, so that they can more easily be redirected by
744
      libraries.
745
746
747
1086 by Martin Pool
prepare 0.0.6 release
748
bzr-0.0.6 2005-08-18
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
749
741 by Martin Pool
- default plugin dir is ~/.bzr.conf/plugins
750
  NEW FEATURES:
751
752
    * Python plugins, automatically loaded from the directories on
753
      BZR_PLUGIN_PATH or ~/.bzr.conf/plugins by default.
754
742 by Martin Pool
- new mkdir command
755
    * New 'bzr mkdir' command.
756
763 by Martin Pool
- Patch from Torsten Marek to take commit messages through an
757
    * Commit mesage is fetched from an editor if not given on the
758
      command line; patch from Torsten Marek.
759
900 by Martin Pool
- patch from john to search for matching commits
760
    * ``bzr log -m FOO`` displays commits whose message matches regexp 
761
      FOO.
971 by Martin Pool
- update news
762
      
763
    * ``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
764
765
    * ``bzr mv`` does move or rename depending on its arguments, like
766
      the Unix command.
767
768
    * ``bzr missing`` command shows a summary of the differences
769
      between two trees.  (Merged from John Arbash-Meinel.)
770
1074 by Martin Pool
- check for email address in BRANCH_ROOT/.bzr/email, so you can
771
    * An email address for commits to a particular tree can be
772
      specified by putting it into .bzr/email within a branch.  (Based
773
      on a patch from Heikki Paajanen.)
774
1094 by Martin Pool
- merge aaron's merge improvements 999..1008
775
971 by Martin Pool
- update news
776
  ENHANCEMENTS:
777
778
    * Faster working tree operations.
900 by Martin Pool
- patch from john to search for matching commits
779
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
780
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
781
  CHANGES:
782
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
783
    * 3rd-party modules shipped with bzr are copied within the bzrlib
784
      python package, so that they can be installed by the setup
785
      script without clashing with anything already existing on the
786
      system.  (Contributed by Gustavo Niemeyer.)
787
788
    * Moved plugins directory to bzrlib/, so that there's a standard
789
      plugin directory which is not only installed with bzr itself but
790
      is also available when using bzr from the development tree.
791
      BZR_PLUGIN_PATH and DEFAULT_PLUGIN_PATH are then added to the
792
      standard plugins directory.
793
849 by Martin Pool
- Put files inside an exported tarball into a top-level directory rather than
794
    * When exporting to a tarball with ``bzr export --format tgz``, put 
795
      everything under a top directory rather than dumping it into the
796
      current directory.   This can be overridden with the ``--root`` 
971 by Martin Pool
- update news
797
      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
798
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
799
    * New ``bzr upgrade`` command to upgrade the format of a branch,
800
      replacing ``bzr check --update``.
801
714 by Martin Pool
- files within stores are no longer made readonly
802
    * Files within store directories are no longer marked readonly on
803
      disk.
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
804
796 by Martin Pool
- note bzr log changes
805
    * Changed ``bzr log`` output to a more compact form suggested by
808 by Martin Pool
- Note new --long log options
806
      John A Meinel.  Old format is available with the ``--long`` or
807
      ``-l`` option, patched by William Dodé.
796 by Martin Pool
- note bzr log changes
808
885 by Martin Pool
- commit command refuses unless something is changed or --unchanged is given
809
    * By default the commit command refuses to record a revision with
810
      no changes unless the ``--unchanged`` option is given.
987 by Martin Pool
- note changes to command line parsing
811
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
812
    * The ``--no-plugins``, ``--profile`` and ``--builtin`` command
813
      line options must come before the command name because they 
814
      affect what commands are available; all other options must come 
815
      after the command name because their interpretation depends on
816
      it.
817
818
    * ``branch`` and ``clone`` added as aliases for ``branch``.
819
820
    * Default log format is back to the long format; the compact one
821
      is available with ``--short``.
822
      
823
      
824
  BUG FIXES:
825
  
826
    * Fix bugs in committing only selected files or within a subdirectory.
827
703 by Martin Pool
- split out a new 'bzr upgrade' command separate from
828
692 by Martin Pool
0.0.5 release
829
bzr-0.0.5  2005-06-15
448 by Martin Pool
- bzr with no command now shows help, not just an error
830
  
831
  CHANGES:
832
833
    * ``bzr`` with no command now shows help rather than giving an
834
      error.  Suggested by Michael Ellerman.
835
465 by Martin Pool
- Move show_status() out of Branch into a new function in
836
    * ``bzr status`` output format changed, because svn-style output
837
      doesn't really match the model of bzr.  Now files are grouped by
838
      status and can be shown with their IDs.  ``bzr status --all``
839
      shows all versioned files and unknown files but not ignored files.
840
527 by Martin Pool
- refactor log command
841
    * ``bzr log`` runs from most-recent to least-recent, the reverse
545 by Martin Pool
- --forward option for log
842
      of the previous order.  The previous behaviour can be obtained
843
      with the ``--forward`` option.
588 by Martin Pool
- change inventory command to not show ids by default
844
        
845
    * ``bzr inventory`` by default shows only filenames, and also ids
846
      if ``--show-ids`` is given, in which case the id is the second
847
      field.
527 by Martin Pool
- refactor log command
848
286 by Martin Pool
- New bzr whoami --email option
849
850
  ENHANCEMENTS:
851
852
    * New 'bzr whoami --email' option shows only the email component
853
      of the user identification, from Jo Vermeulen.
854
420 by Martin Pool
Doc
855
    * New ``bzr ignore PATTERN`` command.
310 by Martin Pool
- new 'bzr ignored' command!
856
318 by Martin Pool
- better error message for Ctrl-c
857
    * Nicer error message for broken pipe, interrupt and similar
858
      conditions that don't indicate an internal error.
317 by Martin Pool
- better error message for broken pipe
859
618 by Martin Pool
- ignore .git files as well
860
    * Add ``.*.sw[nop] .git .*.tmp *,v`` to default ignore patterns.
348 by Martin Pool
- Add vim and RCS ignorefile patterns
861
353 by Martin Pool
- Per-branch locks in read and write modes.
862
    * Per-branch locks keyed on ``.bzr/branch-lock``, available in
863
      either read or write mode.
864
384 by Martin Pool
doc
865
    * New option ``bzr log --show-ids`` shows revision and file ids.
367 by Martin Pool
- New --show-ids option for bzr log
866
378 by Martin Pool
- New usage bzr log FILENAME
867
    * New usage ``bzr log FILENAME`` shows only revisions that
868
      affected that file.
869
379 by Martin Pool
- Simpler compare_inventories() to possibly replace diff_trees
870
    * Changed format for describing changes in ``bzr log -v``.
871
389 by Martin Pool
- new commit --file option!
872
    * New option ``bzr commit --file`` to take a message from a file,
873
      suggested by LarstiQ.
874
468 by Martin Pool
- Interpret arguments to bzr status
875
    * New syntax ``bzr status [FILE...]`` contributed by Bartosz
876
      Oler.  File may be in a branch other than the working directory.
404 by Martin Pool
- bzr status now optionally takes filenames to check
877
416 by Martin Pool
- bzr log and bzr root now accept an http URL
878
    * ``bzr log`` and ``bzr root`` can be given an http URL instead of
879
      a filename.
880
422 by Martin Pool
- External-command patch from mpe
881
    * Commands can now be defined by external programs or scripts
882
      in a directory on $BZRPATH.
883
440 by Martin Pool
doc
884
    * New "stat cache" avoids reading the contents of files if they 
885
      haven't changed since the previous time.
886
443 by Martin Pool
- Patch from Fredrik Lundh to check Python version and
887
    * If the Python interpreter is too old, try to find a better one
888
      or give an error.  Based on a patch from Fredrik Lundh.
889
472 by Martin Pool
- Optional branch parameter to info command
890
    * New optional parameter ``bzr info [BRANCH]``.
891
491 by Martin Pool
- Selective commit!
892
    * New form ``bzr commit SELECTED`` to commit only selected files.
893
567 by Martin Pool
- New form 'bzr log -r FROM:TO'
894
    * New form ``bzr log -r FROM:TO`` shows changes in selected
895
      range; contributed by John A Meinel.
896
571 by Martin Pool
- new --diff-options to pass options through to external
897
    * New option ``bzr diff --diff-options 'OPTS'`` allows passing
898
      options through to an external GNU diff.
899
594 by Martin Pool
- add --no-recurse option for add command
900
    * New option ``bzr add --no-recurse`` to add a directory but not
901
      their contents.
902
607 by Martin Pool
doc
903
    * ``bzr --version`` now shows more information if bzr is being run
904
      from a branch.
905
441 by Martin Pool
- Fix from Lalo for unidiff output of newly added
906
  
907
  BUG FIXES:
908
909
    * Fixed diff format so that added and removed files will be
910
      handled properly by patch.  Fix from Lalo Martins.
911
536 by Martin Pool
doc
912
    * Various fixes for files whose names contain spaces or other
913
      metacharacters.
914
404 by Martin Pool
- bzr status now optionally takes filenames to check
915
296 by Martin Pool
- better reports from testbzr when it fails
916
  TESTING:
917
340 by Martin Pool
- more testcase fixes
918
    * Converted black-box test suites from Bourne shell into Python;
919
      now run using ``./testbzr``.  Various structural improvements to
920
      the tests.
297 by Martin Pool
- fix intentional testcase failure
921
398 by Martin Pool
- testbzr finds the right version of bzr to test
922
    * testbzr by default runs the version of bzr found in the same
923
      directory as the tests, or the one given as the first parameter.
924
399 by Martin Pool
- testbzr also runs selftests
925
    * testbzr also runs the internal tests, so the only command
926
      required to check is just ``./testbzr``.
927
508 by Martin Pool
- new -p option for testbzr to use a different version of python
928
    * testbzr requires python2.4, but can be used to test bzr running
929
      under a different version.
930
594 by Martin Pool
- add --no-recurse option for add command
931
    * Tests added for many other changes in this release.
932
398 by Martin Pool
- testbzr finds the right version of bzr to test
933
314 by Martin Pool
- Update ElementTree to 1.2.6
934
  INTERNAL:
935
936
    * Included ElementTree library upgraded to 1.2.6 by Fredrik Lundh.
937
389 by Martin Pool
- new commit --file option!
938
    * Refactor command functions into Command objects based on HCT by
939
      Scott James Remnant.
329 by Martin Pool
- refactor command functions into command classes
940
941
    * Better help messages for many commands.
942
344 by Martin Pool
- It's not an error to use the library without
943
    * Expose bzrlib.open_tracefile() to start the tracefile; until
944
      this is called trace messages are just discarded.
945
375 by Martin Pool
- New command touching-revisions and function to trace
946
    * New internal function find_touching_revisions() and hidden
947
      command touching-revisions trace the changes to a given file.
297 by Martin Pool
- fix intentional testcase failure
948
379 by Martin Pool
- Simpler compare_inventories() to possibly replace diff_trees
949
    * Simpler and faster compare_inventories() function.
950
397 by Martin Pool
- open_tracefile takes a tracefilename parameter
951
    * bzrlib.open_tracefile() takes a tracefilename parameter.
952
409 by Martin Pool
- New AtomicFile class
953
    * New AtomicFile class.
440 by Martin Pool
doc
954
955
    * New developer commands ``added``, ``modified``.
956
444 by Martin Pool
- cope on platforms with no urandom feature
957
958
  PORTABILITY:
959
960
    * Cope on Windows on python2.3 by using the weaker random seed.
961
      2.4 is now only recommended.
962
963
280 by Martin Pool
Prepare for 0.0.4 release
964
bzr-0.0.4  2005-04-22
184 by mbp at sourcefrog
pychecker fixups
965
196 by mbp at sourcefrog
selected-file diff
966
  ENHANCEMENTS:
184 by mbp at sourcefrog
pychecker fixups
967
244 by mbp at sourcefrog
- New 'bzr log --verbose' from Sebastian Cote
968
    * 'bzr diff' optionally takes a list of files to diff.  Still a bit
196 by mbp at sourcefrog
selected-file diff
969
      basic.  Patch from QuantumG.
184 by mbp at sourcefrog
pychecker fixups
970
242 by mbp at sourcefrog
Fix opening of ~/.bzr.log on Windows
971
    * More default ignore patterns.
972
244 by mbp at sourcefrog
- New 'bzr log --verbose' from Sebastian Cote
973
    * New 'bzr log --verbose' shows a list of files changed in the
974
      changeset.  Patch from Sebastian Cote.
975
261 by Martin Pool
- auto-rollover of .bzr.log
976
    * Roll over ~/.bzr.log if it gets too large.
977
272 by Martin Pool
- Add command aliases
978
    * Command abbreviations 'ci', 'st', 'stat', '?' based on a patch
979
      by Jason Diamon.
980
273 by Martin Pool
- New 'bzr help commands'
981
    * New 'bzr help commands' based on a patch from Denys Duchier.
982
235 by mbp at sourcefrog
update NEWS
983
252 by Martin Pool
- Don't use host fqdn for default user name, because DNS tends
984
  CHANGES:
985
986
    * User email is determined by looking at $BZREMAIL or ~/.bzr.email
987
      or $EMAIL.  All are decoded by the locale preferred encoding.
988
      If none of these are present user@hostname is used.  The host's
989
      fully-qualified name is not used because that tends to fail when
990
      there are DNS problems.
991
255 by Martin Pool
- New whoami command
992
    * New 'bzr whoami' command instead of username user-email.
993
252 by Martin Pool
- Don't use host fqdn for default user name, because DNS tends
994
235 by mbp at sourcefrog
update NEWS
995
  BUG FIXES: 
996
997
    * Make commit safe for hardlinked bzr trees.
998
245 by mbp at sourcefrog
- control files always in utf-8-unix format
999
    * Some Unicode/locale fixes.
1000
278 by Martin Pool
- Better workaround for trailing newlines in diffs
1001
    * Partial workaround for difflib.unified_diff not handling
1002
      trailing newlines properly.
1003
235 by mbp at sourcefrog
update NEWS
1004
232 by mbp at sourcefrog
Allow docstrings for help to be in PEP0257 format.
1005
  INTERNAL:
1006
1007
    * Allow docstrings for help to be in PEP0257 format.  Patch from
1008
      Matt Brubeck.
1009
235 by mbp at sourcefrog
update NEWS
1010
    * More tests in test.sh.
1011
239 by mbp at sourcefrog
- remove profiler temporary file when done
1012
    * Write profile data to a temporary file not into working
1013
      directory and delete it when done.
238 by mbp at sourcefrog
- Don't put profiling temp file in current directory
1014
257 by Martin Pool
- Write less startup junk to .bzr.log
1015
    * Smaller .bzr.log with process ids.
1016
184 by mbp at sourcefrog
pychecker fixups
1017
242 by mbp at sourcefrog
Fix opening of ~/.bzr.log on Windows
1018
  PORTABILITY:
1019
261 by Martin Pool
- auto-rollover of .bzr.log
1020
    * Fix opening of ~/.bzr.log on Windows.  Patch from Andrew
1021
      Bennetts.
242 by mbp at sourcefrog
Fix opening of ~/.bzr.log on Windows
1022
262 by Martin Pool
- gen_file_id: break the file on either / or \ when looking
1023
    * Some improvements in handling paths on Windows, based on a patch
1024
      from QuantumG.
1025
242 by mbp at sourcefrog
Fix opening of ~/.bzr.log on Windows
1026
181 by mbp at sourcefrog
prepare for 0.0.3 release
1027
bzr-0.0.3  2005-04-06
155 by mbp at sourcefrog
add new explicit RootEntry to inventory (in-core only)
1028
156 by mbp at sourcefrog
new "directories" command
1029
  ENHANCEMENTS:
1030
1031
    * New "directories" internal command lists versioned directories
1032
      in the tree.
1033
159 by mbp at sourcefrog
bzr commit --help now works
1034
    * Can now say "bzr commit --help".
1035
174 by mbp at sourcefrog
- New 'move' command; now separated out from rename
1036
    * New "rename" command to rename one file to a different name
1037
      and/or directory.
1038
1039
    * New "move" command to move one or more files into a different
1040
      directory.
168 by mbp at sourcefrog
new "rename" command
1041
164 by mbp at sourcefrog
new 'renames' command
1042
    * New "renames" command lists files renamed since base revision.
1043
176 by mbp at sourcefrog
New cat command contributed by janmar.
1044
    * New cat command contributed by janmar.
1045
165 by mbp at sourcefrog
- put .bzr.log in /home/mbp
1046
  CHANGES:
1047
166 by mbp at sourcefrog
- Write .bzr.log in utf8
1048
    * .bzr.log is placed in $HOME (not pwd) and is always written in
1049
      UTF-8.  (Probably not a completely good long-term solution, but
1050
      will do for now.)
165 by mbp at sourcefrog
- put .bzr.log in /home/mbp
1051
162 by mbp at sourcefrog
workaround for python2.3 difflib bug
1052
  PORTABILITY:
1053
1054
    * Workaround for difflib bug in Python 2.3 that causes an
1055
      exception when comparing empty files.  Reported by Erik Toubro
1056
      Nielsen.
163 by mbp at sourcefrog
merge win32 portability fixes
1057
165 by mbp at sourcefrog
- put .bzr.log in /home/mbp
1058
  INTERNAL:
1059
1060
    * Refactored inventory storage to insert a root entry at the top.
1061
180 by mbp at sourcefrog
- mv command is gone, but renames seem to be working
1062
  TESTING:
1063
169 by mbp at sourcefrog
Start of shell-based black-box testing in test.sh
1064
    * Start of shell-based black-box testing in test.sh.
1065
163 by mbp at sourcefrog
merge win32 portability fixes
1066
1067
bzr-0.0.2.1
1068
1069
  PORTABILITY:
1070
1071
    * Win32 fixes from Steve Brown.
1072
1073
181 by mbp at sourcefrog
prepare for 0.0.3 release
1074
bzr-0.0.2  "black cube"  2005-03-31
101 by mbp at sourcefrog
change default ignore list
1075
133 by mbp at sourcefrog
- new 'ignored' command
1076
  ENHANCEMENTS:
101 by mbp at sourcefrog
change default ignore list
1077
110 by mbp at sourcefrog
Add more patterns to default ignore list
1078
    * Default ignore list extended (see bzrlib/__init__.py).
101 by mbp at sourcefrog
change default ignore list
1079
102 by mbp at sourcefrog
- cache ignore list in Tree
1080
    * Patterns in .bzrignore are now added to the default ignore list,
1081
      rather than replacing it.
1082
146 by mbp at sourcefrog
match ignore patterns like ./config.h
1083
    * Ignore list isn't reread for every file.
102 by mbp at sourcefrog
- cache ignore list in Tree
1084
110 by mbp at sourcefrog
Add more patterns to default ignore list
1085
    * More help topics.
1086
118 by mbp at sourcefrog
Update news
1087
    * Reinstate the 'bzr check' command to check invariants of the
1088
      branch.
133 by mbp at sourcefrog
- new 'ignored' command
1089
135 by mbp at sourcefrog
Simple new 'deleted' command
1090
    * New 'ignored' command lists which files are ignored and why;
1091
      'deleted' lists files deleted in the current working tree.
1092
1093
    * Performance improvements.
137 by mbp at sourcefrog
new --profile option
1094
1095
    * New global --profile option.
146 by mbp at sourcefrog
match ignore patterns like ./config.h
1096
    
1097
    * Ignore patterns like './config.h' now correctly match files in
163 by mbp at sourcefrog
merge win32 portability fixes
1098
      the root directory only.
1099
1100
99 by mbp at sourcefrog
update for release 0.0.1
1101
bzr-0.0.1  2005-03-26
72 by mbp at sourcefrog
- import a subset of elementtree for easier installation
1102
81 by mbp at sourcefrog
show space usage for various stores in the info command
1103
  ENHANCEMENTS:
1104
1105
    * More information from info command.
1106
83 by mbp at sourcefrog
Can now say "bzr help COMMAND" for more detailed help
1107
    * Can now say "bzr help COMMAND" for more detailed help.
1108
92 by mbp at sourcefrog
more performance measurement
1109
    * Less file flushing and faster performance when writing logs and
1110
      committing to stores.
1111
96 by mbp at sourcefrog
with commit -v, show committed revision number
1112
    * More useful verbose output from some commands.
1113
93 by mbp at sourcefrog
Fix inverted display of 'R' and 'M' during 'commit -v'
1114
  BUG FIXES:
1115
1116
    * Fix inverted display of 'R' and 'M' during 'commit -v'.
1117
72 by mbp at sourcefrog
- import a subset of elementtree for easier installation
1118
  PORTABILITY:
1119
1120
    * Include a subset of ElementTree-1.2.20040618 to make
1121
      installation easier.
1122
73 by mbp at sourcefrog
fix time.localtime call for python 2.3
1123
    * Fix time.localtime call to work with Python 2.3 (the minimum
1124
      supported).
1125
1126
71 by mbp at sourcefrog
Add NEWS file
1127
bzr-0.0.0.69  2005-03-22
1128
1129
  ENHANCEMENTS:
1130
1131
    * First public release.
1132
1133
    * Storage of local versions: init, add, remove, rm, info, log,
1134
      diff, status, etc.