Mercurial > hgsubversion
comparison hgsubversion/wrappers.py @ 1248:2d1f6687980b
wrappers.push: call pull instead of repo.pull
repo.pull went away in Mercurial rev 73b5b8312ce6. Calling pull directly is the
easiest way of maintaining compatibility across the change.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Mon, 13 Oct 2014 23:57:21 -0700 |
| parents | 3a4d74823187 |
| children | 4744b7bfa476 b5520673f6f2 |
comparison
equal
deleted
inserted
replaced
| 1247:3a4d74823187 | 1248:2d1f6687980b |
|---|---|
| 287 # push a revision and pull it back. | 287 # push a revision and pull it back. |
| 288 repo.hook('debug-hgsubversion-between-push-and-pull-for-tests') | 288 repo.hook('debug-hgsubversion-between-push-and-pull-for-tests') |
| 289 | 289 |
| 290 # 5. Pull the latest changesets from subversion, which will | 290 # 5. Pull the latest changesets from subversion, which will |
| 291 # include the one we just committed (and possibly others). | 291 # include the one we just committed (and possibly others). |
| 292 r = repo.pull(dest, force=force) | 292 r = pull(repo, dest, force=force) |
| 293 assert not r or r == 0 | 293 assert not r or r == 0 |
| 294 meta = repo.svnmeta(svn.uuid, svn.subdir) | 294 meta = repo.svnmeta(svn.uuid, svn.subdir) |
| 295 hashes = meta.revmap.hashes() | 295 hashes = meta.revmap.hashes() |
| 296 | 296 |
| 297 # 6. Move our tip to the latest pulled tip | 297 # 6. Move our tip to the latest pulled tip |