equal
deleted
inserted
replaced
806 |
806 |
807 A new should be created at the beginning of each pull and discarded |
807 A new should be created at the beginning of each pull and discarded |
808 afterward. |
808 afterward. |
809 """ |
809 """ |
810 |
810 |
811 def __init__(self, repo, remote, heads=None, force=False, bookmarks=()): |
811 def __init__(self, repo, remote, heads=None, force=False, bookmarks=(), |
|
812 remotebookmarks=None): |
812 # repo we pull into |
813 # repo we pull into |
813 self.repo = repo |
814 self.repo = repo |
814 # repo we pull from |
815 # repo we pull from |
815 self.remote = remote |
816 self.remote = remote |
816 # revision we try to pull (None is "all") |
817 # revision we try to pull (None is "all") |
826 # set of pulled head |
827 # set of pulled head |
827 self.rheads = None |
828 self.rheads = None |
828 # list of missing changeset to fetch remotely |
829 # list of missing changeset to fetch remotely |
829 self.fetch = None |
830 self.fetch = None |
830 # remote bookmarks data |
831 # remote bookmarks data |
831 self.remotebookmarks = None |
832 self.remotebookmarks = remotebookmarks |
832 # result of changegroup pulling (used as return code by pull) |
833 # result of changegroup pulling (used as return code by pull) |
833 self.cgresult = None |
834 self.cgresult = None |
834 # list of step already done |
835 # list of step already done |
835 self.stepsdone = set() |
836 self.stepsdone = set() |
836 |
837 |