facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

bookmarks: pull known bookmarks from server that are newer

Browse Source
This commit is contained in:
Matt Mackall 2010-06-17 12:10:47 -05:00
parent 07bf3725e6
commit 58c8d93978
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hgext/bookmarks.py
View File

@ -284,6 +284,32 @@ def reposetup(ui, repo):
finally:
wlock.release()
def pull(self, remote, heads=None, force=False):
result = super(bookmark_repo, self).pull(remote, heads, force)
self.ui.debug("checking for updated bookmarks\n")
rb = remote.listkeys('bookmarks')
changes = 0
for k in rb.keys():
if k in self._bookmarks:
nr, nl = rb[k], self._bookmarks[k]
if nr in self:
cr = self[nr]
cl = self[nl]
if cl.rev() >= cr.rev():
continue
if cr in cl.descendants():
self._bookmarks[k] = cr.node()
changes += 1
self.ui.status(_("updating bookmark %s\n") % k)
else:
self.ui.warn(_("not updating divergent"
" bookmark %s\n") % k)
if changes:
write(repo)
return result
def addchangegroup(self, source, srctype, url, emptyok=False):
parents = self.dirstate.parents()