Show More
@@ -1496,11 +1496,11 b' class localrepository(repo.repository):' | |||||
1496 | return self.push_addchangegroup(remote, force, revs) |
|
1496 | return self.push_addchangegroup(remote, force, revs) | |
1497 |
|
1497 | |||
1498 | def prepush(self, remote, force, revs): |
|
1498 | def prepush(self, remote, force, revs): | |
1499 |
|
|
1499 | common = {} | |
1500 | remote_heads = remote.heads() |
|
1500 | remote_heads = remote.heads() | |
1501 |
inc = self.findincoming(remote, |
|
1501 | inc = self.findincoming(remote, common, remote_heads, force=force) | |
1502 |
|
1502 | |||
1503 |
update, updated_heads = self.findoutgoing(remote, |
|
1503 | update, updated_heads = self.findoutgoing(remote, common, remote_heads) | |
1504 | if revs is not None: |
|
1504 | if revs is not None: | |
1505 | msng_cl, bases, heads = self.changelog.nodesbetween(update, revs) |
|
1505 | msng_cl, bases, heads = self.changelog.nodesbetween(update, revs) | |
1506 | else: |
|
1506 | else: | |
@@ -1546,7 +1546,8 b' class localrepository(repo.repository):' | |||||
1546 |
|
1546 | |||
1547 |
|
1547 | |||
1548 | if revs is None: |
|
1548 | if revs is None: | |
1549 | cg = self.changegroup(update, 'push') |
|
1549 | # use the fast path, no race possible on push | |
|
1550 | cg = self._changegroup(common.keys(), 'push') | |||
1550 | else: |
|
1551 | else: | |
1551 | cg = self.changegroupsubset(update, revs, 'push') |
|
1552 | cg = self.changegroupsubset(update, revs, 'push') | |
1552 | return cg, remote_heads |
|
1553 | return cg, remote_heads |
@@ -22,7 +22,7 b' searching for changes' | |||||
22 | adding changesets |
|
22 | adding changesets | |
23 | adding manifests |
|
23 | adding manifests | |
24 | adding file changes |
|
24 | adding file changes | |
25 |
added 2 changesets with 1 changes to |
|
25 | added 2 changesets with 1 changes to 1 files | |
26 | adding foo |
|
26 | adding foo | |
27 | updating working directory |
|
27 | updating working directory | |
28 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
28 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
General Comments 0
You need to be logged in to leave comments.
Login now