equal
deleted
inserted
replaced
1784 # x | o | o | overwrite (as revert) |
1784 # x | o | o | overwrite (as revert) |
1785 # o | o | o | (*) |
1785 # o | o | o | (*) |
1786 # |
1786 # |
1787 # (*) don't care |
1787 # (*) don't care |
1788 # (*1) deprecated, but used internally (e.g: "rebase --collapse") |
1788 # (*1) deprecated, but used internally (e.g: "rebase --collapse") |
1789 |
1789 with repo.dirstate.running_status(repo): |
1790 lfdirstate = lfutil.openlfdirstate(repo.ui, repo) |
1790 lfdirstate = lfutil.openlfdirstate(repo.ui, repo) |
1791 unsure, s, mtime_boundary = lfdirstate.status( |
1791 unsure, s, mtime_boundary = lfdirstate.status( |
1792 matchmod.always(), |
1792 matchmod.always(), |
1793 subrepos=[], |
1793 subrepos=[], |
1794 ignored=False, |
1794 ignored=False, |
1795 clean=True, |
1795 clean=True, |
1796 unknown=False, |
1796 unknown=False, |
1797 ) |
1797 ) |
1798 oldclean = set(s.clean) |
1798 oldclean = set(s.clean) |
1799 pctx = repo[b'.'] |
1799 pctx = repo[b'.'] |
1800 dctx = repo[node] |
1800 dctx = repo[node] |
1801 for lfile in unsure + s.modified: |
1801 for lfile in unsure + s.modified: |
1802 lfileabs = repo.wvfs.join(lfile) |
1802 lfileabs = repo.wvfs.join(lfile) |