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

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

Rev	Summary	Authors	Date
4869.3.34	Finish the patch based on reviews. Finish the patch based on reviews. * bzrlib/tests/per_merger.py: Fix line too long and spurious spaces. * bzrlib/plugins/news_merge/tests/test_news_merge.py: (TestFilenameMatchesConfig): Ensure that the params get updated. * bzrlib/plugins/news_merge/__init__.py: (filename_matches_config): Save the relevant config variable in the hook params. (install_hook): Wrap the hook installation so we can reuse it for tests. * bzrlib/plugins/news_merge/README: Update the instructions by pointing to the plugin help. * bzrlib/merge.py: (MergeHookParams): Delete spurious spaces. * bzrlib/decorators.py: (use_pretty_decorators): Mention that we get clearance to copy launchpad code here (since canonical has copyrights on both code bases).	Vincent Ladeuil	14 years ago
4869.3.33	Add NEWS entry for cachedproperty. Add NEWS entry for cachedproperty.	Andrew Bennetts	14 years ago
4869.3.32	Use Launchpad's cachedproperty decorator instead of my stupi... Use Launchpad's cachedproperty decorator instead of my stupidly broken one.	Andrew Bennetts	14 years ago
4869.3.31	Add comment, improve doc string, remove redundant line. Add comment, improve doc string, remove redundant line.	Andrew Bennetts	14 years ago
4869.3.30	Clarify hook docstring; hooks can return a iterable of strin... Clarify hook docstring; hooks can return a iterable of strings, rather than lines.	Andrew Bennetts	14 years ago
4869.3.29	Stop news_merge from adding extra newlines at the end of the... Stop news_merge from adding extra newlines at the end of the file.	Andrew Bennetts	14 years ago
4869.3.28	Fix trivial bug in news_merge plugin. Fix trivial bug in news_merge plugin.	Andrew Bennetts	14 years ago
4869.3.27	Move news_merge plugin from contrib to bzrlib/plugins, chang... Move news_merge plugin from contrib to bzrlib/plugins, change it to be enabled via a 'news_merge_files' config option, move more code out of the __init__ to minimise overhead, and add lots of docstrings, add NEWS entry.	Andrew Bennetts	14 years ago
4869.3.26	Fix problem with lazy_importing a submodule of this module. Fix problem with lazy_importing a submodule of this module.	Andrew Bennetts	14 years ago
4869.3.25	Use 2.4 syntax and lazy_import in news_merge plugin. Use 2.4 syntax and lazy_import in news_merge plugin.	Andrew Bennetts	14 years ago
4869.3.24	Mention 'winner' attribute in MergeHookParams' docstring. Mention 'winner' attribute in MergeHookParams' docstring.	Andrew Bennetts	14 years ago
4869.3.23	Remove some confusing code that has no effect. Remove some confusing code that has no effect.	Andrew Bennetts	14 years ago
4869.3.22	Use 'tree.has_id(file_id)' rather than using 'file_id in tre... Use 'tree.has_id(file_id)' rather than using 'file_id in tree' or using tree.inventory.	Andrew Bennetts	14 years ago
4869.3.21	Pass kinds (not pairs) to MergeHookParams. Pass kinds (not pairs) to MergeHookParams.	Andrew Bennetts	14 years ago
4869.3.20	Merge lp:bzr. Merge lp:bzr.	Andrew Bennetts	14 years ago
4869.3.19	Merge news_merge example. Merge news_merge example.	Andrew Bennetts	14 years ago
4869.3.18	Simplify slightly more. Simplify slightly more.	Andrew Bennetts	14 years ago
4869.3.17	Remove contents_conflict nested function, replace last calls... Remove contents_conflict nested function, replace last callsite with simpler form.	Andrew Bennetts	14 years ago
4869.3.16	Move handling of winner==OTHER case into generic hook path t... Move handling of winner==OTHER case into generic hook path too.	Andrew Bennetts	14 years ago
4869.3.15	Refactor so that the default text merge is the final hook tr... Refactor so that the default text merge is the final hook tried. Other hooks can now invoke it directly via merger.default_text_merge if they wish.	Andrew Bennetts	14 years ago

Older »