Re: [Kicad-developers] Git transition
I will try to make the mirror be synced from launchpad, at latest on friday. 2016-08-24 5:39 GMT+02:00 kinichiro inoguchi: > Hi, > > I hope mirror on GitHub keeps refreshing from new git repo on Launchpad. > https://github.com/KiCad/kicad-source-mirror > > For GUI translators task, > we need to download source code tarball to obtain strings in the GUI. > > On GitHub, we could download every committed rev as tarball by one click. > On Launchpad, it seems that only tagged rev can be downloaded. > > If POT file for GUI is provided for every commits, maybe, GUI translators do > not need to access mirror, though. > > Best regards > > > ___ > Mailing list: https://launchpad.net/~kicad-developers > Post to : kicad-developers@lists.launchpad.net > Unsubscribe : https://launchpad.net/~kicad-developers > More help : https://help.launchpad.net/ListHelp > ___ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
Re: [Kicad-developers] [PATCH 1/2] DRC: Add test for via drill size
Both patches commited. Thank you. On Thu, Aug 25, 2016 at 03:16:27AM +0200, Simon Richter wrote: > > This test is only run when the via size itself is acceptable, to avoid > bigger changes to the codebase. > --- > pcbnew/class_drc_item.cpp | 4 > pcbnew/drc_clearance_test_functions.cpp | 12 > pcbnew/drc_stuff.h | 26 ++ > 3 files changed, 30 insertions(+), 12 deletions(-) > ___ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
Re: [Kicad-developers] [PATCH] Via properties: apply microvia settings to microvias
Patch committed. Thank you On Thu, Aug 25, 2016 at 02:28:57AM +0200, Simon Richter wrote: > --- > pcbnew/dialogs/dialog_track_via_properties.cpp | 19 +-- > 1 file changed, 17 insertions(+), 2 deletions(-) > ___ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
[Kicad-developers] [PATCH 2/2] DRC: Test all segments
The DRC also runs per-segment tests, not just segment-segment, so the last segment needs to be tested as well, with an empty list of segments to test against. --- pcbnew/drc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pcbnew/drc.cpp b/pcbnew/drc.cpp index c2c6e1a..9539316 100644 --- a/pcbnew/drc.cpp +++ b/pcbnew/drc.cpp @@ -514,7 +514,7 @@ void DRC::testTracks( wxWindow *aActiveWindow, bool aShowProgressBar ) int ii = 0; count = 0; -for( TRACK* segm = m_pcb->m_Track; segm && segm->Next(); segm = segm->Next() ) +for( TRACK* segm = m_pcb->m_Track; segm; segm = segm->Next() ) { if ( ii++ > delta ) { ___ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
[Kicad-developers] [PATCH 1/2] DRC: Add test for via drill size
This test is only run when the via size itself is acceptable, to avoid bigger changes to the codebase. --- pcbnew/class_drc_item.cpp | 4 pcbnew/drc_clearance_test_functions.cpp | 12 pcbnew/drc_stuff.h | 26 ++ 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/pcbnew/class_drc_item.cpp b/pcbnew/class_drc_item.cpp index ff145f4..cf92901 100644 --- a/pcbnew/class_drc_item.cpp +++ b/pcbnew/class_drc_item.cpp @@ -89,6 +89,10 @@ wxString DRC_ITEM::GetErrorText() const return wxString( _( "Too small via size" ) ); case DRCE_TOO_SMALL_MICROVIA: return wxString( _( "Too small micro via size" ) ); +case DRCE_TOO_SMALL_VIA_DRILL: +return wxString( _( "Too small via drill" ) ); +case DRCE_TOO_SMALL_MICROVIA_DRILL: +return wxString( _( "Too small micro via drill" ) ); // use since this is text ultimately embedded in HTML case DRCE_NETCLASS_TRACKWIDTH: diff --git a/pcbnew/drc_clearance_test_functions.cpp b/pcbnew/drc_clearance_test_functions.cpp index ce34c80..5bf79a3 100644 --- a/pcbnew/drc_clearance_test_functions.cpp +++ b/pcbnew/drc_clearance_test_functions.cpp @@ -169,6 +169,12 @@ bool DRC::doTrackDrc( TRACK* aRefSeg, TRACK* aStart, bool testPads ) DRCE_TOO_SMALL_MICROVIA, m_currentMarker ); return false; } +if( refvia->GetDrill() < dsnSettings.m_MicroViasMinDrill ) +{ +m_currentMarker = fillMarker( refvia, NULL, + DRCE_TOO_SMALL_MICROVIA_DRILL, m_currentMarker ); +return false; +} } else { @@ -178,6 +184,12 @@ bool DRC::doTrackDrc( TRACK* aRefSeg, TRACK* aStart, bool testPads ) DRCE_TOO_SMALL_VIA, m_currentMarker ); return false; } +if( refvia->GetDrill() < dsnSettings.m_ViasMinDrill ) +{ +m_currentMarker = fillMarker( refvia, NULL, + DRCE_TOO_SMALL_VIA_DRILL, m_currentMarker ); +return false; +} } // test if via's hole is bigger than its diameter diff --git a/pcbnew/drc_stuff.h b/pcbnew/drc_stuff.h index 9a5e147..1d863ea 100644 --- a/pcbnew/drc_stuff.h +++ b/pcbnew/drc_stuff.h @@ -66,18 +66,20 @@ #define DRCE_TOO_SMALL_TRACK_WIDTH 27 ///< Too small track width #define DRCE_TOO_SMALL_VIA 28 ///< Too small via size #define DRCE_TOO_SMALL_MICROVIA29 ///< Too small micro via size -#define DRCE_NETCLASS_TRACKWIDTH 30 ///< netclass has TrackWidth < board.m_designSettings->m_TrackMinWidth -#define DRCE_NETCLASS_CLEARANCE31 ///< netclass has Clearance < board.m_designSettings->m_TrackClearance -#define DRCE_NETCLASS_VIASIZE 32 ///< netclass has ViaSize < board.m_designSettings->m_ViasMinSize -#define DRCE_NETCLASS_VIADRILLSIZE 33 ///< netclass has ViaDrillSize < board.m_designSettings->m_ViasMinDrill -#define DRCE_NETCLASS_uVIASIZE 34 ///< netclass has ViaSize < board.m_designSettings->m_MicroViasMinSize -#define DRCE_NETCLASS_uVIADRILLSIZE35 ///< netclass has ViaSize < board.m_designSettings->m_MicroViasMinDrill -#define DRCE_VIA_INSIDE_KEEPOUT36 ///< Via in inside a keepout area -#define DRCE_TRACK_INSIDE_KEEPOUT 37 ///< Track in inside a keepout area -#define DRCE_PAD_INSIDE_KEEPOUT38 ///< Pad in inside a keepout area -#define DRCE_VIA_INSIDE_TEXT 39 ///< Via in inside a text area -#define DRCE_TRACK_INSIDE_TEXT 40 ///< Track in inside a text area -#define DRCE_PAD_INSIDE_TEXT 41 ///< Pad in inside a text area +#define DRCE_TOO_SMALL_VIA_DRILL 30 ///< Too small via drill +#define DRCE_TOO_SMALL_MICROVIA_DRILL 31 ///< Too small micro via drill +#define DRCE_NETCLASS_TRACKWIDTH 32 ///< netclass has TrackWidth < board.m_designSettings->m_TrackMinWidth +#define DRCE_NETCLASS_CLEARANCE33 ///< netclass has Clearance < board.m_designSettings->m_TrackClearance +#define DRCE_NETCLASS_VIASIZE 34 ///< netclass has ViaSize < board.m_designSettings->m_ViasMinSize +#define DRCE_NETCLASS_VIADRILLSIZE 35 ///< netclass has ViaDrillSize < board.m_designSettings->m_ViasMinDrill +#define DRCE_NETCLASS_uVIASIZE 36 ///< netclass has ViaSize < board.m_designSettings->m_MicroViasMinSize +#define DRCE_NETCLASS_uVIADRILLSIZE37 ///< netclass has ViaSize < board.m_designSettings->m_MicroViasMinDrill +#define DRCE_VIA_INSIDE_KEEPOUT38 ///< Via in inside a keepout area
Re: [Kicad-developers] Git transition
Having discussed this a bit more on IRC I must take back this suggestion. Presumably 5.0 will be based on master rather than on 4.0, so things will get messy if we do that... On Wed, Aug 24, 2016 at 08:03:24PM -0400, Chris Pavlina wrote: > I really think the branch should just be named 'stable', things like > "4.0" should be tags inside it. > > However I have pushed an additional 4.0 branch to avoid breaking things > that may have been depending on that name, if there are any. > > On Wed, Aug 24, 2016 at 07:56:05PM -0400, Wayne Stambaugh wrote: > > Nick, > > > > Is this what you were looking for or are you also expecting the branch > > to be named 4.0 instead of stable-4? > > > > On 8/24/2016 7:31 PM, Chris Pavlina wrote: > > > Should be good now. > > > > > > On Wed, Aug 24, 2016 at 07:24:45PM -0400, Wayne Stambaugh wrote: > > >> Thanks. > > >> > > >> On 8/24/2016 7:16 PM, Chris Pavlina wrote: > > >>> I'll fix it. > > >>> > > >>> On Wed, Aug 24, 2016 at 07:11:42PM -0400, Wayne Stambaugh wrote: > > Are saying that Niki's branch is different? When I was asking about a > > git version of the stable branch, why didn't you say something? I > > didn't even see that there was another branch in the mirror on github. > > I agree that it should match the mirror assuming the mirror is up to > > date with the bzr stable 4 branch. What do I need to fix this? If > > someone else wants to step up to the plate and fix this, I'm fine with > > that. I'm busy trying to get my own work done and my patience with the > > git transition is wearing thin. > > > > On 8/24/2016 4:35 PM, Nick Østergaard wrote: > > > I don't like that your "stable-4" branch don't match the 4.0 branch in > > > the kicad-source mirror. > > > See: > > > https://git.launchpad.net/~stambaughw/kicad/+git/kicad-dev/commit/?h=stable-4=7ced0635031e2dcf7ec34db598726f0887da2cc5 > > > https://github.com/KiCad/kicad-source-mirror/commit/bcdcaa724d1097bffd3654220ed549363fac8059 > > > > > > I think it would be better off if we could use the 4.0 branch from the > > > kicad-source-mirror to base it on, and name the branch 4.0 as it was > > > named before and everywhere else. > > > > > > Why did you suddenly start to name the banch "stable-" > > > > > > 2016-08-23 19:39 GMT+02:00 Wayne Stambaugh: > > >> Thanks everyone for taking a look at this. I just pushed the > > >> stable-4 > > >> branch to lp:kicad so we should be synced up. I'll tag the bzr > > >> stable 4 > > >> repo as obsolete when I get a chance. > > >> > > >> On 8/23/2016 1:13 PM, kinichiro inoguchi wrote: > > Can someone please take a look at it you get a chance and make > > sure I > > didn't make a mess of things before I push this to the main repo. > > >>> > > >>> Hi, > > >>> > > >>> I compared the new git stable-4 repository and old bzr lp:kicad/4.0. > > >>> https://git.launchpad.net/~stambaughw/kicad/+git/kicad-dev > > >>> https://code.launchpad.net/~stambaughw/kicad/4.0 > > >>> > > >>> 1. empty directory packaging/linux/ is missing > > >>> > > >>> I checked contents by $ diff -rq lp_kicad_4/ git_stable4/ . > > >>> Is this directory needed ? > > >>> > > >>> 2. difference of commit logs > > >>> > > >>> On lp_kicad_4, lines of logs are 6308. > > >>> $ bzr log --line | wc -l > > >>> 6308 > > >>> > > >>> On git_stable4, 8181 logs exists. > > >>> $ git log --oneline | wc -l > > >>> 8181 > > >>> > > >>> To see diffs, I created the log texts by these commands. > > >>> > > >>> On lp_kicad_4, > > >>> $ bzr log --line | sed 's/^[0-9]*: .* > > >>> [0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] //' \ > > >>> | sed 's/^{.*} //' > ../bzr.txt > > >>> > > >>> On git_stable4, > > >>> $ git log --oneline | sed 's/^[a-zA-Z0-9]* //' > ../git.txt > > >>> > > >>> Then look at the diffs, > > >>> $ diff -y bzr.txt git.txt | less > > >>> > > >>> For example, diffs are like this. > > >>> > > >>> > > >>> ... > > >>> Pcbnew: fix potential issue (crash) when loading board files > > >>> Pcbnew: fix > > >>> [merge] OSX: back port touchpad support from development bran | > > >>> OSX: back po > > >>> > > > >>> Fix 3d-viewe > > >>> > > > >>> Fix touchpad > > >>> > > > >>> Add support > > >>> OSX: legacy canvas rendering speed improvements. > > >>> OSX: legacy > > >>> ... > > >>> > > >>>
[Kicad-developers] [PATCH] Via properties: apply microvia settings to microvias
--- pcbnew/dialogs/dialog_track_via_properties.cpp | 19 +-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/pcbnew/dialogs/dialog_track_via_properties.cpp b/pcbnew/dialogs/dialog_track_via_properties.cpp index 32297c9..8bd3918 100644 --- a/pcbnew/dialogs/dialog_track_via_properties.cpp +++ b/pcbnew/dialogs/dialog_track_via_properties.cpp @@ -289,8 +289,23 @@ bool DIALOG_TRACK_VIA_PROPERTIES::Apply() if( m_viaNetclass->IsChecked() ) { -v->SetWidth( v->GetNetClass()->GetViaDiameter() ); -v->SetDrill( v->GetNetClass()->GetViaDrill() ); +switch( v->GetViaType() ) +{ +default: +wxFAIL_MSG("Unhandled via type"); +// fall through + +case VIA_THROUGH: +case VIA_BLIND_BURIED: +v->SetWidth( v->GetNetClass()->GetViaDiameter() ); +v->SetDrill( v->GetNetClass()->GetViaDrill() ); +break; + +case VIA_MICROVIA: +v->SetWidth( v->GetNetClass()->GetuViaDiameter() ); +v->SetDrill( v->GetNetClass()->GetuViaDrill() ); +break; +} } else { ___ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
Re: [Kicad-developers] Git transition
I really think the branch should just be named 'stable', things like "4.0" should be tags inside it. However I have pushed an additional 4.0 branch to avoid breaking things that may have been depending on that name, if there are any. On Wed, Aug 24, 2016 at 07:56:05PM -0400, Wayne Stambaugh wrote: > Nick, > > Is this what you were looking for or are you also expecting the branch > to be named 4.0 instead of stable-4? > > On 8/24/2016 7:31 PM, Chris Pavlina wrote: > > Should be good now. > > > > On Wed, Aug 24, 2016 at 07:24:45PM -0400, Wayne Stambaugh wrote: > >> Thanks. > >> > >> On 8/24/2016 7:16 PM, Chris Pavlina wrote: > >>> I'll fix it. > >>> > >>> On Wed, Aug 24, 2016 at 07:11:42PM -0400, Wayne Stambaugh wrote: > Are saying that Niki's branch is different? When I was asking about a > git version of the stable branch, why didn't you say something? I > didn't even see that there was another branch in the mirror on github. > I agree that it should match the mirror assuming the mirror is up to > date with the bzr stable 4 branch. What do I need to fix this? If > someone else wants to step up to the plate and fix this, I'm fine with > that. I'm busy trying to get my own work done and my patience with the > git transition is wearing thin. > > On 8/24/2016 4:35 PM, Nick Østergaard wrote: > > I don't like that your "stable-4" branch don't match the 4.0 branch in > > the kicad-source mirror. > > See: > > https://git.launchpad.net/~stambaughw/kicad/+git/kicad-dev/commit/?h=stable-4=7ced0635031e2dcf7ec34db598726f0887da2cc5 > > https://github.com/KiCad/kicad-source-mirror/commit/bcdcaa724d1097bffd3654220ed549363fac8059 > > > > I think it would be better off if we could use the 4.0 branch from the > > kicad-source-mirror to base it on, and name the branch 4.0 as it was > > named before and everywhere else. > > > > Why did you suddenly start to name the banch "stable-" > > > > 2016-08-23 19:39 GMT+02:00 Wayne Stambaugh: > >> Thanks everyone for taking a look at this. I just pushed the stable-4 > >> branch to lp:kicad so we should be synced up. I'll tag the bzr stable > >> 4 > >> repo as obsolete when I get a chance. > >> > >> On 8/23/2016 1:13 PM, kinichiro inoguchi wrote: > Can someone please take a look at it you get a chance and make sure I > didn't make a mess of things before I push this to the main repo. > >>> > >>> Hi, > >>> > >>> I compared the new git stable-4 repository and old bzr lp:kicad/4.0. > >>> https://git.launchpad.net/~stambaughw/kicad/+git/kicad-dev > >>> https://code.launchpad.net/~stambaughw/kicad/4.0 > >>> > >>> 1. empty directory packaging/linux/ is missing > >>> > >>> I checked contents by $ diff -rq lp_kicad_4/ git_stable4/ . > >>> Is this directory needed ? > >>> > >>> 2. difference of commit logs > >>> > >>> On lp_kicad_4, lines of logs are 6308. > >>> $ bzr log --line | wc -l > >>> 6308 > >>> > >>> On git_stable4, 8181 logs exists. > >>> $ git log --oneline | wc -l > >>> 8181 > >>> > >>> To see diffs, I created the log texts by these commands. > >>> > >>> On lp_kicad_4, > >>> $ bzr log --line | sed 's/^[0-9]*: .* > >>> [0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] //' \ > >>> | sed 's/^{.*} //' > ../bzr.txt > >>> > >>> On git_stable4, > >>> $ git log --oneline | sed 's/^[a-zA-Z0-9]* //' > ../git.txt > >>> > >>> Then look at the diffs, > >>> $ diff -y bzr.txt git.txt | less > >>> > >>> For example, diffs are like this. > >>> > >>> > >>> ... > >>> Pcbnew: fix potential issue (crash) when loading board files > >>> Pcbnew: fix > >>> [merge] OSX: back port touchpad support from development bran | > >>> OSX: back po > >>> > Fix > >>> 3d-viewe > >>> > Fix > >>> touchpad > >>> > Add > >>> support > >>> OSX: legacy canvas rendering speed improvements. > >>> OSX: legacy > >>> ... > >>> > >>> > >>> > >>> This diff referes to revno 6291. > >>> It seems that git displays all the commit logs in 1 merge of bzr. > >>> http://bazaar.launchpad.net/~stambaughw/kicad/4.0/revision/6291 > >>> > >>> I think these diffs of commit logs are not problem. > >>> > >>> > >>> After all, I think new git stable4 branch is right. > >>> And, thanks for all of your hard
Re: [Kicad-developers] Git transition
Should be good now. On Wed, Aug 24, 2016 at 07:24:45PM -0400, Wayne Stambaugh wrote: > Thanks. > > On 8/24/2016 7:16 PM, Chris Pavlina wrote: > > I'll fix it. > > > > On Wed, Aug 24, 2016 at 07:11:42PM -0400, Wayne Stambaugh wrote: > >> Are saying that Niki's branch is different? When I was asking about a > >> git version of the stable branch, why didn't you say something? I > >> didn't even see that there was another branch in the mirror on github. > >> I agree that it should match the mirror assuming the mirror is up to > >> date with the bzr stable 4 branch. What do I need to fix this? If > >> someone else wants to step up to the plate and fix this, I'm fine with > >> that. I'm busy trying to get my own work done and my patience with the > >> git transition is wearing thin. > >> > >> On 8/24/2016 4:35 PM, Nick Østergaard wrote: > >>> I don't like that your "stable-4" branch don't match the 4.0 branch in > >>> the kicad-source mirror. > >>> See: > >>> https://git.launchpad.net/~stambaughw/kicad/+git/kicad-dev/commit/?h=stable-4=7ced0635031e2dcf7ec34db598726f0887da2cc5 > >>> https://github.com/KiCad/kicad-source-mirror/commit/bcdcaa724d1097bffd3654220ed549363fac8059 > >>> > >>> I think it would be better off if we could use the 4.0 branch from the > >>> kicad-source-mirror to base it on, and name the branch 4.0 as it was > >>> named before and everywhere else. > >>> > >>> Why did you suddenly start to name the banch "stable-" > >>> > >>> 2016-08-23 19:39 GMT+02:00 Wayne Stambaugh: > Thanks everyone for taking a look at this. I just pushed the stable-4 > branch to lp:kicad so we should be synced up. I'll tag the bzr stable 4 > repo as obsolete when I get a chance. > > On 8/23/2016 1:13 PM, kinichiro inoguchi wrote: > >> Can someone please take a look at it you get a chance and make sure I > >> didn't make a mess of things before I push this to the main repo. > > > > Hi, > > > > I compared the new git stable-4 repository and old bzr lp:kicad/4.0. > > https://git.launchpad.net/~stambaughw/kicad/+git/kicad-dev > > https://code.launchpad.net/~stambaughw/kicad/4.0 > > > > 1. empty directory packaging/linux/ is missing > > > > I checked contents by $ diff -rq lp_kicad_4/ git_stable4/ . > > Is this directory needed ? > > > > 2. difference of commit logs > > > > On lp_kicad_4, lines of logs are 6308. > > $ bzr log --line | wc -l > > 6308 > > > > On git_stable4, 8181 logs exists. > > $ git log --oneline | wc -l > > 8181 > > > > To see diffs, I created the log texts by these commands. > > > > On lp_kicad_4, > > $ bzr log --line | sed 's/^[0-9]*: .* > > [0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] //' \ > > | sed 's/^{.*} //' > ../bzr.txt > > > > On git_stable4, > > $ git log --oneline | sed 's/^[a-zA-Z0-9]* //' > ../git.txt > > > > Then look at the diffs, > > $ diff -y bzr.txt git.txt | less > > > > For example, diffs are like this. > > > > > > ... > > Pcbnew: fix potential issue (crash) when loading board files > > Pcbnew: fix > > [merge] OSX: back port touchpad support from development bran | OSX: > > back po > > > Fix > > 3d-viewe > > > Fix > > touchpad > > > Add > > support > > OSX: legacy canvas rendering speed improvements.OSX: > > legacy > > ... > > > > > > > > This diff referes to revno 6291. > > It seems that git displays all the commit logs in 1 merge of bzr. > > http://bazaar.launchpad.net/~stambaughw/kicad/4.0/revision/6291 > > > > I think these diffs of commit logs are not problem. > > > > > > After all, I think new git stable4 branch is right. > > And, thanks for all of your hard works. > > > > ___ > > Mailing list: https://launchpad.net/~kicad-developers > > Post to : kicad-developers@lists.launchpad.net > > Unsubscribe : https://launchpad.net/~kicad-developers > > More help : https://help.launchpad.net/ListHelp > > > > ___ > Mailing list: https://launchpad.net/~kicad-developers > Post to : kicad-developers@lists.launchpad.net > Unsubscribe : https://launchpad.net/~kicad-developers > More help : https://help.launchpad.net/ListHelp > >> > >> > >> ___ > >> Mailing
Re: [Kicad-developers] Git transition
I'll fix it. On Wed, Aug 24, 2016 at 07:11:42PM -0400, Wayne Stambaugh wrote: > Are saying that Niki's branch is different? When I was asking about a > git version of the stable branch, why didn't you say something? I > didn't even see that there was another branch in the mirror on github. > I agree that it should match the mirror assuming the mirror is up to > date with the bzr stable 4 branch. What do I need to fix this? If > someone else wants to step up to the plate and fix this, I'm fine with > that. I'm busy trying to get my own work done and my patience with the > git transition is wearing thin. > > On 8/24/2016 4:35 PM, Nick Østergaard wrote: > > I don't like that your "stable-4" branch don't match the 4.0 branch in > > the kicad-source mirror. > > See: > > https://git.launchpad.net/~stambaughw/kicad/+git/kicad-dev/commit/?h=stable-4=7ced0635031e2dcf7ec34db598726f0887da2cc5 > > https://github.com/KiCad/kicad-source-mirror/commit/bcdcaa724d1097bffd3654220ed549363fac8059 > > > > I think it would be better off if we could use the 4.0 branch from the > > kicad-source-mirror to base it on, and name the branch 4.0 as it was > > named before and everywhere else. > > > > Why did you suddenly start to name the banch "stable-" > > > > 2016-08-23 19:39 GMT+02:00 Wayne Stambaugh: > >> Thanks everyone for taking a look at this. I just pushed the stable-4 > >> branch to lp:kicad so we should be synced up. I'll tag the bzr stable 4 > >> repo as obsolete when I get a chance. > >> > >> On 8/23/2016 1:13 PM, kinichiro inoguchi wrote: > Can someone please take a look at it you get a chance and make sure I > didn't make a mess of things before I push this to the main repo. > >>> > >>> Hi, > >>> > >>> I compared the new git stable-4 repository and old bzr lp:kicad/4.0. > >>> https://git.launchpad.net/~stambaughw/kicad/+git/kicad-dev > >>> https://code.launchpad.net/~stambaughw/kicad/4.0 > >>> > >>> 1. empty directory packaging/linux/ is missing > >>> > >>> I checked contents by $ diff -rq lp_kicad_4/ git_stable4/ . > >>> Is this directory needed ? > >>> > >>> 2. difference of commit logs > >>> > >>> On lp_kicad_4, lines of logs are 6308. > >>> $ bzr log --line | wc -l > >>> 6308 > >>> > >>> On git_stable4, 8181 logs exists. > >>> $ git log --oneline | wc -l > >>> 8181 > >>> > >>> To see diffs, I created the log texts by these commands. > >>> > >>> On lp_kicad_4, > >>> $ bzr log --line | sed 's/^[0-9]*: .* > >>> [0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] //' \ > >>> | sed 's/^{.*} //' > ../bzr.txt > >>> > >>> On git_stable4, > >>> $ git log --oneline | sed 's/^[a-zA-Z0-9]* //' > ../git.txt > >>> > >>> Then look at the diffs, > >>> $ diff -y bzr.txt git.txt | less > >>> > >>> For example, diffs are like this. > >>> > >>> > >>> ... > >>> Pcbnew: fix potential issue (crash) when loading board filesPcbnew: > >>> fix > >>> [merge] OSX: back port touchpad support from development bran | OSX: > >>> back po > >>> > Fix > >>> 3d-viewe > >>> > Fix > >>> touchpad > >>> > Add > >>> support > >>> OSX: legacy canvas rendering speed improvements.OSX: > >>> legacy > >>> ... > >>> > >>> > >>> > >>> This diff referes to revno 6291. > >>> It seems that git displays all the commit logs in 1 merge of bzr. > >>> http://bazaar.launchpad.net/~stambaughw/kicad/4.0/revision/6291 > >>> > >>> I think these diffs of commit logs are not problem. > >>> > >>> > >>> After all, I think new git stable4 branch is right. > >>> And, thanks for all of your hard works. > >>> > >>> ___ > >>> Mailing list: https://launchpad.net/~kicad-developers > >>> Post to : kicad-developers@lists.launchpad.net > >>> Unsubscribe : https://launchpad.net/~kicad-developers > >>> More help : https://help.launchpad.net/ListHelp > >>> > >> > >> ___ > >> Mailing list: https://launchpad.net/~kicad-developers > >> Post to : kicad-developers@lists.launchpad.net > >> Unsubscribe : https://launchpad.net/~kicad-developers > >> More help : https://help.launchpad.net/ListHelp > > > ___ > Mailing list: https://launchpad.net/~kicad-developers > Post to : kicad-developers@lists.launchpad.net > Unsubscribe : https://launchpad.net/~kicad-developers > More help : https://help.launchpad.net/ListHelp ___ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe :
Re: [Kicad-developers] Git transition
Are saying that Niki's branch is different? When I was asking about a git version of the stable branch, why didn't you say something? I didn't even see that there was another branch in the mirror on github. I agree that it should match the mirror assuming the mirror is up to date with the bzr stable 4 branch. What do I need to fix this? If someone else wants to step up to the plate and fix this, I'm fine with that. I'm busy trying to get my own work done and my patience with the git transition is wearing thin. On 8/24/2016 4:35 PM, Nick Østergaard wrote: > I don't like that your "stable-4" branch don't match the 4.0 branch in > the kicad-source mirror. > See: > https://git.launchpad.net/~stambaughw/kicad/+git/kicad-dev/commit/?h=stable-4=7ced0635031e2dcf7ec34db598726f0887da2cc5 > https://github.com/KiCad/kicad-source-mirror/commit/bcdcaa724d1097bffd3654220ed549363fac8059 > > I think it would be better off if we could use the 4.0 branch from the > kicad-source-mirror to base it on, and name the branch 4.0 as it was > named before and everywhere else. > > Why did you suddenly start to name the banch "stable-" > > 2016-08-23 19:39 GMT+02:00 Wayne Stambaugh: >> Thanks everyone for taking a look at this. I just pushed the stable-4 >> branch to lp:kicad so we should be synced up. I'll tag the bzr stable 4 >> repo as obsolete when I get a chance. >> >> On 8/23/2016 1:13 PM, kinichiro inoguchi wrote: Can someone please take a look at it you get a chance and make sure I didn't make a mess of things before I push this to the main repo. >>> >>> Hi, >>> >>> I compared the new git stable-4 repository and old bzr lp:kicad/4.0. >>> https://git.launchpad.net/~stambaughw/kicad/+git/kicad-dev >>> https://code.launchpad.net/~stambaughw/kicad/4.0 >>> >>> 1. empty directory packaging/linux/ is missing >>> >>> I checked contents by $ diff -rq lp_kicad_4/ git_stable4/ . >>> Is this directory needed ? >>> >>> 2. difference of commit logs >>> >>> On lp_kicad_4, lines of logs are 6308. >>> $ bzr log --line | wc -l >>> 6308 >>> >>> On git_stable4, 8181 logs exists. >>> $ git log --oneline | wc -l >>> 8181 >>> >>> To see diffs, I created the log texts by these commands. >>> >>> On lp_kicad_4, >>> $ bzr log --line | sed 's/^[0-9]*: .* >>> [0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] //' \ >>> | sed 's/^{.*} //' > ../bzr.txt >>> >>> On git_stable4, >>> $ git log --oneline | sed 's/^[a-zA-Z0-9]* //' > ../git.txt >>> >>> Then look at the diffs, >>> $ diff -y bzr.txt git.txt | less >>> >>> For example, diffs are like this. >>> >>> >>> ... >>> Pcbnew: fix potential issue (crash) when loading board filesPcbnew: >>> fix >>> [merge] OSX: back port touchpad support from development bran | OSX: back >>> po >>> > Fix >>> 3d-viewe >>> > Fix >>> touchpad >>> > Add >>> support >>> OSX: legacy canvas rendering speed improvements.OSX: >>> legacy >>> ... >>> >>> >>> >>> This diff referes to revno 6291. >>> It seems that git displays all the commit logs in 1 merge of bzr. >>> http://bazaar.launchpad.net/~stambaughw/kicad/4.0/revision/6291 >>> >>> I think these diffs of commit logs are not problem. >>> >>> >>> After all, I think new git stable4 branch is right. >>> And, thanks for all of your hard works. >>> >>> ___ >>> Mailing list: https://launchpad.net/~kicad-developers >>> Post to : kicad-developers@lists.launchpad.net >>> Unsubscribe : https://launchpad.net/~kicad-developers >>> More help : https://help.launchpad.net/ListHelp >>> >> >> ___ >> Mailing list: https://launchpad.net/~kicad-developers >> Post to : kicad-developers@lists.launchpad.net >> Unsubscribe : https://launchpad.net/~kicad-developers >> More help : https://help.launchpad.net/ListHelp ___ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
Re: [Kicad-developers] Git transition
Hi Wayne. I have had a little chat with Nick about github 4.0 and my 4.0.x branch, and now that 4.0 has been updated to the latest, I would suggest using the 4.0 branch from the KiCAD github mirror instead, as my branch branches of from master at an much earlier point than 4.0, so 4.0 shares more common commits with master than my branch does. If you want to keep it in the launchpad stable-4 branch, you have to do a forced update by doing somthing like: git push +: The important part is the "+" in the refspec, which will tell git to force the update, so when I have done a rebase on one of my branches, my develop branch in this example, I run the following to force the update of my develop branch in my repo: git push github +develop:develop If you rename the branch to you can delete the unused branch in launchpad via git push, see the -d option. On tir, 2016-08-23 at 13:39 -0400, Wayne Stambaugh wrote: > Thanks everyone for taking a look at this. I just pushed the stable- > 4 > branch to lp:kicad so we should be synced up. I'll tag the bzr > stable 4 > repo as obsolete when I get a chance. > > On 8/23/2016 1:13 PM, kinichiro inoguchi wrote: > > > > > > > > Can someone please take a look at it you get a chance and make > > > sure I > > > didn't make a mess of things before I push this to the main repo. > > > > Hi, > > > > I compared the new git stable-4 repository and old bzr > > lp:kicad/4.0. > > https://git.launchpad.net/~stambaughw/kicad/+git/kicad-dev > > https://code.launchpad.net/~stambaughw/kicad/4.0 > > > > 1. empty directory packaging/linux/ is missing > > > > I checked contents by $ diff -rq lp_kicad_4/ git_stable4/ . > > Is this directory needed ? > > > > 2. difference of commit logs > > > > On lp_kicad_4, lines of logs are 6308. > > $ bzr log --line | wc -l > > 6308 > > > > On git_stable4, 8181 logs exists. > > $ git log --oneline | wc -l > > 8181 > > > > To see diffs, I created the log texts by these commands. > > > > On lp_kicad_4, > > $ bzr log --line | sed 's/^[0-9]*: .* > > [0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] //' \ > > | sed 's/^{.*} //' > ../bzr.txt > > > > On git_stable4, > > $ git log --oneline | sed 's/^[a-zA-Z0-9]* //' > ../git.txt > > > > Then look at the diffs, > > $ diff -y bzr.txt git.txt | less > > > > For example, diffs are like this. > > > > === > > = > > ... > > Pcbnew: fix potential issue (crash) when loading board > > filesPcbnew: fix > > [merge] OSX: back port touchpad support from development bran | > > OSX: back po > > > > > Fix 3d-viewe > > > > > Fix touchpad > > > > > Add support > > OSX: legacy canvas rendering speed > > improvements.OSX: legacy > > ... > > > > === > > = > > > > This diff referes to revno 6291. > > It seems that git displays all the commit logs in 1 merge of bzr. > > http://bazaar.launchpad.net/~stambaughw/kicad/4.0/revision/6291 > > > > I think these diffs of commit logs are not problem. > > > > > > After all, I think new git stable4 branch is right. > > And, thanks for all of your hard works. > > > > ___ > > Mailing list: https://launchpad.net/~kicad-developers > > Post to : kicad-developers@lists.launchpad.net > > Unsubscribe : https://launchpad.net/~kicad-developers > > More help : https://help.launchpad.net/ListHelp > > > > ___ > Mailing list: https://launchpad.net/~kicad-developers > Post to : kicad-developers@lists.launchpad.net > Unsubscribe : https://launchpad.net/~kicad-developers > More help : https://help.launchpad.net/ListHelp ___ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
Re: [Kicad-developers] Git transition
I don't like that your "stable-4" branch don't match the 4.0 branch in the kicad-source mirror. See: https://git.launchpad.net/~stambaughw/kicad/+git/kicad-dev/commit/?h=stable-4=7ced0635031e2dcf7ec34db598726f0887da2cc5 https://github.com/KiCad/kicad-source-mirror/commit/bcdcaa724d1097bffd3654220ed549363fac8059 I think it would be better off if we could use the 4.0 branch from the kicad-source-mirror to base it on, and name the branch 4.0 as it was named before and everywhere else. Why did you suddenly start to name the banch "stable-" 2016-08-23 19:39 GMT+02:00 Wayne Stambaugh: > Thanks everyone for taking a look at this. I just pushed the stable-4 > branch to lp:kicad so we should be synced up. I'll tag the bzr stable 4 > repo as obsolete when I get a chance. > > On 8/23/2016 1:13 PM, kinichiro inoguchi wrote: >>> Can someone please take a look at it you get a chance and make sure I >>> didn't make a mess of things before I push this to the main repo. >> >> Hi, >> >> I compared the new git stable-4 repository and old bzr lp:kicad/4.0. >> https://git.launchpad.net/~stambaughw/kicad/+git/kicad-dev >> https://code.launchpad.net/~stambaughw/kicad/4.0 >> >> 1. empty directory packaging/linux/ is missing >> >> I checked contents by $ diff -rq lp_kicad_4/ git_stable4/ . >> Is this directory needed ? >> >> 2. difference of commit logs >> >> On lp_kicad_4, lines of logs are 6308. >> $ bzr log --line | wc -l >> 6308 >> >> On git_stable4, 8181 logs exists. >> $ git log --oneline | wc -l >> 8181 >> >> To see diffs, I created the log texts by these commands. >> >> On lp_kicad_4, >> $ bzr log --line | sed 's/^[0-9]*: .* >> [0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] //' \ >> | sed 's/^{.*} //' > ../bzr.txt >> >> On git_stable4, >> $ git log --oneline | sed 's/^[a-zA-Z0-9]* //' > ../git.txt >> >> Then look at the diffs, >> $ diff -y bzr.txt git.txt | less >> >> For example, diffs are like this. >> >> >> ... >> Pcbnew: fix potential issue (crash) when loading board filesPcbnew: fix >> [merge] OSX: back port touchpad support from development bran | OSX: back >> po >> > Fix >> 3d-viewe >> > Fix >> touchpad >> > Add support >> OSX: legacy canvas rendering speed improvements.OSX: legacy >> ... >> >> >> >> This diff referes to revno 6291. >> It seems that git displays all the commit logs in 1 merge of bzr. >> http://bazaar.launchpad.net/~stambaughw/kicad/4.0/revision/6291 >> >> I think these diffs of commit logs are not problem. >> >> >> After all, I think new git stable4 branch is right. >> And, thanks for all of your hard works. >> >> ___ >> Mailing list: https://launchpad.net/~kicad-developers >> Post to : kicad-developers@lists.launchpad.net >> Unsubscribe : https://launchpad.net/~kicad-developers >> More help : https://help.launchpad.net/ListHelp >> > > ___ > Mailing list: https://launchpad.net/~kicad-developers > Post to : kicad-developers@lists.launchpad.net > Unsubscribe : https://launchpad.net/~kicad-developers > More help : https://help.launchpad.net/ListHelp ___ Mailing list: https://launchpad.net/~kicad-developers Post to : kicad-developers@lists.launchpad.net Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
Re: [Kicad-developers] Git transition
Form like now: lp:id not supported with the terminal. It will be usefull to use form like "LP: #id". В Среда, 24 авг. 2016 в 8:08 , Eldar Khayrullinнаписал: Launchpad supports link messages to bugs like this: LP: #id P.S. and in the terminal in Ubuntu this msg is the link too. В Пятница, 12 авг. 2016 в 10:34 , Wayne Stambaugh написал: On 8/11/2016 11:28 AM, Chris Pavlina wrote: I stand by my recommendation to use a "Fixes: lp:n" on a line by itself. This is _established convention_ in git commit messages. A quick example from the Linux kernel tree has Reported-by, Requested-by, Cc, Signed-off-by all formatted in this way. Come on... it's established convention already, use it. We don't have to be different for the sake of it. It's an established convention for the linux kernel develpers not kicad developers. I'm all for adding this information to the commit message. I looked at Orson's web hook and this is all we need for it to link the bug reports to the commit. Let's go with "Fixes: lp:###" as a separate line in the commit message and see how it goes. If we have issues, we can adjust accordingly. lp: without "Fixes" may not be obvious at first glance to people unfamiliar with our conventions. On Thu, Aug 11, 2016 at 04:09:11PM +0200, Nick Østergaard wrote: Den 11/08/2016 11.18 skrev "Maciej Sumiński" : On 08/10/2016 03:34 PM, Wayne Stambaugh wrote: On 8/10/2016 5:02 AM, Maciej Sumiński wrote: On 08/08/2016 06:09 PM, Wayne Stambaugh wrote: The last time I looked, notifications of repo commits still were not implemented. This is a show stopper for me. I don't want to have to constantly grep the git commit log to see what changed. If change notifications are working correctly, then I'm OK with moving forward on this if you can get the bug fix linking working. We definitely should do some testing before we go live with this. I see there is an option to set notifications, in the same way as for the bazaar branches ("Edit your subscriptions" on the right side pane). I could not verify it, as likely I cannot receive notifications for the changes I introduce. Even if it does not work, I can implement it in my webhook. I spent some time yesterday creating my own git clone of kicad on LP and I noticed that the subscriptions that I need appear to be available for git repos so we shouldn't need any webhooks in for that unless they do not work. If they do not work, let me know and I will fix it in the hook. The webhook has reached beta stage. I have created a dummy project for testing purposes, where you can see a bug report [1] and a commit [2] with message that includes a "fix(es)?[ ]+(lp:|#)?([0-9]+)" regex match. When it is detected, it automatically adds a message, changes the bug status and assignee. One thing that is not possible right now is linking with git branches, as apparently launchpad does not handle this at the moment (or I could not find the right format to specify a branch). Bug report linking is very important to me since I am responsible for the stable branch. If there is no support for this yet, I'm OK with adding the bug report number to the first line of the commit message and the URL somewhere in the commit message body. If I give the OK to use git, I will expect all developers that have commit privileges to the product repo to follow this without exception. The commit message for bug report fixes must have this format: Description of bug report fix. (fixes lp:) * https://bugs.launchpad.net/kicad/+bug/ If this is not acceptable, then the git transition will have to wait until Canonical gets git bug report linking implemented or Orson beats them to it. I spoke with a Launchpad developer and they have it already in their todo list. There is a plan to migrate Launchpad itself to git, so I believe they will do it well. From what I heard, currently it is possible to link git merge requests to bug reports, so it may temporarily solve the problem. All we need to do is to set a webhook pointing to my script [3]. If it is accepted, then I am going to create a separate lp account for the automated changes. Currently the webhook works on my home server which has a high uptime, but still it is not as reliable as dedicated servers. If there is someone willing to host it on a better machine, I will be pleased to help. If you are curious about the source code, then I can put it in the KiCad github (once I get a repository there) or just post it somewhere. I can create a repo on github or you can create a repo on launchpad. Either way is fine by me. If you want to use github, let me know what name you want for the repo and your github user name and I will set up the repo and give you admin rights. I have just pushed