Mercurial > public > mercurial-scm > hg
comparison mercurial/localrepo.py @ 29962:6b5a9a01f29d
manifest: add manifestlog.add
This adds a simple add() function to manifestlog. This lets us convert more
uses of repo.manifest to use repo.manifestlog, so we can further break our
dependency on the manifest class.
| author | Durham Goode <durham@fb.com> |
|---|---|
| date | Tue, 20 Sep 2016 12:24:01 -0700 |
| parents | e35a83cedde1 |
| children | c15f06109b7a |
comparison
equal
deleted
inserted
replaced
| 29961:774a15b129e8 | 29962:6b5a9a01f29d |
|---|---|
| 1730 self.ui.note(_("committing manifest\n")) | 1730 self.ui.note(_("committing manifest\n")) |
| 1731 removed = [f for f in sorted(removed) if f in m1 or f in m2] | 1731 removed = [f for f in sorted(removed) if f in m1 or f in m2] |
| 1732 drop = [f for f in removed if f in m] | 1732 drop = [f for f in removed if f in m] |
| 1733 for f in drop: | 1733 for f in drop: |
| 1734 del m[f] | 1734 del m[f] |
| 1735 mn = self.manifest.add(m, trp, linkrev, | 1735 mn = self.manifestlog.add(m, trp, linkrev, |
| 1736 p1.manifestnode(), p2.manifestnode(), | 1736 p1.manifestnode(), p2.manifestnode(), |
| 1737 added, drop) | 1737 added, drop) |
| 1738 files = changed + removed | 1738 files = changed + removed |
| 1739 else: | 1739 else: |
| 1740 mn = p1.manifestnode() | 1740 mn = p1.manifestnode() |
| 1741 files = [] | 1741 files = [] |
| 1742 | 1742 |