equal
deleted
inserted
replaced
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']: |