/brz/remove-bazaar : changes

» Changes to breezy/reconcile.py from revision 7532

To get this branch, use:

bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

From Revision 7532 to 5555

expand all

Rev	Summary	Authors	Tags	Date
7493	Drop unnecessary imports from __future__. Drop unnecessary imports from __future__. Merged from https://code.launchpad.net/~jelmer/brz/drop-future/+merge/379372	Jelmer Vernooĳ		5 years ago
7319	Use contexts for progress bars where possible. Use contexts for progress bars where possible. Merged from https://code.launchpad.net/~jelmer/brz/progressbar-context/+merge/358460	Jelmer Vernooĳ		6 years ago
7231	Move bzr-specific reconcile bits to breezy.bzr.reconcile. Move bzr-specific reconcile bits to breezy.bzr.reconcile. Merged from https://code.launchpad.net/~jelmer/brz/move-reconcile-1/+merge/359941	Jelmer Vernooĳ		7 years ago
7175	Sprinkle some PEP8iness. Sprinkle some PEP8iness. Merged from https://code.launchpad.net/~jelmer/brz/more-cleanups/+merge/358611	Jelmer Vernooĳ		7 years ago
7038	Add some more bees; support writing both bytes and unicode s... Add some more bees; support writing both bytes and unicode strings in build_tree_contents. Merged from https://code.launchpad.net/~jelmer/brz/python3-n/+merge/349091	Jelmer Vernooĳ		7 years ago
6871	Make progress bars context managers. Make progress bars context managers. Merged from https://code.launchpad.net/~jelmer/brz/pb-context/+merge/339449	Jelmer Vernooĳ		7 years ago
6870	Make progress bars context managers. Make progress bars context managers. Merged from https://code.launchpad.net/~jelmer/brz/pb-context/+merge/339449	Jelmer Vernooĳ		7 years ago
6690	Move most bzr-specific format and protocol code to breezy.bz... Move most bzr-specific format and protocol code to breezy.bzr. Merged from https://code.launchpad.net/~jelmer/brz/move-bzr/+merge/325461	Jelmer Vernooĳ		8 years ago
6681	Rename ``bzrdir`` attribute to ``controldir``. Rename ``bzrdir`` attribute to ``controldir``. Merged from https://code.launchpad.net/~jelmer/brz/rename-controldir/+merge/325433	Jelmer Vernooij		8 years ago
6658	Apply 2to3 dict fixer and clean up with sixish view methods Apply 2to3 dict fixer and clean up with sixish view methods Merged from https://code.launchpad.net/~gz/brz/dict_viewing/+merge/325108	Martin		8 years ago
6624	Merge Python3 porting work ('py3 pokes') Merge Python3 porting work ('py3 pokes')	Jelmer Vernooĳ		8 years ago
6623	Merge rename to breezy. Merge rename to breezy.	Jelmer Vernooĳ		8 years ago
6386	(jelmer) Use the absolute_import feature everywhere in bzrli... (jelmer) Use the absolute_import feature everywhere in bzrlib, and add a source test to make sure it's used everywhere. (Jelmer Vernooij)	Patch Queue Manager		14 years ago
6150	(jr) use .format() instead of % for string formatting where ... (jr) use .format() instead of % for string formatting where there are multiple formats in one string to allow for translations (Jonathan Riddell)	Patch Queue Manager		14 years ago
6143	(jr) Add gettext() to uses of note() (Jonathan Riddell) (jr) Add gettext() to uses of note() (Jonathan Riddell)	Patch Queue Manager		14 years ago
5979	(jelmer) Deprecate Repository.iter_reverse_revision_history(... (jelmer) Deprecate Repository.iter_reverse_revision_history(). (Jelmer Vernooij)	Canonical.com Patch ...		14 years ago
5895	(spiv) Update 'api-docs' make target to use pydoctor, (spiv) Update 'api-docs' make target to use pydoctor, and fix the formatting of many docstrings. (Andrew Bennetts)	Canonical.com Patch ...		14 years ago
5718	(jelmer) Add Prober.known_formats() in favour of (jelmer) Add Prober.known_formats() in favour of BzrDirFormat.register_format() and ControlDirFormat.register_format(). (Jelmer Vernooij)	Canonical.com Patch ...	upstream-2.4.0~beta1~bzr5718	14 years ago
5625	(jelmer) Various more fixes in preparation of moving the wea... (jelmer) Various more fixes in preparation of moving the weave formats into a plugin. (Jelmer Vernooij)	Canonical.com Patch ...		14 years ago
5555	(vila) Merge 2.2 into trunk including fix for bug #583667 an... (vila) Merge 2.2 into trunk including fix for bug #583667 and bug #681885 (Vincent Ladeuil)	Canonical.com Patch ...		15 years ago

Older »