equal
deleted
inserted
replaced
474 else: |
474 else: |
475 ctx2 = self[node2] |
475 ctx2 = self[node2] |
476 |
476 |
477 working = ctx2.rev() is None |
477 working = ctx2.rev() is None |
478 parentworking = working and ctx1 == self['.'] |
478 parentworking = working and ctx1 == self['.'] |
479 match = match or matchmod.always(self.root, self.getcwd()) |
479 match = match or matchmod.always() |
480 |
480 |
481 # Maybe we can use this opportunity to update Watchman's state. |
481 # Maybe we can use this opportunity to update Watchman's state. |
482 # Mercurial uses workingcommitctx and/or memctx to represent the part of |
482 # Mercurial uses workingcommitctx and/or memctx to represent the part of |
483 # the workingctx that is to be committed. So don't update the state in |
483 # the workingctx that is to be committed. So don't update the state in |
484 # that case. |
484 # that case. |