This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10532

git: ensure all dirstate state values are bytes
ClosedPublic

Authored by mharbison72 on Apr 28 2021, 8:24 PM.

Details

Reviewers
durin42
pulkit
Group Reviewers
hg-reviewers
Commits
rHG9cea55ca1175: git: ensure all dirstate state values are bytes
Summary

I'm not sure how this particular git status occurs, but after the fallout of
issue 6510 and getting into the issue 6511 state where git status shows the
files as modified in both the "to be committed" and "not staged" lists,
hg diff was crashing in workingctx.__contains__().

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

mharbison72 created this revision.Apr 28 2021, 8:24 PM
pulkit accepted this revision.Apr 30 2021, 6:03 AM
This revision is now accepted and ready to land.Apr 30 2021, 6:03 AM
mharbison72 added a commit: rHG9cea55ca1175: git: ensure all dirstate state values are bytes.May 3 2021, 10:07 AM
Closed by commit rHG9cea55ca1175: git: ensure all dirstate state values are bytes (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/git/dirstate.py (2 lines)

Diff 27438

hgext/git/dirstate.py

pygit2.GIT_STATUS_INDEX_RENAMED: b'a', pygit2.GIT_STATUS_INDEX_RENAMED: b'a',
pygit2.GIT_STATUS_INDEX_TYPECHANGE: b'n', pygit2.GIT_STATUS_INDEX_TYPECHANGE: b'n',
pygit2.GIT_STATUS_WT_DELETED: b'r', pygit2.GIT_STATUS_WT_DELETED: b'r',
pygit2.GIT_STATUS_WT_MODIFIED: b'n', pygit2.GIT_STATUS_WT_MODIFIED: b'n',
pygit2.GIT_STATUS_WT_NEW: b'?', pygit2.GIT_STATUS_WT_NEW: b'?',
pygit2.GIT_STATUS_WT_RENAMED: b'a', pygit2.GIT_STATUS_WT_RENAMED: b'a',
pygit2.GIT_STATUS_WT_TYPECHANGE: b'n', pygit2.GIT_STATUS_WT_TYPECHANGE: b'n',
pygit2.GIT_STATUS_WT_UNREADABLE: b'?', pygit2.GIT_STATUS_WT_UNREADABLE: b'?',
pygit2.GIT_STATUS_INDEX_MODIFIED | pygit2.GIT_STATUS_WT_MODIFIED: 'm', pygit2.GIT_STATUS_INDEX_MODIFIED | pygit2.GIT_STATUS_WT_MODIFIED: b'm',
} }
@interfaceutil.implementer(intdirstate.idirstate) @interfaceutil.implementer(intdirstate.idirstate)
class gitdirstate(object): class gitdirstate(object):
def __init__(self, ui, root, gitrepo): def __init__(self, ui, root, gitrepo):
self._ui = ui self._ui = ui
self._root = os.path.dirname(root) self._root = os.path.dirname(root)