Merge lp:~jelmer/debian/sid/bzr-git/lintian-fixes into lp:~debian-bazaar/debian/sid/bzr-git/unstable

[Jelmer Vernooij]

Fix some issues reported by lintian

Fix some issues reported by lintian
* Bump debhelper from old 9 to 10.
* Re-export upstream signing key without extra signatures.

This merge proposal was created automatically by the Janitor bot
(https://janitor.debian.net/).

You can follow up to this merge proposal as you normally would.

Build and test logs for this branch can be found at
https://janitor.debian.net/pkg/bzr-git/logs/3f9366f2-bb2d-4b03-9f3e-76f03ed33152.

[lp:~jelmer/debian/sid/bzr-git/lintian-fixes]

181. By Jelmer Vernooij on 2019-02-08

Merge new upstream.

182. By Jelmer Vernooij on 2019-02-08

Bump debhelper from old 9 to 10.

Fixes lintian: package-uses-old-debhelper-compat-version
See https://lintian.debian.org/tags/package-uses-old-debhelper-compat-version.html for more details.

183. By Jelmer Vernooij on 2019-02-08

Re-export upstream signing key without extra signatures.

Fixes lintian: public-upstream-key-not-minimal
See https://lintian.debian.org/tags/public-upstream-key-not-minimal.html for more details.

184. By Jelmer Vernooij on 2019-02-08

releasing package bzr-git version 0.6.13+bzr1650-1

185. By Jelmer Vernooij on 2019-02-11

Add debian/upstream/metadata.

186. By Jelmer Vernooij on 2019-02-11

releasing package bzr-git version 0.6.13+bzr1650-2

187. By Jelmer Vernooij on 2019-02-24

Make the package a transitional package to upgrade to brz.

188. By Jelmer Vernooij on 2019-02-24

Fix debian/rules.

189. By Jelmer Vernooij on 2019-08-25

Move transitional package bzr-git to oldlibs/optional per policy 4.0.1.

Fixes lintian: transitional-package-should-be-oldlibs-optional
See https://lintian.debian.org/tags/transitional-package-should-be-oldlibs-optional.html for more details.

190. By Jelmer Vernooij on 2019-08-25

Add missing dependency on quilt.

Fixes lintian: quilt-series-but-no-build-dep
See https://lintian.debian.org/tags/quilt-series-but-no-build-dep.html for more details.

191. By Jelmer Vernooij on 2019-08-25

Add missing dependency on quilt.

Fixes lintian: quilt-series-but-no-build-dep
See https://lintian.debian.org/tags/quilt-series-but-no-build-dep.html for more details.

Unmerged revisions

191. By Jelmer Vernooij on 2019-08-25

Add missing dependency on quilt.

Fixes lintian: quilt-series-but-no-build-dep
See https://lintian.debian.org/tags/quilt-series-but-no-build-dep.html for more details.

190. By Jelmer Vernooij on 2019-08-25

Add missing dependency on quilt.

Fixes lintian: quilt-series-but-no-build-dep
See https://lintian.debian.org/tags/quilt-series-but-no-build-dep.html for more details.

189. By Jelmer Vernooij on 2019-08-25

Move transitional package bzr-git to oldlibs/optional per policy 4.0.1.

Fixes lintian: transitional-package-should-be-oldlibs-optional
See https://lintian.debian.org/tags/transitional-package-should-be-oldlibs-optional.html for more details.

=== removed directory '.pc'
=== removed file '.pc/.quilt_patches'
--- .pc/.quilt_patches	2013-05-23 21:05:21 +0000
+++ .pc/.quilt_patches	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-debian/patches

=== removed file '.pc/.quilt_series'
--- .pc/.quilt_series	2013-05-23 21:05:21 +0000
+++ .pc/.quilt_series	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-series

=== removed file '.pc/.version'
--- .pc/.version	2013-05-23 21:05:21 +0000
+++ .pc/.version	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-2

=== removed file '.pc/applied-patches'
=== removed file '.testr.conf'
--- .testr.conf	2011-02-16 15:32:18 +0000
+++ .testr.conf	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-[DEFAULT]
-test_command=BZR_PLUGINS_AT=git@`pwd` bzr selftest ^bzrlib.plugins.git. Git --subunit $IDOPTION $LISTOPT
-test_id_option=--load-list $IDFILE
-test_list_option=--list

=== removed file 'COPYING'
--- COPYING	2006-07-15 12:25:27 +0000
+++ COPYING	1970-01-01 00:00:00 +0000
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-	51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-

-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-

-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-

-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-

-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-

-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.

=== removed file 'HACKING'
--- HACKING	2009-10-10 01:18:04 +0000
+++ HACKING	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-Please refer to HACKING in the Bazaar source distribution for topics not 
-covered here.

=== removed file 'INSTALL'
--- INSTALL	2011-06-11 23:05:01 +0000
+++ INSTALL	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-You need the Dulwich Python module installed (or in PYTHONPATH) and a fairly 
-recent version of bzr.
-
-You will also need either the python tdb or sqlite bindings; the latter are included
-with Python.
-
-For more information on Dulwich, see http://samba.org/~jelmer/dulwich/
-
-Installing bzr-git can be done by putting it into the ~/.bazaar/plugins 
-directory, and renaming its directory to "git".

=== removed file 'Makefile'
--- Makefile	2011-10-05 00:04:32 +0000
+++ Makefile	1970-01-01 00:00:00 +0000
@@ -1,70 +0,0 @@
-DEBUGGER ?= 
-BZR_OPTIONS ?= 
-BZR ?= $(shell which bzr)
-PYTHON ?= $(shell which python)
-SETUP ?= ./setup.py
-PYDOCTOR ?= pydoctor
-CTAGS ?= ctags
-PYLINT ?= pylint
-RST2HTML ?= rst2html
-TESTS ?= -s bp.git
-
-all:: build 
-
-build::
-	$(SETUP) build
-
-build-inplace::
-
-install::
-	$(SETUP) install
-
-clean::
-	$(SETUP) clean
-	rm -f *.so
-
-check:: build-inplace 
-	BZR_PLUGINS_AT=git@$(shell pwd) $(DEBUGGER) $(PYTHON) $(PYTHON_OPTIONS) $(BZR) $(BZR_OPTIONS) selftest $(TEST_OPTIONS) $(TESTS)
-
-check-all::
-	$(MAKE) check TESTS="^bzrlib.plugins.git. Git"
-
-check-verbose::
-	$(MAKE) check TEST_OPTIONS=-v
-
-check-one::
-	$(MAKE) check TEST_OPTIONS=--one
-
-check-random::
-	$(MAKE) check TEST_OPTIONS="--random=now --verbose --one"
-
-show-plugins::
-	BZR_PLUGINS_AT=git@$(shell pwd) $(BZR) plugins -v
-
-lint::
-	$(PYLINT) -f parseable *.py */*.py
-
-tags::
-	$(CTAGS) -R .
-
-ctags:: tags
-
-coverage::
-	$(MAKE) check BZR_OPTIONS="--coverage coverage"
-
-.PHONY: update-pot po/bzr-git.pot
-update-pot: po/bzr-git.pot
-
-TRANSLATABLE_PYFILES:=$(shell find . -name '*.py' \
-		| grep -v 'tests/' \
-		)
-
-po/bzr-git.pot: $(PYFILES) $(DOCFILES)
-	BZR_PLUGINS_AT=git@$(shell pwd) bzr export-pot \
-          --plugin=git > po/bzr-git.pot
-	echo $(TRANSLATABLE_PYFILES) | xargs \
-	xgettext --package-name "bzr-git" \
-	  --msgid-bugs-address "<[e-mail]>" \
-	  --copyright-holder "Canonical Ltd <[e-mail]>" \
-	  --from-code ISO-8859-1 --sort-by-file --join --add-comments=i18n: \
-	  -d bzr-git -p po -o bzr-git.pot

=== removed file 'NEWS'
--- NEWS	2017-10-05 22:22:50 +0000
+++ NEWS	1970-01-01 00:00:00 +0000
@@ -1,591 +0,0 @@
-0.6.13  UNRELEASED
-
- BUG FIXES
-
-  * Fix compatibility with newer versions of Dulwich, which
-    now require Repo._determine_file_mode. (Jelmer Vernooij)
-
-  * "Support" empty repositories; print an appropriate error.
-    (Jelmer Vernooij, #1219424)
-
-  * Fix compatibility with and depend on dulwich 0.9.6. (William Grant)
-
-  * Correctly handle all moves when converting bzr trees to git.
-    (William Grant, #818318)
-
-  * Fix compatibility with dulwich 0.14. (Jelmer Vernooij)
-
- FEATURES
-
-  * Mark bzr 2.7 as supported.
-
-  * Support 'HG:rename-source' fields.
-
-  * Support HG extra 'amend_source'.
-
-0.6.12  2013-09-22
-
- FEATURES
-
-  * Support thin packs when pushing and fetching to/from remote
-    repositories. (William Grant, #878085)
-
- CHANGES
-
-  * Fix compatibility with and depend on dulwich 0.9.1. (Jelmer Vernooij)
-
-0.6.11	2013-08-04
-
- BUG FIXES
-
-  * Add support for Bazaar 2.6.0. (Jelmer Vernooij)
-
-0.6.10	2012-12-13
-
- FEATURES
-
-  * New command 'bzr git-push-pristine-tar', which pushes pristine tar deltas
-    to a git repository. (Jelmer Vernooij)
-
- BUG FIXES
-
-  * Implement ``GitRevisionTree.is_executable``. (Jelmer Vernooij)
-
-0.6.9	2012-05-29
-
- BUG FIXES
-
-  * ``bzr git-import`` only creates colocated branches now if
-    the --colocated option is specified. (Jelmer Vernooij)
-
-  * Convert `~` to `_` when pushing into git, as `~` is not allowed in
-    refs. (Jelmer Vernooij)
-
-  * Support optional timeout argument to ``bzr serve --git``.
-    (Jelmer Vernooij)
-
-  * Handle encoding better in working tree iter changes.
-    (Jelmer Vernooij, #1019978)
-
-0.6.8	2012-03-28
-
- BUG FIXES
-
-  * Fixes duplicate tag warnings in 'git-remote-bzr' helper.
-    (Jelmer Vernooij, #905275)
-
-  * Don't suggest development-subtree when submodules are encountered.
-    (Jelmer Vernooij, #951494)
-
-  * Print proper error when encountering data that can't be roundtripped.
-    (Jelmer Vernooij)
-
-  * Ignore control directory filenames on Windows, too.
-    (Jelmer Vernooij, #967054)
-
-  * Fix 'Unable to obtain lock' error when dpushing from a bound branch.
-    (Jelmer Vernooij, #949557)
-
-  * Cope with commits with a completely empty tree.
-    (Jelmer Vernooij, #933132)
-
- TESTS
-
-  * Add test to verify that certain invalid timezones ("--700") are
-    roundtripped correctly. (Jelmer Vernooij, #697828)
-
-0.6.7	2012-01-25
-
- CHANGES
-
-  * Switch to supporting bzr 2.5 only. (Jelmer Vernooij)
-
- PERFORMANCE
-
-  * "git:" revision specifier now avoids full branch history
-    access if it can. (Jelmer Vernooij)
-
- DOCUMENTATION
-
-  * Added manual page for git-remote-bzr. (Jelmer Vernooij0
-
- BUG FIXES
-
-  * Support setting branch nicks. (Jelmer Vernooij, #731239)
-
-  * Support Repository.set_make_working_trees(). (Jelmer Vernooij, #777065)
-
- FEATURES
-
-  * Add 'github:' directory service. (Jelmer Vernooij)
-
-0.6.6	2011-12-15
-
- BUG FIXES
-
-  * Warn about ignoring path segment parameters when using bzr
-    2.4. (Jelmer Vernooij, #887785)
-
-  * Don't request unpeeled objects, newer versions of github refuse it.
-    (Jelmer Vernooij, #897951)
-
-  * Specify proper number of arguments to action() handler.
-    (Jelmer Vernooij, #894195)
-
-  * Fix compatibility with beta 4 of bzr 2.5.
-    (Jelmer Vernooij)
-
- FEATURES
-
-  * New options '--git-receive-pack' and '--git-upload-pack'
-    for 'bzr serve', providing support for inetd.
-    (Jelmer Vernooij)
-
-0.6.5	2011-11-08
-
- CHANGES
-
-  * git-import no longer creates a deep hierarchy to store branches,
-    instead it now strips the refs/heads/ prefix from ref names.
-    (Jelmer Vernooij)
-
-  * Bzr 2.3 is no longer supported. (Jelmer Vernooij)
-
- FIXES
-
-  * Fix compatibility with bzr < 2.5 when used with remote repositories.
-    (Jelmer Vernooij, #885566)
-
-  * Fix git-import after branch refactoring. (Jelmer Vernooij, #886161)
-
-  * git-import now creates colocated branches if the target bzrdir
-    supports them. (Jelmer Vernooij)
-
-0.6.4	2011-11-03
-
- FIXES
-
-  * Fix and test fetching from "bzr serve --git". (Jelmer Vernooij)
-
-  * Raise UnsupportedOperation for `Branch.revision_id_to_dotted_revno`,
-    making it possible to run ``bzr tags`` against remote git repositories.
-    (Jelmer Vernooij, #858942)
-
-  * Fix compatibility with bzr < 2.5. (Jelmer Vernooij, #885566)
-
- FEATURES
-
-  * Allow downloading branches over HTTP from loggerhead using the Git protocol.
-    To enable, set 'http_git=True' in the branch configuration.
-    (Jelmer Vernooij, #585822)
-
-0.6.3	2011-11-01
-
- FIXES
-
-  * Only actually fetch tags if "branch.fetch_tags" is set to true.
-    (Jelmer Vernooij, #771184)
-
-  * Add basic support for alternates. (Jelmer Vernooij)
-
-  * Support addressing branches by ref where the name can't be mapped back to
-    a branch. (Jelmer Vernooij, #829481)
-
-  * Skip post commit hook when dulwich is not available.
-    (Jelmer Vernooij, #853974)
-
-  * Fix pushing from git repository to git repository.
-    (Jelmer Vernooij, #731270)
-
-  * Friendlier error message when HEAD can not be found in remote repository.
-    (Jelmer Vernooij, #778920)
-
-  * Support updating tags in remote branches. (Jelmer Vernooij, #706990)
-
-  * Fix compatibility with tags API after changes in bzr.
-    (Jelmer Vernooij, #861592)
-
-  * Cope with tags pointing at trees when cloning local git repositories.
-    (Jelmer Vernooij, #861973)
-
-  * Remove pending entries when converting directory into tree reference.
-    (Jelmer Vernooij, #871595)
-
-  * Fix fetching into repositories with fallback repositories.
-    (Jelmer Vernooij, #866028)
-
- FEATURES
-
-  * Support the git http smart server protocol. (Jelmer Vernooij, #581933)
-
-  * Support removal of remote branches. (Jelmer Vernooij, #855993)
-
-  * Add i18n support. (Jelmer Vernooij)
-
-  * Now includes git remote helper ``git-remote-bzr``. (Jelmer Vernooij)
-
-0.6.2	2011-08-07
-
- FEATURES
-
-  * Provide Repository.get_known_graph_ancestry(). (Jelmer Vernooij)
-
-  * Provide Repository.get_file_graph(). (Jelmer Vernooij, #677363)
-
-  * Provide GitRevisionTree.get_file_mtime(). (Jelmer Vernooij)
-
-  * Provide GitRevisionTree.get_file_revision(). (Jelmer Vernooij, #780953)
-
-  * Add post-commit hook to update the git cache. (Jelmer Vernooij, #814651)
-
- PERFORMANCE
-
-  * Significantly improve performance of WorkingTree.extras().
-    (Jelmer Vernooij)
-
- CHANGES
-
-  * Require Dulwich 0.8.0. (Jelmer Vernooij)
-
-0.6.1	2011-06-18
-
- BUG FIXES
-
-  * Support git repositories without a branches directory in their control
-    directory. (Jelmer Vernooij, #780239)
-
-  * Fix two mistakes in 'bzr help git'. (Jelmer Vernooij, #791047)
-
-  * Now raises a proper exception when receiving an "Unknown repository"
-    error from GitHub. (Jelmer Vernooij, #798295)
-
-  * Support the new limit argument to InterBranch.fetch. (Jelmer Vernooij, #750175)
-
-  * Support the new testament API that accepts a tree rather than an
-    inventory. (Jelmer Vernooij, #762608)
-
-  * Remove InterBranch.update_revisions. (Jelmer Vernooij, #771765)
-
-  * Implement Repository.set_make_working_trees(). (Jelmer Vernooij, #777065)
-
-0.6.0	2011-04-12
-
- BUG FIXES
-
-  * Fix encoding handling in Git working trees. (Jelmer Vernooij, #393038)
-
-  * Use transports internally in "bzr git-import".
-    (Jelmer Vernooij, #733919)
-
-  * Provide custom GitDir.sprout() implementation for compatibility with bzr 2.4.
-    (Jelmer Vernooij, #717937)
-
-  * Revisions attached to tags that are not in the tips ancestry are now fetched.
-    (Jelmer Vernooij, #309682)
-
-  * Fix recursion error merging tags for bound branches.
-    (Jelmer Vernooij, #742833)
-
-  * Fix fetching from remote git repositories during merge.
-    (Jelmer Vernooij, #741760)
-
-  * Properly raise RootMissing if no root is specified to an empty
-    tree in the commit builder. (Jelmer Vernooij, #731360)
-
-  * Return proper conflict list from WorkingTree.conflicts. (Jelmer Vernooij, #741397)
-
-  * Fix dpush of certain branches. (Jelmer Vernooij, #705807)
-
- API COMPLETENESS
-
-  * Implement LocalGitControlDir.clone_on_transport. (Jelmer Vernooij, #721899)
-
- COMPATIBILITY
-
-  * Drop support for Bazaar < 2.3. (Jelmer Vernooij)
-
-0.5.4	2011-02-10
-
- BUG FIXES
-
-  * Fix test suite compatibility with Bazaar 2.2. (Max Bowsher, #707434)
-
-  * Fix compatibility with older versions of python-tdb.
-    (Jelmer Vernooij, #707735)
-
-  * Fix 'bzr git-import' from remote repositories. (Jelmer Vernooij, #706990)
-
-  * Cope with tags when doing local fetches. (Jelmer Vernooij, #675637)
-
-0.5.3	2011-01-21
-
- BUG FIXES
-
-  * Add in an empty git repository now works. (Jelmer Vernooij, #603823)
-
-  * Support opening of repositories over HTTP where the HTTP server
-    doesn't allow directory access. (Jelmer Vernooij, #617078)
-
-  * Support non-ascii characters in tag names. (Jelmer Vernooij, #616995)
-
-  * Mark as compatible with bzr 2.3, 2.4. (Jelmer Vernooij)
-
-  * Cope with unknown refs. (Jelmer Vernooij, #666443)
-
-  * Don't peel tags automatically when pushing back.
-    (Jelmer Vernooij, #675231)
-
-  * Fix `bzr-receive-pack` and `bzr-upload-pack`. (Jelmer Vernooij, #681193)
-
- FEATURES
-
-  * Remove all remaining dependencies on C git. (Jelmer Vernooij, #348238)
-
-  * Add some basic documentation in 'bzr help git'. (Jelmer Vernooij, #605394)
-
-  * Add --signoff option to 'bzr git-apply'. (Jelmer Vernooij)
-
-  * Add --force option to 'bzr git-apply'. (Jelmer Vernooij)
-
-0.5.2	2010-07-30
-
- COMPATIBILITY
-
-  * Drop support for Bazaar < 2.0. (Jelmer Vernooij)
-
- BUG FIXES
-
-  * Cope with kind changes when generating git objects from Bazaar 
-    revisions that contain kind changes where a directory is changed 
-    into a file and its (file/symlink) children are removed 
-    (rather than moved). (#597758, Jelmer Vernooij)
-
-  * Fix reading pack files over http. (#588724, Jelmer Vernooij)
-
-  * Fix 'bzr status' after 'bzr add' in native git working trees.
-    (#603800, Chadrik)
-
-  * Provide VersionedFiles.get_annotator(). (#508288, Jelmer Vernooij)
-
-  * Handle non-ascii characters in filenames. (#612291, Jelmer Vernooij)
-
- FEATURES
-
-  * Support specifying alternative paths for git-upload-pack and 
-    git-receive-pack. (Ross Light, #585204)
-
-0.5.1	2010-05-22
-
- BUG FIXES
-
-  * Mark as compatible with Bazaar 2.2 (Jelmer Vernooij)
-
-  * Use host specified rather than localhost in `bzr serve`.
-    (David Coles, #543998)
-
-  * Handle working trees without valid HEAD branch.
-    (Jelmer Vernooij, #501385)
-
-  * Default to non-bare repositories when initializing a control directory.
-    (Jelmer Vernooij)
-
-  * Cope with -0000 as timezone in Git commits. (Jelmer Vernooij, #539978)
-
- FEATURES
-
-  * Support 'bzr diff --format=git'. (Jelmer Vernooij, #555994)
-
- PERFORMANCE
- 
-  * Avoid the use of InventoryDirectory.children. This speeds up 
-    imports significantly. (Jelmer Vernooij)
-
-  * Use Bazaar index files to store the sha map and git objects to cache 
-    certain objects. (#520694, Jelmer Vernooij)
-
-0.5.0	2010-03-18
-
- BUG FIXES
-
-  * Fix compatibility with newer versions of Python2.6, which change the 
-    behaviour of urlparse.urlsplit. (Jelmer Vernooij, #561351)
- 
-  * Avoid storing texts of symlinks, which causes checksum errors in 
-    `bzr check`. (#512323, INADA Naoki, Jelmer Vernooij)
-
-  * Support committing to a git branch from a bzr working tree. (#506174,
-	Jelmer Vernooij)
-
-  * Support executable symlinks. (#512871, INADA Naoki, Jelmer Vernooij)
-
-  * When unpacking URLs, strip leftmost slash to match gits 
-    behaviour. (#445156, Jelmer Vernooij)
-
-  * Support merging tags to a local Git repository.
-    (#4445230, Jelmer Vernooij)
-
-  * InterFromGitBranch.pull() supports an optional limit argument to limit
-    how many revisions to import in one go. (Michael Hudson)
-
-  * Cope with different encodings better, rather than just stripping out 
-    unknown characters. (#529460, Jelmer Vernooij)
-
-  * Support ``run_hooks`` argument to ``InterGitRemoteLocalBranch.pull()``.
-    (#524843, Jelmer Vernooij)
-
-  * Properly ignore directories when creating bundles, deal with new files.
-    (#456849, Jelmer Vernooij)
-
- PERFORMANCE
-
-  * Don't import head revision twice when pulling from Git.
-    (Jelmer Vernooij)
-
-
- FEATURES
-
-  * Support (dumb) HTTP repositories. (#373688, Jelmer Vernooij)
-
-  * Implement API for colocated branches. (#380871, Jelmer Vernooij)
-
-0.4.3	2010-01-19
-
- BUG FIXES
-
-  * Fix warning about unclosed files on Windows. (#441978, INADA Naoki)
-
-  * Support creating working tree for existing repository. (Jelmer Vernooij)
-
-  * Fix base url of Git branches - use the working tree path rather than 
-    the control directory path. (Jelmer Vernooij)
-
-  * Fix fetching between git repositories. (#449507, Jelmer Vernooij)
-
-  * Refuse pulling into non-rich-root branches rather than erroring 
-    out with an AttributeError. (#449507, Jelmer Vernooij)
-
-  * Unquote paths extracted from URLs. (#445156, Jelmer Vernooij)
-
- PERFORMANCE
-
-  * Improve performance of WorkingTree.extras() by not looking up the 
-    SHA1, kind and stat data of each file. (Jelmer Vernooij)
-
-  * Provide custom InterTree for faster deltas between git working trees 
-    and revision trees. (Jelmer Vernooij)
-
-  * Provide custom InterTree for faster deltas between git revision trees.
-    (Jelmer Vernooij)
-
-  * Fix several places where a lot of memory was being consumed, especially
-    for repositories with a large number of revisions or big trees.
-    (#486076, Jelmer Vernooij
-
- FEATURES
-
-  * Support for parsing --HG-- metadata in git commit messages, for 
-    better interoperability with bzr-hg.
-
-  * Submodules are now imported. This requires the use of the 
-    development-subtree format in bzrlib though. (#402814, Jelmer Vernooij)
-
-0.4.2	2009-10-01
-
- BUG FIXES
-
-  * Cope with ghosts a bit better during "bzr dpush".
-    (Jelmer Vernooij)
-
-  * Better error message when Dulwich is missing. (#427276, Jelmer Vernooij)
-
-  * Support checkouts. (#427310, Jelmer Vernooij)
-  
-  * Don't break "bzr info -v" when Dulwich is not installed. (#429394, 
-															  Jelmer Vernooij)
-
-  * Mark as compatible with Bazaar 2.1. (Jelmer Vernooij)
-
-  * Fix fetching of remote repositories on Windows. (INADA Naoki,
-													 Jelmer Vernooij, #382125)
-
-  * Ignore directories in WorkingTree.extras(). (Jelmer Vernooij, #373902)
-
- FEATURES
-
-  * New "git" format supported by "bzr send". All revisions 
-    are currently sent as one concatenated file, rather than 
-	as separate files because of limitations in Bazaar.
-	(Jelmer Vernooij, Lukas Lalinsky)
-
- PERFORMANCE
-
-  * Avoid re-fetching basis inventory during fetch.
-    (Jelmer Vernooij)
-
-0.4.1	2009-07-24
-
- BUG FIXES
-
-  * Avoid "No such revision" error when encountering submodules.
-   (#400598)
-
-  * Avoid creating empty trees in Git during dpush, as they are not 
-    officially allowed. (#393706)
-
- FEATURES
-
-  * Progress bars will now show results from the remote git server.
-
-0.4.0	2009-06-18
-
- BUG FIXES
-
-  * Fix handling of not-executable files becoming executable without any 
-    other changes. (#382609)
-
-  * XML-invalid characters are now no longer squashed if not required by 
-    the target repository serializer format. The only non-XML based format 
-	at the moment is the "2a" development format supported since bzr 1.16.
-
-  * Unusual file modes that could be created in Git repositories using older
-    versions of Git are now stored in Bazaar revision properties. This means 
-	it's now possible to import the Git repository and the Linux kernel repository.
-
-  * Mark as compatible with bzr 1.16.
-
-0.3.2	2009-05-20
-
- FEATURES
-
-  * "bzr commit" in git working trees works to some extent.
-
-  * "bzr push" from local git repositories to remote git repositories works.
-
-0.3.1	2009-05-13
-
- FEATURES
-
-  * Alternative (faster) storage for SHA map using the TDB library
-    (http://tdb.samba.org/). This will automatically be used if you have 
-	TDB and its Python bindings installed. In all other situations the previous
-	(slower) Sqlite database format will be used.
-
-  * Now warns when escaping XML-invalid characters to work around a bug in the
-    Bazaar revision serializer.
-
-  * Now allows "unusual" file modes (100664, etc) but will warn the user about
-    them.
-
- BUG FIXES
-
-  * Fixed git-import.
-
-  * Fixed handling kind changes (tree -> blob) during fetch.
-
-0.3.0	2009-05-10
-
- FEATURES
-
-  * Support parsing .gitignore
-
-  * Support dpushing to remote repositories.

=== removed file 'README'
--- README	2011-01-06 12:59:22 +0000
+++ README	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-bzr-git, a plugin for bzr that adds git support.
-
-This was originally written as a proof of concept at Europython 2006 by
-Robert Collins, using stgit's convenience methods for accessing gits head
-and parsing git output. Later, it was adapted to use James Westby's Python
-Git module (which had by then be renamed to "Dulwich") and extended to support
-push and pull by Jelmer Vernooij.
-
-Please see INSTALL for installation instructions, and TODO for future plans.

=== removed file 'TODO'
--- TODO	2011-01-06 12:59:22 +0000
+++ TODO	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-- "Roundtripping" push into git
-- More tests

=== removed file '__init__.py'
--- __init__.py	2017-06-11 02:17:08 +0000
+++ __init__.py	1970-01-01 00:00:00 +0000
@@ -1,475 +0,0 @@
-# Copyright (C) 2006-2009 Canonical Ltd
-
-# Authors: Robert Collins <[e-mail]>
-#          Jelmer Vernooij <[e-mail]>
-#          John Carr <[e-mail]>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-"""A GIT branch and repository format implementation for bzr."""
-
-from __future__ import absolute_import
-
-import os
-import sys
-
-import bzrlib
-import bzrlib.api
-
-from .info import (
-    bzr_compatible_versions,
-    bzr_plugin_version as version_info,
-    dulwich_minimum_version,
-    )
-
-if version_info[3] == 'final':
-    version_string = '%d.%d.%d' % version_info[:3]
-else:
-    version_string = '%d.%d.%d%s%d' % version_info
-__version__ = version_string
-
-bzrlib.api.require_any_api(bzrlib, bzr_compatible_versions)
-
-try:
-    from ...i18n import load_plugin_translations
-except ImportError: # No translations for bzr < 2.5
-    gettext = lambda x: x
-else:
-    translation = load_plugin_translations("bzr-git")
-    gettext = translation.gettext
-
-from ... import (
-    errors as bzr_errors,
-    trace,
-    )
-
-from ...controldir import (
-    ControlDirFormat,
-    Prober,
-    format_registry,
-    network_format_registry as controldir_network_format_registry,
-    )
-
-from ...transport import (
-    register_lazy_transport,
-    register_transport_proto,
-    transport_server_registry,
-    )
-from ...commands import (
-    plugin_cmds,
-    )
-
-
-if getattr(sys, "frozen", None):
-    # allow import additional libs from ./_lib for bzr.exe only
-    sys.path.append(os.path.normpath(
-        os.path.join(os.path.dirname(__file__), '_lib')))
-
-
-def import_dulwich():
-    try:
-        from dulwich import __version__ as dulwich_version
-    except ImportError:
-        raise bzr_errors.DependencyNotPresent("dulwich",
-            "bzr-git: Please install dulwich, https://launchpad.net/dulwich")
-    else:
-        if dulwich_version < dulwich_minimum_version:
-            raise bzr_errors.DependencyNotPresent("dulwich",
-                "bzr-git: Dulwich is too old; at least %d.%d.%d is required" %
-                    dulwich_minimum_version)
-
-
-_versions_checked = False
-def lazy_check_versions():
-    global _versions_checked
-    if _versions_checked:
-        return
-    import_dulwich()
-    _versions_checked = True
-
-format_registry.register_lazy('git',
-    "bzrlib.plugins.git.dir", "LocalGitControlDirFormat",
-    help='GIT repository.', native=False, experimental=False,
-    )
-
-format_registry.register_lazy('git-bare',
-    "bzrlib.plugins.git.dir", "BareLocalGitControlDirFormat",
-    help='Bare GIT repository (no working tree).', native=False,
-    experimental=False,
-    )
-
-from ...revisionspec import (RevisionSpec_dwim, revspec_registry)
-revspec_registry.register_lazy("git:", "bzrlib.plugins.git.revspec",
-    "RevisionSpec_git")
-RevisionSpec_dwim.append_possible_lazy_revspec(
-    "bzrlib.plugins.git.revspec", "RevisionSpec_git")
-
-
-class LocalGitProber(Prober):
-
-    def probe_transport(self, transport):
-        try:
-            external_url = transport.external_url()
-        except bzr_errors.InProcessTransport:
-            raise bzr_errors.NotBranchError(path=transport.base)
-        if (external_url.startswith("http:") or
-            external_url.startswith("https:")):
-            # Already handled by RemoteGitProber
-            raise bzr_errors.NotBranchError(path=transport.base)
-        from ... import urlutils
-        if urlutils.split(transport.base)[1] == ".git":
-            raise bzr_errors.NotBranchError(path=transport.base)
-        if not transport.has_any(['objects', '.git/objects']):
-            raise bzr_errors.NotBranchError(path=transport.base)
-        lazy_check_versions()
-        from .dir import (
-            BareLocalGitControlDirFormat,
-            LocalGitControlDirFormat,
-            )
-        if transport.has_any(['.git/objects']):
-            return LocalGitControlDirFormat()
-        if transport.has('info') and transport.has('objects'):
-            return BareLocalGitControlDirFormat()
-        raise bzr_errors.NotBranchError(path=transport.base)
-
-    @classmethod
-    def known_formats(cls):
-        from .dir import (
-            BareLocalGitControlDirFormat,
-            LocalGitControlDirFormat,
-            )
-        return set([BareLocalGitControlDirFormat(), LocalGitControlDirFormat()])
-
-
-class RemoteGitProber(Prober):
-
-    def probe_http_transport(self, transport):
-        from ... import urlutils
-        base_url, _ = urlutils.split_segment_parameters(transport.external_url())
-        url = urlutils.join(base_url, "info/refs") + "?service=git-upload-pack"
-        from ...transport.http._urllib import HttpTransport_urllib, Request
-        if isinstance(transport, HttpTransport_urllib):
-            req = Request('GET', url, accepted_errors=[200, 403, 404, 405],
-                          headers={"Content-Type": "application/x-git-upload-pack-request"})
-            req.follow_redirections = True
-            resp = transport._perform(req)
-            if resp.code in (404, 405):
-                raise bzr_errors.NotBranchError(transport.base)
-            headers = resp.headers
-            refs_text = resp.read()
-        else:
-            try:
-                from ...transport.http._pycurl import PyCurlTransport
-            except bzr_errors.DependencyNotPresent:
-                raise bzr_errors.NotBranchError(transport.base)
-            else:
-                import pycurl
-                from cStringIO import StringIO
-                if isinstance(transport, PyCurlTransport):
-                    conn = transport._get_curl()
-                    conn.setopt(pycurl.URL, url)
-                    conn.setopt(pycurl.FOLLOWLOCATION, 1)
-                    transport._set_curl_options(conn)
-                    conn.setopt(pycurl.HTTPGET, 1)
-                    header = StringIO()
-                    data = StringIO()
-                    conn.setopt(pycurl.HEADERFUNCTION, header.write)
-                    conn.setopt(pycurl.WRITEFUNCTION, data.write)
-                    transport._curl_perform(conn, header,
-                        ["Content-Type: application/x-git-upload-pack-request"])
-                    code = conn.getinfo(pycurl.HTTP_CODE)
-                    if code in (404, 405):
-                        raise bzr_errors.NotBranchError(transport.base)
-                    if code != 200:
-                        raise bzr_errors.InvalidHttpResponse(transport._path,
-                            str(code))
-                    headers = transport._parse_headers(header)
-                else:
-                    raise bzr_errors.NotBranchError(transport.base)
-                refs_text = data.getvalue()
-        ct = headers.getheader("Content-Type")
-        if ct is None:
-            raise bzr_errors.NotBranchError(transport.base)
-        if ct.startswith("application/x-git"):
-            from .remote import RemoteGitControlDirFormat
-            return RemoteGitControlDirFormat()
-        else:
-            from .dir import (
-                BareLocalGitControlDirFormat,
-                )
-            ret = BareLocalGitControlDirFormat()
-            ret._refs_text = refs_text
-            return ret
-
-    def probe_transport(self, transport):
-        try:
-            external_url = transport.external_url()
-        except bzr_errors.InProcessTransport:
-            raise bzr_errors.NotBranchError(path=transport.base)
-
-        if (external_url.startswith("http:") or
-            external_url.startswith("https:")):
-            return self.probe_http_transport(transport)
-
-        if (not external_url.startswith("git://") and
-            not external_url.startswith("git+")):
-            raise bzr_errors.NotBranchError(transport.base)
-
-        # little ugly, but works
-        from .remote import (
-            GitSmartTransport,
-            RemoteGitControlDirFormat,
-            )
-        if isinstance(transport, GitSmartTransport):
-            return RemoteGitControlDirFormat()
-        raise bzr_errors.NotBranchError(path=transport.base)
-
-    @classmethod
-    def known_formats(cls):
-        from .remote import RemoteGitControlDirFormat
-        return set([RemoteGitControlDirFormat()])
-
-
-ControlDirFormat.register_prober(LocalGitProber)
-ControlDirFormat._server_probers.append(RemoteGitProber)
-
-register_transport_proto('git://',
-        help="Access using the Git smart server protocol.")
-register_transport_proto('git+ssh://',
-        help="Access using the Git smart server protocol over SSH.")
-
-register_lazy_transport("git://", __name__ + '.remote',
-                        'TCPGitSmartTransport')
-register_lazy_transport("git+ssh://", __name__ + '.remote',
-                        'SSHGitSmartTransport')
-
-
-plugin_cmds.register_lazy("cmd_git_import", [], __name__ + ".commands")
-plugin_cmds.register_lazy("cmd_git_object", ["git-objects", "git-cat"],
-    __name__ + ".commands")
-plugin_cmds.register_lazy("cmd_git_refs", [], __name__ + ".commands")
-plugin_cmds.register_lazy("cmd_git_apply", [], __name__ + ".commands")
-plugin_cmds.register_lazy("cmd_git_push_pristine_tar_deltas",
-        ['git-push-pristine-tar', 'git-push-pristine'],
-    __name__ + ".commands")
-
-def extract_git_foreign_revid(rev):
-    try:
-        foreign_revid = rev.foreign_revid
-    except AttributeError:
-        from .mapping import mapping_registry
-        foreign_revid, mapping = \
-            mapping_registry.parse_revision_id(rev.revision_id)
-        return foreign_revid
-    else:
-        from .mapping import foreign_vcs_git
-        if rev.mapping.vcs == foreign_vcs_git:
-            return foreign_revid
-        else:
-            raise bzr_errors.InvalidRevisionId(rev.revision_id, None)
-
-
-def update_stanza(rev, stanza):
-    mapping = getattr(rev, "mapping", None)
-    try:
-        git_commit = extract_git_foreign_revid(rev)
-    except bzr_errors.InvalidRevisionId:
-        pass
-    else:
-        stanza.add("git-commit", git_commit)
-
-from ...hooks import install_lazy_named_hook
-install_lazy_named_hook("bzrlib.version_info_formats.format_rio",
-    "RioVersionInfoBuilder.hooks", "revision", update_stanza,
-    "git commits")
-
-
-transport_server_registry.register_lazy('git',
-    __name__ + '.server',
-    'serve_git',
-    'Git Smart server protocol over TCP. (default port: 9418)')
-
-transport_server_registry.register_lazy('git-receive-pack',
-    __name__ + '.server',
-    'serve_git_receive_pack',
-    help='Git Smart server receive pack command. (inetd mode only)')
-transport_server_registry.register_lazy('git-upload-pack',
-    __name__ + 'git.server',
-    'serve_git_upload_pack',
-    help='Git Smart server upload pack command. (inetd mode only)')
-
-from ...repository import (
-    format_registry as repository_format_registry,
-    network_format_registry as repository_network_format_registry,
-    )
-repository_network_format_registry.register_lazy('git',
-    __name__ + '.repository', 'GitRepositoryFormat')
-
-register_extra_lazy_repository_format = getattr(repository_format_registry,
-    "register_extra_lazy")
-register_extra_lazy_repository_format(__name__ + '.repository',
-    'GitRepositoryFormat')
-
-from ...branch import (
-    network_format_registry as branch_network_format_registry,
-    )
-branch_network_format_registry.register_lazy('git',
-    __name__ + '.branch', 'GitBranchFormat')
-
-from ...branch import (
-    format_registry as branch_format_registry,
-    )
-branch_format_registry.register_extra_lazy(
-    __name__ + '.branch',
-    'GitBranchFormat',
-    )
-
-from ...workingtree import (
-    format_registry as workingtree_format_registry,
-    )
-workingtree_format_registry.register_extra_lazy(
-    __name__ + '.workingtree',
-    'GitWorkingTreeFormat',
-    )
-
-controldir_network_format_registry.register_lazy('git',
-    __name__ + ".dir", "GitControlDirFormat")
-
-
-try:
-    from ...registry import register_lazy
-except ImportError:
-    from ...diff import format_registry as diff_format_registry
-    diff_format_registry.register_lazy('git', __name__ + '.send',
-        'GitDiffTree', 'Git am-style diff format')
-
-    from ...send import (
-        format_registry as send_format_registry,
-        )
-    send_format_registry.register_lazy('git', __name__ + '.send',
-                                       'send_git', 'Git am-style diff format')
-
-    from ...directory_service import directories
-    directories.register_lazy('github:', __name__ + '.directory',
-                              'GitHubDirectory',
-                              'GitHub directory.')
-    directories.register_lazy('[e-mail]:', __name__ + '.directory',
-                              'GitHubDirectory',
-                              'GitHub directory.')
-
-    from ...help_topics import (
-        topic_registry,
-        )
-    topic_registry.register_lazy('git', __name__ + '.help', 'help_git',
-        'Using Bazaar with Git')
-
-    from ...foreign import (
-        foreign_vcs_registry,
-        )
-    foreign_vcs_registry.register_lazy("git",
-        __name__ + ".mapping", "foreign_vcs_git", "Stupid content tracker")
-else:
-    register_lazy("bzrlib.diff", "format_registry",
-        'git', __name__ + '.send', 'GitDiffTree',
-        'Git am-style diff format')
-    register_lazy("bzrlib.send", "format_registry",
-        'git', __name__ + '.send', 'send_git',
-        'Git am-style diff format')
-    register_lazy('bzrlib.directory_service', 'directories', 'github:',
-            __name__ + '.directory', 'GitHubDirectory',
-            'GitHub directory.')
-    register_lazy('bzrlib.directory_service', 'directories',
-            '[e-mail]:', 'bzrlib.plugins.git.directory',
-            'GitHubDirectory', 'GitHub directory.')
-    register_lazy('bzrlib.help_topics', 'topic_registry',
-            'git', __name__ + '.help', 'help_git',
-            'Using Bazaar with Git')
-    register_lazy('bzrlib.foreign', 'foreign_vcs_registry', "git",
-        __name__ + ".mapping", "foreign_vcs_git", "Stupid content tracker")
-
-def update_git_cache(repository, revid):
-    """Update the git cache after a local commit."""
-    if getattr(repository, "_git", None) is not None:
-        return # No need to update cache for git repositories
-
-    if not repository.control_transport.has("git"):
-        return # No existing cache, don't bother updating
-    try:
-        lazy_check_versions()
-    except bzr_errors.DependencyNotPresent, e:
-        # dulwich is probably missing. silently ignore
-        trace.mutter("not updating git map for %r: %s",
-            repository, e)
-
-    from .object_store import BazaarObjectStore
-    store = BazaarObjectStore(repository)
-    store.lock_write()
-    try:
-        try:
-            parent_revisions = set(repository.get_parent_map([revid])[revid])
-        except KeyError:
-            # Isn't this a bit odd - how can a revision that was just committed be missing?
-            return
-        missing_revisions = store._missing_revisions(parent_revisions)
-        if not missing_revisions:
-            # Only update if the cache was up to date previously
-            store._update_sha_map_revision(revid)
-    finally:
-        store.unlock()
-
-
-def post_commit_update_cache(local_branch, master_branch, old_revno, old_revid,
-        new_revno, new_revid):
-    if local_branch is not None:
-        update_git_cache(local_branch.repository, new_revid)
-    update_git_cache(master_branch.repository, new_revid)
-
-
-def loggerhead_git_hook(branch_app, environ):
-    branch = branch_app.branch
-    config_stack = branch.get_config_stack()
-    if config_stack.get('http_git'):
-        return None
-    from .server import git_http_hook
-    return git_http_hook(branch, environ['REQUEST_METHOD'],
-        environ['PATH_INFO'])
-
-install_lazy_named_hook("bzrlib.branch",
-    "Branch.hooks", "post_commit", post_commit_update_cache,
-    "git cache")
-install_lazy_named_hook("bzrlib.plugins.loggerhead.apps.branch",
-    "BranchWSGIApp.hooks", "controller",
-    loggerhead_git_hook, "git support")
-
-
-from ...config import (
-    option_registry,
-    Option,
-    bool_from_store,
-    )
-
-option_registry.register(
-    Option('git.http',
-           default=None, from_unicode=bool_from_store, invalid='warning',
-           help='''\
-Allow fetching of Git packs over HTTP.
-
-This enables support for fetching Git packs over HTTP in Loggerhead.
-'''))
-
-def test_suite():
-    from . import tests
-    return tests.test_suite()

=== removed file 'branch.py'
--- branch.py	2017-06-05 23:51:37 +0000
+++ branch.py	1970-01-01 00:00:00 +0000
@@ -1,1165 +0,0 @@
-# Copyright (C) 2007,2012 Canonical Ltd
-# Copyright (C) 2009-2012 Jelmer Vernooij <[e-mail]>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-"""An adapter between a Git Branch and a Bazaar Branch"""
-
-from __future__ import absolute_import
-
-from cStringIO import StringIO
-from collections import defaultdict
-
-from dulwich.objects import (
-    ZERO_SHA,
-    )
-from dulwich.repo import check_ref_format
-
-from ... import (
-    branch,
-    bzrdir,
-    config,
-    errors,
-    repository as _mod_repository,
-    revision,
-    tag,
-    transport,
-    urlutils,
-    )
-from ...decorators import (
-    needs_read_lock,
-    )
-from ...revision import (
-    NULL_REVISION,
-    )
-from ...trace import (
-    is_quiet,
-    mutter,
-    warning,
-    )
-
-from .config import (
-    GitBranchConfig,
-    GitBranchStack,
-    )
-from .errors import (
-    NoPushSupport,
-    NoSuchRef,
-    )
-from .refs import (
-    is_tag,
-    ref_to_branch_name,
-    ref_to_tag_name,
-    tag_name_to_ref,
-    )
-from .unpeel_map import (
-    UnpeelMap,
-    )
-
-from ...foreign import ForeignBranch
-
-
-class GitPullResult(branch.PullResult):
-    """Result of a pull from a Git branch."""
-
-    def _lookup_revno(self, revid):
-        assert isinstance(revid, str), "was %r" % revid
-        # Try in source branch first, it'll be faster
-        self.target_branch.lock_read()
-        try:
-            return self.target_branch.revision_id_to_revno(revid)
-        finally:
-            self.target_branch.unlock()
-
-    @property
-    def old_revno(self):
-        return self._lookup_revno(self.old_revid)
-
-    @property
-    def new_revno(self):
-        return self._lookup_revno(self.new_revid)
-
-
-class GitTags(tag.BasicTags):
-    """Ref-based tag dictionary."""
-
-    def __init__(self, branch):
-        self.branch = branch
-        self.repository = branch.repository
-
-    def get_refs_container(self):
-        raise NotImplementedError(self.get_refs_container)
-
-    def _iter_tag_refs(self, refs):
-        """Iterate over the tag refs.
-
-        :param refs: Refs dictionary (name -> git sha1)
-        :return: iterator over (name, peeled_sha1, unpeeled_sha1, bzr_revid)
-        """
-        for k, unpeeled in refs.as_dict().iteritems():
-            try:
-                tag_name = ref_to_tag_name(k)
-            except (ValueError, UnicodeDecodeError):
-                continue
-            peeled = refs.get_peeled(k)
-            if peeled is None:
-                peeled = self.repository.bzrdir._git.object_store.peel_sha(unpeeled).id
-            assert type(tag_name) is unicode
-            yield (tag_name, peeled, unpeeled,
-                   self.branch.lookup_foreign_revision_id(peeled))
-
-    def _merge_to_remote_git(self, target_repo, new_refs, overwrite=False):
-        updates = {}
-        conflicts = []
-        def get_changed_refs(old_refs):
-            ret = dict(old_refs)
-            for k, v in new_refs.iteritems():
-                if not is_tag(k):
-                    continue
-                name = ref_to_tag_name(k)
-                if old_refs.get(k) == v:
-                    pass
-                elif overwrite or not k in old_refs:
-                    ret[k] = v
-                    updates[name] = target_repo.lookup_foreign_revision_id(v)
-                else:
-                    conflicts.append((name, v, old_refs[k]))
-            return ret
-        target_repo.bzrdir.send_pack(get_changed_refs, lambda have, want: [])
-        return updates, conflicts
-
-    def _merge_to_local_git(self, target_repo, refs, overwrite=False):
-        conflicts = []
-        updates = {}
-        for k, unpeeled in refs.as_dict().iteritems():
-            if not is_tag(k):
-                continue
-            name = ref_to_tag_name(k)
-            peeled = self.repository.bzrdir.get_peeled(k)
-            if target_repo._git.refs.get(k) == unpeeled:
-                pass
-            elif overwrite or not k in target_repo._git.refs:
-                target_repo._git.refs[k] = unpeeled or peeled
-                updates[name] = target_repo.lookup_foreign_revision_id(peeled)
-            else:
-                conflicts.append((name, peeled, target_repo._git.refs[k]))
-        return updates, conflicts
-
-    def _merge_to_git(self, to_tags, refs, overwrite=False):
-        target_repo = to_tags.repository
-        if self.repository.has_same_location(target_repo):
-            return {}, []
-        if getattr(target_repo, "_git", None):
-            return self._merge_to_local_git(target_repo, refs, overwrite)
-        else:
-            return self._merge_to_remote_git(target_repo, refs, overwrite)
-
-    def _merge_to_non_git(self, to_tags, refs, overwrite=False):
-        unpeeled_map = defaultdict(set)
-        conflicts = []
-        updates = {}
-        result = dict(to_tags.get_tag_dict())
-        for n, peeled, unpeeled, bzr_revid in self._iter_tag_refs(refs):
-            if unpeeled is not None:
-                unpeeled_map[peeled].add(unpeeled)
-            if result.get(n) == bzr_revid:
-                pass
-            elif n not in result or overwrite:
-                result[n] = bzr_revid
-                updates[n] = bzr_revid
-            else:
-                conflicts.append((n, result[n], bzr_revid))
-        to_tags._set_tag_dict(result)
-        if len(unpeeled_map) > 0:
-            map_file = UnpeelMap.from_repository(to_tags.branch.repository)
-            map_file.update(unpeeled_map)
-            map_file.save_in_repository(to_tags.branch.repository)
-        return updates, conflicts
-
-    def merge_to(self, to_tags, overwrite=False, ignore_master=False,
-                 source_refs=None):
-        """See Tags.merge_to."""
-        if source_refs is None:
-            source_refs = self.get_refs_container()
-        if self == to_tags:
-            return {}, []
-        if isinstance(to_tags, GitTags):
-            return self._merge_to_git(to_tags, source_refs,
-                                      overwrite=overwrite)
-        else:
-            if ignore_master:
-                master = None
-            else:
-                master = to_tags.branch.get_master_branch()
-            updates, conflicts = self._merge_to_non_git(to_tags, source_refs,
-                                              overwrite=overwrite)
-            if master is not None:
-                extra_updates, extra_conflicts = self.merge_to(
-                    master.tags, overwrite=overwrite,
-                                           source_refs=source_refs,
-                                           ignore_master=ignore_master)
-                updates.update(extra_updates)
-                conflicts += extra_conflicts
-            return updates, conflicts
-
-    def get_tag_dict(self):
-        ret = {}
-        refs = self.get_refs_container()
-        for (name, peeled, unpeeled, bzr_revid) in self._iter_tag_refs(refs):
-            ret[name] = bzr_revid
-        return ret
-
-
-class LocalGitTagDict(GitTags):
-    """Dictionary with tags in a local repository."""
-
-    def __init__(self, branch):
-        super(LocalGitTagDict, self).__init__(branch)
-        self.refs = self.repository.bzrdir._git.refs
-
-    def get_refs_container(self):
-        return self.refs
-
-    def _set_tag_dict(self, to_dict):
-        extra = set(self.refs.allkeys())
-        for k, revid in to_dict.iteritems():
-            name = tag_name_to_ref(k)
-            if name in extra:
-                extra.remove(name)
-            self.set_tag(k, revid)
-        for name in extra:
-            if is_tag(name):
-                del self.repository._git[name]
-
-    def set_tag(self, name, revid):
-        try:
-            git_sha, mapping = self.branch.lookup_bzr_revision_id(revid)
-        except errors.NoSuchRevision:
-            raise errors.GhostTagsNotSupported(self)
-        self.refs[tag_name_to_ref(name)] = git_sha
-
-
-class DictTagDict(tag.BasicTags):
-
-    def __init__(self, branch, tags):
-        super(DictTagDict, self).__init__(branch)
-        self._tags = tags
-
-    def get_tag_dict(self):
-        return self._tags
-
-
-class GitSymrefBranchFormat(branch.BranchFormat):
-
-    def get_format_description(self):
-        return 'Git Symbolic Reference Branch'
-
-    def network_name(self):
-        return "git"
-
-    def get_reference(self, controldir, name=None):
-        return controldir.get_branch_reference(name)
-
-    def set_reference(self, controldir, name, target):
-        return controldir.set_branch_reference(target, name)
-
-
-class GitBranchFormat(branch.BranchFormat):
-
-    def get_format_description(self):
-        return 'Git Branch'
-
-    def network_name(self):
-        return "git"
-
-    def supports_tags(self):
-        return True
-
-    def supports_leaving_lock(self):
-        return False
-
-    def supports_tags_referencing_ghosts(self):
-        return False
-
-    def tags_are_versioned(self):
-        return False
-
-    @property
-    def _matchingbzrdir(self):
-        from .dir import LocalGitControlDirFormat
-        return LocalGitControlDirFormat()
-
-    def get_foreign_tests_branch_factory(self):
-        from .tests.test_branch import ForeignTestsBranchFactory
-        return ForeignTestsBranchFactory()
-
-    def make_tags(self, branch):
-        try:
-            return branch.tags
-        except AttributeError:
-            pass
-        if getattr(branch.repository, "_git", None) is None:
-            from .remote import RemoteGitTagDict
-            return RemoteGitTagDict(branch)
-        else:
-            return LocalGitTagDict(branch)
-
-    def initialize(self, a_bzrdir, name=None, repository=None,
-                   append_revisions_only=None):
-        from .dir import LocalGitDir
-        if not isinstance(a_bzrdir, LocalGitDir):
-            raise errors.IncompatibleFormat(self, a_bzrdir._format)
-        return a_bzrdir.create_branch(repository=repository, name=name,
-            append_revisions_only=append_revisions_only)
-
-
-class GitReadLock(object):
-
-    def __init__(self, unlock):
-        self.unlock = unlock
-
-
-class GitWriteLock(object):
-
-    def __init__(self, unlock):
-        self.branch_token = None
-        self.unlock = unlock
-
-
-class GitBranch(ForeignBranch):
-    """An adapter to git repositories for bzr Branch objects."""
-
-    @property
-    def control_transport(self):
-        return self.bzrdir.control_transport
-
-    def __init__(self, bzrdir, repository, ref):
-        self.base = bzrdir.root_transport.base
-        self.repository = repository
-        self._format = GitBranchFormat()
-        self.bzrdir = bzrdir
-        self._lock_mode = None
-        self._lock_count = 0
-        super(GitBranch, self).__init__(repository.get_mapping())
-        self.ref = ref
-        try:
-            self.name = ref_to_branch_name(ref)
-        except ValueError:
-            self.name = None
-        self._head = None
-
-    def _get_checkout_format(self, lightweight=False):
-        """Return the most suitable metadir for a checkout of this branch.
-        Weaves are used if this branch's repository uses weaves.
-        """
-        return bzrdir.format_registry.make_bzrdir("default")
-
-    def get_child_submit_format(self):
-        """Return the preferred format of submissions to this branch."""
-        ret = self.get_config_stack().get("child_submit_format")
-        if ret is not None:
-            return ret
-        return "git"
-
-    def get_config(self):
-        return GitBranchConfig(self)
-
-    def get_config_stack(self):
-        return GitBranchStack(self)
-
-    def _get_nick(self, local=False, possible_master_transports=None):
-        """Find the nick name for this branch.
-
-        :return: Branch nick
-        """
-        cs = self.repository._git.get_config_stack()
-        try:
-            return cs.get(("branch", self.name), "nick")
-        except KeyError:
-            pass
-        return self.name.encode('utf-8') or "HEAD"
-
-    def _set_nick(self, nick):
-        cf = self.repository._git.get_config()
-        cf.set(("branch", self.name), "nick", nick)
-        f = StringIO()
-        cf.write_to_file(f)
-        self.bzrdir.control_transport.put_bytes('config', f.getvalue())
-
-    nick = property(_get_nick, _set_nick)
-
-    def __repr__(self):
-        return "<%s(%r, %r)>" % (self.__class__.__name__, self.repository.base,
-            self.name)
-
-    def generate_revision_history(self, revid, old_revid=None):
-        if revid == NULL_REVISION:
-            newhead = ZERO_SHA
-        else:
-            # FIXME: Check that old_revid is in the ancestry of revid
-            newhead, self.mapping = self.repository.lookup_bzr_revision_id(revid)
-            if self.mapping is None:
-                raise AssertionError
-        self._set_head(newhead)
-
-    def lock_write(self, token=None):
-        if token is not None:
-            raise errors.TokenLockingNotSupported(self)
-        if self._lock_mode:
-            if self._lock_mode == 'r':
-                raise errors.ReadOnlyError(self)
-            self._lock_count += 1
-        else:
-            self._lock_mode = 'w'
-            self._lock_count = 1
-        self.repository.lock_write()
-        return GitWriteLock(self.unlock)
-
-    def leave_lock_in_place(self):
-        raise NotImplementedError(self.leave_lock_in_place)
-
-    def dont_leave_lock_in_place(self):
-        raise NotImplementedError(self.dont_leave_lock_in_place)
-
-    def get_stacked_on_url(self):
-        # Git doesn't do stacking (yet...)
-        raise errors.UnstackableBranchFormat(self._format, self.base)
-
-    def get_parent(self):
-        """See Branch.get_parent()."""
-        # FIXME: Set "origin" url from .git/config ?
-        return None
-
-    def set_parent(self, url):
-        # FIXME: Set "origin" url in .git/config ?
-        pass
-
-    def break_lock(self):
-        raise NotImplementedError(self.break_lock)
-
-    def lock_read(self):
-        if self._lock_mode:
-            assert self._lock_mode in ('r', 'w')
-            self._lock_count += 1
-        else:
-            self._lock_mode = 'r'
-            self._lock_count = 1
-        self.repository.lock_read()
-        return GitReadLock(self.unlock)
-
-    def peek_lock_mode(self):
-        return self._lock_mode
-
-    def is_locked(self):
-        return (self._lock_mode is not None)
-
-    def unlock(self):
-        """See Branch.unlock()."""
-        self._lock_count -= 1
-        if self._lock_count == 0:
-            self._lock_mode = None
-            self._clear_cached_state()
-        self.repository.unlock()
-
-    def get_physical_lock_status(self):
-        return False
-
-    @needs_read_lock
-    def last_revision(self):
-        # perhaps should escape this ?
-        if self.head is None:
-            return revision.NULL_REVISION
-        return self.lookup_foreign_revision_id(self.head)
-
-    def _basic_push(self, target, overwrite=False, stop_revision=None):
-        return branch.InterBranch.get(self, target)._basic_push(
-            overwrite, stop_revision)
-
-    def lookup_foreign_revision_id(self, foreign_revid):
-        return self.repository.lookup_foreign_revision_id(foreign_revid,
-            self.mapping)
-
-    def lookup_bzr_revision_id(self, revid):
-        return self.repository.lookup_bzr_revision_id(
-            revid, mapping=self.mapping)
-
-
-class LocalGitBranch(GitBranch):
-    """A local Git branch."""
-
-    def __init__(self, bzrdir, repository, ref):
-        super(LocalGitBranch, self).__init__(bzrdir, repository, ref)
-        refs = bzrdir.get_refs_container()
-        if not (ref in refs or "HEAD" in refs):
-            raise errors.NotBranchError(self.base)
-
-    def create_checkout(self, to_location, revision_id=None, lightweight=False,
-        accelerator_tree=None, hardlink=False):
-        if lightweight:
-            t = transport.get_transport(to_location)
-            t.ensure_base()
-            format = self._get_checkout_format(lightweight=True)
-            checkout = format.initialize_on_transport(t)
-            from_branch = branch.BranchReferenceFormat().initialize(checkout,
-                self)
-            tree = checkout.create_workingtree(revision_id,
-                from_branch=from_branch, hardlink=hardlink)
-            return tree
-        else:
-            return self._create_heavyweight_checkout(to_location, revision_id,
-                hardlink)
-
-    def _create_heavyweight_checkout(self, to_location, revision_id=None,
-                                     hardlink=False):
-        """Create a new heavyweight checkout of this branch.
-
-        :param to_location: URL of location to create the new checkout in.
-        :param revision_id: Revision that should be the tip of the checkout.
-        :param hardlink: Whether to hardlink
-        :return: WorkingTree object of checkout.
-        """
-        checkout_branch = bzrdir.BzrDir.create_branch_convenience(
-            to_location, force_new_tree=False,
-            format=self._get_checkout_format(lightweight=False))
-        checkout = checkout_branch.bzrdir
-        checkout_branch.bind(self)
-        # pull up to the specified revision_id to set the initial
-        # branch tip correctly, and seed it with history.
-        checkout_branch.pull(self, stop_revision=revision_id)
-        return checkout.create_workingtree(revision_id, hardlink=hardlink)
-
-    def fetch(self, from_branch, last_revision=None, limit=None):
-        return branch.InterBranch.get(from_branch, self).fetch(
-            stop_revision=last_revision, limit=limit)
-
-    def _gen_revision_history(self):
-        if self.head is None:
-            return []
-        graph = self.repository.get_graph()
-        ret = list(graph.iter_lefthand_ancestry(self.last_revision(),
-            (revision.NULL_REVISION, )))
-        ret.reverse()
-        return ret
-
-    def _get_head(self):
-        try:
-            return self.repository._git.refs[self.ref or "HEAD"]
-        except KeyError:
-            return None
-
-    def _read_last_revision_info(self):
-        last_revid = self.last_revision()
-        graph = self.repository.get_graph()
-        revno = graph.find_distance_to_null(last_revid,
-            [(revision.NULL_REVISION, 0)])
-        return revno, last_revid
-
-    def set_last_revision_info(self, revno, revision_id):
-        self.set_last_revision(revision_id)
-        self._last_revision_info_cache = revno, revision_id
-
-    def set_last_revision(self, revid):
-        if not revid or not isinstance(revid, basestring):
-            raise errors.InvalidRevisionId(revision_id=revid, branch=self)
-        if revid == NULL_REVISION:
-            newhead = ZERO_SHA
-        else:
-            (newhead, self.mapping) = self.repository.lookup_bzr_revision_id(revid)
-            if self.mapping is None:
-                raise AssertionError
-        self._set_head(newhead)
-
-    def _set_head(self, value):
-        self._head = value
-        self.repository._git.refs[self.ref or "HEAD"] = self._head
-        self._clear_cached_state()
-
-    head = property(_get_head, _set_head)
-
-    def get_push_location(self):
-        """See Branch.get_push_location."""
-        push_loc = self.get_config_stack().get('push_location')
-        return push_loc
-
-    def set_push_location(self, location):
-        """See Branch.set_push_location."""
-        self.get_config().set_user_option('push_location', location,
-                                          store=config.STORE_LOCATION)
-
-    def supports_tags(self):
-        return True
-
-
-def _quick_lookup_revno(local_branch, remote_branch, revid):
-    assert isinstance(revid, str), "was %r" % revid
-    # Try in source branch first, it'll be faster
-    local_branch.lock_read()
-    try:
-        try:
-            return local_branch.revision_id_to_revno(revid)
-        except errors.NoSuchRevision:
-            graph = local_branch.repository.get_graph()
-            try:
-                return graph.find_distance_to_null(revid,
-                    [(revision.NULL_REVISION, 0)])
-            except errors.GhostRevisionsHaveNoRevno:
-                # FIXME: Check using graph.find_distance_to_null() ?
-                remote_branch.lock_read()
-                try:
-                    return remote_branch.revision_id_to_revno(revid)
-                finally:
-                    remote_branch.unlock()
-    finally:
-        local_branch.unlock()
-
-
-class GitBranchPullResult(branch.PullResult):
-
-    def __init__(self):
-        super(GitBranchPullResult, self).__init__()
-        self.new_git_head = None
-        self._old_revno = None
-        self._new_revno = None
-
-    def report(self, to_file):
-        if not is_quiet():
-            if self.old_revid == self.new_revid:
-                to_file.write('No revisions to pull.\n')
-            elif self.new_git_head is not None:
-                to_file.write('Now on revision %d (git sha: %s).\n' %
-                        (self.new_revno, self.new_git_head))
-            else:
-                to_file.write('Now on revision %d.\n' % (self.new_revno,))
-        self._show_tag_conficts(to_file)
-
-    def _lookup_revno(self, revid):
-        return _quick_lookup_revno(self.target_branch, self.source_branch,
-            revid)
-
-    def _get_old_revno(self):
-        if self._old_revno is not None:
-            return self._old_revno
-        return self._lookup_revno(self.old_revid)
-
-    def _set_old_revno(self, revno):
-        self._old_revno = revno
-
-    old_revno = property(_get_old_revno, _set_old_revno)
-
-    def _get_new_revno(self):
-        if self._new_revno is not None:
-            return self._new_revno
-        return self._lookup_revno(self.new_revid)
-
-    def _set_new_revno(self, revno):
-        self._new_revno = revno
-
-    new_revno = property(_get_new_revno, _set_new_revno)
-
-
-class GitBranchPushResult(branch.BranchPushResult):
-
-    def _lookup_revno(self, revid):
-        return _quick_lookup_revno(self.source_branch, self.target_branch,
-            revid)
-
-    @property
-    def old_revno(self):
-        return self._lookup_revno(self.old_revid)
-
-    @property
-    def new_revno(self):
-        new_original_revno = getattr(self, "new_original_revno", None)
-        if new_original_revno:
-            return new_original_revno
-        if getattr(self, "new_original_revid", None) is not None:
-            return self._lookup_revno(self.new_original_revid)
-        return self._lookup_revno(self.new_revid)
-
-
-class InterFromGitBranch(branch.GenericInterBranch):
-    """InterBranch implementation that pulls from Git into bzr."""
-
-    @staticmethod
-    def _get_branch_formats_to_test():
-        try:
-            default_format = branch.format_registry.get_default()
-        except AttributeError:
-            default_format = branch.BranchFormat._default_format
-        return [
-            (GitBranchFormat(), GitBranchFormat()),
-            (GitBranchFormat(), default_format)]
-
-    @classmethod
-    def _get_interrepo(self, source, target):
-        return _mod_repository.InterRepository.get(source.repository, target.repository)
-
-    @classmethod
-    def is_compatible(cls, source, target):
-        if not isinstance(source, GitBranch):
-            return False
-        if isinstance(target, GitBranch):
-            # InterLocalGitRemoteGitBranch or InterToGitBranch should be used
-            return False
-        if getattr(cls._get_interrepo(source, target), "fetch_objects", None) is None:
-            # fetch_objects is necessary for this to work
-            return False
-        return True
-
-    def fetch(self, stop_revision=None, fetch_tags=None, limit=None):
-        self.fetch_objects(stop_revision, fetch_tags=fetch_tags, limit=limit)
-
-    def fetch_objects(self, stop_revision, fetch_tags, limit=None):
-        interrepo = self._get_interrepo(self.source, self.target)
-        if fetch_tags is None:
-            c = self.source.get_config_stack()
-            fetch_tags = c.get('branch.fetch_tags')
-        def determine_wants(heads):
-            if self.source.ref is not None and not self.source.ref in heads:
-                raise NoSuchRef(self.source.ref, self.source.user_url, heads.keys())
-
-            if stop_revision is None:
-                if self.source.ref is not None:
-                    head = heads[self.source.ref]
-                else:
-                    head = heads["HEAD"]
-                self._last_revid = self.source.lookup_foreign_revision_id(head)
-            else:
-                self._last_revid = stop_revision
-            real = interrepo.get_determine_wants_revids(
-                [self._last_revid], include_tags=fetch_tags)
-            return real(heads)
-        pack_hint, head, refs = interrepo.fetch_objects(
-            determine_wants, self.source.mapping, limit=limit)
-        if (pack_hint is not None and
-            self.target.repository._format.pack_compresses):
-            self.target.repository.pack(hint=pack_hint)
-        return head, refs
-
-    def _update_revisions(self, stop_revision=None, overwrite=False):
-        head, refs = self.fetch_objects(stop_revision, fetch_tags=None)
-        if overwrite:
-            prev_last_revid = None
-        else:
-            prev_last_revid = self.target.last_revision()
-        self.target.generate_revision_history(self._last_revid,
-            prev_last_revid, self.source)
-        return head, refs
-
-    def _basic_pull(self, stop_revision, overwrite, run_hooks,
-              _override_hook_target, _hook_master):
-        result = GitBranchPullResult()
-        result.source_branch = self.source
-        if _override_hook_target is None:
-            result.target_branch = self.target
-        else:
-            result.target_branch = _override_hook_target
-        self.source.lock_read()
-        try:
-            self.target.lock_write()
-            try:
-                # We assume that during 'pull' the target repository is closer than
-                # the source one.
-                (result.old_revno, result.old_revid) = \
-                    self.target.last_revision_info()
-                result.new_git_head, remote_refs = self._update_revisions(
-                    stop_revision, overwrite=overwrite)
-                tags_ret  = self.source.tags.merge_to(
-                        self.target.tags, overwrite, ignore_master=True)
-                if isinstance(tags_ret, tuple):
-                    result.tag_updates, result.tag_conflicts = tags_ret
-                else:
-                    result.tag_conflicts = tags_ret
-                (result.new_revno, result.new_revid) = \
-                    self.target.last_revision_info()
-                if _hook_master:
-                    result.master_branch = _hook_master
-                    result.local_branch = result.target_branch
-                else:
-                    result.master_branch = result.target_branch
-                    result.local_branch = None
-                if run_hooks:
-                    for hook in branch.Branch.hooks['post_pull']:
-                        hook(result)
-                return result
-            finally:
-                self.target.unlock()
-        finally:
-            self.source.unlock()
-
-    def pull(self, overwrite=False, stop_revision=None,
-             possible_transports=None, _hook_master=None, run_hooks=True,
-             _override_hook_target=None, local=False):
-        """See Branch.pull.
-
-        :param _hook_master: Private parameter - set the branch to
-            be supplied as the master to pull hooks.
-        :param run_hooks: Private parameter - if false, this branch
-            is being called because it's the master of the primary branch,
-            so it should not run its hooks.
-        :param _override_hook_target: Private parameter - set the branch to be
-            supplied as the target_branch to pull hooks.
-        """
-        # This type of branch can't be bound.
-        bound_location = self.target.get_bound_location()
-        if local and not bound_location:
-            raise errors.LocalRequiresBoundBranch()
-        master_branch = None
-        source_is_master = False
-        self.source.lock_read()
-        if bound_location:
-            # bound_location comes from a config file, some care has to be
-            # taken to relate it to source.user_url
-            normalized = urlutils.normalize_url(bound_location)
-            try:
-                relpath = self.source.user_transport.relpath(normalized)
-                source_is_master = (relpath == '')
-            except (errors.PathNotChild, errors.InvalidURL):
-                source_is_master = False
-        if not local and bound_location and not source_is_master:
-            # not pulling from master, so we need to update master.
-            master_branch = self.target.get_master_branch(possible_transports)
-            master_branch.lock_write()
-        try:
-            try:
-                if master_branch:
-                    # pull from source into master.
-                    master_branch.pull(self.source, overwrite, stop_revision,
-                        run_hooks=False)
-                result = self._basic_pull(stop_revision, overwrite, run_hooks,
-                    _override_hook_target, _hook_master=master_branch)
-            finally:
-                self.source.unlock()
-        finally:
-            if master_branch:
-                master_branch.unlock()
-        return result
-
-    def _basic_push(self, overwrite=False, stop_revision=None):
-        result = branch.BranchPushResult()
-        result.source_branch = self.source
-        result.target_branch = self.target
-        result.old_revno, result.old_revid = self.target.last_revision_info()
-        result.new_git_head, remote_refs = self._update_revisions(
-            stop_revision, overwrite=overwrite)
-        tags_ret = self.source.tags.merge_to(self.target.tags,
-            overwrite)
-        if isinstance(tags_ret, tuple):
-            (result.tag_updates, result.tag_conflicts) = tags_ret
-        else:
-            result.tag_conflicts = tags_ret
-        result.new_revno, result.new_revid = self.target.last_revision_info()
-        return result
-
-
-class InterGitBranch(branch.GenericInterBranch):
-    """InterBranch implementation that pulls between Git branches."""
-
-    def fetch(self, stop_revision=None, fetch_tags=None, limit=None):
-        raise NotImplementedError(self.fetch)
-
-
-class InterLocalGitRemoteGitBranch(InterGitBranch):
-    """InterBranch that copies from a local to a remote git branch."""
-
-    @staticmethod
-    def _get_branch_formats_to_test():
-        # FIXME
-        return []
-
-    @classmethod
-    def is_compatible(self, source, target):
-        from .remote import RemoteGitBranch
-        return (isinstance(source, LocalGitBranch) and
-                isinstance(target, RemoteGitBranch))
-
-    def _basic_push(self, overwrite=False, stop_revision=None):
-        result = GitBranchPushResult()
-        result.source_branch = self.source
-        result.target_branch = self.target
-        if stop_revision is None:
-            stop_revision = self.source.last_revision()
-        # FIXME: Check for diverged branches
-        def get_changed_refs(old_refs):
-            old_ref = old_refs.get(self.target.ref, ZERO_SHA)
-            result.old_revid = self.target.lookup_foreign_revision_id(old_ref)
-            refs = { self.target.ref: self.source.repository.lookup_bzr_revision_id(stop_revision)[0] }
-            result.new_revid = stop_revision
-            for name, sha in self.source.repository._git.refs.as_dict("refs/tags").iteritems():
-                refs[tag_name_to_ref(name)] = sha
-            return refs
-        self.target.repository.send_pack(get_changed_refs,
-            self.source.repository._git.object_store.generate_pack_contents)
-        return result
-
-
-class InterGitLocalGitBranch(InterGitBranch):
-    """InterBranch that copies from a remote to a local git branch."""
-
-    @staticmethod
-    def _get_branch_formats_to_test():
-        # FIXME
-        return []
-
-    @classmethod
-    def is_compatible(self, source, target):
-        return (isinstance(source, GitBranch) and
-                isinstance(target, LocalGitBranch))
-
-    def fetch(self, stop_revision=None, fetch_tags=None, limit=None):
-        interrepo = _mod_repository.InterRepository.get(self.source.repository,
-            self.target.repository)
-        if stop_revision is None:
-            stop_revision = self.source.last_revision()
-        determine_wants = interrepo.get_determine_wants_revids(
-            [stop_revision], include_tags=fetch_tags)
-        interrepo.fetch_objects(determine_wants, limit=limit)
-
-    def _basic_push(self, overwrite=False, stop_revision=None):
-        result = GitBranchPushResult()
-        result.source_branch = self.source
-        result.target_branch = self.target
-        result.old_revid = self.target.last_revision()
-        refs, stop_revision = self.update_refs(stop_revision)
-        self.target.generate_revision_history(stop_revision, result.old_revid)
-        tags_ret = self.source.tags.merge_to(self.target.tags,
-            source_refs=refs, overwrite=overwrite)
-        if isinstance(tags_ret, tuple):
-            (result.tag_updates, result.tag_conflicts) = tags_ret
-        else:
-            result.tag_conflicts = tags_ret
-        result.new_revid = self.target.last_revision()
-        return result
-
-    def update_refs(self, stop_revision=None):
-        interrepo = _mod_repository.InterRepository.get(self.source.repository,
-            self.target.repository)
-        if stop_revision is None:
-            refs = interrepo.fetch(branches=["HEAD"])
-            stop_revision = self.target.lookup_foreign_revision_id(refs["HEAD"])
-        else:
-            refs = interrepo.fetch(revision_id=stop_revision)
-        return refs, stop_revision
-
-    def pull(self, stop_revision=None, overwrite=False,
-        possible_transports=None, run_hooks=True,local=False):
-        # This type of branch can't be bound.
-        if local:
-            raise errors.LocalRequiresBoundBranch()
-        result = GitPullResult()
-        result.source_branch = self.source
-        result.target_branch = self.target
-        self.source.lock_read()
-        try:
-            self.target.lock_write()
-            try:
-                result.old_revid = self.target.last_revision()
-                refs, stop_revision = self.update_refs(stop_revision)
-                self.target.generate_revision_history(stop_revision, result.old_revid)
-                tags_ret = self.source.tags.merge_to(self.target.tags,
-                    overwrite=overwrite, source_refs=refs)
-                if isinstance(tags_ret, tuple):
-                    (result.tag_updates, result.tag_conflicts) = tags_ret
-                else:
-                    result.tag_conflicts = tags_ret
-                result.new_revid = self.target.last_revision()
-                result.local_branch = None
-                result.master_branch = result.target_branch
-                if run_hooks:
-                    for hook in branch.Branch.hooks['post_pull']:
-                        hook(result)
-            finally:
-                self.target.unlock()
-        finally:
-            self.source.unlock()
-        return result
-
-
-class InterToGitBranch(branch.GenericInterBranch):
-    """InterBranch implementation that pulls into a Git branch."""
-
-    def __init__(self, source, target):
-        super(InterToGitBranch, self).__init__(source, target)
-        self.interrepo = _mod_repository.InterRepository.get(source.repository,
-                                           target.repository)
-
-    @staticmethod
-    def _get_branch_formats_to_test():
-        try:
-            default_format = branch.format_registry.get_default()
-        except AttributeError:
-            default_format = branch.BranchFormat._default_format
-        return [(default_format, GitBranchFormat())]
-
-    @classmethod
-    def is_compatible(self, source, target):
-        return (not isinstance(source, GitBranch) and
-                isinstance(target, GitBranch))
-
-    def _get_new_refs(self, stop_revision=None, fetch_tags=None):
-        assert self.source.is_locked()
-        if stop_revision is None:
-            (stop_revno, stop_revision) = self.source.last_revision_info()
-        else:
-            stop_revno = self.source.revision_id_to_revno(stop_revision)
-        assert type(stop_revision) is str
-        main_ref = self.target.ref or "refs/heads/master"
-        refs = { main_ref: (None, stop_revision) }
-        if fetch_tags is None:
-            c = self.source.get_config_stack()
-            fetch_tags = c.get('branch.fetch_tags')
-        for name, revid in self.source.tags.get_tag_dict().iteritems():
-            if self.source.repository.has_revision(revid):
-                ref = tag_name_to_ref(name)
-                if not check_ref_format(ref):
-                    warning("skipping tag with invalid characters %s (%s)",
-                        name, ref)
-                    continue
-                if fetch_tags:
-                    # FIXME: Skip tags that are not in the ancestry
-                    refs[ref] = (None, revid)
-        return refs, main_ref, (stop_revno, stop_revision)
-
-    def _update_refs(self, result, old_refs, new_refs, overwrite):
-        mutter("updating refs. old refs: %r, new refs: %r",
-               old_refs, new_refs)
-        result.tag_updates = {}
-        result.tag_conflicts = []
-        ret = dict(old_refs)
-        def ref_equals(refs, ref, git_sha, revid):
-            try:
-                value = refs[ref]
-            except KeyError:
-                return False
-            if (value[0] is not None and
-                git_sha is not None and
-                value[0] == git_sha):
-                return True
-            if (value[1] is not None and
-                revid is not None and
-                value[1] == revid):
-                return True
-            # FIXME: If one side only has the git sha available and the other only
-            # has the bzr revid, then this will cause us to show a tag as updated
-            # that hasn't actually been updated.
-            return False
-        # FIXME: Check for diverged branches
-        for ref, (git_sha, revid) in new_refs.iteritems():
-            if ref_equals(ret, ref, git_sha, revid):
-                # Already up to date
-                if git_sha is None:
-                    git_sha = old_refs[ref][0]
-                if revid is None:
-                    revid = old_refs[ref][1]
-                ret[ref] = new_refs[ref] = (git_sha, revid)
-            elif ref not in ret or overwrite:
-                try:
-                    tag_name = ref_to_tag_name(ref)
-                except ValueError:
-                    pass
-                else:
-                    result.tag_updates[tag_name] = revid
-                ret[ref] = (git_sha, revid)
-            else:
-                # FIXME: Check diverged
-                diverged = False
-                if diverged:
-                    try:
-                        name = ref_to_tag_name(ref)
-                    except ValueError:
-                        pass
-                    else:
-                        result.tag_conflicts.append((name, revid, ret[name][1]))
-                else:
-                    ret[ref] = (git_sha, revid)
-        return ret
-
-    def fetch(self, stop_revision=None, fetch_tags=None, lossy=False, limit=None):
-        assert limit is None
-        if stop_revision is None:
-            stop_revision = self.source.last_revision()
-        ret = []
-        if fetch_tags:
-            for k, v in self.source.tags.get_tag_dict().iteritems():
-                ret.append((None, v))
-        ret.append((None, stop_revision))
-        self.interrepo.fetch_objects(ret, lossy=lossy)
-
-    def pull(self, overwrite=False, stop_revision=None, local=False,
-             possible_transports=None, run_hooks=True):
-        result = GitBranchPullResult()
-        result.source_branch = self.source
-        result.target_branch = self.target
-        self.source.lock_read()
-        try:
-            self.target.lock_write()
-            try:
-                new_refs, main_ref, stop_revinfo = self._get_new_refs(
-                    stop_revision)
-                def update_refs(old_refs):
-                    return self._update_refs(result, old_refs, new_refs, overwrite)
-                try:
-                    result.revidmap, old_refs, new_refs = self.interrepo.fetch_refs(
-                        update_refs, lossy=False)
-                except NoPushSupport:
-                    raise errors.NoRoundtrippingSupport(self.source, self.target)
-                (old_sha1, result.old_revid) = old_refs.get(main_ref, (ZERO_SHA, NULL_REVISION))
-                if result.old_revid is None:
-                    result.old_revid = self.target.lookup_foreign_revision_id(old_sha1)
-                result.new_revid = new_refs[main_ref][1]
-                result.local_branch = None
-                result.master_branch = self.target
-                if run_hooks:
-                    for hook in branch.Branch.hooks['post_pull']:
-                        hook(result)
-            finally:
-                self.target.unlock()
-        finally:
-            self.source.unlock()
-        return result
-
-    def push(self, overwrite=False, stop_revision=None, lossy=False,
-             _override_hook_source_branch=None):
-        result = GitBranchPushResult()
-        result.source_branch = self.source
-        result.target_branch = self.target
-        result.local_branch = None
-        result.master_branch = result.target_branch
-        self.source.lock_read()
-        try:
-            new_refs, main_ref, stop_revinfo = self._get_new_refs(stop_revision)
-            def update_refs(old_refs):
-                return self._update_refs(result, old_refs, new_refs, overwrite)
-            try:
-                result.revidmap, old_refs, new_refs = self.interrepo.fetch_refs(
-                    update_refs, lossy=lossy)
-            except NoPushSupport:
-                raise errors.NoRoundtrippingSupport(self.source, self.target)
-            (old_sha1, result.old_revid) = old_refs.get(main_ref, (ZERO_SHA, NULL_REVISION))
-            if result.old_revid is None:
-                result.old_revid = self.target.lookup_foreign_revision_id(old_sha1)
-            result.new_revid = new_refs[main_ref][1]
-            (result.new_original_revno, result.new_original_revid) = stop_revinfo
-            for hook in branch.Branch.hooks['post_push']:
-                hook(result)
-        finally:
-            self.source.unlock()
-        return result
-
-
-branch.InterBranch.register_optimiser(InterGitLocalGitBranch)
-branch.InterBranch.register_optimiser(InterFromGitBranch)
-branch.InterBranch.register_optimiser(InterToGitBranch)
-branch.InterBranch.register_optimiser(InterLocalGitRemoteGitBranch)

=== removed file 'bzr-receive-pack'
--- bzr-receive-pack	2010-12-26 04:23:10 +0000
+++ bzr-receive-pack	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-#!/usr/bin/env python
-
-import bzrlib
-from bzrlib.plugin import load_plugins
-load_plugins()
-from bzrlib.plugins.git.server import BzrBackend
-from dulwich.server import ReceivePackHandler, serve_command
-import sys, os
-
-if len(sys.argv) < 2:
-    print >>sys.stderr, "usage: %s <git-dir>" % os.path.basename(sys.argv[0])
-    sys.exit(1)
-
-backend = BzrBackend(bzrlib.transport.get_transport("/"))
-sys.exit(serve_command(ReceivePackHandler, backend=backend))

=== removed file 'bzr-upload-pack'
--- bzr-upload-pack	2010-12-26 04:23:10 +0000
+++ bzr-upload-pack	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-#!/usr/bin/env python
-
-import bzrlib
-from bzrlib.plugin import load_plugins
-load_plugins ()
-from bzrlib.plugins.git.server import BzrBackend
-from dulwich.server import UploadPackHandler, serve_command
-import sys, os
-
-if len(sys.argv) < 2:
-    print "usage: %s <git-dir>" % os.path.basename(sys.argv[0])
-    sys.exit(1)
-
-backend = BzrBackend(bzrlib.transport.get_transport("/"))
-sys.exit(serve_command(UploadPackHandler, backend=backend))

=== removed file 'cache.py'
--- cache.py	2019-02-08 17:04:59 +0000
+++ cache.py	1970-01-01 00:00:00 +0000
@@ -1,1013 +0,0 @@
-# Copyright (C) 2009 Jelmer Vernooij <[e-mail]>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-"""Map from Git sha's to Bazaar objects."""
-
-from __future__ import absolute_import
-
-from dulwich.objects import (
-    sha_to_hex,
-    hex_to_sha,
-    )
-import os
-import threading
-
-from dulwich.objects import (
-    ShaFile,
-    )
-
-from ... import (
-    btree_index as _mod_btree_index,
-    errors as bzr_errors,
-    index as _mod_index,
-    osutils,
-    registry,
-    trace,
-    versionedfile,
-    )
-from ...transport import (
-    get_transport,
-    )
-
-
-def get_cache_dir():
-    try:
-        from xdg.BaseDirectory import xdg_cache_home
-    except ImportError:
-        from ...config import config_dir
-        ret = os.path.join(config_dir(), "git")
-    else:
-        ret = os.path.join(xdg_cache_home, "bazaar", "git")
-    if not os.path.isdir(ret):
-        os.makedirs(ret)
-    return ret
-
-
-def get_remote_cache_transport(repository):
-    """Retrieve the transport to use when accessing (unwritable) remote 
-    repositories.
-    """
-    uuid = getattr(repository, "uuid", None)
-    if uuid is None:
-        path = get_cache_dir()
-    else:
-        path = os.path.join(get_cache_dir(), uuid)
-        if not os.path.isdir(path):
-            os.mkdir(path)
-    return get_transport(path)
-
-
-def check_pysqlite_version(sqlite3):
-    """Check that sqlite library is compatible.
-
-    """
-    if (sqlite3.sqlite_version_info[0] < 3 or
-            (sqlite3.sqlite_version_info[0] == 3 and
-             sqlite3.sqlite_version_info[1] < 3)):
-        trace.warning('Needs at least sqlite 3.3.x')
-        raise bzr_errors.BzrError("incompatible sqlite library")
-
-try:
-    try:
-        import sqlite3
-        check_pysqlite_version(sqlite3)
-    except (ImportError, bzr_errors.BzrError), e:
-        from pysqlite2 import dbapi2 as sqlite3
-        check_pysqlite_version(sqlite3)
-except:
-    trace.warning('Needs at least Python2.5 or Python2.4 with the pysqlite2 '
-            'module')
-    raise bzr_errors.BzrError("missing sqlite library")
-
-
-_mapdbs = threading.local()
-def mapdbs():
-    """Get a cache for this thread's db connections."""
-    try:
-        return _mapdbs.cache
-    except AttributeError:
-        _mapdbs.cache = {}
-        return _mapdbs.cache
-
-
-class GitShaMap(object):
-    """Git<->Bzr revision id mapping database."""
-
-    def lookup_git_sha(self, sha):
-        """Lookup a Git sha in the database.
-        :param sha: Git object sha
-        :return: list with (type, type_data) tuples with type_data:
-            commit: revid, tree_sha, verifiers
-            blob: fileid, revid
-            tree: fileid, revid
-        """
-        raise NotImplementedError(self.lookup_git_sha)
-
-    def lookup_blob_id(self, file_id, revision):
-        """Retrieve a Git blob SHA by file id.
-
-        :param file_id: File id of the file/symlink
-        :param revision: revision in which the file was last changed.
-        """
-        raise NotImplementedError(self.lookup_blob_id)
-
-    def lookup_tree_id(self, file_id, revision):
-        """Retrieve a Git tree SHA by file id.
-        """
-        raise NotImplementedError(self.lookup_tree_id)
-
-    def lookup_commit(self, revid):
-        """Retrieve a Git commit SHA by Bazaar revision id.
-        """
-        raise NotImplementedError(self.lookup_commit)
-
-    def revids(self):
-        """List the revision ids known."""
-        raise NotImplementedError(self.revids)
-
-    def missing_revisions(self, revids):
-        """Return set of all the revisions that are not present."""
-        present_revids = set(self.revids())
-        if not isinstance(revids, set):
-            revids = set(revids)
-        return revids - present_revids
-
-    def sha1s(self):
-        """List the SHA1s."""
-        raise NotImplementedError(self.sha1s)
-
-    def start_write_group(self):
-        """Start writing changes."""
-
-    def commit_write_group(self):
-        """Commit any pending changes."""
-
-    def abort_write_group(self):
-        """Abort any pending changes."""
-
-
-class ContentCache(object):
-    """Object that can cache Git objects."""
-
-    def add(self, object):
-        """Add an object."""
-        raise NotImplementedError(self.add)
-
-    def add_multi(self, objects):
-        """Add multiple objects."""
-        for obj in objects:
-            self.add(obj)
-
-    def __getitem__(self, sha):
-        """Retrieve an item, by SHA."""
-        raise NotImplementedError(self.__getitem__)
-
-
-class BzrGitCacheFormat(object):
-    """Bazaar-Git Cache Format."""
-
-    def get_format_string(self):
-        """Return a single-line unique format string for this cache format."""
-        raise NotImplementedError(self.get_format_string)
-
-    def open(self, transport):
-        """Open this format on a transport."""
-        raise NotImplementedError(self.open)
-
-    def initialize(self, transport):
-        """Create a new instance of this cache format at transport."""
-        transport.put_bytes('format', self.get_format_string())
-
-    @classmethod
-    def from_transport(self, transport):
-        """Open a cache file present on a transport, or initialize one.
-
-        :param transport: Transport to use
-        :return: A BzrGitCache instance
-        """
-        try:
-            format_name = transport.get_bytes('format')
-            format = formats.get(format_name)
-        except bzr_errors.NoSuchFile:
-            format = formats.get('default')
-            format.initialize(transport)
-        return format.open(transport)
-
-    @classmethod
-    def from_repository(cls, repository):
-        """Open a cache file for a repository.
-
-        This will use the repository's transport to store the cache file, or
-        use the users global cache directory if the repository has no 
-        transport associated with it.
-
-        :param repository: Repository to open the cache for
-        :return: A `BzrGitCache`
-        """
-        from ...transport.local import LocalTransport
-        repo_transport = getattr(repository, "_transport", None)
-        if (repo_transport is not None and
-            isinstance(repo_transport, LocalTransport)):
-            # Even if we don't write to this repo, we should be able
-            # to update its cache.
-            try:
-                repo_transport = remove_readonly_transport_decorator(repo_transport)
-            except bzr_errors.ReadOnlyError:
-                transport = None
-            else:
-                try:
-                    repo_transport.mkdir('git')
-                except bzr_errors.FileExists:
-                    pass
-                transport = repo_transport.clone('git')
-        else:
-            transport = None
-        if transport is None:
-            transport = get_remote_cache_transport(repository)
-        return cls.from_transport(transport)
-
-
-class CacheUpdater(object):
-    """Base class for objects that can update a bzr-git cache."""
-
-    def add_object(self, obj, bzr_key_data, path):
-        """Add an object.
-
-        :param obj: Object type ("commit", "blob" or "tree")
-        :param bzr_key_data: bzr key store data or testament_sha in case
-            of commit
-        :param path: Path of the object (optional)
-        """
-        raise NotImplementedError(self.add_object)
-
-    def finish(self):
-        raise NotImplementedError(self.finish)
-
-
-class BzrGitCache(object):
-    """Caching backend."""
-
-    def __init__(self, idmap, content_cache, cache_updater_klass):
-        self.idmap = idmap
-        self.content_cache = content_cache
-        self._cache_updater_klass = cache_updater_klass
-
-    def get_updater(self, rev):
-        """Update an object that implements the CacheUpdater interface for 
-        updating this cache.
-        """
-        return self._cache_updater_klass(self, rev)
-
-
-DictBzrGitCache = lambda: BzrGitCache(DictGitShaMap(), None, DictCacheUpdater)
-
-
-class DictCacheUpdater(CacheUpdater):
-    """Cache updater for dict-based caches."""
-
-    def __init__(self, cache, rev):
-        self.cache = cache
-        self.revid = rev.revision_id
-        self.parent_revids = rev.parent_ids
-        self._commit = None
-        self._entries = []
-
-    def add_object(self, obj, bzr_key_data, path):
-        if obj.type_name == "commit":
-            self._commit = obj
-            assert type(bzr_key_data) is dict
-            key = self.revid
-            type_data = (self.revid, self._commit.tree, bzr_key_data)
-            self.cache.idmap._by_revid[self.revid] = obj.id
-        elif obj.type_name in ("blob", "tree"):
-            if bzr_key_data is not None:
-                if obj.type_name == "blob":
-                    revision = bzr_key_data[1]
-                else:
-                    revision = self.revid
-                key = type_data = (bzr_key_data[0], revision)
-                self.cache.idmap._by_fileid.setdefault(type_data[1], {})[type_data[0]] = obj.id
-        else:
-            raise AssertionError
-        entry = (obj.type_name, type_data)
-        self.cache.idmap._by_sha.setdefault(obj.id, {})[key] = entry
-
-    def finish(self):
-        if self._commit is None:
-            raise AssertionError("No commit object added")
-        return self._commit
-
-
-class DictGitShaMap(GitShaMap):
-    """Git SHA map that uses a dictionary."""
-
-    def __init__(self):
-        self._by_sha = {}
-        self._by_fileid = {}
-        self._by_revid = {}
-
-    def lookup_blob_id(self, fileid, revision):
-        return self._by_fileid[revision][fileid]
-
-    def lookup_git_sha(self, sha):
-        for entry in self._by_sha[sha].itervalues():
-            yield entry
-
-    def lookup_tree_id(self, fileid, revision):
-        return self._by_fileid[revision][fileid]
-
-    def lookup_commit(self, revid):
-        return self._by_revid[revid]
-
-    def revids(self):
-        for key, entries in self._by_sha.iteritems():
-            for (type, type_data) in entries.values():
-                if type == "commit":
-                    yield type_data[0]
-
-    def sha1s(self):
-        return self._by_sha.iterkeys()
-
-
-class SqliteCacheUpdater(CacheUpdater):
-
-    def __init__(self, cache, rev):
-        self.cache = cache
-        self.db = self.cache.idmap.db
-        self.revid = rev.revision_id
-        self._commit = None
-        self._trees = []
-        self._blobs = []
-
-    def add_object(self, obj, bzr_key_data, path):
-        if obj.type_name == "commit":
-            self._commit = obj
-            assert type(bzr_key_data) is dict
-            self._testament3_sha1 = bzr_key_data.get("testament3-sha1")
-        elif obj.type_name == "tree":
-            if bzr_key_data is not None:
-                self._trees.append((obj.id, bzr_key_data[0], self.revid))
-        elif obj.type_name == "blob":
-            if bzr_key_data is not None:
-                self._blobs.append((obj.id, bzr_key_data[0], bzr_key_data[1]))
-        else:
-            raise AssertionError
-
-    def finish(self):
-        if self._commit is None:
-            raise AssertionError("No commit object added")
-        self.db.executemany(
-            "replace into trees (sha1, fileid, revid) values (?, ?, ?)",
-            self._trees)
-        self.db.executemany(
-            "replace into blobs (sha1, fileid, revid) values (?, ?, ?)",
-            self._blobs)
-        self.db.execute(
-            "replace into commits (sha1, revid, tree_sha, testament3_sha1) values (?, ?, ?, ?)",
-            (self._commit.id, self.revid, self._commit.tree, self._testament3_sha1))
-        return self._commit
-
-
-SqliteBzrGitCache = lambda p: BzrGitCache(SqliteGitShaMap(p), None, SqliteCacheUpdater)
-
-
-class SqliteGitCacheFormat(BzrGitCacheFormat):
-
-    def get_format_string(self):
-        return 'bzr-git sha map version 1 using sqlite\n'
-
-    def open(self, transport):
-        try:
-            basepath = transport.local_abspath(".")
-        except bzr_errors.NotLocalUrl:
-            basepath = get_cache_dir()
-        return SqliteBzrGitCache(os.path.join(basepath, "idmap.db"))
-
-
-class SqliteGitShaMap(GitShaMap):
-    """Bazaar GIT Sha map that uses a sqlite database for storage."""
-
-    def __init__(self, path=None):
-        self.path = path
-        if path is None:
-            self.db = sqlite3.connect(":memory:")
-        else:
-            if not mapdbs().has_key(path):
-                mapdbs()[path] = sqlite3.connect(path)
-            self.db = mapdbs()[path]
-        self.db.text_factory = str
-        self.db.executescript("""
-        create table if not exists commits(
-            sha1 text not null check(length(sha1) == 40),
-            revid text not null,
-            tree_sha text not null check(length(tree_sha) == 40)
-        );
-        create index if not exists commit_sha1 on commits(sha1);
-        create unique index if not exists commit_revid on commits(revid);
-        create table if not exists blobs(
-            sha1 text not null check(length(sha1) == 40),
-            fileid text not null,
-            revid text not null
-        );
-        create index if not exists blobs_sha1 on blobs(sha1);
-        create unique index if not exists blobs_fileid_revid on blobs(fileid, revid);
-        create table if not exists trees(
-            sha1 text unique not null check(length(sha1) == 40),
-            fileid text not null,
-            revid text not null
-        );
-        create unique index if not exists trees_sha1 on trees(sha1);
-        create unique index if not exists trees_fileid_revid on trees(fileid, revid);
-""")
-        try:
-            self.db.executescript(
-                "ALTER TABLE commits ADD testament3_sha1 TEXT;")
-        except sqlite3.OperationalError:
-            pass # Column already exists.
-
-    def __repr__(self):
-        return "%s(%r)" % (self.__class__.__name__, self.path)
-
-    def lookup_commit(self, revid):
-        cursor = self.db.execute("select sha1 from commits where revid = ?", 
-            (revid,))
-        row = cursor.fetchone()
-        if row is not None:
-            return row[0]
-        raise KeyError
-
-    def commit_write_group(self):
-        self.db.commit()
-
-    def lookup_blob_id(self, fileid, revision):
-        row = self.db.execute("select sha1 from blobs where fileid = ? and revid = ?", (fileid, revision)).fetchone()
-        if row is not None:
-            return row[0]
-        raise KeyError(fileid)
-
-    def lookup_tree_id(self, fileid, revision):
-        row = self.db.execute("select sha1 from trees where fileid = ? and revid = ?", (fileid, revision)).fetchone()
-        if row is not None:
-            return row[0]
-        raise KeyError(fileid)
-
-    def lookup_git_sha(self, sha):
-        """Lookup a Git sha in the database.
-
-        :param sha: Git object sha
-        :return: (type, type_data) with type_data:
-            commit: revid, tree sha, verifiers
-            tree: fileid, revid
-            blob: fileid, revid
-        """
-        found = False
-        cursor = self.db.execute("select revid, tree_sha, testament3_sha1 from commits where sha1 = ?", (sha,))
-        for row in cursor.fetchall():
-            found = True
-            if row[2] is not None:
-                verifiers = {"testament3-sha1": row[2]}
-            else:
-                verifiers = {}
-            yield ("commit", (row[0], row[1], verifiers))
-        cursor = self.db.execute("select fileid, revid from blobs where sha1 = ?", (sha,))
-        for row in cursor.fetchall():
-            found = True
-            yield ("blob", row)
-        cursor = self.db.execute("select fileid, revid from trees where sha1 = ?", (sha,))
-        for row in cursor.fetchall():
-            found = True
-            yield ("tree", row)
-        if not found:
-            raise KeyError(sha)
-
-    def revids(self):
-        """List the revision ids known."""
-        return (row for (row,) in self.db.execute("select revid from commits"))
-
-    def sha1s(self):
-        """List the SHA1s."""
-        for table in ("blobs", "commits", "trees"):
-            for (sha,) in self.db.execute("select sha1 from %s" % table):
-                yield sha
-
-
-class TdbCacheUpdater(CacheUpdater):
-    """Cache updater for tdb-based caches."""
-
-    def __init__(self, cache, rev):
-        self.cache = cache
-        self.db = cache.idmap.db
-        self.revid = rev.revision_id
-        self.parent_revids = rev.parent_ids
-        self._commit = None
-        self._entries = []
-
-    def add_object(self, obj, bzr_key_data, path):
-        sha = obj.sha().digest()
-        if obj.type_name == "commit":
-            self.db["commit\0" + self.revid] = "\0".join((sha, obj.tree))
-            assert type(bzr_key_data) is dict, "was %r" % bzr_key_data
-            type_data = (self.revid, obj.tree)
-            try:
-                type_data += (bzr_key_data["testament3-sha1"],)
-            except KeyError:
-                pass
-            self._commit = obj
-        elif obj.type_name == "blob":
-            if bzr_key_data is None:
-                return
-            self.db["\0".join(("blob", bzr_key_data[0], bzr_key_data[1]))] = sha
-            type_data = bzr_key_data
-        elif obj.type_name == "tree":
-            if bzr_key_data is None:
-                return
-            (file_id, ) = bzr_key_data
-            type_data = (file_id, self.revid)
-        else:
-            raise AssertionError
-        entry = "\0".join((obj.type_name, ) + type_data) + "\n"
-        key = "git\0" + sha
-        try:
-            oldval = self.db[key]
-        except KeyError:
-            self.db[key] = entry
-        else:
-            if oldval[-1] != "\n":
-                self.db[key] = "".join([oldval, "\n", entry])
-            else:
-                self.db[key] = "".join([oldval, entry])
-
-    def finish(self):
-        if self._commit is None:
-            raise AssertionError("No commit object added")
-        return self._commit
-
-
-TdbBzrGitCache = lambda p: BzrGitCache(TdbGitShaMap(p), None, TdbCacheUpdater)
-
-
-class TdbGitCacheFormat(BzrGitCacheFormat):
-    """Cache format for tdb-based caches."""
-
-    def get_format_string(self):
-        return 'bzr-git sha map version 3 using tdb\n'
-
-    def open(self, transport):
-        try:
-            basepath = transport.local_abspath(".").encode(osutils._fs_enc)
-        except bzr_errors.NotLocalUrl:
-            basepath = get_cache_dir()
-        assert isinstance(basepath, str)
-        try:
-            return TdbBzrGitCache(os.path.join(basepath, "idmap.tdb"))
-        except ImportError:
-            raise ImportError(
-                "Unable to open existing bzr-git cache because 'tdb' is not "
-                "installed.")
-
-
-class TdbGitShaMap(GitShaMap):
-    """SHA Map that uses a TDB database.
-
-    Entries:
-
-    "git <sha1>" -> "<type> <type-data1> <type-data2>"
-    "commit revid" -> "<sha1> <tree-id>"
-    "tree fileid revid" -> "<sha1>"
-    "blob fileid revid" -> "<sha1>"
-    """
-
-    TDB_MAP_VERSION = 3
-    TDB_HASH_SIZE = 50000
-
-    def __init__(self, path=None):
-        import tdb
-        self.path = path
-        if path is None:
-            self.db = {}
-        else:
-            assert isinstance(path, str)
-            if not mapdbs().has_key(path):
-                mapdbs()[path] = tdb.Tdb(path, self.TDB_HASH_SIZE, tdb.DEFAULT,
-                                          os.O_RDWR|os.O_CREAT)
-            self.db = mapdbs()[path]
-        try:
-            if int(self.db["version"]) not in (2, 3):
-                trace.warning("SHA Map is incompatible (%s -> %d), rebuilding database.",
-                              self.db["version"], self.TDB_MAP_VERSION)
-                self.db.clear()
-        except KeyError:
-            pass
-        self.db["version"] = str(self.TDB_MAP_VERSION)
-
-    def start_write_group(self):
-        """Start writing changes."""
-        self.db.transaction_start()
-
-    def commit_write_group(self):
-        """Commit any pending changes."""
-        self.db.transaction_commit()
-
-    def abort_write_group(self):
-        """Abort any pending changes."""
-        self.db.transaction_cancel()
-
-    def __repr__(self):
-        return "%s(%r)" % (self.__class__.__name__, self.path)
-
-    def lookup_commit(self, revid):
-        try:
-            return sha_to_hex(self.db["commit\0" + revid][:20])
-        except KeyError:
-            raise KeyError("No cache entry for %r" % revid)
-
-    def lookup_blob_id(self, fileid, revision):
-        return sha_to_hex(self.db["\0".join(("blob", fileid, revision))])
-
-    def lookup_git_sha(self, sha):
-        """Lookup a Git sha in the database.
-
-        :param sha: Git object sha
-        :return: (type, type_data) with type_data:
-            commit: revid, tree sha
-            blob: fileid, revid
-            tree: fileid, revid
-        """
-        if len(sha) == 40:
-            sha = hex_to_sha(sha)
-        value = self.db["git\0" + sha]
-        for data in value.splitlines():
-            data = data.split("\0")
-            if data[0] == "commit":
-                if len(data) == 3:
-                    yield (data[0], (data[1], data[2], {}))
-                else:
-                    yield (data[0], (data[1], data[2], {"testament3-sha1": data[3]}))
-            elif data[0] in ("tree", "blob"):
-                yield (data[0], tuple(data[1:]))
-            else:
-                raise AssertionError("unknown type %r" % data[0])
-
-    def missing_revisions(self, revids):
-        ret = set()
-        for revid in revids:
-            if self.db.get("commit\0" + revid) is None:
-                ret.add(revid)
-        return ret
-
-    def revids(self):
-        """List the revision ids known."""
-        for key in self.db.iterkeys():
-            if key.startswith("commit\0"):
-                yield key[7:]
-
-    def sha1s(self):
-        """List the SHA1s."""
-        for key in self.db.iterkeys():
-            if key.startswith("git\0"):
-                yield sha_to_hex(key[4:])
-
-
-class VersionedFilesContentCache(ContentCache):
-
-    def __init__(self, vf):
-        self._vf = vf
-
-    def add(self, obj):
-        self._vf.insert_record_stream(
-            [versionedfile.ChunkedContentFactory((obj.id,), [], None,
-                obj.as_legacy_object_chunks())])
-
-    def __getitem__(self, sha):
-        stream = self._vf.get_record_stream([(sha,)], 'unordered', True)
-        entry = stream.next() 
-        if entry.storage_kind == 'absent':
-            raise KeyError(sha)
-        return ShaFile._parse_legacy_object(entry.get_bytes_as('fulltext'))
-
-
-class GitObjectStoreContentCache(ContentCache):
-
-    def __init__(self, store):
-        self.store = store
-
-    def add_multi(self, objs):
-        self.store.add_objects(objs)
-
-    def add(self, obj, path):
-        self.store.add_object(obj)
-
-    def __getitem__(self, sha):
-        return self.store[sha]
-
-
-class IndexCacheUpdater(CacheUpdater):
-
-    def __init__(self, cache, rev):
-        self.cache = cache
-        self.revid = rev.revision_id
-        self.parent_revids = rev.parent_ids
-        self._commit = None
-        self._entries = []
-        self._cache_objs = set()
-
-    def add_object(self, obj, bzr_key_data, path):
-        if obj.type_name == "commit":
-            self._commit = obj
-            assert type(bzr_key_data) is dict
-            self.cache.idmap._add_git_sha(obj.id, "commit",
-                (self.revid, obj.tree, bzr_key_data))
-            self.cache.idmap._add_node(("commit", self.revid, "X"),
-                " ".join((obj.id, obj.tree)))
-            self._cache_objs.add((obj, path))
-        elif obj.type_name == "blob":
-            self.cache.idmap._add_git_sha(obj.id, "blob", bzr_key_data)
-            self.cache.idmap._add_node(("blob", bzr_key_data[0],
-                bzr_key_data[1]), obj.id)
-        elif obj.type_name == "tree":
-            self.cache.idmap._add_git_sha(obj.id, "tree",
-                (bzr_key_data[0], self.revid))
-            self._cache_objs.add((obj, path))
-        else:
-            raise AssertionError
-
-    def finish(self):
-        self.cache.content_cache.add_multi(self._cache_objs)
-        return self._commit
-
-
-class IndexBzrGitCache(BzrGitCache):
-
-    def __init__(self, transport=None):
-        mapper = versionedfile.ConstantMapper("trees")
-        shamap = IndexGitShaMap(transport.clone('index'))
-        #trees_store = knit.make_file_factory(True, mapper)(transport)
-        #content_cache = VersionedFilesContentCache(trees_store)
-        from .transportgit import TransportObjectStore
-        store = TransportObjectStore(transport.clone('objects'))
-        content_cache = GitObjectStoreContentCache(store)
-        super(IndexBzrGitCache, self).__init__(shamap, content_cache,
-                IndexCacheUpdater)
-
-
-class IndexGitCacheFormat(BzrGitCacheFormat):
-
-    def get_format_string(self):
-        return 'bzr-git sha map with git object cache version 1\n'
-
-    def initialize(self, transport):
-        super(IndexGitCacheFormat, self).initialize(transport)
-        transport.mkdir('index')
-        transport.mkdir('objects')
-        from .transportgit import TransportObjectStore
-        TransportObjectStore.init(transport.clone('objects'))
-
-    def open(self, transport):
-        return IndexBzrGitCache(transport)
-
-
-class IndexGitShaMap(GitShaMap):
-    """SHA Map that uses the Bazaar APIs to store a cache.
-
-    BTree Index file with the following contents:
-
-    ("git", <sha1>) -> "<type> <type-data1> <type-data2>"
-    ("commit", <revid>) -> "<sha1> <tree-id>"
-    ("blob", <fileid>, <revid>) -> <sha1>
-
-    """
-
-    def __init__(self, transport=None):
-        if transport is None:
-            self._transport = None
-            self._index = _mod_index.InMemoryGraphIndex(0, key_elements=3)
-            self._builder = self._index
-        else:
-            self._builder = None
-            self._transport = transport
-            self._index = _mod_index.CombinedGraphIndex([])
-            for name in self._transport.list_dir("."):
-                if not name.endswith(".rix"):
-                    continue
-                x = _mod_btree_index.BTreeGraphIndex(self._transport, name,
-                    self._transport.stat(name).st_size)
-                self._index.insert_index(0, x)
-
-    @classmethod
-    def from_repository(cls, repository):
-        transport = getattr(repository, "_transport", None)
-        if transport is not None:
-            try:
-                transport.mkdir('git')
-            except bzr_errors.FileExists:
-                pass
-            return cls(transport.clone('git'))
-        from ...transport import get_transport
-        return cls(get_transport(get_cache_dir()))
-
-    def __repr__(self):
-        if self._transport is not None:
-            return "%s(%r)" % (self.__class__.__name__, self._transport.base)
-        else:
-            return "%s()" % (self.__class__.__name__)
-
-    def repack(self):
-        assert self._builder is None
-        self.start_write_group()
-        for _, key, value in self._index.iter_all_entries():
-            self._builder.add_node(key, value)
-        to_remove = []
-        for name in self._transport.list_dir('.'):
-            if name.endswith('.rix'):
-                to_remove.append(name)
-        self.commit_write_group()
-        del self._index.indices[1:]
-        for name in to_remove:
-            self._transport.rename(name, name + '.old')
-
-    def start_write_group(self):
-        assert self._builder is None
-        self._builder = _mod_btree_index.BTreeBuilder(0, key_elements=3)
-        self._name = osutils.sha()
-
-    def commit_write_group(self):
-        assert self._builder is not None
-        stream = self._builder.finish()
-        name = self._name.hexdigest() + ".rix"
-        size = self._transport.put_file(name, stream)
-        index = _mod_btree_index.BTreeGraphIndex(self._transport, name, size)
-        self._index.insert_index(0, index)
-        self._builder = None
-        self._name = None
-
-    def abort_write_group(self):
-        assert self._builder is not None
-        self._builder = None
-        self._name = None
-
-    def _add_node(self, key, value):
-        try:
-            self._builder.add_node(key, value)
-        except bzr_errors.BadIndexDuplicateKey:
-            # Multiple bzr objects can have the same contents
-            return True
-        else:
-            return False
-
-    def _get_entry(self, key):
-        entries = self._index.iter_entries([key])
-        try:
-            return entries.next()[2]
-        except StopIteration:
-            if self._builder is None:
-                raise KeyError
-            entries = self._builder.iter_entries([key])
-            try:
-                return entries.next()[2]
-            except StopIteration:
-                raise KeyError
-
-    def _iter_entries_prefix(self, prefix):
-        for entry in self._index.iter_entries_prefix([prefix]):
-            yield (entry[1], entry[2])
-        if self._builder is not None:
-            for entry in self._builder.iter_entries_prefix([prefix]):
-                yield (entry[1], entry[2])
-
-    def lookup_commit(self, revid):
-        return self._get_entry(("commit", revid, "X"))[:40]
-
-    def _add_git_sha(self, hexsha, type, type_data):
-        if hexsha is not None:
-            self._name.update(hexsha)
-            if type == "commit":
-                td = (type_data[0], type_data[1])
-                try:
-                    td += (type_data[2]["testament3-sha1"],)
-                except KeyError:
-                    pass
-            else:
-                td = type_data
-            self._add_node(("git", hexsha, "X"), " ".join((type,) + td))
-        else:
-            # This object is not represented in Git - perhaps an empty
-            # directory?
-            self._name.update(type + " ".join(type_data))
-
-    def lookup_blob_id(self, fileid, revision):
-        return self._get_entry(("blob", fileid, revision))
-
-    def lookup_git_sha(self, sha):
-        if len(sha) == 20:
-            sha = sha_to_hex(sha)
-        found = False
-        for key, value in self._iter_entries_prefix(("git", sha, None)):
-            found = True
-            data = value.split(" ", 3)
-            if data[0] == "commit":
-                if data[3]:
-                    verifiers = {"testament3-sha1": data[3]}
-                else:
-                    verifiers = {}
-                yield ("commit", (data[1], data[2], verifiers))
-            else:
-                yield (data[0], tuple(data[1:]))
-        if not found:
-            raise KeyError(sha)
-
-    def revids(self):
-        """List the revision ids known."""
-        for key, value in self._iter_entries_prefix(("commit", None, None)):
-            yield key[1]
-
-    def missing_revisions(self, revids):
-        """Return set of all the revisions that are not present."""
-        missing_revids = set(revids)
-        for _, key, value in self._index.iter_entries((
-            ("commit", revid, "X") for revid in revids)):
-            missing_revids.remove(key[1])
-        return missing_revids
-
-    def sha1s(self):
-        """List the SHA1s."""
-        for key, value in self._iter_entries_prefix(("git", None, None)):
-            yield key[1]
-
-
-formats = registry.Registry()
-formats.register(TdbGitCacheFormat().get_format_string(),
-    TdbGitCacheFormat())
-formats.register(SqliteGitCacheFormat().get_format_string(),
-    SqliteGitCacheFormat())
-formats.register(IndexGitCacheFormat().get_format_string(),
-    IndexGitCacheFormat())
-# In the future, this will become the default:
-# formats.register('default', IndexGitCacheFormat())
-try:
-    import tdb
-except ImportError:
-    formats.register('default', SqliteGitCacheFormat())
-else:
-    formats.register('default', TdbGitCacheFormat())
-
-
-
-def migrate_ancient_formats(repo_transport):
-    # Migrate older cache formats
-    repo_transport = remove_readonly_transport_decorator(repo_transport)
-    has_sqlite = repo_transport.has("git.db")
-    has_tdb = repo_transport.has("git.tdb")
-    if not has_sqlite or has_tdb:
-        return
-    try:
-        repo_transport.mkdir("git")
-    except bzr_errors.FileExists:
-        return
-    # Prefer migrating git.db over git.tdb, since the latter may not 
-    # be openable on some platforms.
-    if has_sqlite:
-        SqliteGitCacheFormat().initialize(repo_transport.clone("git"))
-        repo_transport.rename("git.db", "git/idmap.db")
-    elif has_tdb:
-        TdbGitCacheFormat().initialize(repo_transport.clone("git"))
-        repo_transport.rename("git.tdb", "git/idmap.tdb")
-
-
-def remove_readonly_transport_decorator(transport):
-    if transport.is_readonly():
-        try:
-            return transport._decorated
-        except AttributeError:
-            raise bzr_errors.ReadOnlyError(transport)
-    return transport
-
-
-def from_repository(repository):
-    """Open a cache file for a repository.
-
-    If the repository is remote and there is no transport available from it
-    this will use a local file in the users cache directory
-    (typically ~/.cache/bazaar/git/)
-
-    :param repository: A repository object
-    """
-    repo_transport = getattr(repository, "_transport", None)
-    if repo_transport is not None:
-        try:
-            migrate_ancient_formats(repo_transport)
-        except bzr_errors.ReadOnlyError:
-            pass # Not much we can do
-    return BzrGitCacheFormat.from_repository(repository)

=== removed file 'commands.py'
--- commands.py	2017-06-05 23:51:37 +0000
+++ commands.py	1970-01-01 00:00:00 +0000
@@ -1,351 +0,0 @@
-# Copyright (C) 2006-2009 Canonical Ltd
-
-# Authors: Robert Collins <[e-mail]>
-#          Jelmer Vernooij <[e-mail]>
-#          John Carr <[e-mail]>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-"""Git-specific subcommands for Bazaar."""
-
-from __future__ import absolute_import
-
-from ...commands import (
-    Command,
-    display_command,
-    )
-from ...option import (
-    Option,
-    )
-
-
-class cmd_git_import(Command):
-    """Import all branches from a git repository.
-
-    """
-
-    takes_args = ["src_location", "dest_location?"]
-
-    takes_options = [
-                     Option('colocated', help='Create colocated branches.'),
-                     ]
-
-    def _get_colocated_branch(self, target_bzrdir, name):
-        from ...errors import NotBranchError
-        try:
-            return target_bzrdir.open_branch(name=name)
-        except NotBranchError:
-            return target_bzrdir.create_branch(name=name)
-
-    def _get_nested_branch(self, dest_transport, dest_format, name):
-        from ...bzrdir import BzrDir
-        from ...errors import NotBranchError
-        head_transport = dest_transport.clone(name)
-        try:
-            head_bzrdir = BzrDir.open_from_transport(head_transport)
-        except NotBranchError:
-            head_bzrdir = dest_format.initialize_on_transport_ex(
-                head_transport, create_prefix=True)[1]
-        try:
-            return head_bzrdir.open_branch()
-        except NotBranchError:
-            return head_bzrdir.create_branch()
-
-    def run(self, src_location, dest_location=None, colocated=False):
-        import os
-        import urllib
-        from ... import (
-            controldir,
-            trace,
-            ui,
-            urlutils,
-            )
-        from ...bzrdir import (
-            BzrDir,
-            )
-        from ...errors import (
-            BzrCommandError,
-            NoRepositoryPresent,
-            NotBranchError,
-            )
-        from . import gettext
-        from ...repository import (
-            InterRepository,
-            Repository,
-            )
-        from ...transport import get_transport
-        from .branch import (
-            GitBranch,
-            )
-        from .refs import (
-            ref_to_branch_name,
-            )
-        from .repository import GitRepository
-
-        dest_format = controldir.ControlDirFormat.get_default_format()
-
-        if dest_location is None:
-            dest_location = os.path.basename(src_location.rstrip("/\\"))
-
-        dest_transport = get_transport(dest_location)
-
-        source_repo = Repository.open(src_location)
-        if not isinstance(source_repo, GitRepository):
-            raise BzrCommandError(gettext("%r is not a git repository") % src_location)
-        try:
-            target_bzrdir = BzrDir.open_from_transport(dest_transport)
-        except NotBranchError:
-            target_bzrdir = dest_format.initialize_on_transport_ex(
-                dest_transport, shared_repo=True)[1]
-        try:
-            target_repo = target_bzrdir.find_repository()
-        except NoRepositoryPresent:
-            target_repo = target_bzrdir.create_repository(shared=True)
-
-        if not target_repo.supports_rich_root():
-            raise BzrCommandError(gettext("Target repository doesn't support rich roots"))
-
-        interrepo = InterRepository.get(source_repo, target_repo)
-        mapping = source_repo.get_mapping()
-        refs = interrepo.fetch()
-        refs_dict = refs.as_dict()
-        pb = ui.ui_factory.nested_progress_bar()
-        try:
-            for i, (name, sha) in enumerate(refs_dict.iteritems()):
-                try:
-                    branch_name = ref_to_branch_name(name)
-                except ValueError:
-                    # Not a branch, ignore
-                    continue
-                pb.update(gettext("creating branches"), i, len(refs_dict))
-                if getattr(target_bzrdir._format, "colocated_branches", False) and colocated:
-                    if name == "HEAD":
-                        branch_name = None
-                    head_branch = self._get_colocated_branch(target_bzrdir, branch_name)
-                else:
-                    head_branch = self._get_nested_branch(dest_transport, dest_format, branch_name)
-                revid = mapping.revision_id_foreign_to_bzr(sha)
-                source_branch = GitBranch(source_repo.bzrdir, source_repo,
-                    sha)
-                source_branch.head = sha
-                if head_branch.last_revision() != revid:
-                    head_branch.generate_revision_history(revid)
-                source_branch.tags.merge_to(head_branch.tags)
-                if not head_branch.get_parent():
-                    url = urlutils.join_segment_parameters(
-                        source_branch.base, {"ref": urllib.quote(name, '')})
-                    head_branch.set_parent(url)
-        finally:
-            pb.finished()
-        trace.note(gettext(
-            "Use 'bzr checkout' to create a working tree in "
-            "the newly created branches."))
-
-
-class cmd_git_object(Command):
-    """List or display Git objects by SHA.
-
-    Cat a particular object's Git representation if a SHA is specified.
-    List all available SHAs otherwise.
-    """
-
-    hidden = True
-
-    aliases = ["git-objects", "git-cat"]
-    takes_args = ["sha1?"]
-    takes_options = [Option('directory',
-        short_name='d',
-        help='Location of repository.', type=unicode),
-        Option('pretty', help='Pretty-print objects.')]
-    encoding_type = 'exact'
-
-    @display_command
-    def run(self, sha1=None, directory=".", pretty=False):
-        from ...errors import (
-            BzrCommandError,
-            )
-        from ...bzrdir import (
-            BzrDir,
-            )
-        from .object_store import (
-            get_object_store,
-            )
-        from . import gettext
-        bzrdir, _ = BzrDir.open_containing(directory)
-        repo = bzrdir.find_repository()
-        object_store = get_object_store(repo)
-        object_store.lock_read()
-        try:
-            if sha1 is not None:
-                try:
-                    obj = object_store[str(sha1)]
-                except KeyError:
-                    raise BzrCommandError(gettext("Object not found: %s") % sha1)
-                if pretty:
-                    text = obj.as_pretty_string()
-                else:
-                    text = obj.as_raw_string()
-                self.outf.write(text)
-            else:
-                for sha1 in object_store:
-                    self.outf.write("%s\n" % sha1)
-        finally:
-            object_store.unlock()
-
-
-class cmd_git_refs(Command):
-    """Output all of the virtual refs for a repository.
-
-    """
-
-    hidden = True
-
-    takes_args = ["location?"]
-
-    @display_command
-    def run(self, location="."):
-        from ...bzrdir import (
-            BzrDir,
-            )
-        from .refs import (
-            get_refs_container,
-            )
-        from .object_store import (
-            get_object_store,
-            )
-        bzrdir, _ = BzrDir.open_containing(location)
-        repo = bzrdir.find_repository()
-        object_store = get_object_store(repo)
-        object_store.lock_read()
-        try:
-            refs = get_refs_container(bzrdir, object_store)
-            for k, v in refs.as_dict().iteritems():
-                self.outf.write("%s -> %s\n" % (k, v))
-        finally:
-            object_store.unlock()
-
-
-class cmd_git_apply(Command):
-    """Apply a series of git-am style patches.
-
-    This command will in the future probably be integrated into 
-    "bzr pull".
-    """
-
-    takes_options = [
-        Option('signoff', short_name='s', help='Add a Signed-off-by line.'),
-        Option('force',
-            help='Apply patches even if tree has uncommitted changes.')
-        ]
-    takes_args = ["patches*"]
-
-    def _apply_patch(self, wt, f, signoff):
-        """Apply a patch.
-
-        :param wt: A Bazaar working tree object.
-        :param f: Patch file to read.
-        :param signoff: Add Signed-Off-By flag.
-        """
-        from . import gettext
-        from ...errors import BzrCommandError
-        from dulwich.patch import git_am_patch_split
-        import subprocess
-        (c, diff, version) = git_am_patch_split(f)
-        # FIXME: Cope with git-specific bits in patch
-        # FIXME: Add new files to working tree
-        p = subprocess.Popen(["patch", "-p1"], stdin=subprocess.PIPE,
-            cwd=wt.basedir)
-        p.communicate(diff)
-        exitcode = p.wait()
-        if exitcode != 0:
-            raise BzrCommandError(gettext("error running patch"))
-        message = c.message
-        if signoff:
-            signed_off_by = wt.branch.get_config().username()
-            message += "Signed-off-by: %s\n" % signed_off_by.encode('utf-8')
-        wt.commit(authors=[c.author], message=message)
-
-    def run(self, patches_list=None, signoff=False, force=False):
-        from ...errors import UncommittedChanges
-        from ...workingtree import WorkingTree
-        if patches_list is None:
-            patches_list = []
-
-        tree, _ = WorkingTree.open_containing(".")
-        if tree.basis_tree().changes_from(tree).has_changed() and not force:
-            raise UncommittedChanges(tree)
-        tree.lock_write()
-        try:
-            for patch in patches_list:
-                f = open(patch, 'r')
-                try:
-                    self._apply_patch(tree, f, signoff=signoff)
-                finally:
-                    f.close()
-        finally:
-            tree.unlock()
-
-
-class cmd_git_push_pristine_tar_deltas(Command):
-    """Push pristine tar deltas to a git repository."""
-
-    takes_options = [Option('directory',
-        short_name='d',
-        help='Location of repository.', type=unicode)]
-    takes_args = ['target', 'package']
-
-    def run(self, target, package, directory='.'):
-        from ...branch import Branch
-        from ...errors import (
-            BzrCommandError,
-            NoSuchRevision,
-            )
-        from ...trace import warning
-        from ...repository import Repository
-        from .object_store import get_object_store
-        from .pristine_tar import (
-            revision_pristine_tar_data,
-            store_git_pristine_tar_data,
-            )
-        source = Branch.open_containing(directory)[0]
-        target_bzr = Repository.open(target)
-        target = getattr(target_bzr, '_git', None)
-        git_store = get_object_store(source.repository)
-        self.add_cleanup(git_store.unlock)
-        git_store.lock_read()
-        if target is None:
-            raise BzrCommandError("Target not a git repository")
-        tag_dict = source.tags.get_tag_dict()
-        for name, revid in tag_dict.iteritems():
-            try:
-                rev = source.repository.get_revision(revid)
-            except NoSuchRevision:
-                continue
-            try:
-                delta, kind = revision_pristine_tar_data(rev)
-            except KeyError:
-                continue
-            gitid = git_store._lookup_revision_sha1(revid)
-            if not (name.startswith('upstream/') or name.startswith('upstream-')):
-                warning("Unexpected pristine tar revision tagged %s. Ignoring.",
-                     name)
-                continue
-            upstream_version = name[len("upstream/"):]
-            filename = '%s_%s.orig.tar.%s' % (package, upstream_version, kind)
-            if not gitid in target:
-                warning("base git id %s for %s missing in target repository",
-                        gitid, filename)
-            store_git_pristine_tar_data(target, filename.encode('utf-8'),
-                delta, gitid)

=== removed file 'commit.py'
--- commit.py	2017-06-01 21:50:27 +0000
+++ commit.py	1970-01-01 00:00:00 +0000
@@ -1,233 +0,0 @@
-# Copyright (C) 2009-2010 Jelmer Vernooij <[e-mail]>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-"""Support for committing in native Git working trees."""
-
-from __future__ import absolute_import
-
-from dulwich.index import (
-    commit_tree,
-    )
-import os
-import stat
-
-from ... import (
-    revision as _mod_revision,
-    )
-from ...errors import (
-    RootMissing,
-    )
-from ...repository import (
-    CommitBuilder,
-    )
-
-from dulwich.objects import (
-    S_IFGITLINK,
-    Blob,
-    Commit,
-    )
-from dulwich.repo import Repo
-
-
-from .mapping import (
-    entry_mode,
-    )
-from .roundtrip import (
-    CommitSupplement,
-    inject_bzr_metadata,
-    )
-
-
-class GitCommitBuilder(CommitBuilder):
-    """Commit builder for Git repositories."""
-
-    supports_record_entry_contents = False
-
-    def __init__(self, *args, **kwargs):
-        super(GitCommitBuilder, self).__init__(*args, **kwargs)
-        self._validate_revprops(self._revprops)
-        self.store = self.repository._git.object_store
-        self._blobs = {}
-        self._any_changes = False
-        self._will_record_deletes = False
-        self._override_fileids = {}
-        self._mapping = self.repository.get_mapping()
-
-    def any_changes(self):
-        return self._any_changes
-
-    def record_entry_contents(self, ie, parent_invs, path, tree,
-        content_summary):
-        raise NotImplementedError(self.record_entry_contents)
-
-    def record_delete(self, kind, path, file_id):
-        assert type(path) == str
-        if kind != 'directory':
-            self._override_fileids[path] = None
-            self._blobs[path] = None
-        self._any_changes = True
-
-    def record_iter_changes(self, workingtree, basis_revid, iter_changes):
-        def link_sha1(path, file_id):
-            blob = Blob()
-            blob.data = workingtree.get_symlink_target(file_id, path).encode("utf-8")
-            self.store.add_object(blob)
-            return blob.id
-        def text_sha1(path, file_id):
-            blob = Blob()
-            blob.data = workingtree.get_file_text(file_id, path)
-            self.store.add_object(blob)
-            return blob.id
-        def treeref_sha1(path, file_id):
-            return Repo.open(os.path.join(workingtree.basedir, path)).head()
-        seen_root = False
-        for (file_id, path, changed_content, versioned, parent, name, kind,
-             executable) in iter_changes:
-            if kind[1] in ("directory",):
-                if kind[0] in ("file", "symlink"):
-                    self.record_delete(kind[0], path[0].encode("utf-8"), file_id)
-                if path[1] == "":
-                    seen_root = True
-                continue
-            if path[1] is None:
-                self.record_delete(kind[0], path[0].encode("utf-8"), file_id)
-                continue
-            if kind[1] == "file":
-                mode = stat.S_IFREG
-                sha = text_sha1(path[1], file_id)
-            elif kind[1] == "symlink":
-                mode = stat.S_IFLNK
-                sha = link_sha1(path[1], file_id)
-            elif kind[1] == "tree-reference":
-                mode = S_IFGITLINK
-                sha = treeref_sha1(path[1], file_id)
-            else:
-                raise AssertionError("Unknown kind %r" % kind[1])
-            if executable[1]:
-                mode |= 0111
-            self._any_changes = True
-            encoded_new_path = path[1].encode("utf-8")
-            self._blobs[encoded_new_path] = (mode, sha)
-            file_sha1 = workingtree.get_file_sha1(file_id, path[1])
-            if file_sha1 is None:
-                # File no longer exists
-                if path[0] is not None:
-                    self.record_delete(kind[0], path[0].encode("utf-8"), file_id)
-                continue
-            _, st = workingtree.get_file_with_stat(file_id, path[1])
-            yield file_id, path[1], (file_sha1, st)
-            self._override_fileids[encoded_new_path] = file_id
-        if not seen_root and len(self.parents) == 0:
-            raise RootMissing()
-        if getattr(workingtree, "basis_tree", False):
-            basis_tree = workingtree.basis_tree()
-        else:
-            if len(self.parents) == 0:
-                basis_revid = _mod_revision.NULL_REVISION
-            else:
-                basis_revid = self.parents[0]
-            basis_tree = self.repository.revision_tree(basis_revid)
-        # Fill in entries that were not changed
-        for path, entry in basis_tree.iter_entries_by_dir():
-            if entry.kind not in ("file", "symlink", "tree-reference"):
-                continue
-            if not path in self._blobs:
-                if entry.kind == "symlink":
-                    blob = Blob()
-                    blob.data = basis_tree.get_symlink_target(entry.file_id,
-                        path)
-                    self._blobs[path.encode("utf-8")] = (entry_mode(entry), blob.id)
-                elif entry.kind == "file":
-                    blob = Blob()
-                    blob.data = basis_tree.get_file_text(entry.file_id, path)
-                    self._blobs[path.encode("utf-8")] = (entry_mode(entry), blob.id)
-                else:
-                    (mode, sha) = workingtree._lookup_entry(path.encode("utf-8"), update_index=True)
-                    self._blobs[path.encode("utf-8")] = (sha, mode)
-        if not self._lossy and self._mapping.BZR_FILE_IDS_FILE is not None:
-            try:
-                fileid_map = dict(basis_tree._fileid_map.file_ids)
-            except AttributeError:
-                fileid_map = {}
-            for path, file_id in self._override_fileids.iteritems():
-                assert type(path) == str
-                if file_id is None:
-                    del fileid_map[path]
-                else:
-                    assert type(file_id) == str
-                    fileid_map[path] = file_id
-            if fileid_map:
-                fileid_blob = self._mapping.export_fileid_map(fileid_map)
-                self.store.add_object(fileid_blob)
-                self._blobs[self._mapping.BZR_FILE_IDS_FILE] = (stat.S_IFREG | 0644, fileid_blob.id)
-            else:
-                self._blobs[self._mapping.BZR_FILE_IDS_FILE] = None
-        self.new_inventory = None
-
-    def get_basis_delta(self):
-        if not self._will_record_deletes:
-            raise AssertionError
-        # FIXME
-        return []
-
-    def finish_inventory(self):
-        # eliminate blobs that were removed
-        for path, entry in iter(self._blobs.items()):
-            if entry is None:
-                del self._blobs[path]
-
-    def _iterblobs(self):
-        return ((path, sha, mode) for (path, (mode, sha)) in self._blobs.iteritems())
-
-    def commit(self, message):
-        self._validate_unicode_text(message, 'commit message')
-        c = Commit()
-        c.parents = [self.repository.lookup_bzr_revision_id(revid)[0] for revid in self.parents]
-        c.tree = commit_tree(self.store, self._iterblobs())
-        c.committer = self._committer
-        c.author = self._revprops.get('author', self._committer)
-        if c.author != c.committer:
-            self._revprops.remove("author")
-        c.commit_time = int(self._timestamp)
-        c.author_time = int(self._timestamp)
-        c.commit_timezone = self._timezone
-        c.author_timezone = self._timezone
-        c.encoding = 'utf-8'
-        c.message = message.encode("utf-8")
-        if not self._lossy:
-            commit_supplement = CommitSupplement()
-            commit_supplement.revision_id = self._new_revision_id
-            commit_supplement.properties = self._revprops
-            commit_supplement.explicit_parent_ids = self.parents
-            if commit_supplement:
-                c.message = inject_bzr_metadata(c.message, commit_supplement, "utf-8")
-
-        assert len(c.id) == 40
-        if self._new_revision_id is None or self._lossy:
-            self._new_revision_id = self._mapping.revision_id_foreign_to_bzr(c.id)
-        self.store.add_object(c)
-        self.repository.commit_write_group()
-        return self._new_revision_id
-
-    def abort(self):
-        self.repository.abort_write_group()
-
-    def will_record_deletes(self):
-        self._will_record_deletes = True
-
-    def revision_tree(self):
-        return self.repository.revision_tree(self._new_revision_id)

=== removed file 'config.py'
--- config.py	2017-06-01 21:50:27 +0000
+++ config.py	1970-01-01 00:00:00 +0000
@@ -1,63 +0,0 @@
-# Copyright (C) 2009-2010 Jelmer Vernooij <[e-mail]>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-"""Config file handling for Git."""
-
-from __future__ import absolute_import
-
-from ... import (
-    config,
-    )
-
-class GitBranchConfig(config.BranchConfig):
-    """BranchConfig that uses locations.conf in place of branch.conf"""
-
-    def __init__(self, branch):
-        super(GitBranchConfig, self).__init__(branch)
-        # do not provide a BranchDataConfig
-        self.option_sources = self.option_sources[0], self.option_sources[2]
-
-    def __repr__(self):
-        return "<%s of %r>" % (self.__class__.__name__, self.branch)
-
-    def set_user_option(self, name, value, store=config.STORE_BRANCH,
-            warn_masked=False):
-        """Force local to True"""
-        config.BranchConfig.set_user_option(self, name, value,
-            store=config.STORE_LOCATION, warn_masked=warn_masked)
-
-    def _get_user_id(self):
-        # TODO: Read from ~/.gitconfig
-        return self._get_best_value('_get_user_id')
-
-
-class GitBranchStack(config._CompatibleStack):
-    """GitBranch stack."""
-
-    def __init__(self, branch):
-        lstore = config.LocationStore()
-        loc_matcher = config.LocationMatcher(lstore, branch.base)
-        # FIXME: This should also be looking in .git/config for
-        # local git branches.
-        gstore = config.GlobalStore()
-        super(GitBranchStack, self).__init__(
-            [self._get_overrides,
-             loc_matcher.get_sections,
-             gstore.get_sections],
-            # All modifications go to the corresponding section in
-            # locations.conf
-            lstore, branch.base)
-        self.branch = branch

=== removed file 'debian/bzr-builddeb.conf'
--- debian/bzr-builddeb.conf	2019-02-11 19:56:23 +0000
+++ debian/bzr-builddeb.conf	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-[HOOKS]
-merge-upstream = ./debian/update-deps.py

=== modified file 'debian/changelog'
--- debian/changelog	2019-02-11 19:56:59 +0000
+++ debian/changelog	2019-08-25 13:07:52 +0000
@@ -1,3 +1,13 @@
+bzr-git (0.6.13+bzr1650+brz) UNRELEASED; urgency=medium
+
+  * Make the package a transitional package to upgrade to brz.
+  * Move transitional package bzr-git to oldlibs/optional per policy
+    4.0.1.
+  * Add missing dependency on quilt.
+  * Add missing dependency on quilt.
+
+ -- Jelmer Vernooij <[e-mail]>  Sun, 24 Feb 2019 00:32:01 +0000
+
 bzr-git (0.6.13+bzr1650-2) unstable; urgency=medium
 
   * Add debian/upstream/metadata.

=== removed file 'debian/compat'
--- debian/compat	2019-02-08 17:09:32 +0000
+++ debian/compat	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-10

=== modified file 'debian/control'
--- debian/control	2019-02-08 17:09:32 +0000
+++ debian/control	2019-08-25 13:07:52 +0000
@@ -3,25 +3,18 @@
 Priority: optional
 Maintainer: Debian Bazaar Maintainers <[e-mail]>
 Uploaders: Andrew Starr-Bochicchio <[e-mail]>, Jelmer Vernooij <[e-mail]>
-Build-Depends: debhelper (>= 10~), python (>= 2.6.6-3), python-tdb
-Build-Depends-Indep: bzr (<< 2.8.0), bzr (>= 2.5~), bzr-fastimport (>= 0.12.0+bzr351), python-bzrlib.tests | bzr (<= 2.4.0~beta1-2), python-dulwich (>= 0.19.11~), python-fastimport, python-subunit, python-testtools (>= 0.9.2), python-unittest2
+Build-Depends: debhelper-compat (= 12), quilt, quilt
 Standards-Version: 4.1.1
 Homepage: http://bazaar-vcs.org/BzrForeignBranches/Git
-Vcs-Bzr: https://code.launchpad.net/~debian-bazaar/debian/sid/bzr-git/unstable
-Vcs-Browser: https://code.launchpad.net/~debian-bazaar/debian/sid/bzr-git/unstable
+Vcs-Bzr: https://code.launchpad.net/~debian-bazaar/debian/sid/bzr-git/experimental
+Vcs-Browser: https://code.launchpad.net/~debian-bazaar/debian/sid/bzr-git/experimental
 
 Package: bzr-git
 Architecture: all
-Depends: bzr (<< 2.8.0), bzr (>= 2.5~), python-dulwich (>= 0.19.11~), ${misc:Depends}, ${python:Depends}
-Suggests: bzr-fastimport
-Recommends: python-tdb
-Enhances: bzr, git, loggerhead
-Provides: git-remote-bzr
-Description: Bazaar plugin providing Git integration
- This is a plugin for Bazaar that adds the ability to use Git repositories,
- both local and remote (git://, git+ssh:// and http://). It integrates with the
- regular Bazaar UI, and provides a new Bazaar subcommand `git-import` which
- imports all branches from a Git repository.
+Depends: ${misc:Depends}, brz, python3-dulwich
+Description: transitional dummy package
+ This is a transitional package, replacing the Bazaar packaging
+ with the Breezy packaging.
  .
- An experimental remote helper for Git that can push to and
- fetch from Bazaar branches is also provided.
+ It can be safely removed after an upgrade.
+Section: oldlibs

=== modified file 'debian/copyright'
--- debian/copyright	2018-09-20 17:32:54 +0000
+++ debian/copyright	2019-08-25 13:07:52 +0000
@@ -3,13 +3,6 @@
 Upstream-Contact: Jelmer Vernooij <[e-mail]>
 Source: http://launchpad.net/bzr-git/
 
-Files: *
-Copyright: 2006-2012, Canonical Ltd.
-           2008, John Carr
-           2007, David Allouche <[e-mail]>
-           2007-2012, Jelmer Vernooij <[e-mail]>
-License: GPL-2+
-
 Files: debian/*
 Copyright: 2007-2012 Jelmer Vernooij <[e-mail]>
 License: GPL-2+

=== removed file 'debian/manpages'
--- debian/manpages	2011-12-17 15:37:24 +0000
+++ debian/manpages	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-git-remote-bzr.1

=== removed file 'debian/pycompat'
--- debian/pycompat	2007-12-06 14:56:44 +0000
+++ debian/pycompat	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-2

=== modified file 'debian/rules'
--- debian/rules	2017-10-05 22:31:25 +0000
+++ debian/rules	2019-08-25 13:07:52 +0000
@@ -1,21 +1,8 @@
 #!/usr/bin/make -f
 
+override_dh_auto_build:
+
+override_dh_auto_install:
+
 %:
-	dh $* --buildsystem=python_distutils --with python2
-
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-CONCURRENCY = BZR_CONCURRENCY=$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-endif
-
-override_dh_auto_clean:
-	dh_auto_clean
-	find . -name "*.pyc" -print0 | xargs -0 rm -f
-
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-override_dh_auto_test:
-	$(CONCURRENCY) BZR_PLUGINS_AT=git@$(CURDIR) /usr/bin/bzr selftest --parallel=fork \
-	    -v -s bp.git
-endif
-
-override_dh_installchangelogs:
-	dh_installchangelogs NEWS
+	dh $*

=== modified file 'debian/source/format'
--- debian/source/format	2010-02-04 01:29:52 +0000
+++ debian/source/format	2019-08-25 13:07:52 +0000
@@ -1,1 +1,1 @@
-3.0 (quilt)
+3.0 (native)

=== removed directory 'debian/upstream'
=== removed file 'debian/upstream/metadata'
--- debian/upstream/metadata	2019-02-11 19:56:23 +0000
+++ debian/upstream/metadata	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-Name: bzr-git
-Repository: https://code.launchpad.net/~jelmer/bzr-git/trunk
-Repository-Browse: https://code.launchpad.net/~jelmer/bzr-git/trunk

=== removed file 'debian/upstream/signing-key.asc'
--- debian/upstream/signing-key.asc	2019-02-08 17:09:33 +0000
+++ debian/upstream/signing-key.asc	1970-01-01 00:00:00 +0000
@@ -1,366 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-1rbNHrKsS3nj/fGQlg==
-=udS2
------END PGP PUBLIC KEY BLOCK-----

=== removed file 'debian/watch'
--- debian/watch	2014-01-29 00:24:13 +0000
+++ debian/watch	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-version=3
-opts="pgpsigurlmangle=s/$/.asc/" \
-	http://samba.org/~jelmer/bzr/bzr-git-(.*).tar.gz

=== removed file 'dir.py'
--- dir.py	2017-06-05 23:51:37 +0000
+++ dir.py	1970-01-01 00:00:00 +0000
@@ -1,546 +0,0 @@
-# Copyright (C) 2007 Canonical Ltd
-# Copyright (C) 2010 Jelmer Vernooij
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.