pax_global_header 0000666 0000000 0000000 00000000064 13522242427 0014515 g ustar 00root root 0000000 0000000 52 comment=5392048fb1f68fe1cb0681c7b9fef1802dd74d06
svn2git-5392048fb1f68fe1cb0681c7b9fef1802dd74d06/ 0000775 0000000 0000000 00000000000 13522242427 0020124 5 ustar 00root root 0000000 0000000 svn2git-5392048fb1f68fe1cb0681c7b9fef1802dd74d06/.gitignore 0000664 0000000 0000000 00000000071 13522242427 0022112 0 ustar 00root root 0000000 0000000 Makefile
*~
*.o
svn-all-fast-export
src/local-config.pri
svn2git-5392048fb1f68fe1cb0681c7b9fef1802dd74d06/.travis.yaml 0000664 0000000 0000000 00000000655 13522242427 0022404 0 ustar 00root root 0000000 0000000 language: c++
dist: xenial
addons:
apt:
sources:
- sourceline: deb http://us.archive.ubuntu.com/ubuntu/ xenial-backports main restricted universe multiverse
- sourceline: deb http://us.archive.ubuntu.com/ubuntu/ xenial-updates main restricted
before_install:
- sudo apt update
- sudo apt install -y build-essential subversion git qtchooser qt5-default libapr1 libapr1-dev libsvn-dev
script: qmake && make
svn2git-5392048fb1f68fe1cb0681c7b9fef1802dd74d06/Dockerfile 0000664 0000000 0000000 00000000503 13522242427 0022114 0 ustar 00root root 0000000 0000000 FROM debian:8.11
RUN apt update && apt install -y \
make g++ libapr1-dev libsvn-dev libqt4-dev \
git subversion \
&& rm -rf /var/lib/apt/lists/* \
&& mkdir /usr/local/svn2git
ADD . /usr/local/svn2git
RUN cd /usr/local/svn2git && qmake && make
WORKDIR /workdir
CMD /usr/local/svn2git/svn-all-fast-export
svn2git-5392048fb1f68fe1cb0681c7b9fef1802dd74d06/LICENSE 0000664 0000000 0000000 00000104513 13522242427 0021135 0 ustar 00root root 0000000 0000000 GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc.
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The GNU General Public License is a free, copyleft license for
software and other kinds of works.
The licenses for most software and other practical works are designed
to take away your freedom to share and change the works. By contrast,
the GNU General Public License is intended to guarantee your freedom to
share and change all versions of a program--to make sure it remains free
software for all its users. We, the Free Software Foundation, use the
GNU General Public License for most of our software; it applies also to
any other work released this way by its authors. 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
them 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 prevent others from denying you
these rights or asking you to surrender the rights. Therefore, you have
certain responsibilities if you distribute copies of the software, or if
you modify it: responsibilities to respect the freedom of others.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must pass on to the recipients the same
freedoms that you received. 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.
Developers that use the GNU GPL protect your rights with two steps:
(1) assert copyright on the software, and (2) offer you this License
giving you legal permission to copy, distribute and/or modify it.
For the developers' and authors' protection, the GPL clearly explains
that there is no warranty for this free software. For both users' and
authors' sake, the GPL requires that modified versions be marked as
changed, so that their problems will not be attributed erroneously to
authors of previous versions.
Some devices are designed to deny users access to install or run
modified versions of the software inside them, although the manufacturer
can do so. This is fundamentally incompatible with the aim of
protecting users' freedom to change the software. The systematic
pattern of such abuse occurs in the area of products for individuals to
use, which is precisely where it is most unacceptable. Therefore, we
have designed this version of the GPL to prohibit the practice for those
products. If such problems arise substantially in other domains, we
stand ready to extend this provision to those domains in future versions
of the GPL, as needed to protect the freedom of users.
Finally, every program is threatened constantly by software patents.
States should not allow patents to restrict development and use of
software on general-purpose computers, but in those that do, we wish to
avoid the special danger that patents applied to a free program could
make it effectively proprietary. To prevent this, the GPL assures that
patents cannot be used to render the program non-free.
The precise terms and conditions for copying, distribution and
modification follow.
TERMS AND CONDITIONS
0. Definitions.
"This License" refers to version 3 of the GNU General Public License.
"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.
"The Program" refers to any copyrightable work licensed under this
License. Each licensee is addressed as "you". "Licensees" and
"recipients" may be individuals or organizations.
To "modify" a work means to copy from or adapt all or part of the work
in a fashion requiring copyright permission, other than the making of an
exact copy. The resulting work is called a "modified version" of the
earlier work or a work "based on" the earlier work.
A "covered work" means either the unmodified Program or a work based
on the Program.
To "propagate" a work means to do anything with it that, without
permission, would make you directly or secondarily liable for
infringement under applicable copyright law, except executing it on a
computer or modifying a private copy. Propagation includes copying,
distribution (with or without modification), making available to the
public, and in some countries other activities as well.
To "convey" a work means any kind of propagation that enables other
parties to make or receive copies. Mere interaction with a user through
a computer network, with no transfer of a copy, is not conveying.
An interactive user interface displays "Appropriate Legal Notices"
to the extent that it includes a convenient and prominently visible
feature that (1) displays an appropriate copyright notice, and (2)
tells the user that there is no warranty for the work (except to the
extent that warranties are provided), that licensees may convey the
work under this License, and how to view a copy of this License. If
the interface presents a list of user commands or options, such as a
menu, a prominent item in the list meets this criterion.
1. Source Code.
The "source code" for a work means the preferred form of the work
for making modifications to it. "Object code" means any non-source
form of a work.
A "Standard Interface" means an interface that either is an official
standard defined by a recognized standards body, or, in the case of
interfaces specified for a particular programming language, one that
is widely used among developers working in that language.
The "System Libraries" of an executable work include anything, other
than the work as a whole, that (a) is included in the normal form of
packaging a Major Component, but which is not part of that Major
Component, and (b) serves only to enable use of the work with that
Major Component, or to implement a Standard Interface for which an
implementation is available to the public in source code form. A
"Major Component", in this context, means a major essential component
(kernel, window system, and so on) of the specific operating system
(if any) on which the executable work runs, or a compiler used to
produce the work, or an object code interpreter used to run it.
The "Corresponding Source" for a work in object code form means all
the source code needed to generate, install, and (for an executable
work) run the object code and to modify the work, including scripts to
control those activities. However, it does not include the work's
System Libraries, or general-purpose tools or generally available free
programs which are used unmodified in performing those activities but
which are not part of the work. For example, Corresponding Source
includes interface definition files associated with source files for
the work, and the source code for shared libraries and dynamically
linked subprograms that the work is specifically designed to require,
such as by intimate data communication or control flow between those
subprograms and other parts of the work.
The Corresponding Source need not include anything that users
can regenerate automatically from other parts of the Corresponding
Source.
The Corresponding Source for a work in source code form is that
same work.
2. Basic Permissions.
All rights granted under this License are granted for the term of
copyright on the Program, and are irrevocable provided the stated
conditions are met. This License explicitly affirms your unlimited
permission to run the unmodified Program. The output from running a
covered work is covered by this License only if the output, given its
content, constitutes a covered work. This License acknowledges your
rights of fair use or other equivalent, as provided by copyright law.
You may make, run and propagate covered works that you do not
convey, without conditions so long as your license otherwise remains
in force. You may convey covered works to others for the sole purpose
of having them make modifications exclusively for you, or provide you
with facilities for running those works, provided that you comply with
the terms of this License in conveying all material for which you do
not control copyright. Those thus making or running the covered works
for you must do so exclusively on your behalf, under your direction
and control, on terms that prohibit them from making any copies of
your copyrighted material outside their relationship with you.
Conveying under any other circumstances is permitted solely under
the conditions stated below. Sublicensing is not allowed; section 10
makes it unnecessary.
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
No covered work shall be deemed part of an effective technological
measure under any applicable law fulfilling obligations under article
11 of the WIPO copyright treaty adopted on 20 December 1996, or
similar laws prohibiting or restricting circumvention of such
measures.
When you convey a covered work, you waive any legal power to forbid
circumvention of technological measures to the extent such circumvention
is effected by exercising rights under this License with respect to
the covered work, and you disclaim any intention to limit operation or
modification of the work as a means of enforcing, against the work's
users, your or third parties' legal rights to forbid circumvention of
technological measures.
4. Conveying Verbatim Copies.
You may convey 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;
keep intact all notices stating that this License and any
non-permissive terms added in accord with section 7 apply to the code;
keep intact all notices of the absence of any warranty; and give all
recipients a copy of this License along with the Program.
You may charge any price or no price for each copy that you convey,
and you may offer support or warranty protection for a fee.
5. Conveying Modified Source Versions.
You may convey a work based on the Program, or the modifications to
produce it from the Program, in the form of source code under the
terms of section 4, provided that you also meet all of these conditions:
a) The work must carry prominent notices stating that you modified
it, and giving a relevant date.
b) The work must carry prominent notices stating that it is
released under this License and any conditions added under section
7. This requirement modifies the requirement in section 4 to
"keep intact all notices".
c) You must license the entire work, as a whole, under this
License to anyone who comes into possession of a copy. This
License will therefore apply, along with any applicable section 7
additional terms, to the whole of the work, and all its parts,
regardless of how they are packaged. This License gives no
permission to license the work in any other way, but it does not
invalidate such permission if you have separately received it.
d) If the work has interactive user interfaces, each must display
Appropriate Legal Notices; however, if the Program has interactive
interfaces that do not display Appropriate Legal Notices, your
work need not make them do so.
A compilation of a covered work with other separate and independent
works, which are not by their nature extensions of the covered work,
and which are not combined with it such as to form a larger program,
in or on a volume of a storage or distribution medium, is called an
"aggregate" if the compilation and its resulting copyright are not
used to limit the access or legal rights of the compilation's users
beyond what the individual works permit. Inclusion of a covered work
in an aggregate does not cause this License to apply to the other
parts of the aggregate.
6. Conveying Non-Source Forms.
You may convey a covered work in object code form under the terms
of sections 4 and 5, provided that you also convey the
machine-readable Corresponding Source under the terms of this License,
in one of these ways:
a) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by the
Corresponding Source fixed on a durable physical medium
customarily used for software interchange.
b) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by a
written offer, valid for at least three years and valid for as
long as you offer spare parts or customer support for that product
model, to give anyone who possesses the object code either (1) a
copy of the Corresponding Source for all the software in the
product that is covered by this License, on a durable physical
medium customarily used for software interchange, for a price no
more than your reasonable cost of physically performing this
conveying of source, or (2) access to copy the
Corresponding Source from a network server at no charge.
c) Convey individual copies of the object code with a copy of the
written offer to provide the Corresponding Source. This
alternative is allowed only occasionally and noncommercially, and
only if you received the object code with such an offer, in accord
with subsection 6b.
d) Convey the object code by offering access from a designated
place (gratis or for a charge), and offer equivalent access to the
Corresponding Source in the same way through the same place at no
further charge. You need not require recipients to copy the
Corresponding Source along with the object code. If the place to
copy the object code is a network server, the Corresponding Source
may be on a different server (operated by you or a third party)
that supports equivalent copying facilities, provided you maintain
clear directions next to the object code saying where to find the
Corresponding Source. Regardless of what server hosts the
Corresponding Source, you remain obligated to ensure that it is
available for as long as needed to satisfy these requirements.
e) Convey the object code using peer-to-peer transmission, provided
you inform other peers where the object code and Corresponding
Source of the work are being offered to the general public at no
charge under subsection 6d.
A separable portion of the object code, whose source code is excluded
from the Corresponding Source as a System Library, need not be
included in conveying the object code work.
A "User Product" is either (1) a "consumer product", which means any
tangible personal property which is normally used for personal, family,
or household purposes, or (2) anything designed or sold for incorporation
into a dwelling. In determining whether a product is a consumer product,
doubtful cases shall be resolved in favor of coverage. For a particular
product received by a particular user, "normally used" refers to a
typical or common use of that class of product, regardless of the status
of the particular user or of the way in which the particular user
actually uses, or expects or is expected to use, the product. A product
is a consumer product regardless of whether the product has substantial
commercial, industrial or non-consumer uses, unless such uses represent
the only significant mode of use of the product.
"Installation Information" for a User Product means any methods,
procedures, authorization keys, or other information required to install
and execute modified versions of a covered work in that User Product from
a modified version of its Corresponding Source. The information must
suffice to ensure that the continued functioning of the modified object
code is in no case prevented or interfered with solely because
modification has been made.
If you convey an object code work under this section in, or with, or
specifically for use in, a User Product, and the conveying occurs as
part of a transaction in which the right of possession and use of the
User Product is transferred to the recipient in perpetuity or for a
fixed term (regardless of how the transaction is characterized), the
Corresponding Source conveyed under this section must be accompanied
by the Installation Information. But this requirement does not apply
if neither you nor any third party retains the ability to install
modified object code on the User Product (for example, the work has
been installed in ROM).
The requirement to provide Installation Information does not include a
requirement to continue to provide support service, warranty, or updates
for a work that has been modified or installed by the recipient, or for
the User Product in which it has been modified or installed. Access to a
network may be denied when the modification itself materially and
adversely affects the operation of the network or violates the rules and
protocols for communication across the network.
Corresponding Source conveyed, and Installation Information provided,
in accord with this section must be in a format that is publicly
documented (and with an implementation available to the public in
source code form), and must require no special password or key for
unpacking, reading or copying.
7. Additional Terms.
"Additional permissions" are terms that supplement the terms of this
License by making exceptions from one or more of its conditions.
Additional permissions that are applicable to the entire Program shall
be treated as though they were included in this License, to the extent
that they are valid under applicable law. If additional permissions
apply only to part of the Program, that part may be used separately
under those permissions, but the entire Program remains governed by
this License without regard to the additional permissions.
When you convey a copy of a covered work, you may at your option
remove any additional permissions from that copy, or from any part of
it. (Additional permissions may be written to require their own
removal in certain cases when you modify the work.) You may place
additional permissions on material, added by you to a covered work,
for which you have or can give appropriate copyright permission.
Notwithstanding any other provision of this License, for material you
add to a covered work, you may (if authorized by the copyright holders of
that material) supplement the terms of this License with terms:
a) Disclaiming warranty or limiting liability differently from the
terms of sections 15 and 16 of this License; or
b) Requiring preservation of specified reasonable legal notices or
author attributions in that material or in the Appropriate Legal
Notices displayed by works containing it; or
c) Prohibiting misrepresentation of the origin of that material, or
requiring that modified versions of such material be marked in
reasonable ways as different from the original version; or
d) Limiting the use for publicity purposes of names of licensors or
authors of the material; or
e) Declining to grant rights under trademark law for use of some
trade names, trademarks, or service marks; or
f) Requiring indemnification of licensors and authors of that
material by anyone who conveys the material (or modified versions of
it) with contractual assumptions of liability to the recipient, for
any liability that these contractual assumptions directly impose on
those licensors and authors.
All other non-permissive additional terms are considered "further
restrictions" within the meaning of section 10. If the Program as you
received it, or any part of it, contains a notice stating that it is
governed by this License along with a term that is a further
restriction, you may remove that term. If a license document contains
a further restriction but permits relicensing or conveying under this
License, you may add to a covered work material governed by the terms
of that license document, provided that the further restriction does
not survive such relicensing or conveying.
If you add terms to a covered work in accord with this section, you
must place, in the relevant source files, a statement of the
additional terms that apply to those files, or a notice indicating
where to find the applicable terms.
Additional terms, permissive or non-permissive, may be stated in the
form of a separately written license, or stated as exceptions;
the above requirements apply either way.
8. Termination.
You may not propagate or modify a covered work except as expressly
provided under this License. Any attempt otherwise to propagate or
modify it is void, and will automatically terminate your rights under
this License (including any patent licenses granted under the third
paragraph of section 11).
However, if you cease all violation of this License, then your
license from a particular copyright holder is reinstated (a)
provisionally, unless and until the copyright holder explicitly and
finally terminates your license, and (b) permanently, if the copyright
holder fails to notify you of the violation by some reasonable means
prior to 60 days after the cessation.
Moreover, your license from a particular copyright holder is
reinstated permanently if the copyright holder notifies you of the
violation by some reasonable means, this is the first time you have
received notice of violation of this License (for any work) from that
copyright holder, and you cure the violation prior to 30 days after
your receipt of the notice.
Termination of your rights under this section does not terminate the
licenses of parties who have received copies or rights from you under
this License. If your rights have been terminated and not permanently
reinstated, you do not qualify to receive new licenses for the same
material under section 10.
9. Acceptance Not Required for Having Copies.
You are not required to accept this License in order to receive or
run a copy of the Program. Ancillary propagation of a covered work
occurring solely as a consequence of using peer-to-peer transmission
to receive a copy likewise does not require acceptance. However,
nothing other than this License grants you permission to propagate or
modify any covered work. These actions infringe copyright if you do
not accept this License. Therefore, by modifying or propagating a
covered work, you indicate your acceptance of this License to do so.
10. Automatic Licensing of Downstream Recipients.
Each time you convey a covered work, the recipient automatically
receives a license from the original licensors, to run, modify and
propagate that work, subject to this License. You are not responsible
for enforcing compliance by third parties with this License.
An "entity transaction" is a transaction transferring control of an
organization, or substantially all assets of one, or subdividing an
organization, or merging organizations. If propagation of a covered
work results from an entity transaction, each party to that
transaction who receives a copy of the work also receives whatever
licenses to the work the party's predecessor in interest had or could
give under the previous paragraph, plus a right to possession of the
Corresponding Source of the work from the predecessor in interest, if
the predecessor has it or can get it with reasonable efforts.
You may not impose any further restrictions on the exercise of the
rights granted or affirmed under this License. For example, you may
not impose a license fee, royalty, or other charge for exercise of
rights granted under this License, and you may not initiate litigation
(including a cross-claim or counterclaim in a lawsuit) alleging that
any patent claim is infringed by making, using, selling, offering for
sale, or importing the Program or any portion of it.
11. Patents.
A "contributor" is a copyright holder who authorizes use under this
License of the Program or a work on which the Program is based. The
work thus licensed is called the contributor's "contributor version".
A contributor's "essential patent claims" are all patent claims
owned or controlled by the contributor, whether already acquired or
hereafter acquired, that would be infringed by some manner, permitted
by this License, of making, using, or selling its contributor version,
but do not include claims that would be infringed only as a
consequence of further modification of the contributor version. For
purposes of this definition, "control" includes the right to grant
patent sublicenses in a manner consistent with the requirements of
this License.
Each contributor grants you a non-exclusive, worldwide, royalty-free
patent license under the contributor's essential patent claims, to
make, use, sell, offer for sale, import and otherwise run, modify and
propagate the contents of its contributor version.
In the following three paragraphs, a "patent license" is any express
agreement or commitment, however denominated, not to enforce a patent
(such as an express permission to practice a patent or covenant not to
sue for patent infringement). To "grant" such a patent license to a
party means to make such an agreement or commitment not to enforce a
patent against the party.
If you convey a covered work, knowingly relying on a patent license,
and the Corresponding Source of the work is not available for anyone
to copy, free of charge and under the terms of this License, through a
publicly available network server or other readily accessible means,
then you must either (1) cause the Corresponding Source to be so
available, or (2) arrange to deprive yourself of the benefit of the
patent license for this particular work, or (3) arrange, in a manner
consistent with the requirements of this License, to extend the patent
license to downstream recipients. "Knowingly relying" means you have
actual knowledge that, but for the patent license, your conveying the
covered work in a country, or your recipient's use of the covered work
in a country, would infringe one or more identifiable patents in that
country that you have reason to believe are valid.
If, pursuant to or in connection with a single transaction or
arrangement, you convey, or propagate by procuring conveyance of, a
covered work, and grant a patent license to some of the parties
receiving the covered work authorizing them to use, propagate, modify
or convey a specific copy of the covered work, then the patent license
you grant is automatically extended to all recipients of the covered
work and works based on it.
A patent license is "discriminatory" if it does not include within
the scope of its coverage, prohibits the exercise of, or is
conditioned on the non-exercise of one or more of the rights that are
specifically granted under this License. You may not convey a covered
work if you are a party to an arrangement with a third party that is
in the business of distributing software, under which you make payment
to the third party based on the extent of your activity of conveying
the work, and under which the third party grants, to any of the
parties who would receive the covered work from you, a discriminatory
patent license (a) in connection with copies of the covered work
conveyed by you (or copies made from those copies), or (b) primarily
for and in connection with specific products or compilations that
contain the covered work, unless you entered into that arrangement,
or that patent license was granted, prior to 28 March 2007.
Nothing in this License shall be construed as excluding or limiting
any implied license or other defenses to infringement that may
otherwise be available to you under applicable patent law.
12. No Surrender of Others' Freedom.
If 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 convey a
covered work so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you may
not convey it at all. For example, if you agree to terms that obligate you
to collect a royalty for further conveying from those to whom you convey
the Program, the only way you could satisfy both those terms and this
License would be to refrain entirely from conveying the Program.
13. Use with the GNU Affero General Public License.
Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
under version 3 of the GNU Affero General Public License into a single
combined work, and to convey the resulting work. The terms of this
License will continue to apply to the part which is the covered work,
but the special requirements of the GNU Affero General Public License,
section 13, concerning interaction through a network will apply to the
combination as such.
14. Revised Versions of this License.
The Free Software Foundation may publish revised and/or new versions of
the GNU 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 that a certain numbered version of the GNU General
Public License "or any later version" applies to it, you have the
option of following the terms and conditions either of that numbered
version or of any later version published by the Free Software
Foundation. If the Program does not specify a version number of the
GNU General Public License, you may choose any version ever published
by the Free Software Foundation.
If the Program specifies that a proxy can decide which future
versions of the GNU General Public License can be used, that proxy's
public statement of acceptance of a version permanently authorizes you
to choose that version for the Program.
Later license versions may give you additional or different
permissions. However, no additional obligations are imposed on any
author or copyright holder as a result of your choosing to follow a
later version.
15. Disclaimer of Warranty.
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.
16. Limitation of Liability.
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
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.
17. Interpretation of Sections 15 and 16.
If the disclaimer of warranty and limitation of liability provided
above cannot be given local legal effect according to their terms,
reviewing courts shall apply local law that most closely approximates
an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
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
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
Copyright (C)
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 3 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, see .
Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
Copyright (C)
This program 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, your program's commands
might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
.
The GNU 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 Lesser General
Public License instead of this License. But first, please read
.
svn2git-5392048fb1f68fe1cb0681c7b9fef1802dd74d06/README.md 0000664 0000000 0000000 00000013223 13522242427 0021404 0 ustar 00root root 0000000 0000000 svn-all-fast-export aka svn2git
===============================
This project contains all the tools required to do a conversion of an svn repository (server side, not a checkout) to one or more git repositories.
This is the tool used to convert KDE's Subversion into multiple Git repositories. You can find more description and usage examples at https://techbase.kde.org/Projects/MoveToGit/UsingSvn2Git
How does it work
----------------
The svn2git repository gets you an application that will do the actual conversion.
The conversion exists of looping over each and every commit in the subversion repository and matching the changes to a ruleset after which the changes are applied to a certain path in a git repo.
The ruleset can specify which git repository to use and thus you can have more than one git repository as a result of running the conversion.
Also noteworthy is that you can have a rule that, for example, changes in svnrepo/branches/foo/2.1/ will appear as a git-branch in a repository.
If you have a proper ruleset the tool will create the git repositories for you and show progress while converting commit by commit.
After it is done you likely want to run `git repack -a -d -f` to compress the pack file as it can get quite big.
Running as Docker image
-----------------------
Just mount your SVN folder, plus another working directory where Git repository will be created.
Sample usage with input mounted in /tmp and output produced in /workdir:
```
docker build -t svn2git .
docker run --rm -it -v `pwd`/workdir:/workdir -v /var/lib/svn/project1:/tmp/svn -v `pwd`/conf:/tmp/conf svn2git /usr/local/svn2git/svn-all-fast-export --identity-map /tmp/conf/project1.authors --rules /tmp/conf/project1.rules --add-metadata --svn-branches --debug-rules --svn-ignore --empty-dirs /tmp/svn/
```
Building the tool
-----------------
Run `qmake && make`. You get `./svn-all-fast-export`.
(Do a checkout of the repo .git' and run qmake and make. You can only build it after having installed libsvn-dev, and naturally Qt. Running the command will give you all the options you can pass to the tool.)
You will need to have some packages to compile it. For Ubuntu distros, use this command to install them all:
`sudo apt-get install build-essential subversion git qtchooser qt5-default libapr1 libapr1-dev libsvn-dev`
KDE
---
there is a repository kde-ruleset which has several example files and one file that should become the final ruleset for the whole of KDE called 'kde-rules-main'.
Write the Rules
---------------
You need to write a rules file that describes how to slice the Subversion history into Git repositories and branches. See https://techbase.kde.org/Projects/MoveToGit/UsingSvn2Git.
The rules are also documented in the 'samples' directory of the svn2git repository. Feel free to add more documentation here as well.
Rules
-----
### `create respository`
```
create repository REPOSITORY NAME
[PARAMETERS...]
end repository
```
`PARAMETERS` is any number of:
- `repository TARGET REPOSITORY` Creates a forwarding repository , which allows for redirecting to another repository, typically with some `prefix`.
- `prefix PREFIX` prefixes each file with `PREFIX`, allowing for merging repositories.
- `description DESCRIPTION TEXT` writes a `DESCRIPTION TEXT` to the `description` file in the repository
### `match`
```
match REGEX
[PARAMETERS...]
end match
```
Creates a rule that matches paths by `REGEX` and applies some `PARAMETERS` to them. Matching groups can be created, and the values used in the parameters.
`PARAMETERS` is any number of:
- `repository TARGET REPOSITORY` determines the repository
- `branch BRANCH NAME` determines which branch this path will be placed in. Can also be used to make lightweight tags with `refs/tags/TAG NAME` although note that tags in SVN are not always a single commit, and will not be created correctly unless they are a single copy from somewhere else, with no further changes. See also `annotate true` to make them annotated tags.
- `[min|max] revision REVISION NUMBER` only match if revision is above/below the specified revision number
- `prefix PREFIX` prefixes each file with `PREFIX`, allowing for merging repositories. Same as when used in a `create repository` stanza.
- Note that this will create a separate commit for each prefix matched, even if they were in the same SVN revision.
- `substitute [repository|branch] s/PATTERN/REPLACEMENT/` performs a regex substitution on the repository or branch name. Useful when eliminating characters not supported in git branch names.
- `action ACTION` determines the action to take, from the below three:
- `export` I have no idea what this does
- `ignore` ignores this path
- `recurse` tells svn2git to ignore this path and continue searching it's children.
- `annotate true` creates annotated tags instead of lightweight tags
### `include FILENAME`
Include the contents of another rules file
### `declare VAR=VALUE`
Define variables that can be referenced later. `${VAR}` in any line will be replaced by `VALUE`.
Work flow
---------
Please feel free to fill this section in.
Some SVN tricks
---------------
You can access your newly rsynced SVN repo with commands like `svn ls file:///path/to/repo/trunk/KDE`.
A common issue is tracking when an item left playground for kdereview and then went from kdereview to its final destination. There is no straightforward way to do this. So the following command comes in handy: `svn log -v file:///path/to/repo/kde-svn/kde/trunk/kdereview | grep /trunk/kdereview/mplayerthumbs -A 5 -B 5` This will print all commits relevant to the package you are trying to track. You can also pipe the above command to head or tail to see the the first and last commit it was in that directory.
svn2git-5392048fb1f68fe1cb0681c7b9fef1802dd74d06/fast-export2.pro 0000664 0000000 0000000 00000000060 13522242427 0023200 0 ustar 00root root 0000000 0000000 TEMPLATE = subdirs
# Directories
SUBDIRS = src
svn2git-5392048fb1f68fe1cb0681c7b9fef1802dd74d06/samples/ 0000775 0000000 0000000 00000000000 13522242427 0021570 5 ustar 00root root 0000000 0000000 svn2git-5392048fb1f68fe1cb0681c7b9fef1802dd74d06/samples/ignore-branch.rules 0000664 0000000 0000000 00000001066 13522242427 0025365 0 ustar 00root root 0000000 0000000 #
# Declare the repositories we know about:
#
create repository myproject
end repository
#
# Declare the rules
# Note: rules must end in a slash
#
match /trunk/
repository myproject
branch master
end match
# Ignore this branch:
# We ignore a branch by not telling svn-all-fast-export what to do
# with this path
# Note that rules are applied in order of appearance, so this rule
# must appear before the generic branch rule
match /branches/abandoned-work/
end match
match /branches/([^/]+)/
repository myproject
branch \1
end match
# No tag processing
svn2git-5392048fb1f68fe1cb0681c7b9fef1802dd74d06/samples/merged-branches-tags.rules 0000664 0000000 0000000 00000001205 13522242427 0026624 0 ustar 00root root 0000000 0000000 #
# Declare the repositories we know about:
#
create repository myproject
end repository
#
# Declare the rules
# Note: rules must end in a slash
#
match /trunk/
repository myproject
branch master
end match
# Subversion doesn't understand the Git concept of tags
# In Subversion, tags are really branches
#
# Only a post-processing (i.e., after converting to Git) of the tag
# branches can we be sure that a tag wasn't moved or changed from the
# branch it was copied from
#
# So we don't pretend that SVN tags are Git tags and then import
# everything as one
match /(branches|tags)/([^/]+)/
repository myproject
branch \2
end match
svn2git-5392048fb1f68fe1cb0681c7b9fef1802dd74d06/samples/min-max-revision.rules 0000664 0000000 0000000 00000001350 13522242427 0026045 0 ustar 00root root 0000000 0000000 #
# Declare the repositories we know about:
#
create repository myproject
end repository
#
# Declare the rules
# Note: rules must end in a slash
#
# Ignore this particular revision in trunk
# See ignore-branch.rules first
# Note that rules are applied in order of appearance, so this rule
# must appear before the generic trunk rule
match /trunk/
min revision 123
max revision 123
end match
# Stop importing trunk
# If we don't specify a max revision, then there is no limit
# The same applies to min revision (i.e., min revision is 0)
match /trunk/
min revision 1234
end match
match /trunk/
repository myproject
branch master
end match
match /branches/([^/]+)/
repository myproject
branch \1
end match
# No tag processing
svn2git-5392048fb1f68fe1cb0681c7b9fef1802dd74d06/samples/recurse.rules 0000664 0000000 0000000 00000001246 13522242427 0024317 0 ustar 00root root 0000000 0000000 #
# Declare the repositories we know about:
#
create repository project1
end repository
create repository project2
end repository
#
# Declare the rules
# Note: rules must end in a slash
#
match /trunk/([^/]+)/
repository \1
branch master
end match
#
# SVN layout:
# /branches/branchname/project1
# /branches/branchname/project2
match /branches/([^/]+)/([^/]+)/
repository \2
branch \1
end match
#
# Example of the recurse rule:
# We tell svn-all-fast-export to not import anything
# but to go inside and recurse in the subdirs
# Note how the ending slash is missing in this particular case
match /branches/[^/]+
action recurse
end match
# No tag processing
svn2git-5392048fb1f68fe1cb0681c7b9fef1802dd74d06/samples/standardlayout.rules 0000664 0000000 0000000 00000001414 13522242427 0025702 0 ustar 00root root 0000000 0000000 #
# Declare the repositories we know about:
#
create repository myproject
end repository
#
# Declare the rules
# Note: rules must end in a slash
#
match /trunk/
repository myproject
branch master
end match
match /branches/([^/]+)/
repository myproject
branch \1
end match
# Important:
# Subversion doesn't understand the Git concept of tags
# In Subversion, tags are really branches
#
# Only a post-processing (i.e., after converting to Git) of the tag
# branches can we be sure that a tag wasn't moved or changed from the
# branch it was copied from
#
# This rule will create tags that don't exist in any of the
# branches. It's not what you want.
# See the merged-branches-tags.rules file
match /tags/([^/]+)/
repository myproject
branch refs/tags/\1
end match
svn2git-5392048fb1f68fe1cb0681c7b9fef1802dd74d06/samples/two-projects.rules 0000664 0000000 0000000 00000000750 13522242427 0025306 0 ustar 00root root 0000000 0000000 #
# Declare the repositories we know about:
#
create repository project1
end repository
create repository project2
end repository
#
# Declare the rules
# Note: rules must end in a slash
#
match /project1/trunk/
repository project1
branch master
end match
match /project2/trunk/
repository project2
branch master
end match
# Note how we can use regexp to capture the repository name
match /([^/]+)/branches/([^/]+)/
repository \1
branch \2
end match
# No tag processing
svn2git-5392048fb1f68fe1cb0681c7b9fef1802dd74d06/src/ 0000775 0000000 0000000 00000000000 13522242427 0020713 5 ustar 00root root 0000000 0000000 svn2git-5392048fb1f68fe1cb0681c7b9fef1802dd74d06/src/CommandLineParser.cpp 0000664 0000000 0000000 00000031343 13522242427 0024766 0 ustar 00root root 0000000 0000000 /*
* This file is part of the vng project
* Copyright (C) 2008 Thomas Zander
*
* 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 3 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, see .
*/
#include "CommandLineParser.h"
#include
#include
#include
#include
#include
CommandLineParser *CommandLineParser::self = 0;
class CommandLineParser::Private
{
public:
Private(int argc, char **argv);
// functions
void addDefinitions(const CommandLineOption * options);
void setArgumentDefinition(const char *definition);
void parse();
// variables;
const int argumentCount;
char ** const argumentStrings;
bool dirty;
int requiredArguments;
QString argumentDefinition;
struct OptionDefinition {
OptionDefinition() : optionalParameters(0), requiredParameters(0) { }
QString name;
QString comment;
QChar shortName;
int optionalParameters;
int requiredParameters;
};
// result of what the user typed
struct ParsedOption {
QString option;
QList parameters;
};
QList definitions;
QHash options;
QList arguments;
QList undefinedOptions;
QList errors;
};
CommandLineParser::Private::Private(int argc, char **argv)
: argumentCount(argc), argumentStrings(argv), dirty(true),
requiredArguments(0)
{
}
void CommandLineParser::Private::addDefinitions(const CommandLineOption * options)
{
for (int i=0; options[i].specification != 0; i++) {
OptionDefinition definition;
QString option = QString::fromLatin1(options[i].specification);
// options with optional params are written as "--option required[, optional]
if (option.indexOf(QLatin1Char(',')) >= 0 && ( option.indexOf(QLatin1Char('[')) < 0 || option.indexOf(QLatin1Char(']')) < 0) ) {
QStringList optionParts = option.split(QLatin1Char(','), QString::SkipEmptyParts);
if (optionParts.count() != 2) {
qWarning() << "WARN: option definition '" << option << "' is faulty; only one ',' allowed";
continue;
}
foreach (QString s, optionParts) {
s = s.trimmed();
if (s.startsWith(QLatin1String("--")) && s.length() > 2)
definition.name = s.mid(2);
else if (s.startsWith(QLatin1String("-")) && s.length() > 1)
definition.shortName = s.at(1);
else {
qWarning() << "WARN: option definition '" << option << "' is faulty; the option should start with a -";
break;
}
}
}
else if (option.startsWith(QLatin1String("--")) && option.length() > 2)
definition.name = option.mid(2);
else
qWarning() << "WARN: option definition '" << option << "' has unrecognized format. See the api docs for CommandLineParser for a howto";
if(definition.name.isEmpty())
continue;
if (option.indexOf(QLatin1Char(' ')) > 0) {
QStringList optionParts = definition.name.split(QLatin1Char(' '), QString::SkipEmptyParts);
definition.name = optionParts[0];
bool first = true;
foreach (QString s, optionParts) {
if (first) {
first = false;
continue;
}
s = s.trimmed();
if (s[0].unicode() == '[' && s.endsWith(QLatin1Char(']')))
definition.optionalParameters++;
else
definition.requiredParameters++;
}
}
definition.comment = QString::fromLatin1(options[i].description);
definitions << definition;
}
/*
foreach (OptionDefinition def, definitions) {
qDebug() << "definition:" << (def.shortName != 0 ? def.shortName : QChar(32)) << "|" << def.name << "|" << def.comment
<< "|" << def.requiredParameters << "+" << def.optionalParameters;
}
*/
dirty = true;
}
void CommandLineParser::Private::setArgumentDefinition(const char *defs)
{
requiredArguments = 0;
argumentDefinition = QString::fromLatin1(defs);
QStringList optionParts = argumentDefinition.split(QLatin1Char(' '), QString::SkipEmptyParts);
bool inArg = false;
foreach (QString s, optionParts) {
s = s.trimmed();
if (s[0].unicode() == '<') {
inArg = true;
requiredArguments++;
}
else if (s[0].unicode() == '[')
inArg = true;
if (s.endsWith(QLatin1Char('>')))
inArg = false;
else if (!inArg)
requiredArguments++;
}
}
void CommandLineParser::Private::parse()
{
if (dirty == false)
return;
errors.clear();
options.clear();
arguments.clear();
undefinedOptions.clear();
dirty = false;
class OptionProcessor {
public:
OptionProcessor(Private *d) : clp(d) { }
void next(Private::ParsedOption &option) {
if (! option.option.isEmpty()) {
// find the definition to match.
OptionDefinition def;
foreach (Private::OptionDefinition definition, clp->definitions) {
if (definition.name == option.option) {
def = definition;
break;
}
}
if (! def.name.isEmpty() && def.requiredParameters >= option.parameters.count() &&
def.requiredParameters + def.optionalParameters <= option.parameters.count())
clp->options.insert(option.option, option);
else if (!clp->undefinedOptions.contains(option.option))
clp->undefinedOptions << option.option;
else
clp->errors.append(QLatin1String("Not enough arguments passed for option `")
+ option.option +QLatin1Char('\''));
}
option.option.clear();
option.parameters.clear();
}
private:
CommandLineParser::Private *clp;
};
OptionProcessor processor(this);
bool optionsAllowed = true;
ParsedOption option;
OptionDefinition currentDefinition;
for (int i = 1; i < argumentCount; i++) {
QString arg = QString::fromLocal8Bit(argumentStrings[i]);
if (optionsAllowed) {
if (arg == QLatin1String("--")) {
optionsAllowed = false;
continue;
}
if (arg.startsWith(QLatin1String("--"))) {
processor.next(option);
int end = arg.indexOf(QLatin1Char('='));
option.option = arg.mid(2, end - 2);
if (end > 0)
option.parameters << arg.mid(end+1);
continue;
}
if (arg[0].unicode() == '-' && arg.length() > 1) {
for (int x = 1; x < arg.length(); x++) {
bool resolved = false;
foreach (OptionDefinition definition, definitions) {
if (definition.shortName == arg[x]) {
resolved = true;
processor.next(option);
currentDefinition = definition;
option.option = definition.name;
if (definition.requiredParameters == 1 && arg.length() >= x+2) {
option.parameters << arg.mid(x+1, arg.length());
x = arg.length();
}
break;
}
}
if (!resolved) { // nothing found; copy char so it ends up in unrecognized
option.option = arg[x];
processor.next(option);
}
}
continue;
}
}
if (! option.option.isEmpty()) {
if (currentDefinition.name != option.option) {
// find the definition to match.
foreach (OptionDefinition definition, definitions) {
if (definition.name == option.option) {
currentDefinition = definition;
break;
}
}
}
if (currentDefinition.requiredParameters + currentDefinition.optionalParameters <= option.parameters.count())
processor.next(option);
}
if (option.option.isEmpty())
arguments << arg;
else
option.parameters << arg;
}
processor.next(option);
if (requiredArguments > arguments.count())
errors.append(QLatin1String("Not enough arguments, usage: ") + QString::fromLocal8Bit(argumentStrings[0])
+ QLatin1Char(' ') + argumentDefinition);
/*
foreach (QString key, options.keys()) {
ParsedOption p = options[key];
qDebug() << "-> " << p.option;
foreach (QString v, p.parameters)
qDebug() << " +" << v;
}
qDebug() << "---";
foreach (QString arg, arguments) {
qDebug() << arg;
}
*/
}
// -----------------------------------
// static
void CommandLineParser::init(int argc, char **argv)
{
if (self)
delete self;
self = new CommandLineParser(argc, argv);
}
// static
void CommandLineParser::addOptionDefinitions(const CommandLineOption * optionList)
{
if (!self) {
qWarning() << "WARN: CommandLineParser:: Use init before addOptionDefinitions!";
return;
}
self->d->addDefinitions(optionList);
}
// static
CommandLineParser *CommandLineParser::instance()
{
return self;
}
// static
void CommandLineParser::setArgumentDefinition(const char *definition)
{
if (!self) {
qWarning() << "WARN: CommandLineParser:: Use init before addOptionDefinitions!";
return;
}
self->d->setArgumentDefinition(definition);
}
CommandLineParser::CommandLineParser(int argc, char **argv)
: d(new Private(argc, argv))
{
}
CommandLineParser::~CommandLineParser()
{
delete d;
}
void CommandLineParser::usage(const QString &name, const QString &argumentDescription)
{
QTextStream cout(stdout, QIODevice::WriteOnly);
cout << "Usage: " << d->argumentStrings[0];
if (! name.isEmpty())
cout << " " << name;
if (d->definitions.count())
cout << " [OPTION]";
if (! argumentDescription.isEmpty())
cout << " " << argumentDescription;
cout << endl << endl;
if (d->definitions.count() > 0)
cout << "Options:" << endl;
int commandLength = 0;
foreach (Private::OptionDefinition definition, d->definitions)
commandLength = qMax(definition.name.length(), commandLength);
foreach (Private::OptionDefinition definition, d->definitions) {
cout << " ";
if (definition.shortName == 0)
cout << " --";
else
cout << "-" << definition.shortName << " --";
cout << definition.name;
for (int i = definition.name.length(); i <= commandLength; i++)
cout << ' ';
cout << definition.comment <parse();
return d->options.keys();
}
bool CommandLineParser::contains(const QString & key) const
{
d->parse();
return d->options.contains(key);
}
QStringList CommandLineParser::arguments() const
{
d->parse();
return d->arguments;
}
QStringList CommandLineParser::undefinedOptions() const
{
d->parse();
return d->undefinedOptions;
}
QString CommandLineParser::optionArgument(const QString &optionName, const QString &defaultValue) const
{
QStringList answer = optionArguments(optionName);
if (answer.isEmpty())
return defaultValue;
return answer.first();
}
QStringList CommandLineParser::optionArguments(const QString &optionName) const
{
if (! contains(optionName))
return QStringList();
Private::ParsedOption po = d->options[optionName];
return po.parameters;
}
QStringList CommandLineParser::parseErrors() const
{
d->parse();
return d->errors;
}
svn2git-5392048fb1f68fe1cb0681c7b9fef1802dd74d06/src/CommandLineParser.h 0000664 0000000 0000000 00000007110 13522242427 0024426 0 ustar 00root root 0000000 0000000 /*
* This file is part of the vng project
* Copyright (C) 2008 Thomas Zander
*
* 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 3 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, see .
*/
#ifndef COMMANDLINEPARSER_H
#define COMMANDLINEPARSER_H
#include
struct CommandLineOption {
/**
* The specification of an option includes the name of the option the user must pass and optional arguments it has.
* Example specifications are;
*
* - "-a, --all"
* - "--version"
* - "--type name"
* - "--list item[,item]"
* - "-f, --format name [suffix] [foo]"
* Number 1 allows the user to either type -a or --all (or /A on Windows) to activate this option.
* Number 2 allows the user to type --version to activate this option.
* Number 3 requires the user to type a single argument after the option.
* Number 4 allows the user to use an option that takes a required argument and one or more optional ones
* Number 5 Allows the user to either use -f or --format, which is followed by one required argument
* and optionally 2 more arguments.
*/
const char *specification;
/**
* A textual description of the option that will be printed when the user asks for help.
*/
const char *description;
};
#define CommandLineLastOption { 0, 0 }
/**
* The CommandLineParser singleton
*/
class CommandLineParser
{
public:
static void init(int argc, char *argv[]);
static void addOptionDefinitions(const CommandLineOption *definitions);
static void setArgumentDefinition(const char *definition);
static CommandLineParser *instance();
~CommandLineParser();
void usage(const QString &name, const QString &argumentDescription = QString());
/// return the options that the user passed
QStringList options() const;
/**
* returns true if the option was found.
* Consider the following definition "--expert level" The user can type as an argument
* "--expert 10". Calling contains("expert") will return true.
* @see optionArgument()
*/
bool contains(const QString & key) const;
/// returns the list of items that are not options, note that the first one is the name of the command called
QStringList arguments() const;
/// return the list of options that the user passed but we don't have a definition for.
QStringList undefinedOptions() const;
/**
* Return the argument passed to an option.
* Consider the following definition "--expert level" The user can type as an argument
* "--expert 10". Calling optionArgument("expert") will return a string "10"
* @see contains()
*/
QString optionArgument(const QString &optionName, const QString &defaultValue = QString()) const;
QStringList optionArguments(const QString &optionName) const;
QStringList parseErrors() const;
private:
CommandLineParser(int argc, char **argv);
class Private;
Private * const d;
static CommandLineParser *self;
};
#endif
svn2git-5392048fb1f68fe1cb0681c7b9fef1802dd74d06/src/main.cpp 0000664 0000000 0000000 00000024563 13522242427 0022355 0 ustar 00root root 0000000 0000000 /*
* Copyright (C) 2007 Thiago Macieira
*
* 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 3 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, see .
*/
#include
#include
#include
#include
#include
#include
#include
#include "CommandLineParser.h"
#include "ruleparser.h"
#include "repository.h"
#include "svn.h"
QHash loadIdentityMapFile(const QString &fileName)
{
QHash result;
if (fileName.isEmpty())
return result;
QFile file(fileName);
if (!file.open(QIODevice::ReadOnly)) {
fprintf(stderr, "Could not open file %s: %s",
qPrintable(fileName), qPrintable(file.errorString()));
return result;
}
while (!file.atEnd()) {
QByteArray line = file.readLine();
int comment_pos = line.indexOf('#');
if (comment_pos != -1)
line.truncate(comment_pos);
line = line.trimmed();
int space = line.indexOf(' ');
if (space == -1)
continue; // invalid line
// Support git-svn author files, too
// - svn2git native: loginname Joe User
// - git-svn: loginname = Joe User
int rightspace = line.indexOf(" = ");
int leftspace = space;
if (rightspace == -1) {
rightspace = space;
} else {
leftspace = rightspace;
rightspace += 2;
}
QByteArray realname = line.mid(rightspace).trimmed();
line.truncate(leftspace);
result.insert(line, realname);
};
file.close();
return result;
}
QSet loadRevisionsFile( const QString &fileName, Svn &svn )
{
QRegExp revint("(\\d+)\\s*(?:-\\s*(\\d+|HEAD))?");
QSet revisions;
if(fileName.isEmpty())
return revisions;
QFile file(fileName);
if( !file.open(QIODevice::ReadOnly)) {
fprintf(stderr, "Could not open file %s: %s\n", qPrintable(fileName), qPrintable(file.errorString()));
return revisions;
}
bool ok;
while(!file.atEnd()) {
QByteArray line = file.readLine().trimmed();
revint.indexIn(line);
if( revint.cap(2).isEmpty() ) {
int rev = revint.cap(1).toInt(&ok);
if(ok) {
revisions.insert(rev);
} else {
fprintf(stderr, "Unable to convert %s to int, skipping revision.\n", qPrintable(QString(line)));
}
} else if( revint.captureCount() == 2 ) {
int rev = revint.cap(1).toInt(&ok);
if(!ok) {
fprintf(stderr, "Unable to convert %s (%s) to int, skipping revisions.\n", qPrintable(revint.cap(1)), qPrintable(QString(line)));
continue;
}
int lastrev = 0;
if(revint.cap(2) == "HEAD") {
lastrev = svn.youngestRevision();
ok = true;
} else {
lastrev = revint.cap(2).toInt(&ok);
}
if(!ok) {
fprintf(stderr, "Unable to convert %s (%s) to int, skipping revisions.\n", qPrintable(revint.cap(2)), qPrintable(QString(line)));
continue;
}
for(; rev <= lastrev; ++rev )
revisions.insert(rev);
} else {
fprintf(stderr, "Unable to convert %s to int, skipping revision.\n", qPrintable(QString(line)));
}
}
file.close();
return revisions;
}
static const CommandLineOption options[] = {
{"--identity-map FILENAME", "provide map between svn username and email"},
{"--identity-domain DOMAIN", "provide user domain if no map was given"},
{"--revisions-file FILENAME", "provide a file with revision number that should be processed"},
{"--rules FILENAME[,FILENAME]", "the rules file(s) that determines what goes where"},
{"--msg-filter FILENAME", "External program / script to modify svn log message"},
{"--add-metadata", "if passed, each git commit will have svn commit info"},
{"--add-metadata-notes", "if passed, each git commit will have notes with svn commit info"},
{"--resume-from revision", "start importing at svn revision number"},
{"--max-rev revision", "stop importing at svn revision number"},
{"--dry-run", "don't actually write anything"},
{"--create-dump", "don't create the repository but a dump file suitable for piping into fast-import"},
{"--debug-rules", "print what rule is being used for each file"},
{"--commit-interval NUMBER", "if passed the cache will be flushed to git every NUMBER of commits"},
{"--stats", "after a run print some statistics about the rules"},
{"--svn-branches", "Use the contents of SVN when creating branches, Note: SVN tags are branches as well"},
{"--empty-dirs", "Add .gitignore-file for empty dirs"},
{"--svn-ignore", "Import svn-ignore-properties via .gitignore"},
{"--propcheck", "Check for svn-properties except svn-ignore"},
{"--fast-import-timeout SECONDS", "number of seconds to wait before terminating fast-import, 0 to wait forever"},
{"-h, --help", "show help"},
{"-v, --version", "show version"},
CommandLineLastOption
};
int main(int argc, char **argv)
{
printf("Invoked as:'");
for(int i = 0; i < argc; ++i)
printf(" %s", argv[i]);
printf("'\n");
CommandLineParser::init(argc, argv);
CommandLineParser::addOptionDefinitions(options);
Stats::init();
CommandLineParser *args = CommandLineParser::instance();
if(args->contains(QLatin1String("version"))) {
printf("Git version: %s\n", VER);
return 0;
}
if (args->contains(QLatin1String("help")) || args->arguments().count() != 1) {
args->usage(QString(), "[Path to subversion repo]");
return 0;
}
if (args->undefinedOptions().count()) {
QTextStream out(stderr);
out << "svn-all-fast-export failed: ";
bool first = true;
foreach (QString option, args->undefinedOptions()) {
if (!first)
out << " : ";
out << "unrecognized option or missing argument for; `" << option << "'" << endl;
first = false;
}
return 10;
}
if (!args->contains("rules")) {
QTextStream out(stderr);
out << "svn-all-fast-export failed: please specify the rules using the 'rules' argument\n";
return 11;
}
if (!args->contains("identity-map") && !args->contains("identity-domain")) {
QTextStream out(stderr);
out << "WARNING; no identity-map or -domain specified, all commits will use default @localhost email address\n\n";
}
QCoreApplication app(argc, argv);
// Load the configuration
RulesList rulesList(args->optionArgument(QLatin1String("rules")));
rulesList.load();
int resume_from = args->optionArgument(QLatin1String("resume-from")).toInt();
int max_rev = args->optionArgument(QLatin1String("max-rev")).toInt();
// create the repository list
QHash repositories;
int cutoff = resume_from ? resume_from : INT_MAX;
retry:
int min_rev = 1;
foreach (Rules::Repository rule, rulesList.allRepositories()) {
Repository *repo = createRepository(rule, repositories);
if (!repo)
return EXIT_FAILURE;
repositories.insert(rule.name, repo);
int repo_next = repo->setupIncremental(cutoff);
repo->restoreAnnotatedTags();
repo->restoreBranchNotes();
/*
* cutoff < resume_from => error exit eventually
* repo_next == cutoff => probably truncated log
*/
if (cutoff < resume_from && repo_next == cutoff)
/*
* Restore the log file so we fail the next time
* svn2git is invoked with the same arguments
*/
repo->restoreLog();
if (cutoff < min_rev)
/*
* We've rewound before the last revision of some
* repository that we've already seen. Start over
* from the beginning. (since cutoff is decreasing,
* we're sure we'll make forward progress eventually)
*/
goto retry;
if (min_rev < repo_next)
min_rev = repo_next;
}
if (cutoff < resume_from) {
qCritical() << "Cannot resume from" << resume_from
<< "as there are errors in revision" << cutoff;
return EXIT_FAILURE;
}
if (min_rev < resume_from)
qDebug() << "skipping revisions" << min_rev << "to" << resume_from - 1 << "as requested";
if (resume_from)
min_rev = resume_from;
Svn::initialize();
Svn svn(args->arguments().first());
svn.setMatchRules(rulesList.allMatchRules());
svn.setRepositories(repositories);
svn.setIdentityMap(loadIdentityMapFile(args->optionArgument("identity-map")));
// Massage user input a little, no guarantees that input makes sense.
QString domain = args->optionArgument("identity-domain").simplified().remove(QChar('@'));
if (domain.isEmpty())
domain = QString("localhost");
svn.setIdentityDomain(domain);
if (max_rev < 1)
max_rev = svn.youngestRevision();
bool errors = false;
QSet revisions = loadRevisionsFile(args->optionArgument(QLatin1String("revisions-file")), svn);
const bool filerRevisions = !revisions.isEmpty();
for (int i = min_rev; i <= max_rev; ++i) {
if(filerRevisions) {
if( !revisions.contains(i) ) {
printf(".");
continue;
} else {
printf("\n");
}
}
if (!svn.exportRevision(i)) {
errors = true;
break;
}
}
foreach (Repository *repo, repositories) {
repo->finalizeTags();
repo->saveBranchNotes();
delete repo;
}
Stats::instance()->printStats();
return errors ? EXIT_FAILURE : EXIT_SUCCESS;
}
svn2git-5392048fb1f68fe1cb0681c7b9fef1802dd74d06/src/repository.cpp 0000664 0000000 0000000 00000117336 13522242427 0023651 0 ustar 00root root 0000000 0000000 /*
* Copyright (C) 2007 Thiago Macieira
* Copyright (C) 2009 Thomas Zander
*
* 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 3 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, see .
*/
#include "repository.h"
#include "CommandLineParser.h"
#include
#include
#include
#include
#include
#include
static const int maxSimultaneousProcesses = 100;
typedef unsigned long long mark_t;
static const mark_t maxMark = ULONG_MAX;
class FastImportRepository : public Repository
{
public:
struct AnnotatedTag
{
QString supportingRef;
QByteArray svnprefix;
QByteArray author;
QByteArray log;
uint dt;
int revnum;
};
class Transaction : public Repository::Transaction
{
Q_DISABLE_COPY(Transaction)
friend class FastImportRepository;
FastImportRepository *repository;
QByteArray branch;
QByteArray svnprefix;
QByteArray author;
QByteArray log;
uint datetime;
int revnum;
QVector merges;
QStringList deletedFiles;
QByteArray modifiedFiles;
inline Transaction() {}
public:
~Transaction();
int commit();
void setAuthor(const QByteArray &author);
void setDateTime(uint dt);
void setLog(const QByteArray &log);
void noteCopyFromBranch (const QString &prevbranch, int revFrom);
void deleteFile(const QString &path);
QIODevice *addFile(const QString &path, int mode, qint64 length);
bool commitNote(const QByteArray ¬eText, bool append,
const QByteArray &commit = QByteArray());
};
FastImportRepository(const Rules::Repository &rule);
int setupIncremental(int &cutoff);
void restoreAnnotatedTags();
void restoreBranchNotes();
void restoreLog();
~FastImportRepository();
void reloadBranches();
int createBranch(const QString &branch, int revnum,
const QString &branchFrom, int revFrom);
int deleteBranch(const QString &branch, int revnum);
Repository::Transaction *newTransaction(const QString &branch, const QString &svnprefix, int revnum);
void createAnnotatedTag(const QString &name, const QString &svnprefix, int revnum,
const QByteArray &author, uint dt,
const QByteArray &log);
void finalizeTags();
void saveBranchNotes();
void commit();
bool branchExists(const QString& branch) const;
const QByteArray branchNote(const QString& branch) const;
void setBranchNote(const QString& branch, const QByteArray& noteText);
bool hasPrefix() const;
QString getName() const;
Repository *getEffectiveRepository();
private:
struct Branch
{
int created;
QVector commits;
QVector marks;
};
QHash branches;
QHash branchNotes;
QHash annotatedTags;
QString name;
QString prefix;
LoggingQProcess fastImport;
int commitCount;
int outstandingTransactions;
QByteArray deletedBranches;
QByteArray resetBranches;
QSet deletedBranchNames;
QSet resetBranchNames;
/* Optional filter to fix up log messages */
QProcess filterMsg;
QByteArray msgFilter(QByteArray);
/* starts at 0, and counts up. */
mark_t last_commit_mark;
/* starts at maxMark - 1 and counts down. Reset after each SVN revision */
mark_t next_file_mark;
bool processHasStarted;
void startFastImport();
void closeFastImport();
// called when a transaction is deleted
void forgetTransaction(Transaction *t);
int resetBranch(const QString &branch, int revnum, mark_t mark, const QByteArray &resetTo, const QByteArray &comment);
long long markFrom(const QString &branchFrom, int branchRevNum, QByteArray &desc);
friend class ProcessCache;
Q_DISABLE_COPY(FastImportRepository)
};
class ForwardingRepository : public Repository
{
QString name;
Repository *repo;
QString prefix;
public:
class Transaction : public Repository::Transaction
{
Q_DISABLE_COPY(Transaction)
Repository::Transaction *txn;
QString prefix;
public:
Transaction(Repository::Transaction *t, const QString &p) : txn(t), prefix(p) {}
~Transaction() { delete txn; }
int commit() { return txn->commit(); }
void setAuthor(const QByteArray &author) { txn->setAuthor(author); }
void setDateTime(uint dt) { txn->setDateTime(dt); }
void setLog(const QByteArray &log) { txn->setLog(log); }
void noteCopyFromBranch (const QString &prevbranch, int revFrom)
{ txn->noteCopyFromBranch(prevbranch, revFrom); }
void deleteFile(const QString &path) { txn->deleteFile(prefix + path); }
QIODevice *addFile(const QString &path, int mode, qint64 length)
{ return txn->addFile(prefix + path, mode, length); }
bool commitNote(const QByteArray ¬eText, bool append,
const QByteArray &commit)
{ return txn->commitNote(noteText, append, commit); }
};
ForwardingRepository(const QString &n, Repository *r, const QString &p) : name(n), repo(r), prefix(p) {}
int setupIncremental(int &) { return 1; }
void restoreAnnotatedTags() {}
void restoreBranchNotes() {}
void restoreLog() {}
void reloadBranches() { return repo->reloadBranches(); }
int createBranch(const QString &branch, int revnum,
const QString &branchFrom, int revFrom)
{ return repo->createBranch(branch, revnum, branchFrom, revFrom); }
int deleteBranch(const QString &branch, int revnum)
{ return repo->deleteBranch(branch, revnum); }
Repository::Transaction *newTransaction(const QString &branch, const QString &svnprefix, int revnum)
{
Repository::Transaction *t = repo->newTransaction(branch, svnprefix, revnum);
return new Transaction(t, prefix);
}
void createAnnotatedTag(const QString &name, const QString &svnprefix, int revnum,
const QByteArray &author, uint dt,
const QByteArray &log)
{ repo->createAnnotatedTag(name, svnprefix, revnum, author, dt, log); }
void finalizeTags() { /* loop that called this will invoke it on 'repo' too */ }
void saveBranchNotes() { /* loop that called this will invoke it on 'repo' too */ }
void commit() { repo->commit(); }
bool branchExists(const QString& branch) const
{ return repo->branchExists(branch); }
const QByteArray branchNote(const QString& branch) const
{ return repo->branchNote(branch); }
void setBranchNote(const QString& branch, const QByteArray& noteText)
{ repo->setBranchNote(branch, noteText); }
bool hasPrefix() const
{ return !prefix.isEmpty() || repo->hasPrefix(); }
QString getName() const
{ return name; }
Repository *getEffectiveRepository()
{ return repo->getEffectiveRepository(); }
};
class ProcessCache: QLinkedList
{
public:
void touch(FastImportRepository *repo)
{
remove(repo);
// if the cache is too big, remove from the front
while (size() >= maxSimultaneousProcesses)
takeFirst()->closeFastImport();
// append to the end
append(repo);
}
inline void remove(FastImportRepository *repo)
{
#if QT_VERSION >= 0x040400
removeOne(repo);
#else
removeAll(repo);
#endif
}
};
static ProcessCache processCache;
QDataStream &operator<<(QDataStream &out, const FastImportRepository::AnnotatedTag &annotatedTag)
{
out << annotatedTag.supportingRef
<< annotatedTag.svnprefix
<< annotatedTag.author
<< annotatedTag.log
<< (quint64) annotatedTag.dt
<< (qint64) annotatedTag.revnum;
return out;
}
QDataStream &operator>>(QDataStream &in, FastImportRepository::AnnotatedTag &annotatedTag)
{
quint64 dt;
qint64 revnum;
in >> annotatedTag.supportingRef
>> annotatedTag.svnprefix
>> annotatedTag.author
>> annotatedTag.log
>> dt
>> revnum;
annotatedTag.dt = (uint) dt;
annotatedTag.revnum = (int) revnum;
return in;
}
Repository *createRepository(const Rules::Repository &rule, const QHash &repositories)
{
if (rule.forwardTo.isEmpty())
return new FastImportRepository(rule);
Repository *r = repositories[rule.forwardTo];
if (!r) {
qCritical() << "no repository with name" << rule.forwardTo << "found at" << rule.info();
return r;
}
return new ForwardingRepository(rule.name, r, rule.prefix);
}
static QString marksFileName(QString name)
{
name.replace('/', '_');
name.prepend("marks-");
return name;
}
static QString annotatedTagsFileName(QString name)
{
name.replace('/', '_');
name.prepend("annotatedTags-");
return name;
}
static QString branchNotesFileName(QString name)
{
name.replace('/', '_');
name.prepend("branchNotes-");
return name;
}
FastImportRepository::FastImportRepository(const Rules::Repository &rule)
: name(rule.name), prefix(rule.forwardTo), fastImport(name), commitCount(0), outstandingTransactions(0),
last_commit_mark(0), next_file_mark(maxMark - 1), processHasStarted(false)
{
foreach (Rules::Repository::Branch branchRule, rule.branches) {
Branch branch;
branch.created = 1;
branches.insert(branchRule.name, branch);
}
// create the default branch
branches["master"].created = 1;
if (!CommandLineParser::instance()->contains("dry-run") && !CommandLineParser::instance()->contains("create-dump")) {
fastImport.setWorkingDirectory(name);
if (!QDir(name).exists()) { // repo doesn't exist yet.
qDebug() << "Creating new repository" << name;
QDir::current().mkpath(name);
QProcess init;
init.setWorkingDirectory(name);
init.start("git", QStringList() << "--bare" << "init");
init.waitForFinished(-1);
QProcess casesensitive;
casesensitive.setWorkingDirectory(name);
casesensitive.start("git", QStringList() << "config" << "core.ignorecase" << "false");
casesensitive.waitForFinished(-1);
// Write description
if (!rule.description.isEmpty()) {
QFile fDesc(QDir(name).filePath("description"));
if (fDesc.open(QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Text)) {
fDesc.write(rule.description.toUtf8());
fDesc.putChar('\n');
fDesc.close();
}
}
{
QFile marks(name + "/" + marksFileName(name));
marks.open(QIODevice::WriteOnly);
marks.close();
}
}
}
}
static QString logFileName(QString name)
{
name.replace('/', '_');
if (CommandLineParser::instance()->contains("create-dump"))
name.append(".fi");
else
name.prepend("log-");
return name;
}
static mark_t lastValidMark(QString name)
{
QFile marksfile(name + "/" + marksFileName(name));
if (!marksfile.open(QIODevice::ReadOnly))
return 0;
qDebug() << "marksfile " << marksfile.fileName() ;
mark_t prev_mark = 0;
int lineno = 0;
while (!marksfile.atEnd()) {
QString line = marksfile.readLine();
++lineno;
if (line.isEmpty())
continue;
mark_t mark = 0;
if (line[0] == ':') {
int sp = line.indexOf(' ');
if (sp != -1) {
QString m = line.mid(1, sp-1);
mark = m.toULongLong();
}
}
if (!mark) {
qCritical() << marksfile.fileName() << "line" << lineno << "marks file corrupt?" << "mark " << mark;
return 0;
}
if (mark == prev_mark) {
qCritical() << marksfile.fileName() << "line" << lineno << "marks file has duplicates";
return 0;
}
if (mark < prev_mark) {
qCritical() << marksfile.fileName() << "line" << lineno << "marks file not sorted";
return 0;
}
if (mark > prev_mark + 1)
break;
prev_mark = mark;
}
return prev_mark;
}
int FastImportRepository::setupIncremental(int &cutoff)
{
QFile logfile(logFileName(name));
if (!logfile.exists())
return 1;
logfile.open(QIODevice::ReadWrite);
QRegExp progress("progress SVN r(\\d+) branch (.*) = :(\\d+)");
mark_t last_valid_mark = lastValidMark(name);
int last_revnum = 0;
qint64 pos = 0;
int retval = 0;
QString bkup = logfile.fileName() + ".old";
while (!logfile.atEnd()) {
pos = logfile.pos();
QByteArray line = logfile.readLine();
int hash = line.indexOf('#');
if (hash != -1)
line.truncate(hash);
line = line.trimmed();
if (line.isEmpty())
continue;
if (!progress.exactMatch(line))
continue;
int revnum = progress.cap(1).toInt();
QString branch = progress.cap(2);
mark_t mark = progress.cap(3).toULongLong();
if (revnum >= cutoff)
goto beyond_cutoff;
if (revnum < last_revnum)
qWarning() << "WARN:" << name << "revision numbers are not monotonic: "
<< "got" << QString::number(last_revnum)
<< "and then" << QString::number(revnum);
if (mark > last_valid_mark) {
qWarning() << "WARN:" << name << "unknown commit mark found: rewinding -- did you hit Ctrl-C?";
cutoff = revnum;
goto beyond_cutoff;
}
last_revnum = revnum;
if (last_commit_mark < mark)
last_commit_mark = mark;
Branch &br = branches[branch];
if (!br.created || !mark || br.marks.isEmpty() || !br.marks.last())
br.created = revnum;
br.commits.append(revnum);
br.marks.append(mark);
}
retval = last_revnum + 1;
if (retval == cutoff)
/*
* If a stale backup file exists already, remove it, so that
* we don't confuse ourselves in 'restoreLog()'
*/
QFile::remove(bkup);
return retval;
beyond_cutoff:
// backup file, since we'll truncate
QFile::remove(bkup);
logfile.copy(bkup);
// truncate, so that we ignore the rest of the revisions
qDebug() << name << "truncating history to revision" << cutoff;
logfile.resize(pos);
return cutoff;
}
void FastImportRepository::restoreAnnotatedTags()
{
QFile annotatedTagsFile(name + "/" + annotatedTagsFileName(name));
if (!annotatedTagsFile.exists())
return;
annotatedTagsFile.open(QIODevice::ReadOnly);
QDataStream annotatedTagsStream(&annotatedTagsFile);
annotatedTagsStream >> annotatedTags;
annotatedTagsFile.close();
}
void FastImportRepository::restoreBranchNotes()
{
QFile branchNotesFile(name + "/" + branchNotesFileName(name));
if (!branchNotesFile.exists())
return;
branchNotesFile.open(QIODevice::ReadOnly);
QDataStream branchNotesStream(&branchNotesFile);
branchNotesStream >> branchNotes;
branchNotesFile.close();
}
void FastImportRepository::restoreLog()
{
QString file = logFileName(name);
QString bkup = file + ".old";
if (!QFile::exists(bkup))
return;
QFile::remove(file);
QFile::rename(bkup, file);
}
FastImportRepository::~FastImportRepository()
{
Q_ASSERT(outstandingTransactions == 0);
closeFastImport();
}
void FastImportRepository::closeFastImport()
{
if (fastImport.state() != QProcess::NotRunning) {
int fastImportTimeout = CommandLineParser::instance()->optionArgument(QLatin1String("fast-import-timeout"), QLatin1String("30")).toInt();
if(fastImportTimeout == 0) {
qDebug() << "Waiting forever for fast-import to finish.";
fastImportTimeout = -1;
} else {
qDebug() << "Waiting" << fastImportTimeout << "seconds for fast-import to finish.";
fastImportTimeout *= 10000;
}
fastImport.write("checkpoint\n");
fastImport.waitForBytesWritten(-1);
fastImport.closeWriteChannel();
if (!fastImport.waitForFinished(fastImportTimeout)) {
fastImport.terminate();
if (!fastImport.waitForFinished(200))
qWarning() << "WARN: git-fast-import for repository" << name << "did not die";
}
}
processHasStarted = false;
processCache.remove(this);
}
void FastImportRepository::reloadBranches()
{
bool reset_notes = false;
foreach (QString branch, branches.keys()) {
Branch &br = branches[branch];
if (br.marks.isEmpty() || !br.marks.last())
continue;
reset_notes = true;
QByteArray branchRef = branch.toUtf8();
if (!branchRef.startsWith("refs/"))
branchRef.prepend("refs/heads/");
startFastImport();
fastImport.write("reset " + branchRef +
"\nfrom :" + QByteArray::number(br.marks.last()) + "\n\n"
"progress Branch " + branchRef + " reloaded\n");
}
if (reset_notes &&
CommandLineParser::instance()->contains("add-metadata-notes")) {
startFastImport();
fastImport.write("reset refs/notes/commits\nfrom :" +
QByteArray::number(maxMark) +
"\n");
}
}
long long FastImportRepository::markFrom(const QString &branchFrom, int branchRevNum, QByteArray &branchFromDesc)
{
Branch &brFrom = branches[branchFrom];
if (!brFrom.created)
return -1;
if (brFrom.commits.isEmpty()) {
return -1;
}
if (branchRevNum == brFrom.commits.last()) {
return brFrom.marks.last();
}
QVector::const_iterator it = qUpperBound(brFrom.commits, branchRevNum);
if (it == brFrom.commits.begin()) {
return 0;
}
int closestCommit = *--it;
if (!branchFromDesc.isEmpty()) {
branchFromDesc += " at r" + QByteArray::number(branchRevNum);
if (closestCommit != branchRevNum) {
branchFromDesc += " => r" + QByteArray::number(closestCommit);
}
}
return brFrom.marks[it - brFrom.commits.begin()];
}
int FastImportRepository::createBranch(const QString &branch, int revnum,
const QString &branchFrom, int branchRevNum)
{
QByteArray branchFromDesc = "from branch " + branchFrom.toUtf8();
long long mark = markFrom(branchFrom, branchRevNum, branchFromDesc);
if (mark == -1) {
qCritical() << branch << "in repository" << name
<< "is branching from branch" << branchFrom
<< "but the latter doesn't exist. Can't continue.";
return EXIT_FAILURE;
}
QByteArray branchFromRef = ":" + QByteArray::number(mark);
if (!mark) {
qWarning() << "WARN:" << branch << "in repository" << name << "is branching but no exported commits exist in repository"
<< "creating an empty branch.";
branchFromRef = branchFrom.toUtf8();
if (!branchFromRef.startsWith("refs/"))
branchFromRef.prepend("refs/heads/");
branchFromDesc += ", deleted/unknown";
}
qDebug() << "Creating branch:" << branch << "from" << branchFrom << "(" << branchRevNum << branchFromDesc << ")";
// Preserve note
branchNotes[branch] = branchNotes.value(branchFrom);
return resetBranch(branch, revnum, mark, branchFromRef, branchFromDesc);
}
int FastImportRepository::deleteBranch(const QString &branch, int revnum)
{
static QByteArray null_sha(40, '0');
return resetBranch(branch, revnum, 0, null_sha, "delete");
}
int FastImportRepository::resetBranch(const QString &branch, int revnum, mark_t mark, const QByteArray &resetTo, const QByteArray &comment)
{
QByteArray branchRef = branch.toUtf8();
if (!branchRef.startsWith("refs/"))
branchRef.prepend("refs/heads/");
Branch &br = branches[branch];
QByteArray backupCmd;
if (br.created && br.created != revnum && !br.marks.isEmpty() && br.marks.last()) {
QByteArray backupBranch;
if ((comment == "delete") && branchRef.startsWith("refs/heads/"))
backupBranch = "refs/tags/backups/" + branchRef.mid(11) + "@" + QByteArray::number(revnum);
else
backupBranch = "refs/backups/r" + QByteArray::number(revnum) + branchRef.mid(4);
qWarning() << "WARN: backing up branch" << branch << "to" << backupBranch;
backupCmd = "reset " + backupBranch + "\nfrom " + branchRef + "\n\n";
}
br.created = revnum;
br.commits.append(revnum);
br.marks.append(mark);
QByteArray cmd = "reset " + branchRef + "\nfrom " + resetTo + "\n\n"
"progress SVN r" + QByteArray::number(revnum)
+ " branch " + branch.toUtf8() + " = :" + QByteArray::number(mark)
+ " # " + comment + "\n\n";
if(comment == "delete") {
deletedBranches.append(backupCmd).append(cmd);
deletedBranchNames.insert(branchRef);
} else {
resetBranches.append(backupCmd).append(cmd);
resetBranchNames.insert(branchRef);
}
return EXIT_SUCCESS;
}
void FastImportRepository::commit()
{
if (deletedBranches.isEmpty() && resetBranches.isEmpty()) {
return;
}
startFastImport();
fastImport.write(deletedBranches);
fastImport.write(resetBranches);
deletedBranches.clear();
resetBranches.clear();
QSet::ConstIterator it = deletedBranchNames.constBegin();
for ( ; it != deletedBranchNames.constEnd(); ++it) {
QString tagName = *it;
if (resetBranchNames.contains(tagName))
continue;
if (tagName.startsWith("refs/tags/"))
tagName.remove(0, 10);
if (annotatedTags.remove(tagName) > 0) {
qDebug() << "Removing annotated tag" << tagName << "for" << name;
}
}
deletedBranchNames.clear();
resetBranchNames.clear();
}
Repository::Transaction *FastImportRepository::newTransaction(const QString &branch, const QString &svnprefix,
int revnum)
{
if (!branches.contains(branch)) {
qWarning() << "WARN: Transaction:" << branch << "is not a known branch in repository" << name << endl
<< "Going to create it automatically";
}
Transaction *txn = new Transaction;
txn->repository = this;
txn->branch = branch.toUtf8();
txn->svnprefix = svnprefix.toUtf8();
txn->datetime = 0;
txn->revnum = revnum;
if ((++commitCount % CommandLineParser::instance()->optionArgument(QLatin1String("commit-interval"), QLatin1String("10000")).toInt()) == 0) {
startFastImport();
// write everything to disk every 10000 commits
fastImport.write("checkpoint\n");
qDebug() << "checkpoint!, marks file truncated";
}
outstandingTransactions++;
return txn;
}
void FastImportRepository::forgetTransaction(Transaction *)
{
if (!--outstandingTransactions)
next_file_mark = maxMark - 1;
}
void FastImportRepository::createAnnotatedTag(const QString &ref, const QString &svnprefix,
int revnum,
const QByteArray &author, uint dt,
const QByteArray &log)
{
QString tagName = ref;
if (tagName.startsWith("refs/tags/"))
tagName.remove(0, 10);
if (!annotatedTags.contains(tagName))
printf("\nCreating annotated tag %s (%s) for %s\n", qPrintable(tagName), qPrintable(ref), qPrintable(name));
else
printf("\nRe-creating annotated tag %s for %s\n", qPrintable(tagName), qPrintable(name));
AnnotatedTag &tag = annotatedTags[tagName];
tag.supportingRef = ref;
tag.svnprefix = svnprefix.toUtf8();
tag.revnum = revnum;
tag.author = author;
tag.log = log;
tag.dt = dt;
}
void FastImportRepository::finalizeTags()
{
if (annotatedTags.isEmpty())
return;
QFile annotatedTagsFile(name + "/" + annotatedTagsFileName(name));
annotatedTagsFile.open(QIODevice::WriteOnly);
QDataStream annotatedTagsStream(&annotatedTagsFile);
annotatedTagsStream << annotatedTags;
annotatedTagsFile.close();
printf("Finalising annotated tags for %s...", qPrintable(name));
startFastImport();
QHash::ConstIterator it = annotatedTags.constBegin();
for ( ; it != annotatedTags.constEnd(); ++it) {
const QString &tagName = it.key();
const AnnotatedTag &tag = it.value();
QByteArray message = tag.log;
if (!message.endsWith('\n'))
message += '\n';
if (CommandLineParser::instance()->contains("add-metadata"))
message += "\n" + formatMetadataMessage(tag.svnprefix, tag.revnum, tagName.toUtf8());
{
QByteArray branchRef = tag.supportingRef.toUtf8();
if (!branchRef.startsWith("refs/"))
branchRef.prepend("refs/heads/");
QByteArray s = "progress Creating annotated tag " + tagName.toUtf8() + " from ref " + branchRef + "\n"
+ "tag " + tagName.toUtf8() + "\n"
+ "from " + branchRef + "\n"
+ "tagger " + tag.author + ' ' + QByteArray::number(tag.dt) + " +0000" + "\n"
+ "data " + QByteArray::number( message.length() ) + "\n";
fastImport.write(s);
}
fastImport.write(message);
fastImport.putChar('\n');
if (!fastImport.waitForBytesWritten(-1))
qFatal("Failed to write to process: %s", qPrintable(fastImport.errorString()));
// Append note to the tip commit of the supporting ref. There is no
// easy way to attach a note to the tag itself with fast-import.
if (CommandLineParser::instance()->contains("add-metadata-notes")) {
Repository::Transaction *txn = newTransaction(tag.supportingRef, tag.svnprefix, tag.revnum);
txn->setAuthor(tag.author);
txn->setDateTime(tag.dt);
bool written = txn->commitNote(formatMetadataMessage(tag.svnprefix, tag.revnum, tagName.toUtf8()), true);
delete txn;
if (written && !fastImport.waitForBytesWritten(-1))
qFatal("Failed to write to process: %s", qPrintable(fastImport.errorString()));
}
printf(" %s", qPrintable(tagName));
fflush(stdout);
}
while (fastImport.bytesToWrite())
if (!fastImport.waitForBytesWritten(-1))
qFatal("Failed to write to process: %s", qPrintable(fastImport.errorString()));
printf("\n");
}
void FastImportRepository::saveBranchNotes()
{
if (branchNotes.isEmpty())
return;
QFile branchNotesFile(name + "/" + branchNotesFileName(name));
branchNotesFile.open(QIODevice::WriteOnly);
QDataStream branchNotesStream(&branchNotesFile);
branchNotesStream << branchNotes;
branchNotesFile.close();
}
QByteArray
FastImportRepository::msgFilter(QByteArray msg)
{
QByteArray output = msg;
if (CommandLineParser::instance()->contains("msg-filter")) {
if (filterMsg.state() == QProcess::Running)
qFatal("filter process already running?");
filterMsg.start(CommandLineParser::instance()->optionArgument("msg-filter"));
if(!(filterMsg.waitForStarted(-1)))
qFatal("Failed to Start Filter %d %s", __LINE__, qPrintable(filterMsg.errorString()));
filterMsg.write(msg);
filterMsg.closeWriteChannel();
filterMsg.waitForFinished();
output = filterMsg.readAllStandardOutput();
}
return output;
}
void FastImportRepository::startFastImport()
{
processCache.touch(this);
if (fastImport.state() == QProcess::NotRunning) {
if (processHasStarted)
qFatal("git-fast-import has been started once and crashed?");
processHasStarted = true;
// start the process
QString marksFile = marksFileName(name);
QStringList marksOptions;
marksOptions << "--import-marks=" + marksFile;
marksOptions << "--export-marks=" + marksFile;
marksOptions << "--force";
fastImport.setStandardOutputFile(logFileName(name), QIODevice::Append);
fastImport.setProcessChannelMode(QProcess::MergedChannels);
if (!CommandLineParser::instance()->contains("dry-run") && !CommandLineParser::instance()->contains("create-dump")) {
fastImport.start("git", QStringList() << "fast-import" << marksOptions);
} else {
fastImport.start("cat", QStringList());
}
fastImport.waitForStarted(-1);
reloadBranches();
}
}
QByteArray Repository::formatMetadataMessage(const QByteArray &svnprefix, int revnum, const QByteArray &tag)
{
QByteArray msg = "svn path=" + svnprefix + "; revision=" + QByteArray::number(revnum);
if (!tag.isEmpty())
msg += "; tag=" + tag;
msg += "\n";
return msg;
}
bool FastImportRepository::branchExists(const QString& branch) const
{
return branches.contains(branch);
}
const QByteArray FastImportRepository::branchNote(const QString& branch) const
{
return branchNotes.value(branch);
}
void FastImportRepository::setBranchNote(const QString& branch, const QByteArray& noteText)
{
if (branches.contains(branch))
branchNotes[branch] = noteText;
}
bool FastImportRepository::hasPrefix() const
{
return !prefix.isEmpty();
}
QString FastImportRepository::getName() const
{
return name;
}
Repository *FastImportRepository::getEffectiveRepository()
{
return this;
}
FastImportRepository::Transaction::~Transaction()
{
repository->forgetTransaction(this);
}
void FastImportRepository::Transaction::setAuthor(const QByteArray &a)
{
author = a;
}
void FastImportRepository::Transaction::setDateTime(uint dt)
{
datetime = dt;
}
void FastImportRepository::Transaction::setLog(const QByteArray &l)
{
log = l;
}
void FastImportRepository::Transaction::noteCopyFromBranch(const QString &branchFrom, int branchRevNum)
{
if(branch == branchFrom) {
qWarning() << "WARN: Cannot merge inside a branch";
return;
}
static QByteArray dummy;
long long mark = repository->markFrom(branchFrom, branchRevNum, dummy);
Q_ASSERT(dummy.isEmpty());
if (mark == -1) {
qWarning() << "WARN:" << branch << "is copying from branch" << branchFrom
<< "but the latter doesn't exist. Continuing, assuming the files exist.";
} else if (mark == 0) {
qWarning() << "WARN: Unknown revision r" << QByteArray::number(branchRevNum)
<< ". Continuing, assuming the files exist.";
} else {
qWarning() << "WARN: repository " + repository->name + " branch " + branch + " has some files copied from " + branchFrom + "@" + QByteArray::number(branchRevNum);
if (!merges.contains(mark)) {
merges.append(mark);
qDebug() << "adding" << branchFrom + "@" + QByteArray::number(branchRevNum) << ":" << mark << "as a merge point";
} else {
qDebug() << "merge point already recorded";
}
}
}
void FastImportRepository::Transaction::deleteFile(const QString &path)
{
QString pathNoSlash = repository->prefix + path;
if(pathNoSlash.endsWith('/'))
pathNoSlash.chop(1);
deletedFiles.append(pathNoSlash);
}
QIODevice *FastImportRepository::Transaction::addFile(const QString &path, int mode, qint64 length)
{
mark_t mark = repository->next_file_mark--;
// in case the two mark allocations meet, we might as well just abort
Q_ASSERT(mark > repository->last_commit_mark + 1);
if (modifiedFiles.capacity() == 0)
modifiedFiles.reserve(2048);
modifiedFiles.append("M ");
modifiedFiles.append(QByteArray::number(mode, 8));
modifiedFiles.append(" :");
modifiedFiles.append(QByteArray::number(mark));
modifiedFiles.append(' ');
modifiedFiles.append(repository->prefix + path.toUtf8());
modifiedFiles.append("\n");
// it is returned for being written to, so start the process in any case
repository->startFastImport();
if (!CommandLineParser::instance()->contains("dry-run")) {
repository->fastImport.writeNoLog("blob\nmark :");
repository->fastImport.writeNoLog(QByteArray::number(mark));
repository->fastImport.writeNoLog("\ndata ");
repository->fastImport.writeNoLog(QByteArray::number(length));
repository->fastImport.writeNoLog("\n", 1);
}
return &repository->fastImport;
}
bool FastImportRepository::Transaction::commitNote(const QByteArray ¬eText, bool append, const QByteArray &commit)
{
QByteArray branchRef = branch;
if (!branchRef.startsWith("refs/"))
{
branchRef.prepend("refs/heads/");
}
const QByteArray &commitRef = commit.isNull() ? branchRef : commit;
QByteArray message = "Adding Git note for current " + commitRef + "\n";
QByteArray text = noteText;
if (noteText[noteText.size() - 1] != '\n')
{
text += '\n';
}
QByteArray branchNote = repository->branchNote(branch);
if (!branchNote.isEmpty() && (branchNote[branchNote.size() - 1] != '\n'))
{
branchNote += '\n';
}
if (append && commit.isNull() &&
repository->branchExists(branch) &&
!branchNote.isEmpty())
{
int i = branchNote.indexOf(text);
if ((i == 0) || ((i != -1) && (branchNote[i - 1] == '\n')))
{
// note is already present at the start or somewhere within following a newline
return false;
}
text = branchNote + text;
message = "Appending Git note for current " + commitRef + "\n";
}
QByteArray s("");
s.append("commit refs/notes/commits\n");
s.append("mark :" + QByteArray::number(maxMark) + "\n");
s.append("committer " + author + " " + QString::number(datetime) + " +0000" + "\n");
s.append("data " + QString::number(message.length()) + "\n");
s.append(message + "\n");
s.append("N inline " + commitRef + "\n");
s.append("data " + QString::number(text.length()) + "\n");
s.append(text + "\n");
repository->startFastImport();
repository->fastImport.write(s);
if (commit.isNull())
{
repository->setBranchNote(QString::fromUtf8(branch), text);
}
return true;
}
int FastImportRepository::Transaction::commit()
{
foreach (QString branchName, repository->branches.keys())
{
if (branchName.toUtf8().startsWith(branch + "/") || branch.startsWith((branchName + "/").toUtf8()))
{
qCritical() << "Branch" << branch << "conflicts with already existing branch" << branchName;
return EXIT_FAILURE;
}
}
repository->startFastImport();
// We might be tempted to use the SVN revision number as the fast-import commit mark.
// However, a single SVN revision can modify multiple branches, and thus lead to multiple
// commits in the same repo. So, we need to maintain a separate commit mark counter.
mark_t mark = ++repository->last_commit_mark;
// in case the two mark allocations meet, we might as well just abort
Q_ASSERT(mark < repository->next_file_mark - 1);
// create the commit message
QByteArray message = log;
if (!message.endsWith('\n'))
message += '\n';
if (CommandLineParser::instance()->contains("add-metadata"))
message += "\n" + Repository::formatMetadataMessage(svnprefix, revnum);
// Call external message filter if provided
message = repository->msgFilter(message);
mark_t parentmark = 0;
Branch &br = repository->branches[branch];
if (br.created && !br.marks.isEmpty() && br.marks.last()) {
parentmark = br.marks.last();
} else {
if (revnum > 1) {
// Any branch at revision 1 isn't going to exist, so lets not alarm the user.
qWarning() << "WARN: Branch" << branch << "in repository" << repository->name << "doesn't exist at revision"
<< revnum << "-- did you resume from the wrong revision?";
}
br.created = revnum;
}
br.commits.append(revnum);
br.marks.append(mark);
QByteArray branchRef = branch;
if (!branchRef.startsWith("refs/"))
branchRef.prepend("refs/heads/");
QByteArray s("");
s.append("commit " + branchRef + "\n");
s.append("mark :" + QByteArray::number(mark) + "\n");
s.append("committer " + author + " " + QString::number(datetime).toUtf8() + " +0000" + "\n");
s.append("data " + QString::number(message.length()) + "\n");
s.append(message + "\n");
repository->fastImport.write(s);
// note some of the inferred merges
QByteArray desc = "";
mark_t i = !!parentmark; // if parentmark != 0, there's at least one parent
if(log.contains("This commit was manufactured by cvs2svn") && merges.count() > 1) {
qSort(merges);
repository->fastImport.write("merge :" + QByteArray::number(merges.last()) + "\n");
merges.pop_back();
qWarning() << "WARN: Discarding all but the highest merge point as a workaround for cvs2svn created branch/tag"
<< "Discarded marks:" << merges;
} else {
foreach (const mark_t merge, merges) {
if (merge == parentmark) {
qDebug() << "Skipping marking" << merge << "as a merge point as it matches the parent";
continue;
}
if (++i > 16) {
// FIXME: options:
// (1) ignore the 16 parent limit
// (2) don't emit more than 16 parents
// (3) create another commit on branch to soak up additional parents
// we've chosen option (2) for now, since only artificial commits
// created by cvs2svn seem to have this issue
qWarning() << "WARN: too many merge parents";
break;
}
QByteArray m = " :" + QByteArray::number(merge);
desc += m;
repository->fastImport.write("merge" + m + "\n");
}
}
// write the file deletions
if (deletedFiles.contains(""))
repository->fastImport.write("deleteall\n");
else
foreach (QString df, deletedFiles)
repository->fastImport.write("D " + df.toUtf8() + "\n");
// write the file modifications
repository->fastImport.write(modifiedFiles);
repository->fastImport.write("\nprogress SVN r" + QByteArray::number(revnum)
+ " branch " + branch + " = :" + QByteArray::number(mark)
+ (desc.isEmpty() ? "" : " # merge from") + desc
+ "\n\n");
printf(" %d modifications from SVN %s to %s/%s",
deletedFiles.count() + modifiedFiles.count('\n'), svnprefix.data(),
qPrintable(repository->name), branch.data());
// Commit metadata note if requested
if (CommandLineParser::instance()->contains("add-metadata-notes"))
commitNote(Repository::formatMetadataMessage(svnprefix, revnum), false);
while (repository->fastImport.bytesToWrite())
if (!repository->fastImport.waitForBytesWritten(-1))
qFatal("Failed to write to process: %s for repository %s", qPrintable(repository->fastImport.errorString()), qPrintable(repository->name));
return EXIT_SUCCESS;
}
svn2git-5392048fb1f68fe1cb0681c7b9fef1802dd74d06/src/repository.h 0000664 0000000 0000000 00000011644 13522242427 0023311 0 ustar 00root root 0000000 0000000 /*
* Copyright (C) 2007 Thiago Macieira
*
* 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 3 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, see .
*/
#ifndef REPOSITORY_H
#define REPOSITORY_H
#include
#include
#include
#include
#include "ruleparser.h"
#include "CommandLineParser.h"
class LoggingQProcess : public QProcess
{
QFile log;
bool logging;
public:
LoggingQProcess(const QString filename) : QProcess(), log() {
if(CommandLineParser::instance()->contains("debug-rules")) {
logging = true;
QString name = filename;
name.replace('/', '_');
name.prepend("gitlog-");
log.setFileName(name);
log.open(QIODevice::WriteOnly);
} else {
logging = false;
}
};
~LoggingQProcess() {
if(logging) {
log.close();
}
};
qint64 write(const char *data) {
Q_ASSERT(state() == QProcess::Running);
if(logging) {
log.write(data);
}
return QProcess::write(data);
}
qint64 write(const char *data, qint64 length) {
Q_ASSERT(state() == QProcess::Running);
if(logging) {
log.write(data);
}
return QProcess::write(data, length);
}
qint64 write(const QByteArray &data) {
Q_ASSERT(state() == QProcess::Running);
if(logging) {
log.write(data);
}
return QProcess::write(data);
}
qint64 writeNoLog(const char *data) {
Q_ASSERT(state() == QProcess::Running);
return QProcess::write(data);
}
qint64 writeNoLog(const char *data, qint64 length) {
Q_ASSERT(state() == QProcess::Running);
return QProcess::write(data, length);
}
qint64 writeNoLog(const QByteArray &data) {
Q_ASSERT(state() == QProcess::Running);
return QProcess::write(data);
}
bool putChar( char c) {
Q_ASSERT(state() == QProcess::Running);
if(logging) {
log.putChar(c);
}
return QProcess::putChar(c);
}
};
class Repository
{
public:
class Transaction
{
Q_DISABLE_COPY(Transaction)
protected:
Transaction() {}
public:
virtual ~Transaction() {}
virtual int commit() = 0;
virtual void setAuthor(const QByteArray &author) = 0;
virtual void setDateTime(uint dt) = 0;
virtual void setLog(const QByteArray &log) = 0;
virtual void noteCopyFromBranch (const QString &prevbranch, int revFrom) = 0;
virtual void deleteFile(const QString &path) = 0;
virtual QIODevice *addFile(const QString &path, int mode, qint64 length) = 0;
virtual bool commitNote(const QByteArray ¬eText, bool append,
const QByteArray &commit = QByteArray()) = 0;
};
virtual int setupIncremental(int &cutoff) = 0;
virtual void restoreAnnotatedTags() = 0;
virtual void restoreBranchNotes() = 0;
virtual void restoreLog() = 0;
virtual ~Repository() {}
virtual void reloadBranches() = 0;
virtual int createBranch(const QString &branch, int revnum,
const QString &branchFrom, int revFrom) = 0;
virtual int deleteBranch(const QString &branch, int revnum) = 0;
virtual Repository::Transaction *newTransaction(const QString &branch, const QString &svnprefix, int revnum) = 0;
virtual void createAnnotatedTag(const QString &name, const QString &svnprefix, int revnum,
const QByteArray &author, uint dt,
const QByteArray &log) = 0;
virtual void finalizeTags() = 0;
virtual void saveBranchNotes() = 0;
virtual void commit() = 0;
static QByteArray formatMetadataMessage(const QByteArray &svnprefix, int revnum,
const QByteArray &tag = QByteArray());
virtual bool branchExists(const QString& branch) const = 0;
virtual const QByteArray branchNote(const QString& branch) const = 0;
virtual void setBranchNote(const QString& branch, const QByteArray& noteText) = 0;
virtual bool hasPrefix() const = 0;
virtual QString getName() const = 0;
virtual Repository *getEffectiveRepository() = 0;
};
Repository *createRepository(const Rules::Repository &rule, const QHash &repositories);
#endif
svn2git-5392048fb1f68fe1cb0681c7b9fef1802dd74d06/src/ruleparser.cpp 0000664 0000000 0000000 00000032737 13522242427 0023617 0 ustar 00root root 0000000 0000000 /*
* Copyright (C) 2007 Thiago Macieira
*
* 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 3 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, see .
*/
#include
#include
#include
#include
#include "ruleparser.h"
#include "CommandLineParser.h"
RulesList::RulesList(const QString &filenames)
: m_filenames(filenames)
{
}
RulesList::~RulesList() {}
void RulesList::load()
{
foreach(const QString filename, m_filenames.split(',') ) {
qDebug() << "Loading rules from:" << filename;
Rules *rules = new Rules(filename);
m_rules.append(rules);
rules->load();
m_allrepositories.append(rules->repositories());
QList matchRules = rules->matchRules();
m_allMatchRules.append( QList(matchRules));
}
}
const QList RulesList::allRepositories() const
{
return m_allrepositories;
}
const QList > RulesList::allMatchRules() const
{
return m_allMatchRules;
}
const QList RulesList::rules() const
{
return m_rules;
}
Rules::Rules(const QString &fn)
: filename(fn)
{
}
Rules::~Rules()
{
}
const QList Rules::repositories() const
{
return m_repositories;
}
const QList Rules::matchRules() const
{
return m_matchRules;
}
Rules::Match::Substitution Rules::parseSubstitution(const QString &string)
{
if (string.at(0) != 's' || string.length() < 5)
return Match::Substitution();
const QChar sep = string.at(1);
if (string.at(string.length() - 1) != sep)
return Match::Substitution();
int i = 2, end = 0;
Match::Substitution subst;
// Separator might have been escaped with a backslash
while (i > end) {
int backslashCount = 0;
if ((end = string.indexOf(sep, i)) > -1) {
for (i = end - 1; i >= 2; i--) {
if (string.at(i) == '\\')
backslashCount++;
else
break;
}
} else {
return Match::Substitution(); // error
}
if (backslashCount % 2 != 0) {
// Separator was escaped. Search for another one
i = end + 1;
}
}
// Found the end of the pattern
subst.pattern = QRegExp(string.mid(2, end - 2));
if (!subst.pattern.isValid())
return Match::Substitution(); // error
subst.replacement = string.mid(end + 1, string.length() - 1 - end - 1);
return subst;
}
void Rules::load()
{
load(filename);
}
void Rules::load(const QString &filename)
{
qDebug() << "Loading rules from" << filename;
// initialize the regexps we will use
QRegExp repoLine("create repository\\s+(\\S+)", Qt::CaseInsensitive);
QString varRegex("[A-Za-z0-9_]+");
QRegExp matchLine("match\\s+(.*)", Qt::CaseInsensitive);
QRegExp matchActionLine("action\\s+(\\w+)", Qt::CaseInsensitive);
QRegExp matchRepoLine("repository\\s+(\\S+)", Qt::CaseInsensitive);
QRegExp matchDescLine("description\\s+(.+)$", Qt::CaseInsensitive);
QRegExp matchRepoSubstLine("substitute repository\\s+(.+)$", Qt::CaseInsensitive);
QRegExp matchBranchLine("branch\\s+(\\S+)", Qt::CaseInsensitive);
QRegExp matchBranchSubstLine("substitute branch\\s+(.+)$", Qt::CaseInsensitive);
QRegExp matchRevLine("(min|max) revision (\\d+)", Qt::CaseInsensitive);
QRegExp matchAnnotateLine("annotated\\s+(\\S+)", Qt::CaseInsensitive);
QRegExp matchPrefixLine("prefix\\s+(.*)$", Qt::CaseInsensitive);
QRegExp declareLine("declare\\s+("+varRegex+")\\s*=\\s*(\\S+)", Qt::CaseInsensitive);
QRegExp variableLine("\\$\\{("+varRegex+")(\\|[^}$]*)?\\}", Qt::CaseInsensitive);
QRegExp includeLine("include\\s+(.*)", Qt::CaseInsensitive);
enum { ReadingNone, ReadingRepository, ReadingMatch } state = ReadingNone;
Repository repo;
Match match;
int lineNumber = 0;
QFile file(filename);
if (!file.open(QIODevice::ReadOnly))
qFatal("Could not read the rules file: %s", qPrintable(filename));
QTextStream s(&file);
QStringList lines = s.readAll().split('\n', QString::KeepEmptyParts);
QStringList::iterator it;
for(it = lines.begin(); it != lines.end(); ++it) {
++lineNumber;
QString origLine = *it;
QString line = origLine;
int hash = line.indexOf('#');
if (hash != -1)
line.truncate(hash);
line = line.trimmed();
if (line.isEmpty())
continue;
bool isIncludeRule = includeLine.exactMatch(line);
if (isIncludeRule) {
int index = filename.lastIndexOf("/");
QString includeFile = filename.left( index + 1) + includeLine.cap(1);
load(includeFile);
} else {
while( variableLine.indexIn(line) != -1 ) {
QString replacement;
if (m_variables.contains(variableLine.cap(1))) {
replacement = m_variables[variableLine.cap(1)];
} else {
if (variableLine.cap(2).startsWith('|')) {
replacement = variableLine.cap(2).mid(1);
} else {
qFatal("Undeclared variable: %s", qPrintable(variableLine.cap(1)));
}
}
line = line.replace(variableLine.cap(0), replacement);
}
if (state == ReadingRepository) {
if (matchBranchLine.exactMatch(line)) {
Repository::Branch branch;
branch.name = matchBranchLine.cap(1);
repo.branches += branch;
continue;
} else if (matchDescLine.exactMatch(line)) {
repo.description = matchDescLine.cap(1);
continue;
} else if (matchRepoLine.exactMatch(line)) {
repo.forwardTo = matchRepoLine.cap(1);
continue;
} else if (matchPrefixLine.exactMatch(line)) {
repo.prefix = matchPrefixLine.cap(1);
continue;
} else if (line == "end repository") {
if (!repo.forwardTo.isEmpty()
&& !repo.description.isEmpty()) {
qFatal("Specifing repository and description on repository is invalid on line %d", lineNumber);
}
if (!repo.forwardTo.isEmpty()
&& !repo.branches.isEmpty()) {
qFatal("Specifing repository and branches on repository is invalid on line %d", lineNumber);
}
m_repositories += repo;
{
// clear out 'repo'
Repository temp;
std::swap(repo, temp);
}
state = ReadingNone;
continue;
}
} else if (state == ReadingMatch) {
if (matchRepoLine.exactMatch(line)) {
match.repository = matchRepoLine.cap(1);
continue;
} else if (matchBranchLine.exactMatch(line)) {
match.branch = matchBranchLine.cap(1);
continue;
} else if (matchRepoSubstLine.exactMatch(line)) {
Match::Substitution subst = parseSubstitution(matchRepoSubstLine.cap(1));
if (!subst.isValid()) {
qFatal("Malformed substitution in rules file: line %d: %s",
lineNumber, qPrintable(origLine));
}
match.repo_substs += subst;
continue;
} else if (matchBranchSubstLine.exactMatch(line)) {
Match::Substitution subst = parseSubstitution(matchBranchSubstLine.cap(1));
if (!subst.isValid()) {
qFatal("Malformed substitution in rules file: line %d: %s",
lineNumber, qPrintable(origLine));
}
match.branch_substs += subst;
continue;
} else if (matchRevLine.exactMatch(line)) {
if (matchRevLine.cap(1) == "min")
match.minRevision = matchRevLine.cap(2).toInt();
else // must be max
match.maxRevision = matchRevLine.cap(2).toInt();
continue;
} else if (matchPrefixLine.exactMatch(line)) {
match.prefix = matchPrefixLine.cap(1);
if( match.prefix.startsWith('/'))
match.prefix = match.prefix.mid(1);
continue;
} else if (matchActionLine.exactMatch(line)) {
QString action = matchActionLine.cap(1);
if (action == "export")
match.action = Match::Export;
else if (action == "ignore")
match.action = Match::Ignore;
else if (action == "recurse")
match.action = Match::Recurse;
else
qFatal("Invalid action \"%s\" on line %d", qPrintable(action), lineNumber);
continue;
} else if (matchAnnotateLine.exactMatch(line)) {
match.annotate = matchAnnotateLine.cap(1) == "true";
continue;
} else if (line == "end match") {
if (!match.repository.isEmpty())
match.action = Match::Export;
m_matchRules += match;
Stats::instance()->addRule(match);
state = ReadingNone;
continue;
}
}
bool isRepositoryRule = repoLine.exactMatch(line);
bool isMatchRule = matchLine.exactMatch(line);
bool isVariableRule = declareLine.exactMatch(line);
if (isRepositoryRule) {
// repository rule
state = ReadingRepository;
repo = Repository(); // clear
repo.name = repoLine.cap(1);
repo.lineNumber = lineNumber;
repo.filename = filename;
} else if (isMatchRule) {
// match rule
state = ReadingMatch;
match = Match();
match.rx = QRegExp(matchLine.cap(1), Qt::CaseSensitive, QRegExp::RegExp2);
if( !match.rx.isValid() )
qFatal("Malformed regular expression '%s' in file:'%s':%d, Error: %s",
qPrintable(matchLine.cap(1)), qPrintable(filename), lineNumber,
qPrintable(match.rx.errorString()));
match.lineNumber = lineNumber;
match.filename = filename;
} else if (isVariableRule) {
QString variable = declareLine.cap(1);
QString value = declareLine.cap(2);
m_variables.insert(variable, value);
} else {
qFatal("Malformed line in rules file: line %d: %s",
lineNumber, qPrintable(origLine));
}
}
}
}
Stats *Stats::self = 0;
class Stats::Private
{
public:
Private();
void printStats() const;
void ruleMatched(const Rules::Match &rule, const int rev);
void addRule(const Rules::Match &rule);
private:
QMap m_usedRules;
};
Stats::Stats() : d(new Private())
{
use = CommandLineParser::instance()->contains("stats");
}
Stats::~Stats()
{
delete d;
}
void Stats::init()
{
if(self)
delete self;
self = new Stats();
}
Stats* Stats::instance()
{
return self;
}
void Stats::printStats() const
{
if(use)
d->printStats();
}
void Stats::ruleMatched(const Rules::Match &rule, const int rev)
{
if(use)
d->ruleMatched(rule, rev);
}
void Stats::addRule( const Rules::Match &rule)
{
if(use)
d->addRule(rule);
}
Stats::Private::Private()
{
}
void Stats::Private::printStats() const
{
printf("\nRule stats\n");
foreach(const Rules::Match rule, m_usedRules.keys()) {
printf("%s was matched %i times\n", qPrintable(rule.info()), m_usedRules[rule]);
}
}
void Stats::Private::ruleMatched(const Rules::Match &rule, const int rev)
{
Q_UNUSED(rev);
if(!m_usedRules.contains(rule)) {
m_usedRules.insert(rule, 1);
qWarning() << "WARN: New match rule" << rule.info() << ", should have been added when created.";
} else {
m_usedRules[rule]++;
}
}
void Stats::Private::addRule( const Rules::Match &rule)
{
if(m_usedRules.contains(rule))
qWarning() << "WARN: Rule" << rule.info() << "was added multiple times.";
m_usedRules.insert(rule, 0);
}
#ifndef QT_NO_DEBUG_STREAM
QDebug operator<<(QDebug s, const Rules::Match &rule)
{
s.nospace() << rule.info();
return s.space();
}
#endif
svn2git-5392048fb1f68fe1cb0681c7b9fef1802dd74d06/src/ruleparser.h 0000664 0000000 0000000 00000007416 13522242427 0023260 0 ustar 00root root 0000000 0000000 /*
* Copyright (C) 2007 Thiago Macieira
*
* 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 3 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, see .
*/
#ifndef RULEPARSER_H
#define RULEPARSER_H
#include
#include
#include
#include
#include
#include
class Rules
{
public:
struct Rule
{
QString filename;
int lineNumber;
Rule() : lineNumber(0) {}
};
struct Repository : Rule
{
struct Branch
{
QString name;
};
QString name;
QList branches;
QString description;
QString forwardTo;
QString prefix;
Repository() { }
const QString info() const {
const QString info = Rule::filename % ":" % QByteArray::number(Rule::lineNumber);
return info;
}
};
struct Match : Rule
{
struct Substitution {
QRegExp pattern;
QString replacement;
bool isValid() { return !pattern.isEmpty(); }
QString& apply(QString &string) { return string.replace(pattern, replacement); }
};
QRegExp rx;
QString repository;
QList repo_substs;
QString branch;
QList branch_substs;
QString prefix;
int minRevision;
int maxRevision;
bool annotate;
enum Action {
Ignore,
Export,
Recurse
} action;
Match() : minRevision(-1), maxRevision(-1), annotate(false), action(Ignore) { }
bool operator<(const Match other) const {
if (filename != other.filename)
return filename < other.filename;
return lineNumber < other.lineNumber;
}
const QString info() const {
const QString info = Rule::filename % ":" % QByteArray::number(Rule::lineNumber) % " " % rx.pattern();
return info;
}
};
Rules(const QString &filename);
~Rules();
const QList repositories() const;
const QList matchRules() const;
Match::Substitution parseSubstitution(const QString &string);
void load();
private:
void load(const QString &filename);
QString filename;
QList m_repositories;
QList m_matchRules;
QMap m_variables;
};
class RulesList
{
public:
RulesList( const QString &filenames);
~RulesList();
const QList allRepositories() const;
const QList > allMatchRules() const;
const QList rules() const;
void load();
private:
QString m_filenames;
QList m_rules;
QList m_allrepositories;
QList > m_allMatchRules;
};
class Stats
{
public:
static Stats *instance();
void printStats() const;
void ruleMatched(const Rules::Match &rule, const int rev = -1);
void addRule( const Rules::Match &rule);
static void init();
~Stats();
private:
Stats();
class Private;
Private * const d;
static Stats *self;
bool use;
};
#ifndef QT_NO_DEBUG_STREAM
class QDebug;
QDebug operator<<(QDebug, const Rules::Match &);
#endif
#endif
svn2git-5392048fb1f68fe1cb0681c7b9fef1802dd74d06/src/src.pro 0000664 0000000 0000000 00000002072 13522242427 0022225 0 ustar 00root root 0000000 0000000 if(!defined(SVN_INCLUDE, var)) {
SVN_INCLUDE = /usr/include/subversion-1 /usr/local/include/subversion-1
}
if(!defined(APR_INCLUDE, var)) {
APR_INCLUDE = /usr/include/apr-1.0 /usr/include/apr-1 /usr/local/include/apr-1
}
exists(local-config.pri):include(local-config.pri)
if(!defined(VERSION, var)) {
VERSION = $$system(git --no-pager show --pretty=oneline --no-notes | head -1 | cut -b-40)
}
VERSTR = '\\"$${VERSION}\\"' # place quotes around the version string
DEFINES += VER=\"$${VERSTR}\" # create a VER macro containing the version string
TEMPLATE = app
TARGET = ../svn-all-fast-export
isEmpty(PREFIX) {
PREFIX = /usr/local
}
BINDIR = $$PREFIX/bin
INSTALLS += target
target.path = $$BINDIR
DEPENDPATH += .
QT = core
INCLUDEPATH += . $$SVN_INCLUDE $$APR_INCLUDE
!isEmpty(SVN_LIBDIR): LIBS += -L$$SVN_LIBDIR
LIBS += -lsvn_fs-1 -lsvn_repos-1 -lapr-1 -lsvn_subr-1
# Input
SOURCES += ruleparser.cpp \
repository.cpp \
svn.cpp \
main.cpp \
CommandLineParser.cpp \
HEADERS += ruleparser.h \
repository.h \
svn.h \
CommandLineParser.h \
svn2git-5392048fb1f68fe1cb0681c7b9fef1802dd74d06/src/svn.cpp 0000664 0000000 0000000 00000121146 13522242427 0022232 0 ustar 00root root 0000000 0000000 /*
* Copyright (C) 2007 Thiago Macieira
*
* 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 3 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, see .
*/
/*
* Based on svn-fast-export by Chris Lee
* License: MIT
* URL: git://repo.or.cz/fast-import.git http://repo.or.cz/w/fast-export.git
*/
#define _XOPEN_SOURCE
#define _LARGEFILE_SUPPORT
#define _LARGEFILE64_SUPPORT
#include "svn.h"
#include "CommandLineParser.h"
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include "repository.h"
#undef SVN_ERR
#define SVN_ERR(expr) SVN_INT_ERR(expr)
#if SVN_VER_MAJOR == 1 && SVN_VER_MINOR < 9
#define svn_stream_read_full svn_stream_read
#endif
typedef QList MatchRuleList;
typedef QHash RepositoryHash;
typedef QHash IdentityHash;
class AprAutoPool
{
apr_pool_t *pool;
AprAutoPool(const AprAutoPool &);
AprAutoPool &operator=(const AprAutoPool &);
public:
inline AprAutoPool(apr_pool_t *parent = NULL)
{
pool = svn_pool_create(parent);
}
inline ~AprAutoPool()
{
svn_pool_destroy(pool);
}
inline void clear() { svn_pool_clear(pool); }
inline apr_pool_t *data() const { return pool; }
inline operator apr_pool_t *() const { return pool; }
};
class SvnPrivate
{
public:
QList allMatchRules;
RepositoryHash repositories;
IdentityHash identities;
QString userdomain;
SvnPrivate(const QString &pathToRepository);
~SvnPrivate();
int youngestRevision();
int exportRevision(int revnum);
int openRepository(const QString &pathToRepository);
private:
AprAutoPool global_pool;
AprAutoPool scratch_pool;
svn_fs_t *fs;
svn_revnum_t youngest_rev;
};
void Svn::initialize()
{
// initialize APR or exit
if (apr_initialize() != APR_SUCCESS) {
fprintf(stderr, "You lose at apr_initialize().\n");
exit(1);
}
// static destructor
static struct Destructor { ~Destructor() { apr_terminate(); } } destructor;
}
Svn::Svn(const QString &pathToRepository)
: d(new SvnPrivate(pathToRepository))
{
}
Svn::~Svn()
{
delete d;
}
void Svn::setMatchRules(const QList &allMatchRules)
{
d->allMatchRules = allMatchRules;
}
void Svn::setRepositories(const RepositoryHash &repositories)
{
d->repositories = repositories;
}
void Svn::setIdentityMap(const IdentityHash &identityMap)
{
d->identities = identityMap;
}
void Svn::setIdentityDomain(const QString &identityDomain)
{
d->userdomain = identityDomain;
}
int Svn::youngestRevision()
{
return d->youngestRevision();
}
bool Svn::exportRevision(int revnum)
{
return d->exportRevision(revnum) == EXIT_SUCCESS;
}
SvnPrivate::SvnPrivate(const QString &pathToRepository)
: global_pool(NULL) , scratch_pool(NULL)
{
if( openRepository(pathToRepository) != EXIT_SUCCESS) {
qCritical() << "Failed to open repository";
exit(1);
}
// get the youngest revision
svn_fs_youngest_rev(&youngest_rev, fs, global_pool);
}
SvnPrivate::~SvnPrivate() {}
int SvnPrivate::youngestRevision()
{
return youngest_rev;
}
int SvnPrivate::openRepository(const QString &pathToRepository)
{
svn_repos_t *repos;
QString path = pathToRepository;
while (path.endsWith('/')) // no trailing slash allowed
path = path.mid(0, path.length()-1);
#if SVN_VER_MAJOR == 1 && SVN_VER_MINOR < 9
SVN_ERR(svn_repos_open2(&repos, QFile::encodeName(path), NULL, global_pool));
#else
SVN_ERR(svn_repos_open3(&repos, QFile::encodeName(path), NULL, global_pool, scratch_pool));
#endif
fs = svn_repos_fs(repos);
return EXIT_SUCCESS;
}
enum RuleType { AnyRule = 0, NoIgnoreRule = 0x01, NoRecurseRule = 0x02 };
static MatchRuleList::ConstIterator
findMatchRule(const MatchRuleList &matchRules, int revnum, const QString ¤t,
int ruleMask = AnyRule)
{
MatchRuleList::ConstIterator it = matchRules.constBegin(),
end = matchRules.constEnd();
for ( ; it != end; ++it) {
if (it->minRevision > revnum)
continue;
if (it->maxRevision != -1 && it->maxRevision < revnum)
continue;
if (it->action == Rules::Match::Ignore && ruleMask & NoIgnoreRule)
continue;
if (it->action == Rules::Match::Recurse && ruleMask & NoRecurseRule)
continue;
if (it->rx.indexIn(current) == 0) {
Stats::instance()->ruleMatched(*it, revnum);
return it;
}
}
// no match
return end;
}
static int pathMode(svn_fs_root_t *fs_root, const char *pathname, apr_pool_t *pool)
{
svn_string_t *propvalue;
SVN_ERR(svn_fs_node_prop(&propvalue, fs_root, pathname, "svn:executable", pool));
int mode = 0100644;
if (propvalue)
mode = 0100755;
return mode;
}
svn_error_t *QIODevice_write(void *baton, const char *data, apr_size_t *len)
{
QIODevice *device = reinterpret_cast(baton);
device->write(data, *len);
while (device->bytesToWrite() > 32*1024) {
if (!device->waitForBytesWritten(-1)) {
qFatal("Failed to write to process: %s", qPrintable(device->errorString()));
return svn_error_createf(APR_EOF, SVN_NO_ERROR, "Failed to write to process: %s",
qPrintable(device->errorString()));
}
}
return SVN_NO_ERROR;
}
static svn_stream_t *streamForDevice(QIODevice *device, apr_pool_t *pool)
{
svn_stream_t *stream = svn_stream_create(device, pool);
svn_stream_set_write(stream, QIODevice_write);
return stream;
}
static int dumpBlob(Repository::Transaction *txn, svn_fs_root_t *fs_root,
const char *pathname, const QString &finalPathName, apr_pool_t *pool)
{
AprAutoPool dumppool(pool);
// what type is it?
int mode = pathMode(fs_root, pathname, dumppool);
svn_filesize_t stream_length;
SVN_ERR(svn_fs_file_length(&stream_length, fs_root, pathname, dumppool));
svn_stream_t *in_stream, *out_stream;
if (!CommandLineParser::instance()->contains("dry-run")) {
// open the file
SVN_ERR(svn_fs_file_contents(&in_stream, fs_root, pathname, dumppool));
}
// maybe it's a symlink?
svn_string_t *propvalue;
SVN_ERR(svn_fs_node_prop(&propvalue, fs_root, pathname, "svn:special", dumppool));
if (propvalue) {
apr_size_t len = strlen("link ");
if (!CommandLineParser::instance()->contains("dry-run")) {
QByteArray buf;
buf.reserve(len);
SVN_ERR(svn_stream_read_full(in_stream, buf.data(), &len));
if (len == strlen("link ") && strncmp(buf, "link ", len) == 0) {
mode = 0120000;
stream_length -= len;
} else {
//this can happen if a link changed into a file in one commit
qWarning("file %s is svn:special but not a symlink", pathname);
// re-open the file as we tried to read "link "
svn_stream_close(in_stream);
SVN_ERR(svn_fs_file_contents(&in_stream, fs_root, pathname, dumppool));
}
}
}
QIODevice *io = txn->addFile(finalPathName, mode, stream_length);
if (!CommandLineParser::instance()->contains("dry-run")) {
// open a generic svn_stream_t for the QIODevice
out_stream = streamForDevice(io, dumppool);
SVN_ERR(svn_stream_copy3(in_stream, out_stream, NULL, NULL, dumppool));
// print an ending newline
io->putChar('\n');
}
return EXIT_SUCCESS;
}
static bool wasDir(svn_fs_t *fs, int revnum, const char *pathname, apr_pool_t *pool)
{
AprAutoPool subpool(pool);
svn_fs_root_t *fs_root;
if (svn_fs_revision_root(&fs_root, fs, revnum, subpool) != SVN_NO_ERROR)
return false;
svn_boolean_t is_dir;
if (svn_fs_is_dir(&is_dir, fs_root, pathname, subpool) != SVN_NO_ERROR)
return false;
return is_dir;
}
static int recursiveDumpDir(Repository::Transaction *txn, svn_fs_t *fs, svn_fs_root_t *fs_root,
const QByteArray &pathname, const QString &finalPathName,
apr_pool_t *pool, svn_revnum_t revnum,
const Rules::Match &rule, const MatchRuleList &matchRules,
bool ruledebug)
{
if (!wasDir(fs, revnum, pathname.data(), pool)) {
if (dumpBlob(txn, fs_root, pathname, finalPathName, pool) == EXIT_FAILURE)
return EXIT_FAILURE;
return EXIT_SUCCESS;
}
// get the dir listing
apr_hash_t *entries;
SVN_ERR(svn_fs_dir_entries(&entries, fs_root, pathname, pool));
AprAutoPool dirpool(pool);
// While we get a hash, put it in a map for sorted lookup, so we can
// repeat the conversions and get the same git commit hashes.
QMap map;
for (apr_hash_index_t *i = apr_hash_first(pool, entries); i; i = apr_hash_next(i)) {
const void *vkey;
void *value;
apr_hash_this(i, &vkey, NULL, &value);
svn_fs_dirent_t *dirent = reinterpret_cast(value);
map.insertMulti(QByteArray(dirent->name), dirent->kind);
}
QMapIterator i(map);
while (i.hasNext()) {
dirpool.clear();
i.next();
QByteArray entryName = pathname + '/' + i.key();
QString entryFinalName = finalPathName + QString::fromUtf8(i.key());
if (i.value() == svn_node_dir) {
entryFinalName += '/';
QString entryNameQString = entryName + '/';
MatchRuleList::ConstIterator match = findMatchRule(matchRules, revnum, entryNameQString);
if (match == matchRules.constEnd()) continue; // no match of parent repo? (should not happen)
const Rules::Match &matchedRule = *match;
if (matchedRule.action != Rules::Match::Export || matchedRule.repository != rule.repository) {
if (ruledebug)
qDebug() << "recursiveDumpDir:" << entryNameQString << "skip entry for different/ignored repository";
continue;
}
if (recursiveDumpDir(txn, fs, fs_root, entryName, entryFinalName, dirpool, revnum, rule, matchRules, ruledebug) == EXIT_FAILURE)
return EXIT_FAILURE;
} else if (i.value() == svn_node_file) {
printf("+");
fflush(stdout);
if (dumpBlob(txn, fs_root, entryName, entryFinalName, dirpool) == EXIT_FAILURE)
return EXIT_FAILURE;
}
}
return EXIT_SUCCESS;
}
time_t get_epoch(const char* svn_date)
{
struct tm tm;
memset(&tm, 0, sizeof tm);
QByteArray date(svn_date, strlen(svn_date) - 8);
strptime(date, "%Y-%m-%dT%H:%M:%S", &tm);
return timegm(&tm);
}
class SvnRevision
{
public:
AprAutoPool pool;
QHash transactions;
QList allMatchRules;
RepositoryHash repositories;
IdentityHash identities;
QString userdomain;
svn_fs_t *fs;
svn_fs_root_t *fs_root;
int revnum;
// must call fetchRevProps first:
QByteArray authorident;
QByteArray log;
uint epoch;
bool ruledebug;
bool propsFetched;
bool needCommit;
SvnRevision(int revision, svn_fs_t *f, apr_pool_t *parent_pool)
: pool(parent_pool), fs(f), fs_root(0), revnum(revision), propsFetched(false)
{
ruledebug = CommandLineParser::instance()->contains( QLatin1String("debug-rules"));
}
int open()
{
SVN_ERR(svn_fs_revision_root(&fs_root, fs, revnum, pool));
return EXIT_SUCCESS;
}
int prepareTransactions();
int fetchRevProps();
int commit();
int exportEntry(const char *path, const svn_fs_path_change2_t *change, apr_hash_t *changes);
int exportDispatch(const char *path, const svn_fs_path_change2_t *change,
const char *path_from, svn_revnum_t rev_from,
apr_hash_t *changes, const QString ¤t, const Rules::Match &rule,
const MatchRuleList &matchRules, apr_pool_t *pool);
int exportInternal(const char *path, const svn_fs_path_change2_t *change,
const char *path_from, svn_revnum_t rev_from,
const QString ¤t, const Rules::Match &rule, const MatchRuleList &matchRules);
int recurse(const char *path, const svn_fs_path_change2_t *change,
const char *path_from, const MatchRuleList &matchRules, svn_revnum_t rev_from,
apr_hash_t *changes, apr_pool_t *pool);
int addGitIgnore(apr_pool_t *pool, const char *key, QString path,
svn_fs_root_t *fs_root, Repository::Transaction *txn, const char *content = NULL);
int fetchIgnoreProps(QString *ignore, apr_pool_t *pool, const char *key, svn_fs_root_t *fs_root);
int fetchUnknownProps(apr_pool_t *pool, const char *key, svn_fs_root_t *fs_root);
private:
void splitPathName(const Rules::Match &rule, const QString &pathName, QString *svnprefix_p,
QString *repository_p, QString *effectiveRepository_p, QString *branch_p, QString *path_p);
};
int SvnPrivate::exportRevision(int revnum)
{
SvnRevision rev(revnum, fs, global_pool);
rev.allMatchRules = allMatchRules;
rev.repositories = repositories;
rev.identities = identities;
rev.userdomain = userdomain;
// open this revision:
printf("Exporting revision %d ", revnum);
fflush(stdout);
if (rev.open() == EXIT_FAILURE)
return EXIT_FAILURE;
if (rev.prepareTransactions() == EXIT_FAILURE)
return EXIT_FAILURE;
if (!rev.needCommit) {
printf(" nothing to do\n");
return EXIT_SUCCESS; // no changes?
}
if (rev.commit() == EXIT_FAILURE)
return EXIT_FAILURE;
printf(" done\n");
return EXIT_SUCCESS;
}
void SvnRevision::splitPathName(const Rules::Match &rule, const QString &pathName, QString *svnprefix_p,
QString *repository_p, QString *effectiveRepository_p, QString *branch_p, QString *path_p)
{
QString svnprefix = pathName;
svnprefix.truncate(rule.rx.matchedLength());
if (svnprefix_p) {
*svnprefix_p = svnprefix;
}
if (repository_p) {
*repository_p = svnprefix;
repository_p->replace(rule.rx, rule.repository);
foreach (Rules::Match::Substitution subst, rule.repo_substs) {
subst.apply(*repository_p);
}
}
if (effectiveRepository_p) {
*effectiveRepository_p = svnprefix;
effectiveRepository_p->replace(rule.rx, rule.repository);
foreach (Rules::Match::Substitution subst, rule.repo_substs) {
subst.apply(*effectiveRepository_p);
}
Repository *repository = repositories.value(*effectiveRepository_p, 0);
if (repository) {
*effectiveRepository_p = repository->getEffectiveRepository()->getName();
}
}
if (branch_p) {
*branch_p = svnprefix;
branch_p->replace(rule.rx, rule.branch);
foreach (Rules::Match::Substitution subst, rule.branch_substs) {
subst.apply(*branch_p);
}
}
if (path_p) {
QString prefix = svnprefix;
prefix.replace(rule.rx, rule.prefix);
*path_p = prefix + pathName.mid(svnprefix.length());
}
}
int SvnRevision::prepareTransactions()
{
// find out what was changed in this revision:
apr_hash_t *changes;
SVN_ERR(svn_fs_paths_changed2(&changes, fs_root, pool));
QMap map;
for (apr_hash_index_t *i = apr_hash_first(pool, changes); i; i = apr_hash_next(i)) {
const void *vkey;
void *value;
apr_hash_this(i, &vkey, NULL, &value);
const char *key = reinterpret_cast(vkey);
svn_fs_path_change2_t *change = reinterpret_cast(value);
// If we mix path deletions with path adds/replaces we might erase a
// branch after that it has been reset -> history truncated
if (map.contains(QByteArray(key))) {
// If the same path is deleted and added, we need to put the
// deletions into the map first, then the addition.
if (change->change_kind == svn_fs_path_change_delete) {
// XXX
}
fprintf(stderr, "\nDuplicate key found in rev %d: %s\n", revnum, key);
fprintf(stderr, "This needs more code to be handled, file a bug report\n");
fflush(stderr);
exit(1);
}
map.insertMulti(QByteArray(key), change);
}
QMapIterator i(map);
while (i.hasNext()) {
i.next();
if (exportEntry(i.key(), i.value(), changes) == EXIT_FAILURE)
return EXIT_FAILURE;
}
return EXIT_SUCCESS;
}
int SvnRevision::fetchRevProps()
{
if( propsFetched )
return EXIT_SUCCESS;
apr_hash_t *revprops;
SVN_ERR(svn_fs_revision_proplist(&revprops, fs, revnum, pool));
svn_string_t *svnauthor = (svn_string_t*)apr_hash_get(revprops, "svn:author", APR_HASH_KEY_STRING);
svn_string_t *svndate = (svn_string_t*)apr_hash_get(revprops, "svn:date", APR_HASH_KEY_STRING);
svn_string_t *svnlog = (svn_string_t*)apr_hash_get(revprops, "svn:log", APR_HASH_KEY_STRING);
if (svnlog)
log = svnlog->data;
else
log.clear();
authorident = svnauthor ? identities.value(svnauthor->data) : QByteArray();
epoch = svndate ? get_epoch(svndate->data) : 0;
if (authorident.isEmpty()) {
if (!svnauthor || svn_string_isempty(svnauthor))
authorident = "nobody ";
else
authorident = svnauthor->data + QByteArray(" <") + svnauthor->data +
QByteArray("@") + userdomain.toUtf8() + QByteArray(">");
}
propsFetched = true;
return EXIT_SUCCESS;
}
int SvnRevision::commit()
{
// now create the commit
if (fetchRevProps() != EXIT_SUCCESS)
return EXIT_FAILURE;
foreach (Repository *repo, repositories.values()) {
repo->commit();
}
foreach (Repository::Transaction *txn, transactions) {
txn->setAuthor(authorident);
txn->setDateTime(epoch);
txn->setLog(log);
if (txn->commit() != EXIT_SUCCESS)
return EXIT_FAILURE;
delete txn;
}
return EXIT_SUCCESS;
}
int SvnRevision::exportEntry(const char *key, const svn_fs_path_change2_t *change,
apr_hash_t *changes)
{
AprAutoPool revpool(pool.data());
QString current = QString::fromUtf8(key);
// was this copied from somewhere?
svn_revnum_t rev_from = SVN_INVALID_REVNUM;
const char *path_from = NULL;
if (change->change_kind != svn_fs_path_change_delete) {
// svn_fs_copied_from would fail on deleted paths, because the path
// obviously no longer exists in the current revision
SVN_ERR(svn_fs_copied_from(&rev_from, &path_from, fs_root, key, revpool));
}
// is this a directory?
svn_boolean_t is_dir;
SVN_ERR(svn_fs_is_dir(&is_dir, fs_root, key, revpool));
// Adding newly created directories
if (is_dir && change->change_kind == svn_fs_path_change_add && path_from == NULL
&& CommandLineParser::instance()->contains("empty-dirs")) {
QString keyQString = key;
// Skipping SVN-directory-layout
if (keyQString.endsWith("/trunk") || keyQString.endsWith("/branches") || keyQString.endsWith("/tags")) {
//qDebug() << "Skipping SVN-directory-layout:" << keyQString;
return EXIT_SUCCESS;
}
needCommit = true;
//qDebug() << "Adding directory:" << key;
}
// svn:ignore-properties
else if (is_dir && (change->change_kind == svn_fs_path_change_add || change->change_kind == svn_fs_path_change_modify || change->change_kind == svn_fs_path_change_replace)
&& path_from == NULL && CommandLineParser::instance()->contains("svn-ignore")) {
needCommit = true;
}
else if (is_dir) {
if (change->change_kind == svn_fs_path_change_modify ||
change->change_kind == svn_fs_path_change_add) {
if (path_from == NULL) {
// freshly added directory, or modified properties
// Git doesn't handle directories, so we don't either
//qDebug() << " mkdir ignored:" << key;
return EXIT_SUCCESS;
}
qDebug() << " " << key << "was copied from" << path_from << "rev" << rev_from;
} else if (change->change_kind == svn_fs_path_change_replace) {
if (path_from == NULL)
qDebug() << " " << key << "was replaced";
else
qDebug() << " " << key << "was replaced from" << path_from << "rev" << rev_from;
} else if (change->change_kind == svn_fs_path_change_reset) {
qCritical() << " " << key << "was reset, panic!";
return EXIT_FAILURE;
} else {
// if change_kind == delete, it shouldn't come into this arm of the 'is_dir' test
qCritical() << " " << key << "has unhandled change kind " << change->change_kind << ", panic!";
return EXIT_FAILURE;
}
} else if (change->change_kind == svn_fs_path_change_delete) {
is_dir = wasDir(fs, revnum - 1, key, revpool);
}
if (is_dir)
current += '/';
//MultiRule: loop start
//Replace all returns with continue,
bool isHandled = false;
foreach ( const MatchRuleList matchRules, allMatchRules ) {
// find the first rule that matches this pathname
MatchRuleList::ConstIterator match = findMatchRule(matchRules, revnum, current);
if (match != matchRules.constEnd()) {
const Rules::Match &rule = *match;
if ( exportDispatch(key, change, path_from, rev_from, changes, current, rule, matchRules, revpool) == EXIT_FAILURE )
return EXIT_FAILURE;
isHandled = true;
} else if (is_dir && path_from != NULL) {
qDebug() << current << "is a copy-with-history, auto-recursing";
if ( recurse(key, change, path_from, matchRules, rev_from, changes, revpool) == EXIT_FAILURE )
return EXIT_FAILURE;
isHandled = true;
} else if (is_dir && change->change_kind == svn_fs_path_change_delete) {
qDebug() << current << "deleted, auto-recursing";
if ( recurse(key, change, path_from, matchRules, rev_from, changes, revpool) == EXIT_FAILURE )
return EXIT_FAILURE;
isHandled = true;
}
}
if ( isHandled ) {
return EXIT_SUCCESS;
}
if (wasDir(fs, revnum - 1, key, revpool)) {
qDebug() << current << "was a directory; ignoring";
} else if (change->change_kind == svn_fs_path_change_delete) {
qDebug() << current << "is being deleted but I don't know anything about it; ignoring";
} else {
qCritical() << current << "did not match any rules; cannot continue";
return EXIT_FAILURE;
}
return EXIT_SUCCESS;
}
int SvnRevision::exportDispatch(const char *key, const svn_fs_path_change2_t *change,
const char *path_from, svn_revnum_t rev_from,
apr_hash_t *changes, const QString ¤t,
const Rules::Match &rule, const MatchRuleList &matchRules, apr_pool_t *pool)
{
//if(ruledebug)
// qDebug() << "rev" << revnum << qPrintable(current) << "matched rule:" << rule.lineNumber << "(" << rule.rx.pattern() << ")";
switch (rule.action) {
case Rules::Match::Ignore:
//if(ruledebug)
// qDebug() << " " << "ignoring.";
return EXIT_SUCCESS;
case Rules::Match::Recurse:
if(ruledebug)
qDebug() << "rev" << revnum << qPrintable(current) << "matched rule:" << rule.info() << " " << "recursing.";
return recurse(key, change, path_from, matchRules, rev_from, changes, pool);
case Rules::Match::Export:
if(ruledebug)
qDebug() << "rev" << revnum << qPrintable(current) << "matched rule:" << rule.info() << " " << "exporting.";
if (exportInternal(key, change, path_from, rev_from, current, rule, matchRules) == EXIT_SUCCESS)
return EXIT_SUCCESS;
if (change->change_kind != svn_fs_path_change_delete) {
if(ruledebug)
qDebug() << "rev" << revnum << qPrintable(current) << "matched rule:" << rule.info() << " " << "Unable to export non path removal.";
return EXIT_FAILURE;
}
// we know that the default action inside recurse is to recurse further or to ignore,
// either of which is reasonably safe for deletion
qWarning() << "WARN: deleting unknown path" << current << "; auto-recursing";
return recurse(key, change, path_from, matchRules, rev_from, changes, pool);
}
// never reached
return EXIT_FAILURE;
}
int SvnRevision::exportInternal(const char *key, const svn_fs_path_change2_t *change,
const char *path_from, svn_revnum_t rev_from,
const QString ¤t, const Rules::Match &rule, const MatchRuleList &matchRules)
{
needCommit = true;
QString svnprefix, repository, effectiveRepository, branch, path;
splitPathName(rule, current, &svnprefix, &repository, &effectiveRepository, &branch, &path);
Repository *repo = repositories.value(repository, 0);
if (!repo) {
if (change->change_kind != svn_fs_path_change_delete)
qCritical() << "Rule" << rule
<< "references unknown repository" << repository;
return EXIT_FAILURE;
}
printf(".");
fflush(stdout);
// qDebug() << " " << qPrintable(current) << "rev" << revnum << "->"
// << qPrintable(repository) << qPrintable(branch) << qPrintable(path);
if (change->change_kind == svn_fs_path_change_delete && current == svnprefix && path.isEmpty() && !repo->hasPrefix()) {
if(ruledebug)
qDebug() << "repository" << repository << "branch" << branch << "deleted";
return repo->deleteBranch(branch, revnum);
}
QString previous;
QString prevsvnprefix, prevrepository, preveffectiverepository, prevbranch, prevpath;
if (path_from != NULL) {
previous = QString::fromUtf8(path_from);
if (wasDir(fs, rev_from, path_from, pool.data())) {
previous += '/';
}
MatchRuleList::ConstIterator prevmatch =
findMatchRule(matchRules, rev_from, previous, NoIgnoreRule);
if (prevmatch != matchRules.constEnd()) {
splitPathName(*prevmatch, previous, &prevsvnprefix, &prevrepository,
&preveffectiverepository, &prevbranch, &prevpath);
} else {
qWarning() << "WARN: SVN reports a \"copy from\" @" << revnum << "from" << path_from << "@" << rev_from << "but no matching rules found! Ignoring copy, treating as a modification";
path_from = NULL;
}
}
// current == svnprefix => we're dealing with the contents of the whole branch here
if (path_from != NULL && current == svnprefix && path.isEmpty()) {
if (previous != prevsvnprefix) {
// source is not the whole of its branch
qDebug() << qPrintable(current) << "is a partial branch of repository"
<< qPrintable(prevrepository) << "branch"
<< qPrintable(prevbranch) << "subdir"
<< qPrintable(prevpath);
} else if (preveffectiverepository != effectiveRepository) {
qWarning() << "WARN:" << qPrintable(current) << "rev" << revnum
<< "is a cross-repository copy (from repository"
<< qPrintable(prevrepository) << "branch"
<< qPrintable(prevbranch) << "path"
<< qPrintable(prevpath) << "rev" << rev_from << ")";
} else if (path != prevpath) {
qDebug() << qPrintable(current)
<< "is a branch copy which renames base directory of all contents"
<< qPrintable(prevpath) << "to" << qPrintable(path);
// FIXME: Handle with fast-import 'file rename' facility
// ??? Might need special handling when path == / or prevpath == /
} else {
if (prevbranch == branch) {
// same branch and same repository
qDebug() << qPrintable(current) << "rev" << revnum
<< "is reseating branch" << qPrintable(branch)
<< "to an earlier revision"
<< qPrintable(previous) << "rev" << rev_from;
} else {
// same repository but not same branch
// this means this is a plain branch
qDebug() << qPrintable(repository) << ": branch"
<< qPrintable(branch) << "is branching from"
<< qPrintable(prevbranch);
}
if (repo->createBranch(branch, revnum, prevbranch, rev_from) == EXIT_FAILURE)
return EXIT_FAILURE;
if(CommandLineParser::instance()->contains("svn-branches")) {
Repository::Transaction *txn = transactions.value(repository + branch, 0);
if (!txn) {
txn = repo->newTransaction(branch, svnprefix, revnum);
if (!txn)
return EXIT_FAILURE;
transactions.insert(repository + branch, txn);
}
if(ruledebug)
qDebug() << "Create a true SVN copy of branch (" << key << "->" << branch << path << ")";
txn->deleteFile(path);
recursiveDumpDir(txn, fs, fs_root, key, path, pool, revnum, rule, matchRules, ruledebug);
}
if (rule.annotate) {
// create an annotated tag
fetchRevProps();
repo->createAnnotatedTag(branch, svnprefix, revnum, authorident,
epoch, log);
}
return EXIT_SUCCESS;
}
}
Repository::Transaction *txn = transactions.value(repository + branch, 0);
if (!txn) {
txn = repo->newTransaction(branch, svnprefix, revnum);
if (!txn)
return EXIT_FAILURE;
transactions.insert(repository + branch, txn);
}
//
// If this path was copied from elsewhere, use it to infer _some_
// merge points. This heuristic is fairly useful for tracking
// changes across directory re-organizations and wholesale branch
// imports.
//
if (path_from != NULL && preveffectiverepository == effectiveRepository && prevbranch != branch) {
if(ruledebug)
qDebug() << "copy from branch" << prevbranch << "to branch" << branch << "@rev" << rev_from;
txn->noteCopyFromBranch (prevbranch, rev_from);
}
if (change->change_kind == svn_fs_path_change_replace && path_from == NULL) {
if(ruledebug)
qDebug() << "replaced with empty path (" << branch << path << ")";
txn->deleteFile(path);
}
if (change->change_kind == svn_fs_path_change_delete) {
if(ruledebug)
qDebug() << "delete (" << branch << path << ")";
txn->deleteFile(path);
} else if (!current.endsWith('/')) {
if(ruledebug)
qDebug() << "add/change file (" << key << "->" << branch << path << ")";
dumpBlob(txn, fs_root, key, path, pool);
} else {
if(ruledebug)
qDebug() << "add/change dir (" << key << "->" << branch << path << ")";
// Check unknown svn-properties
if (((path_from == NULL && change->prop_mod==1) || (path_from != NULL && (change->change_kind == svn_fs_path_change_add || change->change_kind == svn_fs_path_change_replace)))
&& CommandLineParser::instance()->contains("propcheck")) {
if (fetchUnknownProps(pool, key, fs_root) != EXIT_SUCCESS) {
qWarning() << "Error checking svn-properties (" << key << ")";
}
}
txn->deleteFile(path);
// Add GitIgnore with svn:ignore
int ignoreSet = false;
if (((path_from == NULL && change->prop_mod==1) || (path_from != NULL && (change->change_kind == svn_fs_path_change_add || change->change_kind == svn_fs_path_change_replace)))
&& CommandLineParser::instance()->contains("svn-ignore")) {
QString svnignore;
// TODO: Check if svn:ignore or other property was changed, but always set on copy/rename (path_from != NULL)
if (fetchIgnoreProps(&svnignore, pool, key, fs_root) != EXIT_SUCCESS) {
qWarning() << "Error fetching svn-properties (" << key << ")";
} else if (!svnignore.isNull()) {
addGitIgnore(pool, key, path, fs_root, txn, svnignore.toStdString().c_str());
ignoreSet = true;
}
}
// Add GitIgnore for empty directories (if GitIgnore was not set previously)
if (CommandLineParser::instance()->contains("empty-dirs") && ignoreSet == false) {
if (addGitIgnore(pool, key, path, fs_root, txn) == EXIT_SUCCESS) {
return EXIT_SUCCESS;
}
}
recursiveDumpDir(txn, fs, fs_root, key, path, pool, revnum, rule, matchRules, ruledebug);
}
if (rule.annotate) {
// create an annotated tag
fetchRevProps();
repo->createAnnotatedTag(branch, svnprefix, revnum, authorident,
epoch, log);
}
return EXIT_SUCCESS;
}
int SvnRevision::recurse(const char *path, const svn_fs_path_change2_t *change,
const char *path_from, const MatchRuleList &matchRules, svn_revnum_t rev_from,
apr_hash_t *changes, apr_pool_t *pool)
{
svn_fs_root_t *fs_root = this->fs_root;
if (change->change_kind == svn_fs_path_change_delete)
SVN_ERR(svn_fs_revision_root(&fs_root, fs, revnum - 1, pool));
// get the dir listing
svn_node_kind_t kind;
SVN_ERR(svn_fs_check_path(&kind, fs_root, path, pool));
if(kind == svn_node_none) {
qWarning() << "WARN: Trying to recurse using a nonexistant path" << path << ", ignoring";
return EXIT_SUCCESS;
} else if(kind != svn_node_dir) {
qWarning() << "WARN: Trying to recurse using a non-directory path" << path << ", ignoring";
return EXIT_SUCCESS;
}
apr_hash_t *entries;
SVN_ERR(svn_fs_dir_entries(&entries, fs_root, path, pool));
AprAutoPool dirpool(pool);
// While we get a hash, put it in a map for sorted lookup, so we can
// repeat the conversions and get the same git commit hashes.
QMap map;
for (apr_hash_index_t *i = apr_hash_first(pool, entries); i; i = apr_hash_next(i)) {
dirpool.clear();
const void *vkey;
void *value;
apr_hash_this(i, &vkey, NULL, &value);
svn_fs_dirent_t *dirent = reinterpret_cast(value);
map.insertMulti(QByteArray(dirent->name), dirent->kind);
}
QMapIterator i(map);
while (i.hasNext()) {
dirpool.clear();
i.next();
QByteArray entry = path + QByteArray("/") + i.key();
QByteArray entryFrom;
if (path_from)
entryFrom = path_from + QByteArray("/") + i.key();
// check if this entry is in the changelist for this revision already
svn_fs_path_change2_t *otherchange =
(svn_fs_path_change2_t*)apr_hash_get(changes, entry.constData(), APR_HASH_KEY_STRING);
if (otherchange && otherchange->change_kind == svn_fs_path_change_add) {
qDebug() << entry << "rev" << revnum
<< "is in the change-list, deferring to that one";
continue;
}
QString current = QString::fromUtf8(entry);
if (i.value() == svn_node_dir)
current += '/';
// find the first rule that matches this pathname
MatchRuleList::ConstIterator match = findMatchRule(matchRules, revnum, current);
if (match != matchRules.constEnd()) {
if (exportDispatch(entry, change, entryFrom.isNull() ? 0 : entryFrom.constData(),
rev_from, changes, current, *match, matchRules, dirpool) == EXIT_FAILURE)
return EXIT_FAILURE;
} else {
if (i.value() == svn_node_dir) {
qDebug() << current << "rev" << revnum
<< "did not match any rules; auto-recursing";
if (recurse(entry, change, entryFrom.isNull() ? 0 : entryFrom.constData(),
matchRules, rev_from, changes, dirpool) == EXIT_FAILURE)
return EXIT_FAILURE;
}
}
}
return EXIT_SUCCESS;
}
int SvnRevision::addGitIgnore(apr_pool_t *pool, const char *key, QString path,
svn_fs_root_t *fs_root, Repository::Transaction *txn, const char *content)
{
// Check for number of subfiles if no content
if (!content) {
apr_hash_t *entries;
SVN_ERR(svn_fs_dir_entries(&entries, fs_root, key, pool));
// Return if any subfiles
if (apr_hash_count(entries)!=0) {
return EXIT_FAILURE;
}
}
// Add gitignore-File
QString gitIgnorePath = path + ".gitignore";
if (content) {
QIODevice *io = txn->addFile(gitIgnorePath, 33188, strlen(content));
if (!CommandLineParser::instance()->contains("dry-run")) {
io->write(content);
io->putChar('\n');
}
} else {
QIODevice *io = txn->addFile(gitIgnorePath, 33188, 0);
if (!CommandLineParser::instance()->contains("dry-run")) {
io->putChar('\n');
}
}
return EXIT_SUCCESS;
}
int SvnRevision::fetchIgnoreProps(QString *ignore, apr_pool_t *pool, const char *key, svn_fs_root_t *fs_root)
{
// Get svn:ignore
svn_string_t *prop = NULL;
SVN_ERR(svn_fs_node_prop(&prop, fs_root, key, "svn:ignore", pool));
if (prop) {
*ignore = QString(prop->data);
// remove patterns with slashes or backslashes,
// they didn't match anything in Subversion but would in Git eventually
ignore->remove(QRegExp("^[^\\r\\n]*[\\\\/][^\\r\\n]*(?:[\\r\\n]|$)|[\\r\\n][^\\r\\n]*[\\\\/][^\\r\\n]*(?=[\\r\\n]|$)"));
// add a slash in front to have the same meaning in Git of only working on the direct children
ignore->replace(QRegExp("(^|[\\r\\n])\\s*(?![\\r\\n]|$)"), "\\1/");
} else {
*ignore = QString();
}
// Get svn:global-ignores
prop = NULL;
SVN_ERR(svn_fs_node_prop(&prop, fs_root, key, "svn:global-ignores", pool));
if (prop) {
QString global_ignore = QString(prop->data);
// remove patterns with slashes or backslashes,
// they didn't match anything in Subversion but would in Git eventually
global_ignore.remove(QRegExp("^[^\\r\\n]*[\\\\/][^\\r\\n]*(?:[\\r\\n]|$)|[\\r\\n][^\\r\\n]*[\\\\/][^\\r\\n]*(?=[\\r\\n]|$)"));
ignore->append(global_ignore);
}
// replace multiple asterisks Subversion meaning by Git meaning
ignore->replace(QRegExp("\\*+"), "*");
return EXIT_SUCCESS;
}
int SvnRevision::fetchUnknownProps(apr_pool_t *pool, const char *key, svn_fs_root_t *fs_root)
{
// Check all properties
apr_hash_t *table;
SVN_ERR(svn_fs_node_proplist(&table, fs_root, key, pool));
apr_hash_index_t *hi;
void *propVal;
const void *propKey;
for (hi = apr_hash_first(pool, table); hi; hi = apr_hash_next(hi)) {
apr_hash_this(hi, &propKey, NULL, &propVal);
if (strcmp((char*)propKey, "svn:ignore")!=0 && strcmp((char*)propKey, "svn:global-ignores")!=0 && strcmp((char*)propKey, "svn:mergeinfo") !=0) {
qWarning() << "WARN: Unknown svn-property" << (char*)propKey << "set to" << ((svn_string_t*)propVal)->data << "for" << key;
}
}
return EXIT_SUCCESS;
}
svn2git-5392048fb1f68fe1cb0681c7b9fef1802dd74d06/src/svn.h 0000664 0000000 0000000 00000002505 13522242427 0021674 0 ustar 00root root 0000000 0000000 /*
* Copyright (C) 2007 Thiago Macieira
*
* 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 3 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, see .
*/
#ifndef SVN_H
#define SVN_H
#include
#include
#include "ruleparser.h"
class Repository;
class SvnPrivate;
class Svn
{
public:
static void initialize();
Svn(const QString &pathToRepository);
~Svn();
void setMatchRules(const QList > &matchRules);
void setRepositories(const QHash &repositories);
void setIdentityMap(const QHash &identityMap);
void setIdentityDomain(const QString &identityDomain);
int youngestRevision();
bool exportRevision(int revnum);
private:
SvnPrivate * const d;
};
#endif