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

checkheads: extract bookmark computation from the branch loop

Browse Source 
No branch specific data are used in the computation of the bookmarked heads. We
can only compute it once.
This commit is contained in:
Pierre-Yves David 2012-07-17 18:14:16 +02:00
parent c77673e2fa
commit 2013cc02a8
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mercurial/discovery.py
View File

@ -249,12 +249,22 @@ def checkheads(repo, remote, outgoing, remoteheads, newbranch=False, inc=False):
hint=_("use 'hg push --new-branch' to create"
" new remote branches"))
# 2. Check for new heads.
# 2 compute newly pushed bookmarks. We
# we don't warned about bookmarked heads.
localbookmarks = repo._bookmarks
remotebookmarks = remote.listkeys('bookmarks')
bookmarkedheads = set()
for bm in localbookmarks:
rnode = remotebookmarks.get(bm)
if rnode and rnode in repo:
lctx, rctx = repo[bm], repo[rnode]
if rctx == lctx.ancestor(rctx):
bookmarkedheads.add(lctx.node())
# 3. Check for new heads.
# If there are more heads after the push than before, a suitable
# error message, depending on unsynced status, is displayed.
error = None
localbookmarks = repo._bookmarks
unsynced = False
for branch, heads in headssum.iteritems():
if heads[0] is None:
@ -267,14 +277,6 @@ def checkheads(repo, remote, outgoing, remoteheads, newbranch=False, inc=False):
newhs = set(heads[1])
dhs = None
if len(newhs) > len(oldhs):
remotebookmarks = remote.listkeys('bookmarks')
bookmarkedheads = set()
for bm in localbookmarks:
rnode = remotebookmarks.get(bm)
if rnode and rnode in repo:
lctx, rctx = repo[bm], repo[rnode]
if rctx == lctx.ancestor(rctx):
bookmarkedheads.add(lctx.node())
# strip updates to existing remote heads from the new heads list
dhs = list(newhs - bookmarkedheads - oldhs)
if dhs: