~bzr-pqm/bzr/bzr.dev : changes

~bzr-pqm/bzr/bzr.dev » Changes from revision 6622

From Revision 1481 to 1462

Rev	Summary	Authors	Date
1481	Allow the first revision on revision-history to have parents... Allow the first revision on revision-history to have parents. 'bzr check' allows the first revision on revision-history to have parents - something that is expected for cheap checkouts, and occurs when conversions from baz do not have all history.	Robert Collins	19 years ago
1480	BUGFIX: fetch was not skipping all missing parents for inven... BUGFIX: fetch was not skipping all missing parents for inventory insertion	Robert Collins	19 years ago
1479	More quoting at the transport layer bugfixes. More quoting at the transport layer bugfixes.	Robert Collins	19 years ago
1478	convert versioning tests to use self.run_bzr, making the tes... convert versioning tests to use self.run_bzr, making the test suite quieter	Robert Collins	19 years ago
1477	merge setting of name during branching merge setting of name during branching	Robert Collins	19 years ago
1476	Merge now has a retcode of 1 when conflicts occur. (Robert C... Merge now has a retcode of 1 when conflicts occur. (Robert Collins) 'merge_flex' no longer calls conflict_handler.finalize(), instead that is called by merge_inner. This is so that the conflict count can be retrieved (and potentially manipulated) before returning to the caller of merge_inner. Likewise 'merge' now returns the conflict count to the caller. (Robert Collins)	Robert Collins	19 years ago
1475	update NEWS for post_commit update NEWS for post_commit	Robert Collins	19 years ago
1474	Merge from Aaron Bentley. Merge from Aaron Bentley.	Robert Collins	19 years ago
1473	merge from Martin merge from Martin	Robert Collins	19 years ago
1472	post commit hook, first pass implementation post commit hook, first pass implementation	Robert Collins	19 years ago
1471	Bugfix to previous url escaping patch - include weave stores Bugfix to previous url escaping patch - include weave stores	Robert Collins	19 years ago
1470	merge from Martin, via newformat, and teach sftp about urles... merge from Martin, via newformat, and teach sftp about urlescaped paths	Robert Collins	19 years ago
1469	Change Transport.* to work with URL's. Change Transport.* to work with URL's. * bzrlib.transport.Transport now accepts ONLY url escaped relative paths to apis like 'put', 'get' and 'has'. This is to provide consistent behaviour - it operates on url's only. (Robert Collins)	Robert Collins	19 years ago
1468	The HTTP transport would return NoSuchFile inappropriately. The HTTP transport would return NoSuchFile inappropriately. bzrlib.transport.http has been modified so that only 404 urllib errors are returned as NoSuchFile. Other exceptions will propogate as normal. This allows debuging of actual errors. (Robert Collins)	Robert Collins	19 years ago
1467	WorkingTree.__del__ has been removed. WorkingTree.__del__ has been removed. It was non deterministic and not doing what it was intended to. See WorkingTree.__init__ for a comment about future directions. (Robert Collins/Martin Pool)	Robert Collins	19 years ago
1466	revision may be None in cmd_branch, do not treat as an int. revision may be None in cmd_branch, do not treat as an int.	Robert Collins	19 years ago
1465	Bugfix the new pull --clobber to not generate spurious confl... Bugfix the new pull --clobber to not generate spurious conflicts. When --clobber clobbered the history, a bad merge base was used. Supporting this: * merge.merge_inner now has tempdir as an optional parameter. (Robert Collins) * Tree.kind is not recorded at the top level of the hierarchy, as it was missing on EmptyTree, leading to a bug with merge on EmptyTrees. (Robert Collins)	Robert Collins	19 years ago
1464	Merged Martin. Merged Martin.	Robert Collins	19 years ago
1463	Merge in various improvements to pull, testing and configura... Merge in various improvements to pull, testing and configuration. * 'bzr pull' now accepts '--clobber' which will discard local changes and make this branch identical to the source branch. (Robert Collins) * There is a new method for TestCaseInTempDir, assertFileEqual, which will check that a given content is equal to the content of the named file. (Robert Collins) * 'pull' has been factored out of the command as WorkingTree.pull(). A new option to WorkingTree.pull has been added, clobber, which will ignore diverged history and pull anyway. (Robert Collins) * config.Config has a 'get_user_option' call that accepts an option name. This will be looked up in branches.conf and bazaar.conf as normal. It is intended that this be used by plugins to support options - options of built in programs should have specific methods on the config. (Robert Collins)	Robert Collins	19 years ago
1462	Merge in more GPG work, and more Branch-api-shrinkage. Merge in more GPG work, and more Branch-api-shrinkage. * Branch.remove has been moved to WorkingTree, which has also gained lock_read, lock_write and unlock methods for convenience. (Robert Collins) * Two decorators, needs_read_lock and needs_write_lock have been added to the branch module. Use these to cause a function to run in a read or write lock respectively. (Robert Collins) * Branch.open_containing now returns a tuple (Branch, relative-path), which allows direct access to the common case of 'get me this file from its branch'. (Robert Collins)	Robert Collins	19 years ago