Mercurial > public > mercurial-scm > hg-stable
diff mercurial/localrepo.py @ 16551:ebf6d38c9063 stable
localrepo: add setparents() to adjust dirstate copies (issue3407)
The fix introduced in eab9119c5dee was only partially successful. It is correct
to turn dirstate 'm' merge records into normal/dirty ones but copy records are
lost in the process. To adjust them as well, we need to look in the first
parent manifest to know which files were added and preserve only related
records. But the dirstate does not have access to changesets, the logic has to
moved at another level, in localrepo.
| author | Patrick Mezard <patrick@mezard.eu> |
|---|---|
| date | Sun, 29 Apr 2012 22:25:55 +0200 |
| parents | 63c817ea4a70 |
| children | 3f85cef66dcc 2950d186a927 |
line wrap: on
line diff
--- a/mercurial/localrepo.py Sun Apr 29 16:18:46 2012 +0200 +++ b/mercurial/localrepo.py Sun Apr 29 22:25:55 2012 +0200 @@ -633,6 +633,17 @@ '''get list of changectxs for parents of changeid''' return self[changeid].parents() + def setparents(self, p1, p2=nullid): + copies = self.dirstate.setparents(p1, p2) + if copies: + # Adjust copy records, the dirstate cannot do it, it + # requires access to parents manifests. Preserve them + # only for entries added to first parent. + pctx = self[p1] + for f in copies: + if f not in pctx and copies[f] in pctx: + self.dirstate.copy(copies[f], f) + def filectx(self, path, changeid=None, fileid=None): """changeid can be a changeset revision, node, or tag. fileid can be a file revision or node."""