Plugins Github Repo - Pull Request shows also old merged commits

Nils · February 27, 2022, 10:34am

Hi,

am more or less a Github user and updated my forked plugins repository to the newest state. Also I cannot do a rebase or something as my gh-pages branch is up to date. But if I compare or create a pull request against the original repository there are still merged commits shown with no files changed.

How can I reset this and drop old commits from the list?

Cheers,
Nils

Charlie_Powell · February 27, 2022, 4:59pm

Using the command on your fork's gh-pages branch, running git reset --hard upstream/gh-pages works for me to remove all the extra commits and make your branch the same as the upstream one. You would then need to do git push --force to push it to GitHub.

It can help to create separate branches off the gh-pages branch when you make PRs, since we are using 'Squash and Merge' for PRs most of the time the individual commits never make it merged just one single one for each PR.

Nils · February 28, 2022, 7:35am

Worked...but accidentally reset my changes and closed Pull Request. But anyhow integrating it into core would be better.

By the way...what are the changes you planned and what I should do if something happens like now that the maintenance branch is broken? Like to know because perhaps there are other topics I can contribute to the core development in the future.

Charlie_Powell · February 28, 2022, 8:30am

As far as I know the current maintenance branch isn't broken, it runs fine for me.

foosel · February 28, 2022, 2:22pm

This is very much news to me too. Please clarify.

Integrate what into core? This is basic git usage and nothing OctoPrint specific.

Charlie_Powell · February 28, 2022, 3:44pm

This was relating to the discussion I had over whether the GitHub credential setting should be a plugin or a core PR yesterday

foosel · February 28, 2022, 5:01pm

Aaaah, gotcha, thanks for clarifying, I was seriously confused there.

Nils · February 28, 2022, 8:12pm

Hi guys,

I checked out the maintenance branch and get this errors. Also the Web Frontend is not really working and throws errors. Other branches working fine...sorry for asking perhaps stupid questions but I am new in OctoPrint ans also large Github projects...was alone in my projects in the past.

2022-02-28 21:09:18,863 - octoprint.server.util.flask.fix_webassets_filtertool - ERROR - Got an exception while trying to apply filter, ignoring file
Traceback (most recent call last):
  File "C:\Users\nrott\Documents\GitHub\OctoPrint\src\octoprint\server\util\flask.py", line 178, in fixed_wrap_cache
    content = func().getvalue()
  File "c:\Users\nrott\Documents\GitHub\OctoPrint\venv3\lib\site-packages\webassets\merge.py", line 250, in func
    data = StringIO(hunk.data())
  File "c:\Users\nrott\Documents\GitHub\OctoPrint\venv3\lib\site-packages\webassets\merge.py", line 78, in data
    f = open(self.filename, 'r', encoding='utf-8')
FileNotFoundError: [Errno 2] No such file or directory: 'C:\\Users\\nrott\\Documents\\GitHub\\OctoPrint\\src\\octoprint\\static\\plugin\\gcodeviewer\\js\\viewer\\renderer.js'
2022-02-28 21:09:18,863 - octoprint.server.util.flask.fix_webassets_filtertool - ERROR - Got an exception while trying to apply filter, ignoring file
Traceback (most recent call last):
  File "C:\Users\nrott\Documents\GitHub\OctoPrint\src\octoprint\server\util\flask.py", line 178, in fixed_wrap_cache
    content = func().getvalue()
  File "c:\Users\nrott\Documents\GitHub\OctoPrint\venv3\lib\site-packages\webassets\merge.py", line 250, in func
    data = StringIO(hunk.data())
  File "c:\Users\nrott\Documents\GitHub\OctoPrint\venv3\lib\site-packages\webassets\merge.py", line 78, in data
    f = open(self.filename, 'r', encoding='utf-8')
FileNotFoundError: [Errno 2] No such file or directory: 'C:\\Users\\nrott\\Documents\\GitHub\\OctoPrint\\src\\octoprint\\static\\plugin\\logging\\js\\logging.js'
2022-02-28 21:09:18,864 - octoprint.server.util.flask.fix_webassets_filtertool - ERROR - Got an exception while trying to apply filter, ignoring file
Traceback (most recent call last):
  File "C:\Users\nrott\Documents\GitHub\OctoPrint\src\octoprint\server\util\flask.py", line 178, in fixed_wrap_cache
    content = func().getvalue()
  File "c:\Users\nrott\Documents\GitHub\OctoPrint\venv3\lib\site-packages\webassets\merge.py", line 250, in func
    data = StringIO(hunk.data())
  File "c:\Users\nrott\Documents\GitHub\OctoPrint\venv3\lib\site-packages\webassets\merge.py", line 78, in data
    f = open(self.filename, 'r', encoding='utf-8')
FileNotFoundError: [Errno 2] No such file or directory: 'C:\\Users\\nrott\\Documents\\GitHub\\OctoPrint\\src\\octoprint\\static\\plugin\\pluginmanager\\js\\pluginmanager.js'
2022-02-28 21:09:18,864 - octoprint.server.util.flask.fix_webassets_filtertool - ERROR - Got an exception while trying to apply filter, ignoring file
Traceback (most recent call last):
  File "C:\Users\nrott\Documents\GitHub\OctoPrint\src\octoprint\server\util\flask.py", line 178, in fixed_wrap_cache
    content = func().getvalue()
  File "c:\Users\nrott\Documents\GitHub\OctoPrint\venv3\lib\site-packages\webassets\merge.py", line 250, in func
    data = StringIO(hunk.data())
  File "c:\Users\nrott\Documents\GitHub\OctoPrint\venv3\lib\site-packages\webassets\merge.py", line 78, in data
    f = open(self.filename, 'r', encoding='utf-8')
FileNotFoundError: [Errno 2] No such file or directory: 'C:\\Users\\nrott\\Documents\\GitHub\\OctoPrint\\src\\octoprint\\static\\plugin\\softwareupdate\\js\\softwareupdate.js'
2022-02-28 21:09:18,864 - octoprint.server.util.flask.fix_webassets_filtertool - ERROR - Got an exception while trying to apply filter, ignoring file
Traceback (most recent call last):
  File "C:\Users\nrott\Documents\GitHub\OctoPrint\src\octoprint\server\util\flask.py", line 178, in fixed_wrap_cache
    content = func().getvalue()
  File "c:\Users\nrott\Documents\GitHub\OctoPrint\venv3\lib\site-packages\webassets\merge.py", line 250, in func
    data = StringIO(hunk.data())
  File "c:\Users\nrott\Documents\GitHub\OctoPrint\venv3\lib\site-packages\webassets\merge.py", line 78, in data
    f = open(self.filename, 'r', encoding='utf-8')
FileNotFoundError: [Errno 2] No such file or directory: 'C:\\Users\\nrott\\Documents\\GitHub\\OctoPrint\\src\\octoprint\\static\\plugin\\tracking\\js\\usage.js'

foosel · March 1, 2022, 4:09pm

Hm, can't reproduce this locally. The files it's looking for there also look weird, src/octoprint/static/plugin indeed doesn't exist. Try pulling a clean branch again (git reset --hard origin/maintenance after pulling if need be), then make sure to run pip install -e .[devel,plugins], then start again with octoprint serve --debug and report back.

Nils · March 1, 2022, 6:31pm

pip install does it. Is it necessary if a branch is switched to run it again?

foosel · March 2, 2022, 8:57am

Yes, because I might change dependencies around and so on. It's never just "switch branch and go" when you deal with development versions, always run pip install -e. I actually have my launch config set up thus that it does it automatically on every single launch of the server. I thought that was also in the docs on how to set up a development environment, but apparently not, so I'll see that this gets changed.

jneilliii · March 2, 2022, 5:59pm

It's on the IDE steps as a pre-run step to run external program (at least for pycharm).

https://docs.octoprint.org/en/master/development/environment.html#pycharm

Nils · March 2, 2022, 8:11pm

Using VSCode. This explains why it is missing. Did not compare the setup steps. Will add it…