Bump pygit2 to 1.15 and fix enums (#11983)

stubs/pygit2/METADATA.toml

@@ -1,4 +1,4 @@
-version = "1.14.*"
+version = "1.15.*"
 upstream_repository = "https://github.com/libgit2/pygit2"
 requires = ["types-cffi"]
 

stubs/pygit2/pygit2/_pygit2.pyi

@@ -67,6 +67,7 @@ GIT_CHECKOUT_USE_OURS: int
 GIT_CHECKOUT_USE_THEIRS: int
 GIT_CONFIG_HIGHEST_LEVEL: int
 GIT_CONFIG_LEVEL_APP: int
+GIT_CONFIG_LEVEL_WORKTREE: int
 GIT_CONFIG_LEVEL_GLOBAL: int
 GIT_CONFIG_LEVEL_LOCAL: int
 GIT_CONFIG_LEVEL_PROGRAMDATA: int
@@ -175,11 +176,6 @@ GIT_OBJECT_OFS_DELTA: int
 GIT_OBJECT_REF_DELTA: int
 GIT_OBJECT_TAG: int
 GIT_OBJECT_TREE: int
-GIT_OBJ_ANY: int
-GIT_OBJ_BLOB: int
-GIT_OBJ_COMMIT: int
-GIT_OBJ_TAG: int
-GIT_OBJ_TREE: int
 GIT_OID_HEXSZ: int
 GIT_OID_HEX_ZERO: str
 GIT_OID_MINPREFIXLEN: int
@@ -217,16 +213,9 @@ GIT_OPT_SET_WINDOWS_SHAREMODE: int
 GIT_REFERENCES_ALL: int
 GIT_REFERENCES_BRANCHES: int
 GIT_REFERENCES_TAGS: int
-GIT_REF_INVALID: int
-GIT_REF_LISTALL: int
-GIT_REF_OID: int
-GIT_REF_SYMBOLIC: int
 GIT_RESET_HARD: int
 GIT_RESET_MIXED: int
 GIT_RESET_SOFT: int
-GIT_REVPARSE_MERGE_BASE: int
-GIT_REVPARSE_RANGE: int
-GIT_REVPARSE_SINGLE: int
 GIT_REVSPEC_MERGE_BASE: int
 GIT_REVSPEC_RANGE: int
 GIT_REVSPEC_SINGLE: int
@@ -287,10 +276,8 @@ _GIT_OBJ_TREE: TypeAlias = Literal[2]
 class Object:
     _pointer: bytes
     filemode: FileMode
-    hex: str
     id: Oid
     name: str | None
-    oid: Oid
     raw_name: bytes | None
     short_id: str
     type: Literal[_GIT_OBJ_COMMIT, _GIT_OBJ_TREE, _GIT_OBJ_TAG, _GIT_OBJ_BLOB]
@@ -526,7 +513,6 @@ class OdbBackendPack(OdbBackend):
 
 @final
 class Oid:
-    hex: str
     raw: bytes
     def __init__(self, raw: bytes = ..., hex: str = ...) -> None: ...
     def __eq__(self, other: object) -> bool: ...

stubs/pygit2/pygit2/enums.pyi

@@ -1,395 +1,394 @@
 from enum import IntEnum, IntFlag
 
 class ApplyLocation(IntEnum):
-    WORKDIR: int
-    INDEX: int
-    BOTH: int
+    WORKDIR = 0
+    INDEX = 1
+    BOTH = 2
 
 class AttrCheck(IntFlag):
-    FILE_THEN_INDEX: int
-    INDEX_THEN_FILE: int
-    INDEX_ONLY: int
-    NO_SYSTEM: int
-    INCLUDE_HEAD: int
-    INCLUDE_COMMIT: int
+    FILE_THEN_INDEX = 0x0
+    INDEX_THEN_FILE = 0x1
+    INDEX_ONLY = 0x2
+    NO_SYSTEM = 0x4
+    INCLUDE_HEAD = 0x8
+    INCLUDE_COMMIT = 0x10
 
 class BlameFlag(IntFlag):
-    NORMAL: int
-    TRACK_COPIES_SAME_FILE: int
-    TRACK_COPIES_SAME_COMMIT_MOVES: int
-    TRACK_COPIES_SAME_COMMIT_COPIES: int
-    TRACK_COPIES_ANY_COMMIT_COPIES: int
-    FIRST_PARENT: int
-    USE_MAILMAP: int
-    IGNORE_WHITESPACE: int
+    NORMAL = 0x0
+    TRACK_COPIES_SAME_FILE = 0x1
+    TRACK_COPIES_SAME_COMMIT_MOVES = 0x2
+    TRACK_COPIES_SAME_COMMIT_COPIES = 0x4
+    TRACK_COPIES_ANY_COMMIT_COPIES = 0x8
+    FIRST_PARENT = 0x10
+    USE_MAILMAP = 0x20
+    IGNORE_WHITESPACE = 0x40
 
 class BlobFilter(IntFlag):
-    CHECK_FOR_BINARY: int
-    NO_SYSTEM_ATTRIBUTES: int
-    ATTRIBUTES_FROM_HEAD: int
-    ATTRIBUTES_FROM_COMMIT: int
+    CHECK_FOR_BINARY = 0x1
+    NO_SYSTEM_ATTRIBUTES = 0x2
+    ATTRIBUTES_FROM_HEAD = 0x4
+    ATTRIBUTES_FROM_COMMIT = 0x8
 
 class BranchType(IntFlag):
-    LOCAL: int
-    REMOTE: int
-    ALL: int
+    LOCAL = 0x1
+    REMOTE = 0x2
+    ALL = 0x3
 
 class CheckoutNotify(IntFlag):
-    NONE: int
-    CONFLICT: int
-    DIRTY: int
-    UPDATED: int
-    UNTRACKED: int
-    IGNORED: int
-    ALL: int
+    NONE = 0x0
+    CONFLICT = 0x1
+    DIRTY = 0x2
+    UPDATED = 0x4
+    UNTRACKED = 0x8
+    IGNORED = 0x10
+    ALL = 0xFFFF
 
 class CheckoutStrategy(IntFlag):
-    NONE: int
-    SAFE: int
-    FORCE: int
-    RECREATE_MISSING: int
-    ALLOW_CONFLICTS: int
-    REMOVE_UNTRACKED: int
-    REMOVE_IGNORED: int
-    UPDATE_ONLY: int
-    DONT_UPDATE_INDEX: int
-    NO_REFRESH: int
-    SKIP_UNMERGED: int
-    USE_OURS: int
-    USE_THEIRS: int
-    DISABLE_PATHSPEC_MATCH: int
-    SKIP_LOCKED_DIRECTORIES: int
-    DONT_OVERWRITE_IGNORED: int
-    CONFLICT_STYLE_MERGE: int
-    CONFLICT_STYLE_DIFF3: int
-    DONT_REMOVE_EXISTING: int
-    DONT_WRITE_INDEX: int
-    DRY_RUN: int
-    CONFLICT_STYLE_ZDIFF3: int
+    NONE = 0x0
+    SAFE = 0x1
+    FORCE = 0x2
+    RECREATE_MISSING = 0x4
+    ALLOW_CONFLICTS = 0x10
+    REMOVE_UNTRACKED = 0x20
+    REMOVE_IGNORED = 0x40
+    UPDATE_ONLY = 0x80
+    DONT_UPDATE_INDEX = 0x100
+    NO_REFRESH = 0x200
+    SKIP_UNMERGED = 0x400
+    USE_OURS = 0x800
+    USE_THEIRS = 0x1000
+    DISABLE_PATHSPEC_MATCH = 0x2000
+    SKIP_LOCKED_DIRECTORIES = 0x40000
+    DONT_OVERWRITE_IGNORED = 0x80000
+    CONFLICT_STYLE_MERGE = 0x100000
+    CONFLICT_STYLE_DIFF3 = 0x200000
+    DONT_REMOVE_EXISTING = 0x400000
+    DONT_WRITE_INDEX = 0x800000
+    DRY_RUN = 0x1000000
+    CONFLICT_STYLE_ZDIFF3 = 0x200000
 
 class ConfigLevel(IntEnum):
-    PROGRAMDATA: int
-    SYSTEM: int
-    XDG: int
-    GLOBAL: int
-    LOCAL: int
-    APP: int
-    HIGHEST_LEVEL: int
+    PROGRAMDATA = 1
+    SYSTEM = 2
+    XDG = 3
+    GLOBAL = 4
+    LOCAL = 5
+    WORKTREE = 6
+    APP = 7
+    HIGHEST_LEVEL = -1
 
 class CredentialType(IntFlag):
-    USERPASS_PLAINTEXT: int
-    SSH_KEY: int
-    SSH_CUSTOM: int
-    DEFAULT: int
-    SSH_INTERACTIVE: int
-    USERNAME: int
-    SSH_MEMORY: int
+    USERPASS_PLAINTEXT = 0x1
+    SSH_KEY = 0x2
+    SSH_CUSTOM = 0x4
+    DEFAULT = 0x8
+    SSH_INTERACTIVE = 0x10
+    USERNAME = 0x20
+    SSH_MEMORY = 0x40
 
 class DeltaStatus(IntEnum):
-    UNMODIFIED: int
-    ADDED: int
-    DELETED: int
-    MODIFIED: int
-    RENAMED: int
-    COPIED: int
-    IGNORED: int
-    UNTRACKED: int
-    TYPECHANGE: int
-    UNREADABLE: int
-    CONFLICTED: int
+    UNMODIFIED = 0
+    ADDED = 1
+    DELETED = 2
+    MODIFIED = 3
+    RENAMED = 4
+    COPIED = 5
+    IGNORED = 6
+    UNTRACKED = 7
+    TYPECHANGE = 8
+    UNREADABLE = 9
+    CONFLICTED = 10
 
 class DescribeStrategy(IntEnum):
-    DEFAULT: int
-    TAGS: int
-    ALL: int
+    DEFAULT = 0
+    TAGS = 1
+    ALL = 2
 
 class DiffFind(IntFlag):
-    FIND_BY_CONFIG: int
-    FIND_RENAMES: int
-    FIND_RENAMES_FROM_REWRITES: int
-    FIND_COPIES: int
-    FIND_COPIES_FROM_UNMODIFIED: int
-    FIND_REWRITES: int
-    BREAK_REWRITES: int
-    FIND_AND_BREAK_REWRITES: int
-    FIND_FOR_UNTRACKED: int
-    FIND_ALL: int
-    FIND_IGNORE_LEADING_WHITESPACE: int
-    FIND_IGNORE_WHITESPACE: int
-    FIND_DONT_IGNORE_WHITESPACE: int
-    FIND_EXACT_MATCH_ONLY: int
-    BREAK_REWRITES_FOR_RENAMES_ONLY: int
-    FIND_REMOVE_UNMODIFIED: int
+    FIND_BY_CONFIG = 0x0
+    FIND_RENAMES = 0x1
+    FIND_RENAMES_FROM_REWRITES = 0x2
+    FIND_COPIES = 0x4
+    FIND_COPIES_FROM_UNMODIFIED = 0x8
+    FIND_REWRITES = 0x10
+    BREAK_REWRITES = 0x20
+    FIND_AND_BREAK_REWRITES = 0x30
+    FIND_FOR_UNTRACKED = 0x40
+    FIND_ALL = 0xFF
+    FIND_IGNORE_LEADING_WHITESPACE = 0x0
+    FIND_IGNORE_WHITESPACE = 0x1000
+    FIND_DONT_IGNORE_WHITESPACE = 0x2000
+    FIND_EXACT_MATCH_ONLY = 0x4000
+    BREAK_REWRITES_FOR_RENAMES_ONLY = 0x8000
+    FIND_REMOVE_UNMODIFIED = 0x10000
 
 class DiffFlag(IntFlag):
-    BINARY: int
-    NOT_BINARY: int
-    VALID_ID: int
-    EXISTS: int
-    VALID_SIZE: int
+    BINARY = 0x1
+    NOT_BINARY = 0x2
+    VALID_ID = 0x4
+    EXISTS = 0x8
+    VALID_SIZE = 0x10
 
 class DiffOption(IntFlag):
-    NORMAL: int
-    REVERSE: int
-    INCLUDE_IGNORED: int
-    RECURSE_IGNORED_DIRS: int
-    INCLUDE_UNTRACKED: int
-    RECURSE_UNTRACKED_DIRS: int
-    INCLUDE_UNMODIFIED: int
-    INCLUDE_TYPECHANGE: int
-    INCLUDE_TYPECHANGE_TREES: int
-    IGNORE_FILEMODE: int
-    IGNORE_SUBMODULES: int
-    IGNORE_CASE: int
-    INCLUDE_CASECHANGE: int
-    DISABLE_PATHSPEC_MATCH: int
-    SKIP_BINARY_CHECK: int
-    ENABLE_FAST_UNTRACKED_DIRS: int
-    UPDATE_INDEX: int
-    INCLUDE_UNREADABLE: int
-    INCLUDE_UNREADABLE_AS_UNTRACKED: int
-    INDENT_HEURISTIC: int
-    IGNORE_BLANK_LINES: int
-    FORCE_TEXT: int
-    FORCE_BINARY: int
-    IGNORE_WHITESPACE: int
-    IGNORE_WHITESPACE_CHANGE: int
-    IGNORE_WHITESPACE_EOL: int
-    SHOW_UNTRACKED_CONTENT: int
-    SHOW_UNMODIFIED: int
-    PATIENCE: int
-    MINIMAL: int
-    SHOW_BINARY: int
+    NORMAL = 0x0
+    REVERSE = 0x1
+    INCLUDE_IGNORED = 0x2
+    RECURSE_IGNORED_DIRS = 0x4
+    INCLUDE_UNTRACKED = 0x8
+    RECURSE_UNTRACKED_DIRS = 0x10
+    INCLUDE_UNMODIFIED = 0x20
+    INCLUDE_TYPECHANGE = 0x40
+    INCLUDE_TYPECHANGE_TREES = 0x80
+    IGNORE_FILEMODE = 0x100
+    IGNORE_SUBMODULES = 0x200
+    IGNORE_CASE = 0x400
+    INCLUDE_CASECHANGE = 0x800
+    DISABLE_PATHSPEC_MATCH = 0x1000
+    SKIP_BINARY_CHECK = 0x2000
+    ENABLE_FAST_UNTRACKED_DIRS = 0x4000
+    UPDATE_INDEX = 0x8000
+    INCLUDE_UNREADABLE = 0x10000
+    INCLUDE_UNREADABLE_AS_UNTRACKED = 0x20000
+    INDENT_HEURISTIC = 0x40000
+    IGNORE_BLANK_LINES = 0x80000
+    FORCE_TEXT = 0x100000
+    FORCE_BINARY = 0x200000
+    IGNORE_WHITESPACE = 0x400000
+    IGNORE_WHITESPACE_CHANGE = 0x800000
+    IGNORE_WHITESPACE_EOL = 0x1000000
+    SHOW_UNTRACKED_CONTENT = 0x2000000
+    SHOW_UNMODIFIED = 0x4000000
+    PATIENCE = 0x10000000
+    MINIMAL = 0x20000000
+    SHOW_BINARY = 0x40000000
 
 class DiffStatsFormat(IntFlag):
-    NONE: int
-    FULL: int
-    SHORT: int
-    NUMBER: int
-    INCLUDE_SUMMARY: int
+    NONE = 0x0
+    FULL = 0x1
+    SHORT = 0x2
+    NUMBER = 0x4
+    INCLUDE_SUMMARY = 0x8
 
 class Feature(IntFlag):
-    THREADS: int
-    HTTPS: int
-    SSH: int
-    NSEC: int
+    THREADS = 0x1
+    HTTPS = 0x2
+    SSH = 0x4
+    NSEC = 0x8
 
 class FetchPrune(IntEnum):
-    UNSPECIFIED: int
-    PRUNE: int
-    NO_PRUNE: int
+    UNSPECIFIED = 0
+    PRUNE = 1
+    NO_PRUNE = 2
 
 class FileMode(IntFlag):
-    UNREADABLE: int
-    TREE: int
-    BLOB: int
-    BLOB_EXECUTABLE: int
-    LINK: int
-    COMMIT: int
+    UNREADABLE = 0x0
+    TREE = 0x4000
+    BLOB = 0x81A4
+    BLOB_EXECUTABLE = 0x81ED
+    LINK = 0xA000
+    COMMIT = 0xE000
 
 class FileStatus(IntFlag):
-    CURRENT: int
-    INDEX_NEW: int
-    INDEX_MODIFIED: int
-    INDEX_DELETED: int
-    INDEX_RENAMED: int
-    INDEX_TYPECHANGE: int
-    WT_NEW: int
-    WT_MODIFIED: int
-    WT_DELETED: int
-    WT_TYPECHANGE: int
-    WT_RENAMED: int
-    WT_UNREADABLE: int
-    IGNORED: int
-    CONFLICTED: int
+    CURRENT = 0x0
+    INDEX_NEW = 0x1
+    INDEX_MODIFIED = 0x2
+    INDEX_DELETED = 0x4
+    INDEX_RENAMED = 0x8
+    INDEX_TYPECHANGE = 0x10
+    WT_NEW = 0x80
+    WT_MODIFIED = 0x100
+    WT_DELETED = 0x200
+    WT_TYPECHANGE = 0x400
+    WT_RENAMED = 0x800
+    WT_UNREADABLE = 0x1000
+    IGNORED = 0x4000
+    CONFLICTED = 0x8000
 
 class FilterFlag(IntFlag):
-    DEFAULT: int
-    ALLOW_UNSAFE: int
-    NO_SYSTEM_ATTRIBUTES: int
-    ATTRIBUTES_FROM_HEAD: int
-    ATTRIBUTES_FROM_COMMIT: int
+    DEFAULT = 0x0
+    ALLOW_UNSAFE = 0x1
+    NO_SYSTEM_ATTRIBUTES = 0x2
+    ATTRIBUTES_FROM_HEAD = 0x4
+    ATTRIBUTES_FROM_COMMIT = 0x8
 
 class FilterMode(IntEnum):
-    TO_WORKTREE: int
-    SMUDGE: int
-    TO_ODB: int
-    CLEAN: int
+    TO_WORKTREE = 0
+    SMUDGE = 0
+    TO_ODB = 1
+    CLEAN = 1
 
 class MergeAnalysis(IntFlag):
-    NONE: int
-    NORMAL: int
-    UP_TO_DATE: int
-    FASTFORWARD: int
-    UNBORN: int
+    NONE = 0x0
+    NORMAL = 0x1
+    UP_TO_DATE = 0x2
+    FASTFORWARD = 0x4
+    UNBORN = 0x8
 
 class MergeFavor(IntEnum):
-    NORMAL: int
-    OURS: int
-    THEIRS: int
-    UNION: int
+    NORMAL = 0
+    OURS = 1
+    THEIRS = 2
+    UNION = 3
 
 class MergeFileFlag(IntFlag):
-    DEFAULT: int
-    STYLE_MERGE: int
-    STYLE_DIFF3: int
-    SIMPLIFY_ALNUM: int
-    IGNORE_WHITESPACE: int
-    IGNORE_WHITESPACE_CHANGE: int
-    IGNORE_WHITESPACE_EOL: int
-    DIFF_PATIENCE: int
-    DIFF_MINIMAL: int
-    STYLE_ZDIFF3: int
-    ACCEPT_CONFLICTS: int
+    DEFAULT = 0x0
+    STYLE_MERGE = 0x1
+    STYLE_DIFF3 = 0x2
+    SIMPLIFY_ALNUM = 0x4
+    IGNORE_WHITESPACE = 0x8
+    IGNORE_WHITESPACE_CHANGE = 0x10
+    IGNORE_WHITESPACE_EOL = 0x20
+    DIFF_PATIENCE = 0x40
+    DIFF_MINIMAL = 0x80
+    STYLE_ZDIFF3 = 0x100
+    ACCEPT_CONFLICTS = 0x200
 
 class MergeFlag(IntFlag):
-    FIND_RENAMES: int
-    FAIL_ON_CONFLICT: int
-    SKIP_REUC: int
-    NO_RECURSIVE: int
-    VIRTUAL_BASE: int
+    FIND_RENAMES = 0x1
+    FAIL_ON_CONFLICT = 0x2
+    SKIP_REUC = 0x4
+    NO_RECURSIVE = 0x8
+    VIRTUAL_BASE = 0x10
 
 class MergePreference(IntFlag):
-    NONE: int
-    NO_FASTFORWARD: int
-    FASTFORWARD_ONLY: int
+    NONE = 0x0
+    NO_FASTFORWARD = 0x1
+    FASTFORWARD_ONLY = 0x2
 
 class ObjectType(IntEnum):
-    ANY: int
-    INVALID: int
-    COMMIT: int
-    TREE: int
-    BLOB: int
-    TAG: int
-    OFS_DELTA: int
-    REF_DELTA: int
+    ANY = -2
+    INVALID = -1
+    COMMIT = 1
+    TREE = 2
+    BLOB = 3
+    TAG = 4
+    OFS_DELTA = 6
+    REF_DELTA = 7
 
 class Option(IntEnum):
-    GET_MWINDOW_SIZE: int
-    SET_MWINDOW_SIZE: int
-    GET_MWINDOW_MAPPED_LIMIT: int
-    SET_MWINDOW_MAPPED_LIMIT: int
-    GET_SEARCH_PATH: int
-    SET_SEARCH_PATH: int
-    SET_CACHE_OBJECT_LIMIT: int
-    SET_CACHE_MAX_SIZE: int
-    ENABLE_CACHING: int
-    GET_CACHED_MEMORY: int
-    GET_TEMPLATE_PATH: int
-    SET_TEMPLATE_PATH: int
-    SET_SSL_CERT_LOCATIONS: int
-    SET_USER_AGENT: int
-    ENABLE_STRICT_OBJECT_CREATION: int
-    ENABLE_STRICT_SYMBOLIC_REF_CREATION: int
-    SET_SSL_CIPHERS: int
-    GET_USER_AGENT: int
-    ENABLE_OFS_DELTA: int
-    ENABLE_FSYNC_GITDIR: int
-    GET_WINDOWS_SHAREMODE: int
-    SET_WINDOWS_SHAREMODE: int
-    ENABLE_STRICT_HASH_VERIFICATION: int
-    SET_ALLOCATOR: int
-    ENABLE_UNSAVED_INDEX_SAFETY: int
-    GET_PACK_MAX_OBJECTS: int
-    SET_PACK_MAX_OBJECTS: int
-    DISABLE_PACK_KEEP_FILE_CHECKS: int
-    GET_OWNER_VALIDATION: int
-    SET_OWNER_VALIDATION: int
+    GET_MWINDOW_SIZE = 0
+    SET_MWINDOW_SIZE = 1
+    GET_MWINDOW_MAPPED_LIMIT = 2
+    SET_MWINDOW_MAPPED_LIMIT = 3
+    GET_SEARCH_PATH = 4
+    SET_SEARCH_PATH = 5
+    SET_CACHE_OBJECT_LIMIT = 6
+    SET_CACHE_MAX_SIZE = 7
+    ENABLE_CACHING = 8
+    GET_CACHED_MEMORY = 9
+    GET_TEMPLATE_PATH = 10
+    SET_TEMPLATE_PATH = 11
+    SET_SSL_CERT_LOCATIONS = 12
+    SET_USER_AGENT = 13
+    ENABLE_STRICT_OBJECT_CREATION = 14
+    ENABLE_STRICT_SYMBOLIC_REF_CREATION = 15
+    SET_SSL_CIPHERS = 16
+    GET_USER_AGENT = 17
+    ENABLE_OFS_DELTA = 18
+    ENABLE_FSYNC_GITDIR = 19
+    GET_WINDOWS_SHAREMODE = 20
+    SET_WINDOWS_SHAREMODE = 21
+    ENABLE_STRICT_HASH_VERIFICATION = 22
+    SET_ALLOCATOR = 23
+    ENABLE_UNSAVED_INDEX_SAFETY = 24
+    GET_PACK_MAX_OBJECTS = 25
+    SET_PACK_MAX_OBJECTS = 26
+    DISABLE_PACK_KEEP_FILE_CHECKS = 27
+    GET_OWNER_VALIDATION = 35
+    SET_OWNER_VALIDATION = 36
 
 class ReferenceFilter(IntEnum):
-    ALL: int
-    BRANCHES: int
-    TAGS: int
+    ALL = 0
+    BRANCHES = 1
+    TAGS = 2
 
 class ReferenceType(IntFlag):
-    INVALID: int
-    DIRECT: int
-    SYMBOLIC: int
-    ALL: int
-    OID: int
-    LISTALL: int
+    INVALID = 0x0
+    DIRECT = 0x1
+    SYMBOLIC = 0x2
+    ALL = 0x3
 
 class RepositoryInitFlag(IntFlag):
-    BARE: int
-    NO_REINIT: int
-    NO_DOTGIT_DIR: int
-    MKDIR: int
-    MKPATH: int
-    EXTERNAL_TEMPLATE: int
-    RELATIVE_GITLINK: int
+    BARE = 0x1
+    NO_REINIT = 0x2
+    NO_DOTGIT_DIR = 0x4
+    MKDIR = 0x8
+    MKPATH = 0x10
+    EXTERNAL_TEMPLATE = 0x20
+    RELATIVE_GITLINK = 0x40
 
 class RepositoryInitMode(IntEnum):
-    SHARED_UMASK: int
-    SHARED_GROUP: int
-    SHARED_ALL: int
+    SHARED_UMASK = 0
+    SHARED_GROUP = 1533
+    SHARED_ALL = 1535
 
 class RepositoryOpenFlag(IntFlag):
-    DEFAULT: int
-    NO_SEARCH: int
-    CROSS_FS: int
-    BARE: int
-    NO_DOTGIT: int
-    FROM_ENV: int
+    DEFAULT = 0x0
+    NO_SEARCH = 0x1
+    CROSS_FS = 0x2
+    BARE = 0x4
+    NO_DOTGIT = 0x8
+    FROM_ENV = 0x10
 
 class RepositoryState(IntEnum):
-    NONE: int
-    MERGE: int
-    REVERT: int
-    REVERT_SEQUENCE: int
-    CHERRYPICK: int
-    CHERRYPICK_SEQUENCE: int
-    BISECT: int
-    REBASE: int
-    REBASE_INTERACTIVE: int
-    REBASE_MERGE: int
-    APPLY_MAILBOX: int
-    APPLY_MAILBOX_OR_REBASE: int
+    NONE = 0
+    MERGE = 1
+    REVERT = 2
+    REVERT_SEQUENCE = 3
+    CHERRYPICK = 4
+    CHERRYPICK_SEQUENCE = 5
+    BISECT = 6
+    REBASE = 7
+    REBASE_INTERACTIVE = 8
+    REBASE_MERGE = 9
+    APPLY_MAILBOX = 10
+    APPLY_MAILBOX_OR_REBASE = 11
 
 class ResetMode(IntEnum):
-    SOFT: int
-    MIXED: int
-    HARD: int
+    SOFT = 1
+    MIXED = 2
+    HARD = 3
 
 class RevSpecFlag(IntFlag):
-    SINGLE: int
-    RANGE: int
-    MERGE_BASE: int
+    SINGLE = 0x1
+    RANGE = 0x2
+    MERGE_BASE = 0x4
 
 class SortMode(IntFlag):
-    NONE: int
-    TOPOLOGICAL: int
-    TIME: int
-    REVERSE: int
+    NONE = 0x0
+    TOPOLOGICAL = 0x1
+    TIME = 0x2
+    REVERSE = 0x4
 
 class StashApplyProgress(IntEnum):
-    NONE: int
-    LOADING_STASH: int
-    ANALYZE_INDEX: int
-    ANALYZE_MODIFIED: int
-    ANALYZE_UNTRACKED: int
-    CHECKOUT_UNTRACKED: int
-    CHECKOUT_MODIFIED: int
-    DONE: int
+    NONE = 0
+    LOADING_STASH = 1
+    ANALYZE_INDEX = 2
+    ANALYZE_MODIFIED = 3
+    ANALYZE_UNTRACKED = 4
+    CHECKOUT_UNTRACKED = 5
+    CHECKOUT_MODIFIED = 6
+    DONE = 7
 
 class SubmoduleIgnore(IntEnum):
-    UNSPECIFIED: int
-    NONE: int
-    UNTRACKED: int
-    DIRTY: int
-    ALL: int
+    UNSPECIFIED = -1
+    NONE = 1
+    UNTRACKED = 2
+    DIRTY = 3
+    ALL = 4
 
 class SubmoduleStatus(IntFlag):
-    IN_HEAD: int
-    IN_INDEX: int
-    IN_CONFIG: int
-    IN_WD: int
-    INDEX_ADDED: int
-    INDEX_DELETED: int
-    INDEX_MODIFIED: int
-    WD_UNINITIALIZED: int
-    WD_ADDED: int
-    WD_DELETED: int
-    WD_MODIFIED: int
-    WD_INDEX_MODIFIED: int
-    WD_WD_MODIFIED: int
-    WD_UNTRACKED: int
+    IN_HEAD = 0x1
+    IN_INDEX = 0x2
+    IN_CONFIG = 0x4
+    IN_WD = 0x8
+    INDEX_ADDED = 0x10
+    INDEX_DELETED = 0x20
+    INDEX_MODIFIED = 0x40
+    WD_UNINITIALIZED = 0x80
+    WD_ADDED = 0x100
+    WD_DELETED = 0x200
+    WD_MODIFIED = 0x400
+    WD_INDEX_MODIFIED = 0x800
+    WD_WD_MODIFIED = 0x1000
+    WD_UNTRACKED = 0x2000

stubs/pygit2/pygit2/index.pyi

@@ -1,6 +1,6 @@
 from _typeshed import StrOrBytesPath, StrPath
 from collections.abc import Iterator
-from typing_extensions import Self
+from typing_extensions import Self, deprecated
 
 from _cffi_backend import _CDataBase
 
@@ -40,6 +40,7 @@ class IndexEntry:
     @property
     def oid(self) -> Oid: ...
     @property
+    @deprecated("Use str(entry.id)")
     def hex(self) -> str: ...
     def __eq__(self, other: object) -> bool: ...
 

stubs/pygit2/pygit2/remotes.pyi

@@ -58,7 +58,13 @@ class Remote:
     def fetch_refspecs(self) -> list[str]: ...
     @property
     def push_refspecs(self) -> list[str]: ...
-    def push(self, specs: _IntoStrArray, callbacks: RemoteCallbacks | None = None, proxy: _ProxySpec = None) -> None: ...
+    def push(
+        self,
+        specs: _IntoStrArray,
+        callbacks: RemoteCallbacks | None = None,
+        proxy: _ProxySpec = None,
+        push_options: _IntoStrArray | None = None,
+    ) -> None: ...
 
 _RemoteName: TypeAlias = bytes | str
 

stubs/pygit2/pygit2/repository.pyi

@@ -1,13 +1,13 @@
 from _typeshed import StrOrBytesPath
-from collections.abc import Callable, Iterable, Iterator
+from collections.abc import Callable, Iterator
 from tarfile import TarInfo
 from typing import IO, Any, Protocol
-from typing_extensions import TypeAlias, deprecated
+from typing_extensions import TypeAlias
 
 from ._pygit2 import Blob, Commit, Diff, Object, Oid, Reference, Repository as _Repository, Signature, Tree, _OidArg
 from .blame import Blame
 from .branches import Branches
-from .callbacks import CheckoutCallbacks, RemoteCallbacks, StashApplyCallbacks
+from .callbacks import CheckoutCallbacks, StashApplyCallbacks
 from .config import Config
 from .enums import (
     AttrCheck,
@@ -26,7 +26,7 @@ from .index import Index, IndexEntry
 from .packbuilder import PackBuilder
 from .references import References
 from .remotes import RemoteCollection
-from .submodules import Submodule, SubmoduleCollection
+from .submodules import SubmoduleCollection
 from .utils import _IntoStrArray
 
 _PackDelegate: TypeAlias = Callable[[PackBuilder], None]
@@ -47,16 +47,6 @@ class BaseRepository(_Repository):
         self, path: StrOrBytesPath | None = None, pack_delegate: _PackDelegate | None = None, n_threads: int | None = None
     ) -> int: ...
     def __iter__(self) -> Iterator[Oid]: ...
-    @deprecated("Use repo.submodules.add(...)")
-    def add_submodule(self, url: str, path: str, link: bool = True, callbacks: RemoteCallbacks | None = None) -> Submodule: ...
-    @deprecated("Use repo.submodules[...]")
-    def lookup_submodule(self, path: str) -> Submodule: ...
-    @deprecated("Use repo.submodules.init(...)")
-    def init_submodules(self, submodules: Iterable[str] | None = None, overwrite: bool = False) -> None: ...
-    @deprecated("Use repo.submodules.update(...)")
-    def update_submodules(
-        self, submodules: Iterable[str] | None = None, init: bool = False, callbacks: RemoteCallbacks | None = None
-    ) -> None: ...
     def get(self, key: _OidArg, default: Object | None = None) -> Object | None: ...
     def __getitem__(self, key: _OidArg) -> Object: ...
     def __contains__(self, key: _OidArg) -> bool: ...

stubs/pygit2/pygit2/utils.pyi

@@ -1,5 +1,7 @@
+import contextlib
 import types
 from _typeshed import StrOrBytesPath, StrPath
+from collections.abc import Iterator
 from typing import Generic, TypeVar
 from typing_extensions import TypeAlias
 
@@ -9,6 +11,8 @@ def maybe_string(ptr: _CDataBase) -> str | None: ...
 def to_bytes(s: _CDataBase | StrOrBytesPath | None, encoding: str = "utf-8", errors: str = "strict") -> _CDataBase | bytes: ...
 def to_str(s: StrOrBytesPath) -> str: ...
 def ptr_to_bytes(ptr_cdata: _CDataBase) -> bytes: ...
+@contextlib.contextmanager
+def new_git_strarray() -> Iterator[_GitStrArray]: ...
 def strarray_to_strings(arr: _GitStrArray) -> list[str]: ...
 
 # Actual type: _cffi_backend.__CDataOwn <cdata 'struct git_strarray *'>
@@ -21,12 +25,14 @@ class _GitStrArray(_CDataBase):  # type: ignore[misc]  # pyright: ignore
 _IntoStrArray: TypeAlias = list[StrPath] | tuple[StrPath] | None
 
 class StrArray:
-    array: _CDataBase | _GitStrArray
     def __init__(self, l: _IntoStrArray) -> None: ...
     def __enter__(self) -> _CDataBase: ...
     def __exit__(
         self, type: type[BaseException] | None, value: BaseException | None, traceback: types.TracebackType | None
     ) -> None: ...
+    @property
+    def ptr(self) -> _CDataBase | _GitStrArray: ...
+    def assign_to(self, git_strarray: _GitStrArray) -> None: ...
 
 _T = TypeVar("_T")