Show More
@@ -1951,6 +1951,9 b' class localrepository(object):' | |||
|
1951 | 1951 | |
|
1952 | 1952 | self.ui.debug("checking for updated bookmarks\n") |
|
1953 | 1953 | rb = remote.listkeys('bookmarks') |
|
1954 | revnums = map(unfi.changelog.rev, revs or []) | |
|
1955 | ancestors = [ | |
|
1956 | a for a in unfi.changelog.ancestors(revnums, inclusive=True)] | |
|
1954 | 1957 | for k in rb.keys(): |
|
1955 | 1958 | if k in unfi._bookmarks: |
|
1956 | 1959 | nr, nl = rb[k], hex(self._bookmarks[k]) |
@@ -1958,6 +1961,8 b' class localrepository(object):' | |||
|
1958 | 1961 | cr = unfi[nr] |
|
1959 | 1962 | cl = unfi[nl] |
|
1960 | 1963 | if bookmarks.validdest(unfi, cr, cl): |
|
1964 | if ancestors and cl.rev() not in ancestors: | |
|
1965 | continue | |
|
1961 | 1966 | r = remote.pushkey('bookmarks', k, nr, nl) |
|
1962 | 1967 | if r: |
|
1963 | 1968 | self.ui.status(_("updating bookmark %s\n") % k) |
General Comments 0
You need to be logged in to leave comments.
Login now