equal
deleted
inserted
replaced
380 |
380 |
381 A new should be created at the begining of each push and discarded |
381 A new should be created at the begining of each push and discarded |
382 afterward. |
382 afterward. |
383 """ |
383 """ |
384 |
384 |
385 def __init__(self, repo, remote, heads=None): |
385 def __init__(self, repo, remote, heads=None, force=False): |
386 # repo we pull from |
386 # repo we pull from |
387 self.repo = repo |
387 self.repo = repo |
388 # repo we pull to |
388 # repo we pull to |
389 self.remote = remote |
389 self.remote = remote |
390 # revision we try to pull (None is "all") |
390 # revision we try to pull (None is "all") |
391 self.heads = heads |
391 self.heads = heads |
|
392 # do we force pull? |
|
393 self.force = force |
392 |
394 |
393 def pull(repo, remote, heads=None, force=False): |
395 def pull(repo, remote, heads=None, force=False): |
394 pullop = pulloperation(repo, remote, heads) |
396 pullop = pulloperation(repo, remote, heads) |
395 if pullop.remote.local(): |
397 if pullop.remote.local(): |
396 missing = set(pullop.remote.requirements) - pullop.repo.supported |
398 missing = set(pullop.remote.requirements) - pullop.repo.supported |