Mercurial > hg
comparison tests/test-resolve.t @ 44856:b7808443ed6a
mergestate: split out merge state handling code from main merge module
There's already some pretty reasonable encapsulation here, but I want
to make the mergestate storage a property of the context so memctx
instances can do a reasonable thing. This is the first step in a
reshuffle to make that easier.
Differential Revision: https://phab.mercurial-scm.org/D8550
author | Augie Fackler <augie@google.com> |
---|---|
date | Mon, 18 May 2020 14:59:59 -0400 |
parents | acbfa31cfaf2 |
children | dc5e5577af39 |
comparison
equal
deleted
inserted
replaced
44855:1d2d353e5c4a | 44856:b7808443ed6a |
---|---|
90 don't allow marking or unmarking driver-resolved files | 90 don't allow marking or unmarking driver-resolved files |
91 | 91 |
92 $ cat > $TESTTMP/markdriver.py << EOF | 92 $ cat > $TESTTMP/markdriver.py << EOF |
93 > '''mark and unmark files as driver-resolved''' | 93 > '''mark and unmark files as driver-resolved''' |
94 > from mercurial import ( | 94 > from mercurial import ( |
95 > merge, | 95 > mergestate, |
96 > pycompat, | 96 > pycompat, |
97 > registrar, | 97 > registrar, |
98 > scmutil, | 98 > scmutil, |
99 > ) | 99 > ) |
100 > cmdtable = {} | 100 > cmdtable = {} |
104 > b'FILE...') | 104 > b'FILE...') |
105 > def markdriver(ui, repo, *pats, **opts): | 105 > def markdriver(ui, repo, *pats, **opts): |
106 > wlock = repo.wlock() | 106 > wlock = repo.wlock() |
107 > opts = pycompat.byteskwargs(opts) | 107 > opts = pycompat.byteskwargs(opts) |
108 > try: | 108 > try: |
109 > ms = merge.mergestate.read(repo) | 109 > ms = mergestate.mergestate.read(repo) |
110 > m = scmutil.match(repo[None], pats, opts) | 110 > m = scmutil.match(repo[None], pats, opts) |
111 > for f in ms: | 111 > for f in ms: |
112 > if not m(f): | 112 > if not m(f): |
113 > continue | 113 > continue |
114 > if not opts[b'unmark']: | 114 > if not opts[b'unmark']: |