Mercurial > public > mercurial-scm > hg
comparison mercurial/changegroup.py @ 31608:4baf79a77afa
merge with stable
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 24 Mar 2017 08:37:26 -0700 |
parents | 82f1ef8b4477 ed5b25874d99 |
children | 282b288aa20c |
comparison
equal
deleted
inserted
replaced
31607:aea8ec3f7dd1 | 31608:4baf79a77afa |
---|---|
292 | 292 |
293 # write changelog data to temp files so concurrent readers | 293 # write changelog data to temp files so concurrent readers |
294 # will not see an inconsistent view | 294 # will not see an inconsistent view |
295 cl = repo.changelog | 295 cl = repo.changelog |
296 cl.delayupdate(tr) | 296 cl.delayupdate(tr) |
297 oldheads = cl.heads() | 297 oldheads = set(cl.heads()) |
298 | 298 |
299 trp = weakref.proxy(tr) | 299 trp = weakref.proxy(tr) |
300 # pull off the changeset group | 300 # pull off the changeset group |
301 repo.ui.status(_("adding changesets\n")) | 301 repo.ui.status(_("adding changesets\n")) |
302 clstart = len(cl) | 302 clstart = len(cl) |