[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-sdk-devel
Subject: Re: [Kde-scm-interest] New life in kdesdk-migration-to-git :) (was: Re: Layout of "lokalize" and "ko
From: Sebastian_Dörner <sebastian () sebastian-doerner ! de>
Date: 2013-01-01 13:35:11
Message-ID: CA+_kBjA3VAr_gRhUmAA_Eq8rZCEtBFodovfTotqXtt871_LE2g () mail ! gmail ! com
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
Great work, Jeremy!
Overall this makes sense to me, but here's an observation that might help
you double-check your thoughts:
Below the if-statement you changed, we have "if (previous != prevsvnprefix)
{", which leads to not creating a branch. I guess this has a similar
function as the if-statement you changed. So this probably works like a
double-check (but somewhat different apparently). Otherwise, the same
branch would now (with your change) be created multiple times, once for
each subdirectory match (or does that in fact happen, but is recognized and
aborted inside CreateBranch?). The delete-part however, does not have the
double-check, so it needs the isEmpty() check.
On 31 December 2012 23:21, Jeremy Whiting <jpwhiting@kde.org> wrote:
> Ok, today I found out why all the tag annotations were missing in
> kde-dev-utils (and a few in dolphin-plugins also) The attached patch fixes
> the issue, the problem is that if a branch is created with nothing at the
> top level, svn2git doesn't create the branch, and if there's no branch it
> doesn't create the annotated tag, etc. The attached patch to svn2git fixes
> the issue and the fixed dolphin-plugins and kde-dev-utils are on
> scratch/whiting/dolphin-plugins.git and kde-dev-utils.git
>
> It seems when torgny added the path.isEmpty() he was fixing deleting
> branches when only a subfolder gets removed. This path.isEmpty() is where
> it's creating branches though, not deleting them. I can push this commit
> to svn2git master if it looks ok with you guys.
>
> thanks,
> Jeremy
>
>
> On Sat, Dec 29, 2012 at 9:39 AM, Jeremy Whiting <jpwhiting@kde.org> wrote:
>
>> Ok, I added one. It seems to build and install fine here. Though I did
>> notice kde-dev-utils has both doc/kmtrace and kmtrace/doc with the same
>> contents I'll see if I can find out why and not add the one in doc/kmtrace.
>>
>> thanks,
>> Jeremy
>>
>>
>> On Sat, Dec 29, 2012 at 9:05 AM, Albert Astals Cid <aacid@kde.org> wrote:
>>
>>> El Dissabte, 29 de desembre de 2012, a les 12:57:27, Sebastian Dörner va
>>> escriure:
>>> > On 29 December 2012 00:47, Albert Astals Cid <aacid@kde.org> wrote:
>>> > > El Divendres, 28 de desembre de 2012, a les 13:36:39, Jeremy Whiting
>>> va
>>> > >
>>> > > escriure:
>>> > > > I've also just pushed new repos to scratch/whiting using the latest
>>> > > > rules
>>> > > > and parentmaps. There is one issue that some of the tags aren't
>>> > >
>>> > > annotated
>>> > >
>>> > > > so are failing the hook to be pushed, but otherwise check them out
>>> and
>>> > >
>>> > > see
>>> > >
>>> > > > if anything is missing. I'll look into the tag issue.
>>> > >
>>> > > CMake Error: The source directory "kde-dev-utils" does not appear to
>>> > > contain
>>> > > CMakeLists.txt.
>>> >
>>> > This is because there is none. This repo is entirely new in its
>>> collection
>>> > of utils, so we don't have a CMakeLists.txt. I would therefore argue
>>> to add
>>> > one after the conversion.
>>>
>>> Can we get that in then? Without it it is quite hard to know if
>>> installing the
>>> git repos gives me the same files that installing the svn repo since i
>>> can't
>>> install kde-dev-utils.
>>>
>>> Cheers,
>>> Albert
>>>
>>> >
>>> > > strigi-analyzers seems a weak name, it ought to be something like
>>> > > kdesdk-string-analyzers, since the repo name will be kde:xxx and you
>>> don't
>>> > > want to "own" kde:strigi-analyzers
>>> > >
>>> > > Same for thumbnailers
>>> >
>>> > I just adapted the rules to use the names kdesdk-strigi-analyzers and
>>> > kdesdk-thumbnailers.
>>> >
>>> > > the umbrello repo is huge, anything we could do so it's not that big?
>>> > >
>>> > > sandsmark in git says "git gc --aggressive && git prune gets it down
>>> to
>>> > > 28mb
>>> > > for me" maybe we can do that to all the repos?
>>> >
>>> > As we usually did that in previous conversions, I agree we should do it
>>> > here.
>>> >
>>> > > Cheers,
>>> > >
>>> > > Albert
>>> > >
>>> > > > thanks,
>>> > > > Jeremy
>>> > > >
>>> > > >
>>> > > > On Fri, Dec 28, 2012 at 8:23 AM, Sebastian Dörner <
>>> > > >
>>> > > > sebastian@sebastian-doerner.de> wrote:
>>> > > > > I've been working with Jeremy (and Nicolas) so we can finally
>>> get this
>>> > > > > over with. This is a heads-up about the strigi-analyzers. The
>>> current
>>> > > > > situation is as follows:
>>> > > > >
>>> > > > > 1) Nobody seems to have very strong opinions about whether to
>>> have
>>> > > > > the
>>> > > > > analyzers with the apps or their own repo (among the stakeholders
>>> > > > > Nick,
>>> > > > > Kevin, Friedrich, Jeremy, me)
>>> > > > > 2) Nick prefers the analyzers separate, because the analyzers
>>> don't
>>> > > > > depend on lokalize.
>>> > > > > 3) Kevin is unsure, would like to be consistent with whatever
>>> > > > > Lokalize
>>> > > > > does.
>>> > > > > 4) KDE / Nepomuk will probably move away from strigi in the
>>> future.
>>> > > > > 5) Currently distributions often have a separate package
>>> > > > > kdesdk-strigi-analyzers (or similar).
>>> > > > > 6) It is easiest from a rule-writing pov to keep the analyzers
>>> > >
>>> > > separate.
>>> > >
>>> > > > > Particularly because of points 4 and 5 we are currently
>>> implementing a
>>> > > > > solution with separate repos for strigi-analyzers (all of them)
>>> and
>>> > > > > thumbnailers. Neither the kompare nor the lokalize repo would
>>> then
>>> > >
>>> > > contain
>>> > >
>>> > > > > any strigi-analyzers.
>>> > > > > If you have any objections, please bring them forward now.
>>> > > > >
>>> > > > > Regards
>>> > > > > Sebastian
>>> > > > >
>>> > > > > _______________________________________________
>>> > > > > Kde-scm-interest mailing list
>>> > > > > Kde-scm-interest@kde.org
>>> > > > > https://mail.kde.org/mailman/listinfo/kde-scm-interest
>>>
>>
>>
>
[Attachment #5 (text/html)]
<div dir="ltr">Great work, Jeremy!<div><br></div><div style>Overall this makes sense \
to me, but here's an observation that might help you double-check your \
thoughts:</div><div style><br></div><div style>Below the if-statement you changed, we \
have "if (previous != prevsvnprefix) {", which leads to not creating a \
branch. I guess this has a similar function as the if-statement you changed. So this \
probably works like a double-check (but somewhat different apparently). Otherwise, \
the same branch would now (with your change) be created multiple times, once for each \
subdirectory match (or does that in fact happen, but is recognized and aborted inside \
CreateBranch?). The delete-part however, does not have the double-check, so it needs \
the isEmpty() check.</div> </div><div class="gmail_extra"><br><br><div \
class="gmail_quote">On 31 December 2012 23:21, Jeremy Whiting <span dir="ltr"><<a \
href="mailto:jpwhiting@kde.org" target="_blank">jpwhiting@kde.org</a>></span> \
wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px \
#ccc solid;padding-left:1ex"> <div dir="ltr"><div><div>Ok, today I found out why all \
the tag annotations were missing in kde-dev-utils (and a few in dolphin-plugins also) \
The attached patch fixes the issue, the problem is that if a branch is created with \
nothing at the top level, svn2git doesn't create the branch, and if there's \
no branch it doesn't create the annotated tag, etc. The attached patch to \
svn2git fixes the issue and the fixed dolphin-plugins and kde-dev-utils are on \
scratch/whiting/dolphin-plugins.git and kde-dev-utils.git<br>
<br></div>It seems when torgny added the path.isEmpty() he was fixing deleting \
branches when only a subfolder gets removed. This path.isEmpty() is where it's \
creating branches though, not deleting them. I can push this commit to svn2git \
master if it looks ok with you guys.<br>
<br></div>thanks,<br>Jeremy<br></div><div class="HOEnZb"><div class="h5"><div \
class="gmail_extra"><br><br><div class="gmail_quote">On Sat, Dec 29, 2012 at 9:39 AM, \
Jeremy Whiting <span dir="ltr"><<a href="mailto:jpwhiting@kde.org" \
target="_blank">jpwhiting@kde.org</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc \
solid;padding-left:1ex"><div dir="ltr"><div>Ok, I added one. It seems to build and \
install fine here. Though I did notice kde-dev-utils has both doc/kmtrace and \
kmtrace/doc with the same contents I'll see if I can find out why and not add \
the one in doc/kmtrace.<br>
<br></div>thanks,<br>Jeremy<br></div><div><div><div class="gmail_extra"><br><br><div \
class="gmail_quote">On Sat, Dec 29, 2012 at 9:05 AM, Albert Astals Cid <span \
dir="ltr"><<a href="mailto:aacid@kde.org" \
target="_blank">aacid@kde.org</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc \
solid;padding-left:1ex">El Dissabte, 29 de desembre de 2012, a les 12:57:27, \
Sebastian Dörner va<br> escriure:<br>
<div>> On 29 December 2012 00:47, Albert Astals Cid <<a \
href="mailto:aacid@kde.org" target="_blank">aacid@kde.org</a>> wrote:<br> > \
> El Divendres, 28 de desembre de 2012, a les 13:36:39, Jeremy Whiting va<br> > \
><br> > > escriure:<br>
> > > I've also just pushed new repos to scratch/whiting using the \
latest<br> > > > rules<br>
> > > and parentmaps. There is one issue that some of the tags \
aren't<br> > ><br>
> > annotated<br>
> ><br>
> > > so are failing the hook to be pushed, but otherwise check them out \
and<br> > ><br>
> > see<br>
> ><br>
> > > if anything is missing. I'll look into the tag issue.<br>
> ><br>
> > CMake Error: The source directory "kde-dev-utils" does not appear \
to<br> > > contain<br>
> > CMakeLists.txt.<br>
><br>
> This is because there is none. This repo is entirely new in its collection<br>
> of utils, so we don't have a CMakeLists.txt. I would therefore argue to \
add<br> > one after the conversion.<br>
<br>
</div>Can we get that in then? Without it it is quite hard to know if installing \
the<br> git repos gives me the same files that installing the svn repo since i \
can't<br> install kde-dev-utils.<br>
<br>
Cheers,<br>
Albert<br>
<div><div><br>
><br>
> > strigi-analyzers seems a weak name, it ought to be something like<br>
> > kdesdk-string-analyzers, since the repo name will be kde:xxx and you \
don't<br> > > want to "own" kde:strigi-analyzers<br>
> ><br>
> > Same for thumbnailers<br>
><br>
> I just adapted the rules to use the names kdesdk-strigi-analyzers and<br>
> kdesdk-thumbnailers.<br>
><br>
> > the umbrello repo is huge, anything we could do so it's not that \
big?<br> > ><br>
> > sandsmark in git says "git gc --aggressive && git prune gets \
it down to<br> > > 28mb<br>
> > for me" maybe we can do that to all the repos?<br>
><br>
> As we usually did that in previous conversions, I agree we should do it<br>
> here.<br>
><br>
> > Cheers,<br>
> ><br>
> > Albert<br>
> ><br>
> > > thanks,<br>
> > > Jeremy<br>
> > ><br>
> > ><br>
> > > On Fri, Dec 28, 2012 at 8:23 AM, Sebastian Dörner <<br>
> > ><br>
> > > <a href="mailto:sebastian@sebastian-doerner.de" \
target="_blank">sebastian@sebastian-doerner.de</a>> wrote:<br> > > > > \
I've been working with Jeremy (and Nicolas) so we can finally get this<br> > \
> > > over with. This is a heads-up about the strigi-analyzers. The \
current<br> > > > > situation is as follows:<br>
> > > ><br>
> > > > 1) Nobody seems to have very strong opinions about whether to \
have<br> > > > > the<br>
> > > > analyzers with the apps or their own repo (among the \
stakeholders<br> > > > > Nick,<br>
> > > > Kevin, Friedrich, Jeremy, me)<br>
> > > > 2) Nick prefers the analyzers separate, because the analyzers \
don't<br> > > > > depend on lokalize.<br>
> > > > 3) Kevin is unsure, would like to be consistent with \
whatever<br> > > > > Lokalize<br>
> > > > does.<br>
> > > > 4) KDE / Nepomuk will probably move away from strigi in the \
future.<br> > > > > 5) Currently distributions often have a separate \
package<br> > > > > kdesdk-strigi-analyzers (or similar).<br>
> > > > 6) It is easiest from a rule-writing pov to keep the \
analyzers<br> > ><br>
> > separate.<br>
> ><br>
> > > > Particularly because of points 4 and 5 we are currently \
implementing a<br> > > > > solution with separate repos for \
strigi-analyzers (all of them) and<br> > > > > thumbnailers. Neither the \
kompare nor the lokalize repo would then<br> > ><br>
> > contain<br>
> ><br>
> > > > any strigi-analyzers.<br>
> > > > If you have any objections, please bring them forward now.<br>
> > > ><br>
> > > > Regards<br>
> > > > Sebastian<br>
> > > ><br>
> > > > _______________________________________________<br>
> > > > Kde-scm-interest mailing list<br>
> > > > <a href="mailto:Kde-scm-interest@kde.org" \
target="_blank">Kde-scm-interest@kde.org</a><br> > > > > <a \
href="https://mail.kde.org/mailman/listinfo/kde-scm-interest" \
target="_blank">https://mail.kde.org/mailman/listinfo/kde-scm-interest</a><br> \
</div></div></blockquote></div><br></div> </div></div></blockquote></div><br></div>
</div></div></blockquote></div><br></div>
_______________________________________________
kde-sdk-devel mailing list
kde-sdk-devel@kde.org
https://mail.kde.org/mailman/listinfo/kde-sdk-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic