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

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

From Revision 1466 to 1447

Rev	Summary	Authors	Date
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
1461	Typo in config.py (Thanks Fabbione) Typo in config.py (Thanks Fabbione)	Robert Collins	19 years ago
1460	merge from martin. merge from martin.	Robert Collins	19 years ago
1459	Merge in first part of GPG support. Merge in first part of GPG support. This adds check_signatures config support, triams back the transport api to be leaner and easier to hook in suffixes - non primary streams in the store associated with the fileid that primary data is stored in, a gpg module which will encapsulate all signing and checking operations.	Robert Collins	19 years ago
1458	Merge start of removal of WorkingTree concepts from Branch. Merge start of removal of WorkingTree concepts from Branch.	Robert Collins	19 years ago
1457	make plugins able to use other plugins in normal python styl... make plugins able to use other plugins in normal python style	Robert Collins	19 years ago
1456	merge in branches.conf support merge in branches.conf support	Robert Collins	19 years ago
1455	merge from martin merge from martin	Robert Collins	19 years ago
1454	Merge from Martin. Merge from Martin.	Robert Collins	19 years ago
1453	merge current config support - classes split out merge current config support - classes split out	Robert Collins	19 years ago
1452	merge from martin merge from martin	Robert Collins	19 years ago
1451	make MergeTree clearer make MergeTree clearer	Robert Collins	19 years ago
1450	hah, missed tests in check changes hah, missed tests in check changes	Robert Collins	19 years ago
1449	teach check about ghosts teach check about ghosts	Robert Collins	19 years ago
1448	revert symlinks correctly revert symlinks correctly	Robert Collins	19 years ago
1447	Wipe the hashcache after a successful upgrade Wipe the hashcache after a successful upgrade	Robert Collins	19 years ago