Re: kde-workspace git broken ?
Am Mittwoch, 13. November 2013, 18:42:33 schrieb Ben Cooksley: On Tue, Nov 12, 2013 at 2:21 AM, Wolfgang Bauer wba...@tmo.at wrote: Sorry, it was my fault. And there's also commit 925af7a94eacbe7fef101c6e0f6415b1898d3bfe now. Hi Wolfgang, The sha you have just referenced is a blob, not a commit - at least in kde-workspace. As far as I am aware this issue is now resolved. That was in the KDE/4.11 branch. But it was removed along with the other commits. Can those 4 commits somehow be reverted? To my knowledge, the defective entries have been purged from the history of the repository in their entirety. Yes, all of them are gone as far as I can see... Kindest Regards, Wolfgang
Re: kde-workspace git broken ?
Am Montag, 11. November 2013, 14:13:22 schrieben Sie: On Monday 11 November 2013 13:29:32 Hugo Pereira Da Costa wrote: Hello, I think commits 9f70241d57f3ba1013b9f28650478c8bbb1233e0 137dd285bdf821fd2c8a5c17e30dc9c1a6eca87b 09ea308ab55505efe7aeaebcd4aef6292cd884e6 seriously broke kde-workspace yes, it's broken. I already created a sysadmin request. Unfortunately a similar commit got just pushed to KDE/4.11. So at the moment both master and KDE/4.11 branch are broken. Please remember: do not push a revert of a merge commit. Cheers Martin Sorry, it was my fault. And there's also commit 925af7a94eacbe7fef101c6e0f6415b1898d3bfe now. My most sincere apologies for that. But I do not really know what I did wrong in the first place. Can those 4 commits somehow be reverted? Thanks. Kindest Regards,
Re: kde-workspace git broken ?
On Tue, Nov 12, 2013 at 2:21 AM, Wolfgang Bauer wba...@tmo.at wrote: Am Montag, 11. November 2013, 14:13:22 schrieben Sie: On Monday 11 November 2013 13:29:32 Hugo Pereira Da Costa wrote: Hello, I think commits 9f70241d57f3ba1013b9f28650478c8bbb1233e0 137dd285bdf821fd2c8a5c17e30dc9c1a6eca87b 09ea308ab55505efe7aeaebcd4aef6292cd884e6 seriously broke kde-workspace yes, it's broken. I already created a sysadmin request. Unfortunately a similar commit got just pushed to KDE/4.11. So at the moment both master and KDE/4.11 branch are broken. Please remember: do not push a revert of a merge commit. Cheers Martin Sorry, it was my fault. And there's also commit 925af7a94eacbe7fef101c6e0f6415b1898d3bfe now. Hi Wolfgang, The sha you have just referenced is a blob, not a commit - at least in kde-workspace. As far as I am aware this issue is now resolved. My most sincere apologies for that. But I do not really know what I did wrong in the first place. Can those 4 commits somehow be reverted? To my knowledge, the defective entries have been purged from the history of the repository in their entirety. Thanks. Kindest Regards, Thanks, Ben Cooksley KDE Sysadmin
kde-workspace git broken ?
Hello,
I think commits
9f70241d57f3ba1013b9f28650478c8bbb1233e0
137dd285bdf821fd2c8a5c17e30dc9c1a6eca87b
09ea308ab55505efe7aeaebcd4aef6292cd884e6
seriously broke kde-workspace
At least several changes in oxygen where reverted in the process.
(below is a diff of oxygenstyle.h between
008ac5efabfb99f04813e5dad29c2d0a92d13fc5 and current master), which
should definitly not be there ...
can someone more git-knowledgable check/confirm/fix ?
Hugo
diff --git a/kstyles/oxygen/oxygenstyle.h b/kstyles/oxygen/oxygenstyle.h
index afe632b..59f2ae4 100644
--- a/kstyles/oxygen/oxygenstyle.h
+++ b/kstyles/oxygen/oxygenstyle.h
@@ -24,7 +24,7 @@
// (c) 2002,2003 Maksim Orlovich mo0...@mail.rochester.edu
// based on the KDE3 HighColor Style
// Copyright (C) 2001-2002 Karol Szwed gall...@kde.org
-// (C) 2001-2002 Fredrik Höglund fred...@kde.org
+// (C) 2001-2002 Fredrik Höglund fred...@kde.org
// Drawing routines adapted from the KDE2 HCStyle,
// Copyright (C) 2000 Daniel M. Duley mos...@kde.org
// (C) 2000 Dirk Mueller muel...@kde.org
@@ -51,24 +51,18 @@
#include oxygenmetrics.h
#include oxygentileset.h
-#include QMap
-#include QAbstractScrollArea
-#include QCommonStyle
-#include QDockWidget
-#include QMdiSubWindow
-#include QStyleOption
-#include QStyleOptionSlider
-#include QStylePlugin
-#include QToolBar
-#include QToolBox
-#include QWidget
-
-#include QIcon
-
-namespace OxygenPrivate
-{
- class TabBarData;
-}
+#include QtCore/QMap
+#include QtGui/QAbstractScrollArea
+#include QtGui/QCommonStyle
+#include QtGui/QDockWidget
+#include QtGui/QMdiSubWindow
+#include QtGui/QStyleOption
+#include QtGui/QStyleOptionSlider
+#include QtGui/QToolBar
+#include QtGui/QToolBox
+#include QtGui/QWidget
+
+#include KIcon
namespace Oxygen
{
@@ -85,23 +79,6 @@ namespace Oxygen
class WidgetExplorer;
class BlurHelper;
- class StylePlugin : public QStylePlugin
- {
- Q_OBJECT
- Q_PLUGIN_METADATA(IID org.qt-project.Qt.QStyleFactoryInterface FILE
oxygen.json )
-
- public:
-
- //! constructor
- StylePlugin(QObject *parent = 0):
- QStylePlugin(parent)
- {}
-
- //! create style
- QStyle* create( const QString );
-
- };
-
//! toplevel manager
class TopLevelManager: public QObject
{
@@ -197,6 +174,7 @@ namespace Oxygen
bool eventFilterComboBoxContainer( QWidget*, QEvent* );
bool eventFilterDockWidget( QDockWidget*, QEvent* );
bool eventFilterMdiSubWindow( QMdiSubWindow*, QEvent* );
+ bool eventFilterQ3ListView( QWidget*, QEvent* );
bool eventFilterScrollBar( QWidget*, QEvent* );
bool eventFilterTabBar( QWidget*, QEvent* );
bool eventFilterToolBar( QToolBar*, QEvent* );
@@ -211,7 +189,7 @@ namespace Oxygen
//@}
- protected Q_SLOTS:
+ protected slots:
//! update oxygen configuration
void oxygenConfigurationChanged( void );
@@ -226,7 +204,10 @@ namespace Oxygen
{ return pixelMetric(PM_DefaultLayoutSpacing, option, widget); }
//! standard icons
- virtual QIcon standardIcon( StandardPixmap, const QStyleOption* = 0,
const QWidget* = 0) const;
+ virtual QIcon standardIconImplementation(
+ StandardPixmap standardIcon,
+ const QStyleOption *option,
+ const QWidget *widget) const;
protected:
@@ -300,6 +281,59 @@ namespace Oxygen
//! list of slabs
typedef QListSlabRect SlabRectList;
+ /*!
+ tabBar data class needed for
+ the rendering of tabbars when
+ one tab is being drawn
+ */
+ class TabBarData: public QObject
+ {
+
+ public:
+
+ //! constructor
+ explicit TabBarData( Style* parent ):
+ QObject( parent ),
+ _style( parent ),
+ _dirty( false )
+ {}
+
+ //! destructor
+ virtual ~TabBarData( void )
+ {}
+
+ //! assign target tabBar
+ void lock( const QWidget* widget )
+ { _tabBar = widget; }
+
+ //! true if tabbar is locked
+ bool locks( const QWidget* widget ) const
+ { return _tabBar _tabBar.data() == widget; }
+
+ //! set dirty
+ void setDirty( const bool value = true )
+ { _dirty = value; }
+
+ //! release
+ void release( void )
+ { _tabBar.clear(); }
+
+ //! draw tabBarBase
+ virtual void drawTabBarBaseControl( const QStyleOptionTab*, QPainter*,
const QWidget* );
+
+ private:
+
+ //! pointer to parent style object
+ QWeakPointerconst Style _style;
+
+ //! pointer to target tabBar
+ QWeakPointerconst QWidget _tabBar;
+
+ //! if true, will paint on next TabBarTabShapeControlCall
+ bool _dirty;
+
+ };
+
//@}
//! animations
@@ -341,6 +375,10 @@ namespace Oxygen
SplitterFactory splitterFactory( void ) const
{ return *_splitterFactory; }
+ //! tabBar data
+ TabBarData tabBarData( void ) const
+ { return *_tabBarData; }
+
//!@name subelementRect specialized functions
//@{
@@ -477,6 +515,8 @@ namespace Oxygen
bool drawPanelItemViewItemPrimitive( const QStyleOption*, QPainter*,
const QWidget* ) const;
bool drawPanelLineEditPrimitive( const QStyleOption*, QPainter*, const
QWidget* ) const;
bool drawIndicatorMenuCheckMarkPrimitive( const QStyleOption*,
QPainter*, const QWidget*
Re: kde-workspace git broken ?
On Monday 11 November 2013 13:29:32 Hugo Pereira Da Costa wrote: Hello, I think commits 9f70241d57f3ba1013b9f28650478c8bbb1233e0 137dd285bdf821fd2c8a5c17e30dc9c1a6eca87b 09ea308ab55505efe7aeaebcd4aef6292cd884e6 seriously broke kde-workspace yes, it's broken. I already created a sysadmin request. Unfortunately a similar commit got just pushed to KDE/4.11. So at the moment both master and KDE/4.11 branch are broken. Please remember: do not push a revert of a merge commit. Cheers Martin signature.asc Description: This is a digitally signed message part.
Re: kde-workspace git broken ?
On Monday 11 November 2013 14:13:22 Martin Gräßlin wrote: Please remember: do not push a revert of a merge commit. Another tip not everyone might know: you can use git push --dry-run to see which changes would be pushed, without actually pushing them. That helps a lot with avoiding breakage. Sven
Re: kde-workspace git broken ?
On 11/11/2013 02:13 PM, Martin Gräßlin wrote: On Monday 11 November 2013 13:29:32 Hugo Pereira Da Costa wrote: Hello, I think commits 9f70241d57f3ba1013b9f28650478c8bbb1233e0 137dd285bdf821fd2c8a5c17e30dc9c1a6eca87b 09ea308ab55505efe7aeaebcd4aef6292cd884e6 seriously broke kde-workspace yes, it's broken. I already created a sysadmin request. Unfortunately a similar commit got just pushed to KDE/4.11. So at the moment both master and KDE/4.11 branch are broken. Please remember: do not push a revert of a merge commit. Is it possible to have a commit hook that would prevent such revert ? Cheers Martin
Re: kde-workspace git broken ?
Hi everyone, I have now force pushed kde-workspace to return it to a valid state. + 09ea308...008ac5e 008ac5efabfb99f04813e5dad29c2d0a92d13fc5 - master (forced update) + 8105121...f1b57a9 f1b57a9ca9193fb94d985b5cc6d739866c5c59d2 - KDE/4.11 (forced update) I have also blacklisted the following defective commits from re-entering the repository: - 8105121937a9d4727e6c8e4473f45f4cf0692175 - 092e385f018c5aea7996babb7b2c4d317e71a085 - 09ea308ab55505efe7aeaebcd4aef6292cd884e6 Any work after those commits has been discarded, and will need to be reapplied by cherry-picking. Do NOT attempt to rebase or merge your work across, you will simply reintroduce the defective commits. In terms of a hook to block this - unfortunately while merges are detectable, reverts are not, they simply look like ordinary commits. Anything we add to attempt to block this would be very fragile and vulnerable to failure (ie. looking in the commit message for Revert and merge) Thanks, Ben Cooksley KDE Sysadmin
