Mercurial > hg

diff mercurial/localrepo.py @ 29962:6b5a9a01f29d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/mercurial/localrepo.py	Tue Sep 20 12:24:01 2016 -0700
+++ b/mercurial/localrepo.py	Tue Sep 20 12:24:01 2016 -0700
@@ -1732,9 +1732,9 @@
                 drop = [f for f in removed if f in m]
                 for f in drop:
                     del m[f]
-                mn = self.manifest.add(m, trp, linkrev,
-                                       p1.manifestnode(), p2.manifestnode(),
-                                       added, drop)
+                mn = self.manifestlog.add(m, trp, linkrev,
+                                          p1.manifestnode(), p2.manifestnode(),
+                                          added, drop)
                 files = changed + removed
             else:
                 mn = p1.manifestnode()