2107 if not files and md: |
2107 if not files and md: |
2108 self.ui.debug('not reusing manifest (no file change in ' |
2108 self.ui.debug('not reusing manifest (no file change in ' |
2109 'changelog, but manifest differs)\n') |
2109 'changelog, but manifest differs)\n') |
2110 if files or md: |
2110 if files or md: |
2111 self.ui.note(_("committing manifest\n")) |
2111 self.ui.note(_("committing manifest\n")) |
|
2112 # we're using narrowmatch here since it's already applied at |
|
2113 # other stages (such as dirstate.walk), so we're already |
|
2114 # ignoring things outside of narrowspec in most cases. The |
|
2115 # one case where we might have files outside the narrowspec |
|
2116 # at this point is merges, and we already error out in the |
|
2117 # case where the merge has files outside of the narrowspec, |
|
2118 # so this is safe. |
2112 mn = mctx.write(trp, linkrev, |
2119 mn = mctx.write(trp, linkrev, |
2113 p1.manifestnode(), p2.manifestnode(), |
2120 p1.manifestnode(), p2.manifestnode(), |
2114 added, drop) |
2121 added, drop, match=self.narrowmatch()) |
2115 else: |
2122 else: |
2116 self.ui.debug('reusing manifest form p1 (listed files ' |
2123 self.ui.debug('reusing manifest form p1 (listed files ' |
2117 'actually unchanged)\n') |
2124 'actually unchanged)\n') |
2118 mn = p1.manifestnode() |
2125 mn = p1.manifestnode() |
2119 else: |
2126 else: |