Forum > Designer
"TestAll" project issues
Aruna:
@JuhaManninen and @dbanon I tried everything and am still unable to 'sync' the Lazarus/main repository with my own fork. I have given the bash output at each stage and if someone can figure out a fix it would be most welcome. Else I am simply going to delete my fork and start from scratch.
I have been struggling with this over a week now :-( Please see below for details.
I created a remote 'personal' which is my forked repository and a 'upstream' which is lazarus/main.
--- Code: Bash [+][-]window.onload = function(){var x1 = document.getElementById("main_content_section"); if (x1) { var x = document.getElementsByClassName("geshi");for (var i = 0; i < x.length; i++) { x[i].style.maxHeight='none'; x[i].style.height = Math.min(x[i].clientHeight+15,306)+'px'; x[i].style.resize = "vertical";}};} ---aruna@debian:/media/aruna/linux-next/lazarus$ git remote -vpersonal https://gitlab.com/aruna.hewapathirane/lazarus.git (fetch)personal https://gitlab.com/aruna.hewapathirane/lazarus.git (push)upstream https://gitlab.com/freepascal.org/lazarus/lazarus.git (fetch)upstream https://gitlab.com/freepascal.org/lazarus/lazarus.git (push)
git status tells me my branch is behind by 24 commits.
--- Code: Bash [+][-]window.onload = function(){var x1 = document.getElementById("main_content_section"); if (x1) { var x = document.getElementsByClassName("geshi");for (var i = 0; i < x.length; i++) { x[i].style.maxHeight='none'; x[i].style.height = Math.min(x[i].clientHeight+15,306)+'px'; x[i].style.resize = "vertical";}};} ---aruna@debian:/media/aruna/linux-next/lazarus$ git statusOn branch mainYour branch is behind 'upstream/main' by 24 commits, and can be fast-forwarded. (use "git pull" to update your local branch) nothing to commit, working tree clean
I do a git pull upstream
--- Code: Bash [+][-]window.onload = function(){var x1 = document.getElementById("main_content_section"); if (x1) { var x = document.getElementsByClassName("geshi");for (var i = 0; i < x.length; i++) { x[i].style.maxHeight='none'; x[i].style.height = Math.min(x[i].clientHeight+15,306)+'px'; x[i].style.resize = "vertical";}};} ---aruna@debian:/media/aruna/linux-next/lazarus$ git pull upstreamUpdating fe6b88d8da..0f438c98feFast-forward components/buildintf/projectintf.pas | 4 +- components/codetools/finddeclarationtool.pas | 38 ++++++++++++------ components/ideintf/objectinspector.pp | 2 +- components/jcf2/IdePlugin/lazarus/jcfuiconsts.pas | 2 +- components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.cs.po | 2 +- components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.de.po | 4 +- components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.es.po | 2 +- components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.fr.po | 4 +- components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.hu.po | 4 +- components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.it.po | 4 +- components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.ja.po | 4 +- components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.lt.po | 4 +- components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.pl.po | 2 +- components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.pot | 2 +- components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.pt_BR.po | 4 +- components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.ru.po | 6 +-- components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.uk.po | 4 +- components/jcf2/IdePlugin/lazarus/languages/jcfuiconsts.zh_CN.po | 2 +- components/jcf2/Parse/BuildParseTree.pas | 2 +- components/jcf2/Process/Indent/Indenter.pas | 11 ++++- components/jcf2/Process/Transform/SortUsesData.pas | 4 +- components/lazcontrols/docs/listfilteredit.xml | 68 +++++++++++++++++-------------- components/lazcontrols/docs/listviewfilteredit.xml | 39 +++++++++++++++--- components/lazcontrols/docs/treefilteredit.xml | 52 ++++++++++++++++++++---- components/lazcontrols/listfilteredit.pas | 2 +- components/lazcontrols/listviewfilteredit.pas | 12 +++++- components/lazcontrols/treefilteredit.pas | 5 ++- components/lazreport/source/fr3tolrf.pas | 2 +- components/virtualtreeview/laz.virtualtrees.pas | 8 ---- docs/xml/lcl/comctrls.xml | 40 ++++++++++++++---- docs/xml/lcl/editbtn.xml | 107 +++++++++++++++++++++++++++++++++++++------------ docs/xml/lcl/printers.xml | 2 - examples/filteredits/filteredits.ex-meta | 5 +++ examples/filteredits/filtereditsdemo.ico | Bin 0 -> 133345 bytes examples/filteredits/filtereditsdemo.lpi | 95 +++++++++++++++++++++++++++++++++++++++++++ examples/filteredits/filtereditsdemo.lpr | 28 +++++++++++++ examples/filteredits/filtereditsdemo.res | Bin 0 -> 135460 bytes examples/filteredits/listfilterunit.lfm | 23 +++++++++++ examples/filteredits/listfilterunit.pas | 50 +++++++++++++++++++++++ examples/filteredits/listviewfilterunit.lfm | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ examples/filteredits/listviewfilterunit.pas | 129 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ examples/filteredits/mainunit.lfm | 51 +++++++++++++++++++++++ examples/filteredits/mainunit.pas | 85 +++++++++++++++++++++++++++++++++++++++ examples/filteredits/treefilterunit.lfm | 23 +++++++++++ examples/filteredits/treefilterunit.pas | 50 +++++++++++++++++++++++ ide/componentlist.pas | 1 - ide/editorfilemanager.pas | 1 - ide/frames/editor_keymapping_options.pas | 3 +- ide/projectinspector.pas | 2 - ide/searchresultview.pp | 3 +- ide/viewunit_dlg.pp | 1 - lcl/editbtn.pas | 57 ++++++++++++++++++-------- lcl/grids.pas | 8 ---- lcl/include/wincontrol.inc | 6 ++- lcl/interfaces/qt5/cbindings/Qt5Pas.pro | 11 +++-- lcl/interfaces/qt5/cbindings/src/chandles.h | 3 ++ lcl/interfaces/qt5/cbindings/src/pascalbind.h | 2 + lcl/interfaces/qt5/cbindings/src/qnativeeventfilter_hook.h | 87 ++++++++++++++++++++++++++++++++++++++++ lcl/interfaces/qt5/cbindings/src/qnativeeventfilter_hook_c.cpp | 36 +++++++++++++++++ lcl/interfaces/qt5/cbindings/src/qnativeeventfilter_hook_c.h | 23 +++++++++++ lcl/interfaces/qt5/qt56.pas | 9 +++++ lcl/interfaces/qt6/cbindings/Qt6Pas.pro | 13 +++--- lcl/interfaces/qt6/cbindings/src/chandles.h | 3 ++ lcl/interfaces/qt6/cbindings/src/pascalbind.h | 2 + lcl/interfaces/qt6/cbindings/src/qnativeeventfilter_hook.h | 87 ++++++++++++++++++++++++++++++++++++++++ lcl/interfaces/qt6/cbindings/src/qnativeeventfilter_hook_c.cpp | 36 +++++++++++++++++ lcl/interfaces/qt6/cbindings/src/qnativeeventfilter_hook_c.h | 23 +++++++++++ lcl/interfaces/qt6/qt62.pas | 10 +++++ lcl/lcltype.pp | 5 +++ packager/installpkgsetdlg.pas | 4 +- packager/packageeditor.pas | 22 +++++----- tools/runwait.sh | 7 +++- 72 files changed, 1386 insertions(+), 190 deletions(-) create mode 100644 examples/filteredits/filteredits.ex-meta create mode 100644 examples/filteredits/filtereditsdemo.ico create mode 100644 examples/filteredits/filtereditsdemo.lpi create mode 100644 examples/filteredits/filtereditsdemo.lpr create mode 100644 examples/filteredits/filtereditsdemo.res create mode 100644 examples/filteredits/listfilterunit.lfm create mode 100644 examples/filteredits/listfilterunit.pas create mode 100644 examples/filteredits/listviewfilterunit.lfm create mode 100644 examples/filteredits/listviewfilterunit.pas create mode 100644 examples/filteredits/mainunit.lfm create mode 100644 examples/filteredits/mainunit.pas create mode 100644 examples/filteredits/treefilterunit.lfm create mode 100644 examples/filteredits/treefilterunit.pas create mode 100644 lcl/interfaces/qt5/cbindings/src/qnativeeventfilter_hook.h create mode 100644 lcl/interfaces/qt5/cbindings/src/qnativeeventfilter_hook_c.cpp create mode 100644 lcl/interfaces/qt5/cbindings/src/qnativeeventfilter_hook_c.h create mode 100644 lcl/interfaces/qt6/cbindings/src/qnativeeventfilter_hook.h create mode 100644 lcl/interfaces/qt6/cbindings/src/qnativeeventfilter_hook_c.cpp create mode 100644 lcl/interfaces/qt6/cbindings/src/qnativeeventfilter_hook_c.h
Now git status says my branch is uptodate.
--- Code: Bash [+][-]window.onload = function(){var x1 = document.getElementById("main_content_section"); if (x1) { var x = document.getElementsByClassName("geshi");for (var i = 0; i < x.length; i++) { x[i].style.maxHeight='none'; x[i].style.height = Math.min(x[i].clientHeight+15,306)+'px'; x[i].style.resize = "vertical";}};} ---aruna@debian:/media/aruna/linux-next/lazarus$ git statusOn branch mainYour branch is up to date with 'upstream/main'. nothing to commit, working tree clean
So I try to push what I just pulled to my remote 'personal' and nothing but grief. I need HELP!
--- Code: Bash [+][-]window.onload = function(){var x1 = document.getElementById("main_content_section"); if (x1) { var x = document.getElementsByClassName("geshi");for (var i = 0; i < x.length; i++) { x[i].style.maxHeight='none'; x[i].style.height = Math.min(x[i].clientHeight+15,306)+'px'; x[i].style.resize = "vertical";}};} ---aruna@debian:/media/aruna/linux-next/lazarus$ git push personalUsername for 'https://gitlab.com': Aruna.HewapathiranePassword for 'https://Aruna.Hewapathirane@gitlab.com': To https://gitlab.com/aruna.hewapathirane/lazarus.git ! [rejected] main -> main (non-fast-forward)error: failed to push some refs to 'https://gitlab.com/aruna.hewapathirane/lazarus.git'hint: Updates were rejected because the tip of your current branch is behindhint: its remote counterpart. Integrate the remote changes (e.g.hint: 'git pull ...') before pushing again.hint: See the 'Note about fast-forwards' in 'git push --help' for details.aruna@debian:/media/aruna/linux-next/lazarus$
Aruna:
--- Quote from: JuhaManninen on December 22, 2022, 08:59:01 am ---Do you also work with carrots? Or some other vegetables maybe? ;)
--- End quote ---
I have tried to grow my own vegetables but I live in a condominium apartment so it has had limited success. I do not have land to plant on. I have to use small pots or bottles along the living room window so they get some sunlight. I am not sure if this will work but here are some pictures of my attempts at growing herbs.
Martin_fr:
--- Quote from: Aruna on December 28, 2022, 03:34:39 am ---@JuhaManninen and @dbanon I tried everything and am still unable to 'sync' the Lazarus/main repository with my own fork. I have given the bash output at each stage and if someone can figure out a fix it would be most welcome. Else I am simply going to delete my fork and start from scratch.
I have been struggling with this over a week now :-( Please see below for details.
I created a remote 'personal' which is my forked repository and a 'upstream' which is lazarus/main.
--- End quote ---
You haven't done a "git pull personal".
If you look at the "git log --oneline --graph --all" then you should see
(or "git log --oneline --graph -n 50 main upstream/main personal/main")
1) main (your local branch / the tip of your local branch)
2) upstream/main (the tip of the main branch in the lazarus repo)
3) personal/main (the tip of the main branch in your fork)
the local "main" must be above the personal/main.
And there must be a line down connecting them.
So personal/main is on a commit that is included in local main.
If they are (the error does NOT suggest) on different lines, then they have "diverged".
But this should only be possible if you made your own commits to main and pushed that to personal/main.
(to avoid that, always make your own commits on new branches)
Aruna:
--- Quote from: Martin_fr on December 28, 2022, 04:14:17 am ---
If you look at the "git log --oneline --graph --all" then you should see
(or "git log --oneline --graph -n 50 main upstream/main personal/main")
)
--- End quote ---
Hello @Martin_fr thank you very much for taking the time to explain but this is way over my head right now. Hopefully with time I will begin to understand how git does things.
I ran git reflog. Bash output Is below. You may be able to see where I went wrong? Please do not ask me why I did whatever it is I did I was experimenting is my only reason for
all this.
[/quote]
--- Code: Bash [+][-]window.onload = function(){var x1 = document.getElementById("main_content_section"); if (x1) { var x = document.getElementsByClassName("geshi");for (var i = 0; i < x.length; i++) { x[i].style.maxHeight='none'; x[i].style.height = Math.min(x[i].clientHeight+15,306)+'px'; x[i].style.resize = "vertical";}};} --- 0f438c98fe HEAD@{0}: pull upstream: Fast-forwardfe6b88d8da HEAD@{1}: reset: moving to fe6b88d8dadd428486b0 HEAD@{2}: reset: moving to dd428486b00f438c98fe HEAD@{3}: reset: moving to HEAD0f438c98fe HEAD@{4}: pull upstream: Fast-forward5f76b3e31c HEAD@{5}: pull: Fast-forwardfe6b88d8da HEAD@{6}: checkout: moving from fixes_2_2 to mainfe6b88d8da HEAD@{7}: checkout: moving from cfe290a58bea764f8246399038407a3af3dccae8 to fixes_2_2cfe290a58b HEAD@{8}: rebase (pick): Delete Laz_Hello.lpi858d0032ce HEAD@{9}: rebase (pick): Upload New File92f578a52c HEAD@{10}: rebase (pick): Upload New Fileff9d3bdfba HEAD@{11}: rebase (pick): Upload New Filef9610dee62 HEAD@{12}: rebase (pick): Upload New File471e177452 HEAD@{13}: rebase (pick): Upload New Filec02bf01597 HEAD@{14}: rebase (pick): Upload New File83f083fa3e HEAD@{15}: rebase (pick): Upload New Filecbe7cd4092 HEAD@{16}: rebase (pick): Upload New File338d6ffa60 HEAD@{17}: rebase (pick): Upload New File5050e1f5ae HEAD@{18}: rebase (pick): Add new directory2eafc5a18d HEAD@{19}: rebase (pick): Add new directoryfe6b88d8da HEAD@{20}: rebase (start): checkout maindd428486b0 HEAD@{21}: checkout: moving from c06424ac85213ff461ecaca210b62cc2fe868382 to personal/mainc06424ac85 HEAD@{22}: checkout: moving from main to personal/fixes_2_2fe6b88d8da HEAD@{23}: checkout: moving from fixes_2_2 to mainfe6b88d8da HEAD@{24}: checkout: moving from main to fixes_2_2fe6b88d8da HEAD@{25}: pull: Fast-forwardd7e3d2231f HEAD@{26}: checkout: moving from c06424ac85213ff461ecaca210b62cc2fe868382 to mainc06424ac85 HEAD@{27}: checkout: moving from main to remotes/personal/fixes_2_2d7e3d2231f HEAD@{28}: checkout: moving from c06424ac85213ff461ecaca210b62cc2fe868382 to mainc06424ac85 HEAD@{29}: checkout: moving from main to remotes/personal/fixes_2_2d7e3d2231f HEAD@{30}: checkout: moving from c06424ac85213ff461ecaca210b62cc2fe868382 to mainc06424ac85 HEAD@{31}: checkout: moving from main to remotes/personal/fixes_2_2d7e3d2231f HEAD@{32}: reset: moving to HEADd7e3d2231f HEAD@{33}: clone: from https://gitlab.com/freepascal.org/lazarus/lazarus.git
As you suggested I also ran
--- Code: Bash [+][-]window.onload = function(){var x1 = document.getElementById("main_content_section"); if (x1) { var x = document.getElementsByClassName("geshi");for (var i = 0; i < x.length; i++) { x[i].style.maxHeight='none'; x[i].style.height = Math.min(x[i].clientHeight+15,306)+'px'; x[i].style.resize = "vertical";}};} ---git log --oneline --graph -n 50 main upstream/main personal/main
Bash output is below. Martin I was thinking if I have really messed things up would it not be easier to start again from scratch? Or this can still be salvaged? I am again humbled by the knowledge and experience that is available freely to anyone on this forum.
--- Code: Bash [+][-]window.onload = function(){var x1 = document.getElementById("main_content_section"); if (x1) { var x = document.getElementsByClassName("geshi");for (var i = 0; i < x.length; i++) { x[i].style.maxHeight='none'; x[i].style.height = Math.min(x[i].clientHeight+15,306)+'px'; x[i].style.resize = "vertical";}};} ---* 0f438c98fe CodeTools: fix attribute resolver* 5f76b3e31c LCL: additional fix to TWinControl.GetClientRect wcfBoundsRealized (DockedFormEditor issue), issue #40052. Patch by rich2014.* 822f606e97 Docs: LCL/comctrls. Adds content for overridden TPageControl.ChildClassAllowed topic.* dea606d77f Docs: LCL/printers. Removes TODO entry that has already been handled.* eb59ad598f JCF: regenerated translations and updated Russian translation* 5719672f10 Codetools: Fix SmartHint for generic specialized types. Issue #29860.* 425db255bd Docs: LCL/editbtn. Adds and updates topics for changes in 5f4aa964.* 421193c712 Docs: LazControls/treefilteredit. Adds and updates topics for changes in 5f4aa964.* c4dcb8c515 Docs: LazControls/listviewfilteredit. Adds and updates topics for changes in 5f4aa964.* 9a99d112b5 Docs: LazControls/listfilteredit. Updates topics for changes in 5f4aa964.* c2a26476f9 buildintf: comment* 5ea4a1e270 Tools: Fix handling program parameters in runwait.sh. Issue #40045, patch by Dean Mustakinov.* edbe283fc6 Jedi Code Format: Eliminate an assertion failure in debug mode. Issue #40053, patch by Domingo Galmés.* 2e160e525d Jedi Code Format: Improve the text for an indentation option. Issue #40054, patch by Domingo Galmés.* d6bfb829cf Jedi Code Format: Fix a memory leak. Issue #40058, patch by Domingo Galmés.* 0777a5b939 Jedi Code Format: Fix indentation of generic function forward declarations. Issue #40055, patch by Domingo Galmés.* be093cd40d Add an example project for FilterEdits. Issue #40035, modified from patch by dbannon.* 5f4aa96422 LazControls, FilterEdits: Improve setting the filter programmatically. Invalidate after properties change.* 70bc333d28 Merge branch 'main' into 'main'|\ | * 2461afd1b1 Cleanup the code and update libqt*pas version| * 5d47e14a50 Added NativeEventFilter hook in qt5| * 7702f3d65a Added NativeEventFilter hook in qt6|/ * f0e459f047 FPC: Extend System.UITypes* 99caa084fc Revert TFontStyles to the original size* fe6b88d8da CI: added a comment to configuration* 57cc6997fc CI: added manual job for building docs (and emitting them as artifact) with FPDoc from stable FPC* 3e36732de6 laz.virtualtrees: fixed crash with qt widgetsets on windows. issue #40056* d115ec0399 Qt6: fixed building cbindings on windows.* d7e3d2231f Docs: LCL/lclplatformdef. Adds DirNameToDisplayName and DisplayNameToDirName topics for changes in c45dfb7a.* 2e64ec91a8 Docs: LCL/printers. Adds, updates topics with aliases to System.UITypes. Changes in 43d7f203.* d97d330495 Docs: LCL/grids. Adds content to the TCustomStringGrid.SaveColumns and TStringGridStrings topics.* 651303f114 Docs: LCL/graphics. Adds, updates topics with aliases to System.UITypes. Changes in 43d7f203.* db360c7ede Docs: LCL/forms. Adds, updates topics for aliases to System.UITypes. Changes in 43d7f203.* 967e4ee615 Docs: LCL/controls. Adds, updates topics with aliases to System.UITypes. Changes in 43d7f203.* 5f819ddd36 Docs: LazUtils/uitypes. Updates topics with aliases to System.UITypes. Changes in 43d7f203.* 21e56937cf CI: added manual jobs for building docs (and emitting them as artifacts) with FPDoc from FPC `main` and `fixes` branches* a2b7d28e68 CI: store FPDoc executables separately for different FPC versions* 1b9e56b56c lcl: fixed TWinControl.GetClientRect wcfBoundsRealized, issue #40052* f87fe0303d lcl gtk3: load theme.css only if existing* 166d1b6dbf Docs: Removed unneeded .gitignore. The one in root of the Lazarus source directory already has relevant entries.* ebdc3913ed IDE/images: Add some update and missing icons in File menu. By Roland Hahn.* 829f320095 FPC: Extend System.UITypes* c45dfb7a56 IDE: Show Widgetset display name instead of dir name in selection list for project. Issue #40040, patch by theo222.* 43d7f20349 FPC: Extend System.UITypes* 5b0ed449f3 Docs: LCL/grids. Updates TCustomStringGrid.Modified topic to reflect usage.* b72d31e3dc Docs: LazUtils/lconvencoding. Adds and updates topics for changes in 0ae37a90.* 62f886435d Docs: LazUtils/codepagescommon. Adds topics for changes in 0ae37a90.* 0ae37a906c LConvEncoding: add EncodingCP865. Patch by Alexey Torgashin. Issue #40041.* b40000c46c Docs: LCL/comctrl. Updates topic content.* d7f0ef81fe CI: added archive with CHM docs for stable FPC to build image (needed for building Lazarus docs)
Aruna:
--- Quote from: Martin_fr on December 28, 2022, 04:14:17 am ---You haven't done a "git pull personal".
--- End quote ---
I am confused now @Martin_fr I thought the steps below are what I have to do to 'sync' the repos?
1 - Fork Lazarus main/trunk
2 - clone the fork to my local system
3 - make changes/test/experiment on my local clone( on a separate branch as you pointed out )
4 - push the changes to my remote fork ( in this case 'personal')
5 - create a merge/pull request from my remote 'personal' to lazarus main/trunk (in this case 'upstream')
6 - when needed git pull upstream to 'sync' things again?
So why do I need to git pull personal? personal is the fork which has no changes so why pull it? very confused here..
Or as is usual I am not seeing the big picture?
Navigation
[0] Message Index
[#] Next page
[*] Previous page