Skip to content

Prevent untracked files complicating worktree removal #14743

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rtibbles merged 2 commits into from
May 28, 2026
Merged

Prevent untracked files complicating worktree removal #14743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd5bbd1
Add ignores for various other harnesses
bjester May 21, 2026
90cfe2d
Prevent creating untracked file-- file:memorydb_default
bjester May 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ kolibri/locale/.crowdin-download-marker
.junie/
.aiassistant/
.aiignore
.codex*
.qwen/
.vibe/
.aider.config.yml

@rtibbles rtibbles May 21, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Almost feels like we should just have an explicit allow list of .* files and folders, rather than excluding things (don't need to do that here).


# Complexity
output/*.html
Expand Down
23 changes: 22 additions & 1 deletion kolibri/core/content/test/test_sqlalchemy_bridge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,12 @@ class SQLAlchemyBridgeSQLAlchemyFunctionsTestCase(TestCase):
def test_sqlite_string(self):
self.assertEqual("sqlite:///test", sqlite_connection_string("test"))

def test_sqlite_uri_string(self):
self.assertEqual(
"sqlite:///file:memorydb_default?mode=memory&cache=shared&uri=true",
sqlite_connection_string("file:memorydb_default?mode=memory&cache=shared"),
)

def test_get_engine(self):
self.assertEqual(type(get_engine("sqlite:///")), Engine)

Expand Down Expand Up @@ -204,12 +210,27 @@ class SQLAlchemyBridgeDefaultDBStringTestCase(TestCase):
@pytest.mark.filterwarnings("ignore:Overriding setting DATABASES")
@override_settings(
DATABASES={
"default": {"ENGINE": "django.db.backends.sqlite3", "NAME": "test.sqlite3"}
"default": {"ENGINE": "django.db.backends.sqlite3", "NAME": "test.sqlite3"},
}
)
def test_sqlite(self):
self.assertEqual(get_default_db_string(), "sqlite:///test.sqlite3")

@pytest.mark.filterwarnings("ignore:Overriding setting DATABASES")
@override_settings(
DATABASES={
"default": {
"ENGINE": "django.db.backends.sqlite3",
"NAME": "file:memorydb_default?mode=memory&cache=shared",
},
}
)
def test_sqlite_uri(self):
self.assertEqual(
get_default_db_string(),
"sqlite:///file:memorydb_default?mode=memory&cache=shared&uri=true",
)

@pytest.mark.filterwarnings("ignore:Overriding setting DATABASES")
@override_settings(
DATABASES={
Expand Down
7 changes: 7 additions & 0 deletions kolibri/core/content/utils/sqlalchemybridge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,13 @@ def dispose(self):


def sqlite_connection_string(db_path):
# shortcut db_paths like `file:memorydb_default?mode=memory&cache=shared`
# to ensure they have `uri=true` so sqlite treats it as in-memory
if db_path.startswith("file:"):
separator = "&" if "?" in db_path else "?"
return "sqlite:///{db_path}{separator}uri=true".format(
db_path=db_path, separator=separator
)
# Call normpath to ensure that Windows paths are properly formatted
return "sqlite://{db_path}".format(
db_path="" if db_path == ":memory:" else "/" + os.path.normpath(db_path)
Expand Down
Loading