[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: Re: [kdelibs/KDE/4.8] kio/kio: These are local files, use toLocalFile()
From: Ben Cooksley <sourtooth () gmail ! com>
Date: 2012-01-28 12:10:23
Message-ID: CA+XidOEZ=1v+BNohZ6-JFqz=TUrj6BUj7cpFx_F=W4ZgFKrn3Q () mail ! gmail ! com
[Download RAW message or body]
On Jan 29, 2012 12:18 AM, "David Faure" <faure@kde.org> wrote:
>
> Hi Sebastian,
>
> What did you do, exactly? I got 80 commit emails from you in kdelibs
(branch
> KDE/4.8) for things that had been committed to this branch already...
>
> Hmm, in git log I only see this:
> commit 5bc7491f520bb995b54169f94b58f48fc914a827
> Merge: 5682224 bbd9a75
> Author: Sebastian Trueg <trueg@kde.org>
> Date: Fri Jan 27 14:19:44 2012 +0100
>
> Merge branch 'nepomuk/DmsPort-resourceWatcher' into tmp
>
> Strange that this generated so many commit email... Maybe a bug in the git
> commit hook...
Is it possible that a rebase of some description occurred here?
The same routines in the hooks which ran here are the ones that run when
new branches are created - so I doubt it is a hook bug (and if it is it
must be a very obscure corner case... in git itself)
>
>
> On Friday 27 January 2012 14:20:44 Sebastian Trueg wrote:
> > Git commit 1aca8a65ce59f873d433d423bbf434898d84eaab by Sebastian Trueg,
on
> > behalf of David Faure. Committed on 25/01/2012 at 00:33.
> > Pushed by trueg into branch 'KDE/4.8'.
> >
> > These are local files, use toLocalFile()
> >
> > (should make no difference on unix, but should be better on Windows)
> >
> > M +2 -2 kio/kio/kdirlister.cpp
> >
> > http://commits.kde.org/kdelibs/1aca8a65ce59f873d433d423bbf434898d84eaab
> >
> > diff --git a/kio/kio/kdirlister.cpp b/kio/kio/kdirlister.cpp
> > index ec3d622..8cf5901 100644
> > --- a/kio/kio/kdirlister.cpp
> > +++ b/kio/kio/kdirlister.cpp
> > @@ -842,7 +842,7 @@ void KDirListerCache::slotFilesAdded( const QString
&dir
> > /*url*/ ) // from KDirN KUrl urlDir(dir);
> > kDebug(7004) << urlDir; // output urls, not qstrings, since they
might
> > contain a password if (urlDir.isLocalFile()) {
> > - Q_FOREACH(const QString& u,
> > directoriesForCanonicalPath(urlDir.path())) { + Q_FOREACH(const
> > QString& u, directoriesForCanonicalPath(urlDir.toLocalFile())) {
> > updateDirectory(KUrl(u));
> > }
> > } else {
> > @@ -1074,7 +1074,7 @@ void KDirListerCache::slotFileDirty( const
QString&
> > path ) KUrl url(path);
> > url.adjustPath(KUrl::RemoveTrailingSlash);
> > if (isDir) {
> > - Q_FOREACH(const QString& dir,
> > directoriesForCanonicalPath(url.path())) { + Q_FOREACH(const
> > QString& dir, directoriesForCanonicalPath(url.toLocalFile())) {
> > handleDirDirty(dir);
> > }
> > } else {
> --
> David Faure, faure@kde.org, http://www.davidfaure.fr
> Sponsored by Nokia to work on KDE, incl. KDE Frameworks 5
- Ben
[Attachment #3 (text/html)]
<p>On Jan 29, 2012 12:18 AM, "David Faure" <<a \
href="mailto:faure@kde.org">faure@kde.org</a>> wrote:<br> ><br>
> Hi Sebastian,<br>
><br>
> What did you do, exactly? I got 80 commit emails from you in kdelibs (branch<br>
> KDE/4.8) for things that had been committed to this branch already...<br>
><br>
> Hmm, in git log I only see this:<br>
> commit 5bc7491f520bb995b54169f94b58f48fc914a827<br>
> Merge: 5682224 bbd9a75<br>
> Author: Sebastian Trueg <<a \
href="mailto:trueg@kde.org">trueg@kde.org</a>><br> > Date: Fri Jan 27 \
14:19:44 2012 +0100<br> ><br>
> Merge branch 'nepomuk/DmsPort-resourceWatcher' into tmp<br>
><br>
> Strange that this generated so many commit email... Maybe a bug in the git<br>
> commit hook...</p>
<p>Is it possible that a rebase of some description occurred here?<br>
The same routines in the hooks which ran here are the ones that run when new branches \
are created - so I doubt it is a hook bug (and if it is it must be a very obscure \
corner case... in git itself)<br> <br>
><br>
><br>
> On Friday 27 January 2012 14:20:44 Sebastian Trueg wrote:<br>
> > Git commit 1aca8a65ce59f873d433d423bbf434898d84eaab by Sebastian Trueg, \
on<br> > > behalf of David Faure. Committed on 25/01/2012 at 00:33.<br>
> > Pushed by trueg into branch 'KDE/4.8'.<br>
> ><br>
> > These are local files, use toLocalFile()<br>
> ><br>
> > (should make no difference on unix, but should be better on Windows)<br>
> ><br>
> > M +2 -2 kio/kio/kdirlister.cpp<br>
> ><br>
> > <a href="http://commits.kde.org/kdelibs/1aca8a65ce59f873d433d423bbf434898d84 \
eaab">http://commits.kde.org/kdelibs/1aca8a65ce59f873d433d423bbf434898d84eaab</a><br> \
> ><br> > > diff --git a/kio/kio/kdirlister.cpp \
b/kio/kio/kdirlister.cpp<br> > > index ec3d622..8cf5901 100644<br>
> > --- a/kio/kio/kdirlister.cpp<br>
> > +++ b/kio/kio/kdirlister.cpp<br>
> > @@ -842,7 +842,7 @@ void KDirListerCache::slotFilesAdded( const QString \
&dir<br> > > /*url*/ ) // from KDirN KUrl urlDir(dir);<br>
> > kDebug(7004) << urlDir; // output urls, not qstrings, since they \
might<br> > > contain a password if (urlDir.isLocalFile()) {<br>
> > - Q_FOREACH(const QString& u,<br>
> > directoriesForCanonicalPath(urlDir.path())) { + Q_FOREACH(const<br>
> > QString& u, directoriesForCanonicalPath(urlDir.toLocalFile())) {<br>
> > updateDirectory(KUrl(u));<br>
> > }<br>
> > } else {<br>
> > @@ -1074,7 +1074,7 @@ void KDirListerCache::slotFileDirty( const \
QString&<br> > > path ) KUrl url(path);<br>
> > url.adjustPath(KUrl::RemoveTrailingSlash);<br>
> > if (isDir) {<br>
> > - Q_FOREACH(const QString& dir,<br>
> > directoriesForCanonicalPath(url.path())) { + Q_FOREACH(const<br>
> > QString& dir, directoriesForCanonicalPath(url.toLocalFile())) {<br>
> > handleDirDirty(dir);<br>
> > }<br>
> > } else {<br>
> --<br>
> David Faure, <a href="mailto:faure@kde.org">faure@kde.org</a>, <a \
href="http://www.davidfaure.fr">http://www.davidfaure.fr</a><br> > Sponsored by \
Nokia to work on KDE, incl. KDE Frameworks 5</p> <p>- Ben</p>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic