Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/localrepo.py @ 2471:6904e1ef8ad1
merge with crew.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Tue, 20 Jun 2006 23:58:45 -0700 |
parents | fe1689273f84 6ab016edd5c4 |
children | 7a77934ece46 |
comparison
equal
deleted
inserted
replaced
2470:fe1689273f84 | 2471:6904e1ef8ad1 |
---|---|
1113 # | 1113 # |
1114 # unbundle assumes local user cannot lock remote repo (new ssh | 1114 # unbundle assumes local user cannot lock remote repo (new ssh |
1115 # servers, http servers). | 1115 # servers, http servers). |
1116 | 1116 |
1117 if 'unbundle' in remote.capabilities: | 1117 if 'unbundle' in remote.capabilities: |
1118 self.push_unbundle(remote, force, revs) | 1118 return self.push_unbundle(remote, force, revs) |
1119 else: | 1119 return self.push_addchangegroup(remote, force, revs) |
1120 self.push_addchangegroup(remote, force, revs) | |
1121 | 1120 |
1122 def prepush(self, remote, force, revs): | 1121 def prepush(self, remote, force, revs): |
1123 base = {} | 1122 base = {} |
1124 remote_heads = remote.heads() | 1123 remote_heads = remote.heads() |
1125 inc = self.findincoming(remote, base, remote_heads, force=force) | 1124 inc = self.findincoming(remote, base, remote_heads, force=force) |