equal
deleted
inserted
replaced
187 if mctx.ctx.rev() is not None: |
187 if mctx.ctx.rev() is not None: |
188 return [] |
188 return [] |
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, |
195 'clean': clean, |
200 'clean': clean, |
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, |
202 'symlink': symlink, |
208 'symlink': symlink, |
203 'unknown': unknown, |
209 'unknown': unknown, |