Show More
@@ -85,24 +85,25 b" don't allow marking or unmarking driver-" | |||
|
85 | 85 | |
|
86 | 86 | $ cat > $TESTTMP/markdriver.py << EOF |
|
87 | 87 | > '''mark and unmark files as driver-resolved''' |
|
88 | > from mercurial import merge, registrar, scmutil | |
|
88 | > from mercurial import merge, registrar, scmutil, pycompat | |
|
89 | 89 | > cmdtable = {} |
|
90 | 90 | > command = registrar.command(cmdtable) |
|
91 | 91 | > @command(b'markdriver', |
|
92 | > [('u', 'unmark', None, '')], | |
|
93 | > 'FILE...') | |
|
92 | > [(b'u', b'unmark', None, b'')], | |
|
93 | > b'FILE...') | |
|
94 | 94 | > def markdriver(ui, repo, *pats, **opts): |
|
95 | 95 | > wlock = repo.wlock() |
|
96 | > opts = pycompat.byteskwargs(opts) | |
|
96 | 97 | > try: |
|
97 | 98 | > ms = merge.mergestate.read(repo) |
|
98 | 99 | > m = scmutil.match(repo[None], pats, opts) |
|
99 | 100 | > for f in ms: |
|
100 | 101 | > if not m(f): |
|
101 | 102 | > continue |
|
102 | > if not opts['unmark']: | |
|
103 | > ms.mark(f, 'd') | |
|
103 | > if not opts[b'unmark']: | |
|
104 | > ms.mark(f, b'd') | |
|
104 | 105 | > else: |
|
105 | > ms.mark(f, 'u') | |
|
106 | > ms.mark(f, b'u') | |
|
106 | 107 | > ms.commit() |
|
107 | 108 | > finally: |
|
108 | 109 | > wlock.release() |
General Comments 0
You need to be logged in to leave comments.
Login now