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

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

From Revision 1493 to 1474

Rev	Summary	Authors	Date
1493	Adjust sftp url regex to allow foo@bar usernames. Adjust sftp url regex to allow foo@bar usernames.	Robert Collins	19 years ago
1492	Support decoration of commands. Support decoration of commands. Commands.register_command now takes an optional flag to signal that the registrant is planning to decorate an existing command. When given multiple plugins registering a command is not an error, and the original command class (whether built in or a plugin based one) is returned to the caller. There is a new error 'MustUseDecorated' for signalling when a wrapping command should switch to the original version. (Robert Collins)	Robert Collins	19 years ago
1491	Merge from Martin. Merge from Martin.	Robert Collins	19 years ago
1490	Implement a 'bzr push' command, with saved locations; update... Implement a 'bzr push' command, with saved locations; update diff to return 1. * 'bzr diff' now returns 1 when there are changes in the working tree. * 'bzr push' now exists and can push changes to a remote location. This uses the transport infrastructure, and can store the remote location in the ~/.bazaar/branches.conf configuration file. * WorkingTree.pull has been split across Branch and WorkingTree, to allow Branch only pulls. * commands.display_command now returns the result of the decorated function. * LocationConfig now has a set_user_option(key, value) call to save a setting in its matching location section (a new one is created if needed). * Branch has two new methods, get_push_location and set_push_location to respectively, get and set the push location.	Robert Collins	19 years ago
1489	Make the paramiko tests pass. Nice huh. Make the paramiko tests pass. Nice huh.	Robert Collins	19 years ago
1488	Merge from Martin Merge from Martin	Robert Collins	19 years ago
1487	NEWS file entry for prior commit - upgrades of trees with no... NEWS file entry for prior commit - upgrades of trees with no revisions should not fail.	Robert Collins	19 years ago
1486	fix upgrading of trees with no commits fix upgrading of trees with no commits	Robert Collins	19 years ago
1485	touch up plugin.py docstring touch up plugin.py docstring	Robert Collins	19 years ago
1484	merge from martin merge from martin	Robert Collins	19 years ago
1483	BUGFIX: re-sign should accept ranges BUGFIX: re-sign should accept ranges	Robert Collins	19 years ago
1482	'revision.revision_graph can handle having only partial hist... 'revision.revision_graph can handle having only partial history. Previously, it would fail for a graph with no revision with no parents. (Robert Collins).	Robert Collins	19 years ago
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