Show More
@@ -141,14 +141,14 b' def _computeellipsis(repo, common, heads' | |||||
141 | # changesets because it's not always correct. TODO: could |
|
141 | # changesets because it's not always correct. TODO: could | |
142 | # we trust it for the non-merge case? |
|
142 | # we trust it for the non-merge case? | |
143 | p1mf = mfl[cl.changelogrevision(ps[0]).manifest].read() |
|
143 | p1mf = mfl[cl.changelogrevision(ps[0]).manifest].read() | |
144 |
needed = |
|
144 | needed = bool(curmf.diff(p1mf, match)) | |
145 | if not needed and len(ps) > 1: |
|
145 | if not needed and len(ps) > 1: | |
146 | # For merge changes, the list of changed files is not |
|
146 | # For merge changes, the list of changed files is not | |
147 | # helpful, since we need to emit the merge if a file |
|
147 | # helpful, since we need to emit the merge if a file | |
148 | # in the narrow spec has changed on either side of the |
|
148 | # in the narrow spec has changed on either side of the | |
149 | # merge. As a result, we do a manifest diff to check. |
|
149 | # merge. As a result, we do a manifest diff to check. | |
150 | p2mf = mfl[cl.changelogrevision(ps[1]).manifest].read() |
|
150 | p2mf = mfl[cl.changelogrevision(ps[1]).manifest].read() | |
151 |
needed = |
|
151 | needed = bool(curmf.diff(p2mf, match)) | |
152 | else: |
|
152 | else: | |
153 | # For a root node, we need to include the node if any |
|
153 | # For a root node, we need to include the node if any | |
154 | # files in the node match the narrowspec. |
|
154 | # files in the node match the narrowspec. |
General Comments 0
You need to be logged in to leave comments.
Login now