equal
deleted
inserted
replaced
799 removed.append(f) |
799 removed.append(f) |
800 else: |
800 else: |
801 self.ui.warn(_("%s not tracked!\n") % f) |
801 self.ui.warn(_("%s not tracked!\n") % f) |
802 changes = [modified, [], removed, [], []] |
802 changes = [modified, [], removed, [], []] |
803 else: |
803 else: |
804 changes = self.status(match=match) |
804 changes = self.status(match=match, clean=force) |
|
805 if force: |
|
806 changes[0].extend(changes[6]) |
805 |
807 |
806 if (not force and not extra.get("close") and p2 == nullid |
808 if (not force and not extra.get("close") and p2 == nullid |
807 and not (changes[0] or changes[1] or changes[2]) |
809 and not (changes[0] or changes[1] or changes[2]) |
808 and self[None].branch() == self['.'].branch()): |
810 and self[None].branch() == self['.'].branch()): |
809 self.ui.status(_("nothing changed\n")) |
811 self.ui.status(_("nothing changed\n")) |