Show More
@@ -156,6 +156,8 b' class basectx(object):' | |||||
156 | # need to filter files if they are already reported as removed |
|
156 | # need to filter files if they are already reported as removed | |
157 | unknown = [fn for fn in unknown if fn not in mf1] |
|
157 | unknown = [fn for fn in unknown if fn not in mf1] | |
158 | ignored = [fn for fn in ignored if fn not in mf1] |
|
158 | ignored = [fn for fn in ignored if fn not in mf1] | |
|
159 | # if they're deleted, don't report them as removed | |||
|
160 | removed = [fn for fn in removed if fn not in deletedset] | |||
159 |
|
161 | |||
160 | return scmutil.status(modified, added, removed, deleted, unknown, |
|
162 | return scmutil.status(modified, added, removed, deleted, unknown, | |
161 | ignored, clean) |
|
163 | ignored, clean) |
@@ -679,7 +679,6 b' Setup working directory' | |||||
679 | R content1_content2_missing-untracked |
|
679 | R content1_content2_missing-untracked | |
680 | R content1_missing_content1-untracked |
|
680 | R content1_missing_content1-untracked | |
681 | R content1_missing_content3-untracked |
|
681 | R content1_missing_content3-untracked | |
682 | R content1_missing_missing-tracked |
|
|||
683 | R content1_missing_missing-untracked |
|
682 | R content1_missing_missing-untracked | |
684 | ! content1_content1_missing-tracked |
|
683 | ! content1_content1_missing-tracked | |
685 | ! content1_content2_missing-tracked |
|
684 | ! content1_content2_missing-tracked |
@@ -153,9 +153,8 b' BROKEN: missing_content2_content[23]-unt' | |||||
153 | R content1_missing_content1-untracked |
|
153 | R content1_missing_content1-untracked | |
154 | R content1_missing_content3-untracked |
|
154 | R content1_missing_content3-untracked | |
155 | R content1_missing_missing-untracked |
|
155 | R content1_missing_missing-untracked | |
156 | BROKEN: content1_*_missing-tracked appear twice; should just be '!' |
|
156 | BROKEN: content1_content*_missing-tracked appear twice; should just be '!' | |
157 | $ hg status -A --rev 0 'glob:*_*_missing-tracked' |
|
157 | $ hg status -A --rev 0 'glob:*_*_missing-tracked' | |
158 | R content1_missing_missing-tracked |
|
|||
159 | ! content1_content1_missing-tracked |
|
158 | ! content1_content1_missing-tracked | |
160 | ! content1_content2_missing-tracked |
|
159 | ! content1_content2_missing-tracked | |
161 | ! content1_missing_missing-tracked |
|
160 | ! content1_missing_missing-tracked |
General Comments 0
You need to be logged in to leave comments.
Login now