Repository navigation
Git update_repo fails when there are only untracked files #395
Description
Currenly when using vcspull sync, and a repo has untracked files and no other changes, the command fails with something like
File "/home/jhon/.local/lib/python3.10/site-packages/vcspull/cli/sync.py", line 104, in update_repo
r.update_repo(set_remotes=True) # Creates repo if not exists and fetches
File "/home/jhon/.local/lib/python3.10/site-packages/libvcs/projects/git.py", line 465, in update_repo
self.run(["stash", "pop", "--index", "--quiet"])
File "/home/jhon/.local/lib/python3.10/site-packages/libvcs/projects/base.py", line 154, in run
return run(
File "/home/jhon/.local/lib/python3.10/site-packages/libvcs/cmd/core.py", line 211, in run
raise exc.CommandError(output=output, returncode=code, cmd=cmd)
libvcs.exc.CommandError: Command failed with code 1: git stash pop --index --quiet)
That is because git status returns output including the untracked files while git stash save doesn't have the -u flag and so no stash is actually created.
To fix the problem, one of these should be performed:
- Add
--untracked-files=notogit status - Add
--include-untrackedtogit stash save - Check if a stash was actually created before trying to pop
Activity
jfpedroza commentedon Sep 23, 2022
I would like to fix this. Which of the options would prefer?
tony commentedon Sep 23, 2022
@jfpedroza Hi
I'm not sure of the consequences at scale. All look appetizing, and look like they'd make the syncing more robust.
I would accept a PR with any of those.
And if you wrote a test, that'd be legendary.
P.S. I am going to be making sweeping improvements to this library over the coming months - as well as vcspull. I apologize for how crusty the internals are. They will improve, markedly.
jfpedroza commentedon Sep 24, 2022
So, I went and cloned everything and set up the projects.
It turns out
vcspullpoints tolibvcs 0.14which looks like a different project thanmasterandvcspullwon't run with it.Should I check the changes against the
mypy-annotationsbranch?jfpedroza commentedon Sep 24, 2022
I got it running with that branch and adding the
vcskey to the config entries.tony commentedon Sep 24, 2022
@jfpedroza
You've ran into a temporary issue. That's where I'm doing work at the moment - and could probably break within minutes of you making a change (assuming I'm awake)
I'll give you instructions to where the stable branches are
Sorry about that: Backstory: The metaphorical "big dig" is happening, where a major refactor on both sides are being reconciled
tony commentedon Sep 24, 2022
libvcs branch: v0.13.x
vcspull branch:
masterIs this any better?
Or, I can notify you when
mypy-annotationsis completed (in which case bothmasterbranches will work together)tony commentedon Sep 24, 2022
I updated both of these:
libvcs: v0.13.x
If you try this locally, does
py.testwork?My changes: Dev package updates, fixed tests on CI (using
git --versionat2.27.3)vcspull: master
README now points to libvcs v0.13.x
When pointing to a live libvcs from vcspull:
Clone libvcs also, then checkout v0.13.x:
git checkout v0.13.xIn vcspull master (or your branch based off master):
pip install -e ~/path/to/libvcstony commentedon Sep 24, 2022
@jfpedroza Due to the state of limbo you've happened upon this issue - I am also happy to PR it on your behalf.
(for both backport and new version of libtmux)
jfpedroza commentedon Sep 25, 2022
I checked out the
v0.13.xbranch and got this error. Already deleted the virtual env and created it again.tony commentedon Sep 25, 2022
@jfpedroza Thank you!
poetry self --versionpython -Vpy.test --versionWhat do those look like?
jfpedroza commentedon Sep 25, 2022
jfpedroza commentedon Sep 25, 2022
I just realized. Do the tests require Subversion and Mercurial to be installed? Because I absolutely don't have those.
Although, all tests in
masterpass.tony commentedon Sep 25, 2022
Those should be skipped automatically if you don't have the binary
I will take a closer look now
tony commentedon Sep 25, 2022
@jfpedroza If you fetch the latest from v0.13.x (ff9247b), is it any better?
jfpedroza commentedon Sep 25, 2022
Tests pass now :D
tony commentedon Sep 25, 2022
@jfpedroza Brilliant!
tony commentedon Sep 25, 2022
FYI I will go to sleep for now and be around in the morning tomorrow 🙏