mercurial-scm/hg: hgext/git/dirstate.py annotate

annotate hgext/git/dirstate.py @ 51923:e99c007030da

git: make `dirstate.parents()` return a list like the core class The core class returned a list, so that's how I type annotated it, and this got flagged. I suppose we could annotate it as a `Sequence[bytes]`, but it's a trivial difference.

author	Matt Harbison <matt_harbison@yahoo.com>
date	Fri, 27 Sep 2024 12:05:48 -0400
parents	3a90a6fd710d
children	93d872a06132

rev	line source
51859 f4733654f144 typing: add `from __future__ import annotations` to most files Matt Harbison <matt_harbison@yahoo.com> parents: 51270 diff changeset	1 from __future__ import annotations
f4733654f144 typing: add `from __future__ import annotations` to most files Matt Harbison <matt_harbison@yahoo.com> parents: 51270 diff changeset	2
44477 ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	3 import contextlib
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	4 import os
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	5
47012 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46113 diff changeset	6 from mercurial.node import sha1nodeconstants
44477 ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	7 from mercurial import (
49077 20d151e43429 git: adapt to some recent dirstate API changes Matt Harbison <matt_harbison@yahoo.com> parents: 48946 diff changeset	8 dirstatemap,
44477 ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	9 error,
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	10 extensions,
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	11 match as matchmod,
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	12 pycompat,
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	13 scmutil,
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	14 util,
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	15 )
49077 20d151e43429 git: adapt to some recent dirstate API changes Matt Harbison <matt_harbison@yahoo.com> parents: 48946 diff changeset	16 from mercurial.dirstateutils import (
20d151e43429 git: adapt to some recent dirstate API changes Matt Harbison <matt_harbison@yahoo.com> parents: 48946 diff changeset	17 timestamp,
20d151e43429 git: adapt to some recent dirstate API changes Matt Harbison <matt_harbison@yahoo.com> parents: 48946 diff changeset	18 )
44477 ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	19 from mercurial.interfaces import (
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	20 dirstate as intdirstate,
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	21 )
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	22
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	23 from . import gitutil
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	24
49077 20d151e43429 git: adapt to some recent dirstate API changes Matt Harbison <matt_harbison@yahoo.com> parents: 48946 diff changeset	25
20d151e43429 git: adapt to some recent dirstate API changes Matt Harbison <matt_harbison@yahoo.com> parents: 48946 diff changeset	26 DirstateItem = dirstatemap.DirstateItem
20d151e43429 git: adapt to some recent dirstate API changes Matt Harbison <matt_harbison@yahoo.com> parents: 48946 diff changeset	27 propertycache = util.propertycache
44484 ec54b3d2af0b git: don't fail import when pygit2 is not install Martin von Zweigbergk <martinvonz@google.com> parents: 44477 diff changeset	28 pygit2 = gitutil.get_pygit2()
ec54b3d2af0b git: don't fail import when pygit2 is not install Martin von Zweigbergk <martinvonz@google.com> parents: 44477 diff changeset	29
44477 ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	30
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	31 def readpatternfile(orig, filepath, warn, sourceinfo=False):
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	32 if not (b'info/exclude' in filepath or filepath.endswith(b'.gitignore')):
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	33 return orig(filepath, warn, sourceinfo=False)
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	34 result = []
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	35 warnings = []
49078 020328be00cb git: un-byteify the `mode` argument for the builtin `open()` Matt Harbison <matt_harbison@yahoo.com> parents: 49077 diff changeset	36 with open(filepath, 'rb') as fp:
44477 ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	37 for l in fp:
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	38 l = l.strip()
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	39 if not l or l.startswith(b'#'):
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	40 continue
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	41 if l.startswith(b'!'):
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	42 warnings.append(b'unsupported ignore pattern %s' % l)
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	43 continue
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	44 if l.startswith(b'/'):
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	45 result.append(b'rootglob:' + l[1:])
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	46 else:
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	47 result.append(b'relglob:' + l)
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	48 return result, warnings
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	49
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	50
50776 39eb3aab3e63 wrapfunction: use sysstr instead of bytes as argument in the "git" extension Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50256 diff changeset	51 extensions.wrapfunction(matchmod, 'readpatternfile', readpatternfile)
44477 ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	52
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	53
44484 ec54b3d2af0b git: don't fail import when pygit2 is not install Martin von Zweigbergk <martinvonz@google.com> parents: 44477 diff changeset	54 _STATUS_MAP = {}
ec54b3d2af0b git: don't fail import when pygit2 is not install Martin von Zweigbergk <martinvonz@google.com> parents: 44477 diff changeset	55 if pygit2:
ec54b3d2af0b git: don't fail import when pygit2 is not install Martin von Zweigbergk <martinvonz@google.com> parents: 44477 diff changeset	56 _STATUS_MAP = {
ec54b3d2af0b git: don't fail import when pygit2 is not install Martin von Zweigbergk <martinvonz@google.com> parents: 44477 diff changeset	57 pygit2.GIT_STATUS_CONFLICTED: b'm',
ec54b3d2af0b git: don't fail import when pygit2 is not install Martin von Zweigbergk <martinvonz@google.com> parents: 44477 diff changeset	58 pygit2.GIT_STATUS_CURRENT: b'n',
ec54b3d2af0b git: don't fail import when pygit2 is not install Martin von Zweigbergk <martinvonz@google.com> parents: 44477 diff changeset	59 pygit2.GIT_STATUS_IGNORED: b'?',
ec54b3d2af0b git: don't fail import when pygit2 is not install Martin von Zweigbergk <martinvonz@google.com> parents: 44477 diff changeset	60 pygit2.GIT_STATUS_INDEX_DELETED: b'r',
ec54b3d2af0b git: don't fail import when pygit2 is not install Martin von Zweigbergk <martinvonz@google.com> parents: 44477 diff changeset	61 pygit2.GIT_STATUS_INDEX_MODIFIED: b'n',
ec54b3d2af0b git: don't fail import when pygit2 is not install Martin von Zweigbergk <martinvonz@google.com> parents: 44477 diff changeset	62 pygit2.GIT_STATUS_INDEX_NEW: b'a',
ec54b3d2af0b git: don't fail import when pygit2 is not install Martin von Zweigbergk <martinvonz@google.com> parents: 44477 diff changeset	63 pygit2.GIT_STATUS_INDEX_RENAMED: b'a',
ec54b3d2af0b git: don't fail import when pygit2 is not install Martin von Zweigbergk <martinvonz@google.com> parents: 44477 diff changeset	64 pygit2.GIT_STATUS_INDEX_TYPECHANGE: b'n',
ec54b3d2af0b git: don't fail import when pygit2 is not install Martin von Zweigbergk <martinvonz@google.com> parents: 44477 diff changeset	65 pygit2.GIT_STATUS_WT_DELETED: b'r',
ec54b3d2af0b git: don't fail import when pygit2 is not install Martin von Zweigbergk <martinvonz@google.com> parents: 44477 diff changeset	66 pygit2.GIT_STATUS_WT_MODIFIED: b'n',
ec54b3d2af0b git: don't fail import when pygit2 is not install Martin von Zweigbergk <martinvonz@google.com> parents: 44477 diff changeset	67 pygit2.GIT_STATUS_WT_NEW: b'?',
ec54b3d2af0b git: don't fail import when pygit2 is not install Martin von Zweigbergk <martinvonz@google.com> parents: 44477 diff changeset	68 pygit2.GIT_STATUS_WT_RENAMED: b'a',
ec54b3d2af0b git: don't fail import when pygit2 is not install Martin von Zweigbergk <martinvonz@google.com> parents: 44477 diff changeset	69 pygit2.GIT_STATUS_WT_TYPECHANGE: b'n',
ec54b3d2af0b git: don't fail import when pygit2 is not install Martin von Zweigbergk <martinvonz@google.com> parents: 44477 diff changeset	70 pygit2.GIT_STATUS_WT_UNREADABLE: b'?',
47054 9cea55ca1175 git: ensure all dirstate state values are bytes Matt Harbison <matt_harbison@yahoo.com> parents: 46113 diff changeset	71 pygit2.GIT_STATUS_INDEX_MODIFIED \| pygit2.GIT_STATUS_WT_MODIFIED: b'm',
44484 ec54b3d2af0b git: don't fail import when pygit2 is not install Martin von Zweigbergk <martinvonz@google.com> parents: 44477 diff changeset	72 }
44477 ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	73
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	74
51921 3a90a6fd710d dirstate: subclass the new dirstate Protocol class Matt Harbison <matt_harbison@yahoo.com> parents: 51920 diff changeset	75 class gitdirstate(intdirstate.idirstate):
49077 20d151e43429 git: adapt to some recent dirstate API changes Matt Harbison <matt_harbison@yahoo.com> parents: 48946 diff changeset	76 def __init__(self, ui, vfs, gitrepo, use_dirstate_v2):
44477 ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	77 self._ui = ui
49077 20d151e43429 git: adapt to some recent dirstate API changes Matt Harbison <matt_harbison@yahoo.com> parents: 48946 diff changeset	78 self._root = os.path.dirname(vfs.base)
20d151e43429 git: adapt to some recent dirstate API changes Matt Harbison <matt_harbison@yahoo.com> parents: 48946 diff changeset	79 self._opener = vfs
44477 ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	80 self.git = gitrepo
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	81 self._plchangecallbacks = {}
47772 0bdcb5ef932c git: restore basic functionality (issue6545) Augie Fackler <augie@google.com> parents: 47539 diff changeset	82 # TODO: context.poststatusfixup is bad and uses this attribute
0bdcb5ef932c git: restore basic functionality (issue6545) Augie Fackler <augie@google.com> parents: 47539 diff changeset	83 self._dirty = False
49077 20d151e43429 git: adapt to some recent dirstate API changes Matt Harbison <matt_harbison@yahoo.com> parents: 48946 diff changeset	84 self._mapcls = dirstatemap.dirstatemap
20d151e43429 git: adapt to some recent dirstate API changes Matt Harbison <matt_harbison@yahoo.com> parents: 48946 diff changeset	85 self._use_dirstate_v2 = use_dirstate_v2
20d151e43429 git: adapt to some recent dirstate API changes Matt Harbison <matt_harbison@yahoo.com> parents: 48946 diff changeset	86
20d151e43429 git: adapt to some recent dirstate API changes Matt Harbison <matt_harbison@yahoo.com> parents: 48946 diff changeset	87 @propertycache
20d151e43429 git: adapt to some recent dirstate API changes Matt Harbison <matt_harbison@yahoo.com> parents: 48946 diff changeset	88 def _map(self):
20d151e43429 git: adapt to some recent dirstate API changes Matt Harbison <matt_harbison@yahoo.com> parents: 48946 diff changeset	89 """Return the dirstate contents (see documentation for dirstatemap)."""
20d151e43429 git: adapt to some recent dirstate API changes Matt Harbison <matt_harbison@yahoo.com> parents: 48946 diff changeset	90 self._map = self._mapcls(
20d151e43429 git: adapt to some recent dirstate API changes Matt Harbison <matt_harbison@yahoo.com> parents: 48946 diff changeset	91 self._ui,
20d151e43429 git: adapt to some recent dirstate API changes Matt Harbison <matt_harbison@yahoo.com> parents: 48946 diff changeset	92 self._opener,
20d151e43429 git: adapt to some recent dirstate API changes Matt Harbison <matt_harbison@yahoo.com> parents: 48946 diff changeset	93 self._root,
20d151e43429 git: adapt to some recent dirstate API changes Matt Harbison <matt_harbison@yahoo.com> parents: 48946 diff changeset	94 sha1nodeconstants,
20d151e43429 git: adapt to some recent dirstate API changes Matt Harbison <matt_harbison@yahoo.com> parents: 48946 diff changeset	95 self._use_dirstate_v2,
20d151e43429 git: adapt to some recent dirstate API changes Matt Harbison <matt_harbison@yahoo.com> parents: 48946 diff changeset	96 )
20d151e43429 git: adapt to some recent dirstate API changes Matt Harbison <matt_harbison@yahoo.com> parents: 48946 diff changeset	97 return self._map
44477 ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	98
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	99 def p1(self):
44492 eb061d272af4 git: correctly handle p1() on dirstate when underlying git repo is empty Augie Fackler <raf@durin42.com> parents: 44484 diff changeset	100 try:
eb061d272af4 git: correctly handle p1() on dirstate when underlying git repo is empty Augie Fackler <raf@durin42.com> parents: 44484 diff changeset	101 return self.git.head.peel().id.raw
eb061d272af4 git: correctly handle p1() on dirstate when underlying git repo is empty Augie Fackler <raf@durin42.com> parents: 44484 diff changeset	102 except pygit2.GitError:
eb061d272af4 git: correctly handle p1() on dirstate when underlying git repo is empty Augie Fackler <raf@durin42.com> parents: 44484 diff changeset	103 # Typically happens when peeling HEAD fails, as in an
eb061d272af4 git: correctly handle p1() on dirstate when underlying git repo is empty Augie Fackler <raf@durin42.com> parents: 44484 diff changeset	104 # empty repository.
47012 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46113 diff changeset	105 return sha1nodeconstants.nullid
44477 ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	106
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	107 def p2(self):
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	108 # TODO: MERGE_HEAD? something like that, right?
47012 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46113 diff changeset	109 return sha1nodeconstants.nullid
44477 ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	110
47012 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46113 diff changeset	111 def setparents(self, p1, p2=None):
d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46113 diff changeset	112 if p2 is None:
d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46113 diff changeset	113 p2 = sha1nodeconstants.nullid
d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46113 diff changeset	114 assert p2 == sha1nodeconstants.nullid, b'TODO merging support'
44477 ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	115 self.git.head.set_target(gitutil.togitnode(p1))
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	116
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	117 @util.propertycache
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	118 def identity(self):
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	119 return util.filestat.frompath(
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	120 os.path.join(self._root, b'.git', b'index')
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	121 )
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	122
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	123 def branch(self):
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	124 return b'default'
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	125
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	126 def parents(self):
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	127 # TODO how on earth do we find p2 if a merge is in flight?
51923 e99c007030da git: make `dirstate.parents()` return a list like the core class Matt Harbison <matt_harbison@yahoo.com> parents: 51921 diff changeset	128 return [self.p1(), sha1nodeconstants.nullid]
44477 ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	129
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	130 def __iter__(self):
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	131 return (pycompat.fsencode(f.path) for f in self.git.index)
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	132
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	133 def items(self):
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	134 for ie in self.git.index:
47539 84391ddf4c78 dirstate-item: rename the class to DirstateItem Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47057 diff changeset	135 yield ie.path, None # value should be a DirstateItem
44477 ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	136
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	137 # py2,3 compat forward
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	138 iteritems = items
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	139
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	140 def __getitem__(self, filename):
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	141 try:
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	142 gs = self.git.status_file(filename)
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	143 except KeyError:
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	144 return b'?'
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	145 return _STATUS_MAP[gs]
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	146
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	147 def __contains__(self, filename):
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	148 try:
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	149 gs = self.git.status_file(filename)
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	150 return _STATUS_MAP[gs] != b'?'
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	151 except KeyError:
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	152 return False
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	153
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	154 def status(self, match, subrepos, ignored, clean, unknown):
45431 7a57ced7de87 git: remove unrequired assignment of listignored and listunknown Pulkit Goyal <7895pulkit@gmail.com> parents: 45423 diff changeset	155 listclean = clean
44477 ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	156 # TODO handling of clean files - can we get that from git.status()?
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	157 modified, added, removed, deleted, unknown, ignored, clean = (
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	158 [],
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	159 [],
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	160 [],
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	161 [],
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	162 [],
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	163 [],
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	164 [],
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	165 )
49077 20d151e43429 git: adapt to some recent dirstate API changes Matt Harbison <matt_harbison@yahoo.com> parents: 48946 diff changeset	166
20d151e43429 git: adapt to some recent dirstate API changes Matt Harbison <matt_harbison@yahoo.com> parents: 48946 diff changeset	167 try:
20d151e43429 git: adapt to some recent dirstate API changes Matt Harbison <matt_harbison@yahoo.com> parents: 48946 diff changeset	168 mtime_boundary = timestamp.get_fs_now(self._opener)
20d151e43429 git: adapt to some recent dirstate API changes Matt Harbison <matt_harbison@yahoo.com> parents: 48946 diff changeset	169 except OSError:
20d151e43429 git: adapt to some recent dirstate API changes Matt Harbison <matt_harbison@yahoo.com> parents: 48946 diff changeset	170 # In largefiles or readonly context
20d151e43429 git: adapt to some recent dirstate API changes Matt Harbison <matt_harbison@yahoo.com> parents: 48946 diff changeset	171 mtime_boundary = None
20d151e43429 git: adapt to some recent dirstate API changes Matt Harbison <matt_harbison@yahoo.com> parents: 48946 diff changeset	172
44477 ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	173 gstatus = self.git.status()
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	174 for path, status in gstatus.items():
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	175 path = pycompat.fsencode(path)
45421 0c6b2cc9a7bb git: make dirstate status() respect matcher Augie Fackler <raf@durin42.com> parents: 45420 diff changeset	176 if not match(path):
0c6b2cc9a7bb git: make dirstate status() respect matcher Augie Fackler <raf@durin42.com> parents: 45420 diff changeset	177 continue
44477 ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	178 if status == pygit2.GIT_STATUS_IGNORED:
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	179 if path.endswith(b'/'):
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	180 continue
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	181 ignored.append(path)
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	182 elif status in (
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	183 pygit2.GIT_STATUS_WT_MODIFIED,
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	184 pygit2.GIT_STATUS_INDEX_MODIFIED,
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	185 pygit2.GIT_STATUS_WT_MODIFIED
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	186 \| pygit2.GIT_STATUS_INDEX_MODIFIED,
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	187 ):
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	188 modified.append(path)
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	189 elif status == pygit2.GIT_STATUS_INDEX_NEW:
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	190 added.append(path)
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	191 elif status == pygit2.GIT_STATUS_WT_NEW:
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	192 unknown.append(path)
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	193 elif status == pygit2.GIT_STATUS_WT_DELETED:
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	194 deleted.append(path)
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	195 elif status == pygit2.GIT_STATUS_INDEX_DELETED:
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	196 removed.append(path)
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	197 else:
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	198 raise error.Abort(
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	199 b'unhandled case: status for %r is %r' % (path, status)
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	200 )
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	201
45422 601e3658216d git: make dirstate actually support listclean parameter Augie Fackler <raf@durin42.com> parents: 45421 diff changeset	202 if listclean:
601e3658216d git: make dirstate actually support listclean parameter Augie Fackler <raf@durin42.com> parents: 45421 diff changeset	203 observed = set(
601e3658216d git: make dirstate actually support listclean parameter Augie Fackler <raf@durin42.com> parents: 45421 diff changeset	204 modified + added + removed + deleted + unknown + ignored
601e3658216d git: make dirstate actually support listclean parameter Augie Fackler <raf@durin42.com> parents: 45421 diff changeset	205 )
601e3658216d git: make dirstate actually support listclean parameter Augie Fackler <raf@durin42.com> parents: 45421 diff changeset	206 index = self.git.index
601e3658216d git: make dirstate actually support listclean parameter Augie Fackler <raf@durin42.com> parents: 45421 diff changeset	207 index.read()
601e3658216d git: make dirstate actually support listclean parameter Augie Fackler <raf@durin42.com> parents: 45421 diff changeset	208 for entry in index:
601e3658216d git: make dirstate actually support listclean parameter Augie Fackler <raf@durin42.com> parents: 45421 diff changeset	209 path = pycompat.fsencode(entry.path)
601e3658216d git: make dirstate actually support listclean parameter Augie Fackler <raf@durin42.com> parents: 45421 diff changeset	210 if not match(path):
601e3658216d git: make dirstate actually support listclean parameter Augie Fackler <raf@durin42.com> parents: 45421 diff changeset	211 continue
601e3658216d git: make dirstate actually support listclean parameter Augie Fackler <raf@durin42.com> parents: 45421 diff changeset	212 if path in observed:
601e3658216d git: make dirstate actually support listclean parameter Augie Fackler <raf@durin42.com> parents: 45421 diff changeset	213 continue # already in some other set
601e3658216d git: make dirstate actually support listclean parameter Augie Fackler <raf@durin42.com> parents: 45421 diff changeset	214 if path[-1] == b'/':
601e3658216d git: make dirstate actually support listclean parameter Augie Fackler <raf@durin42.com> parents: 45421 diff changeset	215 continue # directory
601e3658216d git: make dirstate actually support listclean parameter Augie Fackler <raf@durin42.com> parents: 45421 diff changeset	216 clean.append(path)
601e3658216d git: make dirstate actually support listclean parameter Augie Fackler <raf@durin42.com> parents: 45421 diff changeset	217
44477 ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	218 # TODO are we really always sure of status here?
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	219 return (
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	220 False,
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	221 scmutil.status(
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	222 modified, added, removed, deleted, unknown, ignored, clean
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	223 ),
49077 20d151e43429 git: adapt to some recent dirstate API changes Matt Harbison <matt_harbison@yahoo.com> parents: 48946 diff changeset	224 mtime_boundary,
44477 ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	225 )
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	226
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	227 def flagfunc(self, buildfallback):
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	228 # TODO we can do better
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	229 return buildfallback()
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	230
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	231 def getcwd(self):
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	232 # TODO is this a good way to do this?
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	233 return os.path.dirname(
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	234 os.path.dirname(pycompat.fsencode(self.git.path))
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	235 )
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	236
49077 20d151e43429 git: adapt to some recent dirstate API changes Matt Harbison <matt_harbison@yahoo.com> parents: 48946 diff changeset	237 def get_entry(self, path):
20d151e43429 git: adapt to some recent dirstate API changes Matt Harbison <matt_harbison@yahoo.com> parents: 48946 diff changeset	238 """return a DirstateItem for the associated path"""
20d151e43429 git: adapt to some recent dirstate API changes Matt Harbison <matt_harbison@yahoo.com> parents: 48946 diff changeset	239 entry = self._map.get(path)
20d151e43429 git: adapt to some recent dirstate API changes Matt Harbison <matt_harbison@yahoo.com> parents: 48946 diff changeset	240 if entry is None:
20d151e43429 git: adapt to some recent dirstate API changes Matt Harbison <matt_harbison@yahoo.com> parents: 48946 diff changeset	241 return DirstateItem()
20d151e43429 git: adapt to some recent dirstate API changes Matt Harbison <matt_harbison@yahoo.com> parents: 48946 diff changeset	242 return entry
20d151e43429 git: adapt to some recent dirstate API changes Matt Harbison <matt_harbison@yahoo.com> parents: 48946 diff changeset	243
51920 51be8bf8c986 git: correct some signature mismatches between dirstate and the Protocol class Matt Harbison <matt_harbison@yahoo.com> parents: 51859 diff changeset	244 def normalize(self, path, isknown=False, ignoremissing=False):
44477 ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	245 normed = util.normcase(path)
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	246 assert normed == path, b"TODO handling of case folding: %s != %s" % (
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	247 normed,
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	248 path,
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	249 )
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	250 return path
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	251
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	252 @property
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	253 def _checklink(self):
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	254 return util.checklink(os.path.dirname(pycompat.fsencode(self.git.path)))
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	255
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	256 def copies(self):
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	257 # TODO support copies?
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	258 return {}
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	259
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	260 # # TODO what the heck is this
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	261 _filecache = set()
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	262
51920 51be8bf8c986 git: correct some signature mismatches between dirstate and the Protocol class Matt Harbison <matt_harbison@yahoo.com> parents: 51859 diff changeset	263 @property
50022 e333cc169c45 dirstate: rename `pendingparentchange` to `is_changing_parents` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49961 diff changeset	264 def is_changing_parents(self):
44477 ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	265 # TODO: we need to implement the context manager bits and
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	266 # correctly stage/revert index edits.
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	267 return False
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	268
51920 51be8bf8c986 git: correct some signature mismatches between dirstate and the Protocol class Matt Harbison <matt_harbison@yahoo.com> parents: 51859 diff changeset	269 @property
50023 e1cff85484e2 dirstate: introduce a `is_changing_any` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50022 diff changeset	270 def is_changing_any(self):
e1cff85484e2 dirstate: introduce a `is_changing_any` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50022 diff changeset	271 # TODO: we need to implement the context manager bits and
e1cff85484e2 dirstate: introduce a `is_changing_any` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50022 diff changeset	272 # correctly stage/revert index edits.
e1cff85484e2 dirstate: introduce a `is_changing_any` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50022 diff changeset	273 return False
e1cff85484e2 dirstate: introduce a `is_changing_any` property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50022 diff changeset	274
44477 ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	275 def write(self, tr):
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	276 # TODO: call parent change callbacks
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	277
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	278 if tr:
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	279
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	280 def writeinner(category):
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	281 self.git.index.write()
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	282
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	283 tr.addpending(b'gitdirstate', writeinner)
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	284 else:
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	285 self.git.index.write()
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	286
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	287 def pathto(self, f, cwd=None):
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	288 if cwd is None:
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	289 cwd = self.getcwd()
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	290 # TODO core dirstate does something about slashes here
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	291 assert isinstance(f, bytes)
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	292 r = util.pathto(self._root, cwd, f)
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	293 return r
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	294
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	295 def matches(self, match):
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	296 for x in self.git.index:
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	297 p = pycompat.fsencode(x.path)
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	298 if match(p):
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	299 yield p
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	300
48385 080151f18f3a dirstate: make it mandatory to provide parentfiledata in `set_clean` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47772 diff changeset	301 def set_clean(self, f, parentfiledata):
44477 ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	302 """Mark a file normal and clean."""
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	303 # TODO: for now we just let libgit2 re-stat the file. We can
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	304 # clearly do better.
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	305
47772 0bdcb5ef932c git: restore basic functionality (issue6545) Augie Fackler <augie@google.com> parents: 47539 diff changeset	306 def set_possibly_dirty(self, f):
44477 ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	307 """Mark a file normal, but possibly dirty."""
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	308 # TODO: for now we just let libgit2 re-stat the file. We can
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	309 # clearly do better.
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	310
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	311 def walk(self, match, subrepos, unknown, ignored, full=True):
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	312 # TODO: we need to use .status() and not iterate the index,
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	313 # because the index doesn't force a re-walk and so `hg add` of
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	314 # a new file without an intervening call to status will
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	315 # silently do nothing.
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	316 r = {}
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	317 cwd = self.getcwd()
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	318 for path, status in self.git.status().items():
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	319 if path.startswith('.hg/'):
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	320 continue
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	321 path = pycompat.fsencode(path)
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	322 if not match(path):
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	323 continue
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	324 # TODO construct the stat info from the status object?
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	325 try:
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	326 s = os.stat(os.path.join(cwd, path))
49306 2e726c934fcd py3: catch FileNotFoundError instead of checking errno == ENOENT Manuel Jacob <me@manueljacob.de> parents: 49078 diff changeset	327 except FileNotFoundError:
44477 ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	328 continue
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	329 r[path] = s
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	330 return r
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	331
49385 3c4d36a96a3e git: add a missing reset_copy keyword argument to dirstate.set_tracked() Anton Shestakov <av6@dwimlabs.net> parents: 49306 diff changeset	332 def set_tracked(self, f, reset_copy=False):
3c4d36a96a3e git: add a missing reset_copy keyword argument to dirstate.set_tracked() Anton Shestakov <av6@dwimlabs.net> parents: 49306 diff changeset	333 # TODO: support copies and reset_copy=True
47772 0bdcb5ef932c git: restore basic functionality (issue6545) Augie Fackler <augie@google.com> parents: 47539 diff changeset	334 uf = pycompat.fsdecode(f)
0bdcb5ef932c git: restore basic functionality (issue6545) Augie Fackler <augie@google.com> parents: 47539 diff changeset	335 if uf in self.git.index:
0bdcb5ef932c git: restore basic functionality (issue6545) Augie Fackler <augie@google.com> parents: 47539 diff changeset	336 return False
0bdcb5ef932c git: restore basic functionality (issue6545) Augie Fackler <augie@google.com> parents: 47539 diff changeset	337 index = self.git.index
0bdcb5ef932c git: restore basic functionality (issue6545) Augie Fackler <augie@google.com> parents: 47539 diff changeset	338 index.read()
0bdcb5ef932c git: restore basic functionality (issue6545) Augie Fackler <augie@google.com> parents: 47539 diff changeset	339 index.add(uf)
0bdcb5ef932c git: restore basic functionality (issue6545) Augie Fackler <augie@google.com> parents: 47539 diff changeset	340 index.write()
0bdcb5ef932c git: restore basic functionality (issue6545) Augie Fackler <augie@google.com> parents: 47539 diff changeset	341 return True
0bdcb5ef932c git: restore basic functionality (issue6545) Augie Fackler <augie@google.com> parents: 47539 diff changeset	342
44477 ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	343 def add(self, f):
45420 c67529569643 git: fix up dirstate use of index Augie Fackler <raf@durin42.com> parents: 44927 diff changeset	344 index = self.git.index
c67529569643 git: fix up dirstate use of index Augie Fackler <raf@durin42.com> parents: 44927 diff changeset	345 index.read()
c67529569643 git: fix up dirstate use of index Augie Fackler <raf@durin42.com> parents: 44927 diff changeset	346 index.add(pycompat.fsdecode(f))
c67529569643 git: fix up dirstate use of index Augie Fackler <raf@durin42.com> parents: 44927 diff changeset	347 index.write()
44477 ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	348
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	349 def drop(self, f):
45420 c67529569643 git: fix up dirstate use of index Augie Fackler <raf@durin42.com> parents: 44927 diff changeset	350 index = self.git.index
c67529569643 git: fix up dirstate use of index Augie Fackler <raf@durin42.com> parents: 44927 diff changeset	351 index.read()
45423 d4cf80341589 git: fix index handling of removed files during commit (issue6398) Augie Fackler <raf@durin42.com> parents: 45422 diff changeset	352 fs = pycompat.fsdecode(f)
d4cf80341589 git: fix index handling of removed files during commit (issue6398) Augie Fackler <raf@durin42.com> parents: 45422 diff changeset	353 if fs in index:
d4cf80341589 git: fix index handling of removed files during commit (issue6398) Augie Fackler <raf@durin42.com> parents: 45422 diff changeset	354 index.remove(fs)
d4cf80341589 git: fix index handling of removed files during commit (issue6398) Augie Fackler <raf@durin42.com> parents: 45422 diff changeset	355 index.write()
44477 ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	356
47772 0bdcb5ef932c git: restore basic functionality (issue6545) Augie Fackler <augie@google.com> parents: 47539 diff changeset	357 def set_untracked(self, f):
0bdcb5ef932c git: restore basic functionality (issue6545) Augie Fackler <augie@google.com> parents: 47539 diff changeset	358 index = self.git.index
0bdcb5ef932c git: restore basic functionality (issue6545) Augie Fackler <augie@google.com> parents: 47539 diff changeset	359 index.read()
0bdcb5ef932c git: restore basic functionality (issue6545) Augie Fackler <augie@google.com> parents: 47539 diff changeset	360 fs = pycompat.fsdecode(f)
0bdcb5ef932c git: restore basic functionality (issue6545) Augie Fackler <augie@google.com> parents: 47539 diff changeset	361 if fs in index:
0bdcb5ef932c git: restore basic functionality (issue6545) Augie Fackler <augie@google.com> parents: 47539 diff changeset	362 index.remove(fs)
0bdcb5ef932c git: restore basic functionality (issue6545) Augie Fackler <augie@google.com> parents: 47539 diff changeset	363 index.write()
0bdcb5ef932c git: restore basic functionality (issue6545) Augie Fackler <augie@google.com> parents: 47539 diff changeset	364 return True
0bdcb5ef932c git: restore basic functionality (issue6545) Augie Fackler <augie@google.com> parents: 47539 diff changeset	365 return False
0bdcb5ef932c git: restore basic functionality (issue6545) Augie Fackler <augie@google.com> parents: 47539 diff changeset	366
44477 ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	367 def remove(self, f):
45420 c67529569643 git: fix up dirstate use of index Augie Fackler <raf@durin42.com> parents: 44927 diff changeset	368 index = self.git.index
c67529569643 git: fix up dirstate use of index Augie Fackler <raf@durin42.com> parents: 44927 diff changeset	369 index.read()
c67529569643 git: fix up dirstate use of index Augie Fackler <raf@durin42.com> parents: 44927 diff changeset	370 index.remove(pycompat.fsdecode(f))
c67529569643 git: fix up dirstate use of index Augie Fackler <raf@durin42.com> parents: 44927 diff changeset	371 index.write()
44477 ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	372
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	373 def copied(self, path):
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	374 # TODO: track copies?
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	375 return None
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	376
44927 472b14da52c2 git: implement stub prefetch_parents dirstate method Josef 'Jeff' Sipek <jeffpc@josefsipek.net> parents: 44622 diff changeset	377 def prefetch_parents(self):
472b14da52c2 git: implement stub prefetch_parents dirstate method Josef 'Jeff' Sipek <jeffpc@josefsipek.net> parents: 44622 diff changeset	378 # TODO
472b14da52c2 git: implement stub prefetch_parents dirstate method Josef 'Jeff' Sipek <jeffpc@josefsipek.net> parents: 44622 diff changeset	379 pass
472b14da52c2 git: implement stub prefetch_parents dirstate method Josef 'Jeff' Sipek <jeffpc@josefsipek.net> parents: 44622 diff changeset	380
47772 0bdcb5ef932c git: restore basic functionality (issue6545) Augie Fackler <augie@google.com> parents: 47539 diff changeset	381 def update_file(self, args, *kwargs):
0bdcb5ef932c git: restore basic functionality (issue6545) Augie Fackler <augie@google.com> parents: 47539 diff changeset	382 # TODO
0bdcb5ef932c git: restore basic functionality (issue6545) Augie Fackler <augie@google.com> parents: 47539 diff changeset	383 pass
0bdcb5ef932c git: restore basic functionality (issue6545) Augie Fackler <augie@google.com> parents: 47539 diff changeset	384
44477 ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	385 @contextlib.contextmanager
49961 7a8bfc05b691 dirstate: rename parentchange to changing_parents Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49960 diff changeset	386 def changing_parents(self, repo):
44477 ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	387 # TODO: track this maybe?
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	388 yield
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	389
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	390 def addparentchangecallback(self, category, callback):
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	391 # TODO: should this be added to the dirstate interface?
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	392 self._plchangecallbacks[category] = callback
ad718271a9eb git: skeleton of a new extension to _directly_ operate on git repos Augie Fackler <augie@google.com> parents: diff changeset	393
51270 79cd29d598af dirstate: make the `transaction` argument of `setbranch` mandatory Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50776 diff changeset	394 def setbranch(self, branch, transaction):
44622 7bbb83e4e8de git: abort when attempting to set a branch Josef 'Jeff' Sipek <jeffpc@josefsipek.net> parents: 44492 diff changeset	395 raise error.Abort(
7bbb83e4e8de git: abort when attempting to set a branch Josef 'Jeff' Sipek <jeffpc@josefsipek.net> parents: 44492 diff changeset	396 b'git repos do not support branches. try using bookmarks'
7bbb83e4e8de git: abort when attempting to set a branch Josef 'Jeff' Sipek <jeffpc@josefsipek.net> parents: 44492 diff changeset	397 )

Mercurial > public > mercurial-scm > hg

annotate hgext/git/dirstate.py @ 51923:e99c007030da