comparison hgext/git/dirstate.py @ 47084:7431f5ab0d2a

branching: merge stable into default
author Raphaël Gomès <rgomes@octobus.net>
date Mon, 03 May 2021 18:55:19 +0200
parents d55b71393907 9cea55ca1175
children 84391ddf4c78
comparison
equal deleted inserted replaced
47083:12450fbea288 47084:7431f5ab0d2a
61 pygit2.GIT_STATUS_WT_MODIFIED: b'n', 61 pygit2.GIT_STATUS_WT_MODIFIED: b'n',
62 pygit2.GIT_STATUS_WT_NEW: b'?', 62 pygit2.GIT_STATUS_WT_NEW: b'?',
63 pygit2.GIT_STATUS_WT_RENAMED: b'a', 63 pygit2.GIT_STATUS_WT_RENAMED: b'a',
64 pygit2.GIT_STATUS_WT_TYPECHANGE: b'n', 64 pygit2.GIT_STATUS_WT_TYPECHANGE: b'n',
65 pygit2.GIT_STATUS_WT_UNREADABLE: b'?', 65 pygit2.GIT_STATUS_WT_UNREADABLE: b'?',
66 pygit2.GIT_STATUS_INDEX_MODIFIED | pygit2.GIT_STATUS_WT_MODIFIED: 'm', 66 pygit2.GIT_STATUS_INDEX_MODIFIED | pygit2.GIT_STATUS_WT_MODIFIED: b'm',
67 } 67 }
68 68
69 69
70 @interfaceutil.implementer(intdirstate.idirstate) 70 @interfaceutil.implementer(intdirstate.idirstate)
71 class gitdirstate(object): 71 class gitdirstate(object):