Show More
@@ -189,6 +189,11 b' def unresolved(mctx, x):' | |||||
189 | ms = merge.mergestate(mctx.ctx._repo) |
|
189 | ms = merge.mergestate(mctx.ctx._repo) | |
190 | return [f for f in mctx.subset if f in ms and ms[f] == 'u'] |
|
190 | return [f for f in mctx.subset if f in ms and ms[f] == 'u'] | |
191 |
|
191 | |||
|
192 | def hgignore(mctx, x): | |||
|
193 | getargs(x, 0, 0, _("hgignore takes no arguments")) | |||
|
194 | ignore = mctx.ctx._repo.dirstate._ignore | |||
|
195 | return [f for f in mctx.subset if ignore(f)] | |||
|
196 | ||||
192 | symbols = { |
|
197 | symbols = { | |
193 | 'added': added, |
|
198 | 'added': added, | |
194 | 'binary': binary, |
|
199 | 'binary': binary, | |
@@ -196,6 +201,7 b' symbols = {' | |||||
196 | 'deleted': deleted, |
|
201 | 'deleted': deleted, | |
197 | 'exec': exec_, |
|
202 | 'exec': exec_, | |
198 | 'ignored': ignored, |
|
203 | 'ignored': ignored, | |
|
204 | 'hgignore': hgignore, | |||
199 | 'modified': modified, |
|
205 | 'modified': modified, | |
200 | 'removed': removed, |
|
206 | 'removed': removed, | |
201 | 'resolved': resolved, |
|
207 | 'resolved': resolved, |
General Comments 0
You need to be logged in to leave comments.
Login now