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

bookmarks: add support for remote bookmarks

Browse Source
This commit is contained in:
Sean Farley 2014-03-18 13:46:10 -05:00
parent 6d1a2b7538
commit 51e7c01f4e
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hg_remotebranches.py
View File

@ -41,7 +41,7 @@ def expush(orig, repo, remote, *args, **kwargs):
repo = repo.unfiltered() repo = repo.unfiltered()
for branch, nodes in remote.branchmap().iteritems(): for branch, nodes in remote.branchmap().iteritems():
bmap[branch] = [n for n in nodes if not repo[n].obsolete()] bmap[branch] = [n for n in nodes if not repo[n].obsolete()]
saveremotebranches(repo, path, bmap) saveremotebranches(repo, path, bmap, remote.listkeys('bookmarks'))
except Exception, e: except Exception, e:
ui.debug('remote branches for path %s not saved: %s\n' ui.debug('remote branches for path %s not saved: %s\n'
% (path, e)) % (path, e))
@ -56,7 +56,7 @@ def expull(orig, repo, remote, *args, **kwargs):
try: try:
path = activepath(repo.ui, remote) path = activepath(repo.ui, remote)
if path: if path:
saveremotebranches(repo, path, remote.branchmap()) saveremotebranches(repo, path, remote.branchmap(), remote.listkeys('bookmarks'))
except Exception, e: except Exception, e:
ui.debug('remote branches for path %s not saved: %s\n' ui.debug('remote branches for path %s not saved: %s\n'
% (path, e)) % (path, e))
@ -197,7 +197,7 @@ def expandscheme(ui, uri):
return uri return uri
def saveremotebranches(repo, remote, bm): def saveremotebranches(repo, remote, branches, bookmarks):
bfile = repo.join('remotebranches') bfile = repo.join('remotebranches')
olddata = [] olddata = []
existed = os.path.exists(bfile) existed = os.path.exists(bfile)
@ -209,11 +209,13 @@ def saveremotebranches(repo, remote, bm):
f = open(bfile, 'w') f = open(bfile, 'w')
if existed: if existed:
f.write(''.join(olddata)) f.write(''.join(olddata))
for branch, nodes in bm.iteritems(): for branch, nodes in branches.iteritems():
for n in nodes: for n in nodes:
f.write('%s %s/%s\n' % (node.hex(n), remote, branch)) f.write('%s %s/%s\n' % (node.hex(n), remote, branch))
if remote != 'default' and branch == 'default' and alias_default: if remote != 'default' and branch == 'default' and alias_default:
f.write('%s %s\n' % (node.hex(n), remote)) f.write('%s %s\n' % (node.hex(n), remote))
for bookmark, n in bookmarks.iteritems():
f.write('%s %s/%s\n' % (n, remote, bookmark))
f.close() f.close()
######### #########