Comments
Patch
@@ -1681,11 +1681,10 @@ class localrepository(object):
tmp = discovery.findcommonincoming(self, remote, heads=heads,
force=force)
common, fetch, rheads = tmp
if not fetch:
self.ui.status(_("no changes found\n"))
- added = []
result = 0
else:
tr = self.transaction(trname)
if heads is None and list(common) == [nullid]:
self.ui.status(_("requesting all changes\n"))
@@ -1707,20 +1706,17 @@ class localrepository(object):
cg = remote.changegroupsubset(fetch, heads, 'pull')
# we use unfiltered changelog here because hidden revision must
# be taken in account for phase synchronization. They may
# becomes public and becomes visible again.
cl = self.unfiltered().changelog
- clstart = len(cl)
result = self.addchangegroup(cg, 'pull', remote.url())
- clend = len(cl)
- added = [cl.node(r) for r in xrange(clstart, clend)]
# compute target subset
if heads is None:
# We pulled every thing possible
# sync on everything common
- subset = common + added
+ subset = common + rheads
else:
# We pulled a specific subset
# sync on this subset
subset = heads