mercurial/bookmarks.py
changeset 24398 c0096a2bd3ff
parent 24397 d0ea2028e8e6
child 24399 3993eb47ea49
equal deleted inserted replaced
24397:d0ea2028e8e6 24398:c0096a2bd3ff
   468     for s in sorted(incomings):
   468     for s in sorted(incomings):
   469         ui.write(s)
   469         ui.write(s)
   470 
   470 
   471     return 0
   471     return 0
   472 
   472 
       
   473 def outgoing(ui, repo, other):
       
   474     '''Show bookmarks outgoing from repo to other
       
   475     '''
       
   476     ui.status(_("searching for changed bookmarks\n"))
       
   477 
       
   478     r = compare(repo, repo._bookmarks, other.listkeys('bookmarks'),
       
   479                 srchex=hex)
       
   480     addsrc, adddst, advsrc, advdst, diverge, differ, invalid, same = r
       
   481 
       
   482     outgoings = []
       
   483     if ui.debugflag:
       
   484         getid = lambda id: id
       
   485     else:
       
   486         getid = lambda id: id[:12]
       
   487     def add(b, id):
       
   488         outgoings.append("   %-25s %s\n" % (b, getid(id)))
       
   489     for b, scid, dcid in addsrc:
       
   490         add(b, scid)
       
   491 
       
   492     if not outgoings:
       
   493         ui.status(_("no changed bookmarks found\n"))
       
   494         return 1
       
   495 
       
   496     for s in sorted(outgoings):
       
   497         ui.write(s)
       
   498 
       
   499     return 0
       
   500 
   473 def diff(ui, dst, src):
   501 def diff(ui, dst, src):
   474     ui.status(_("searching for changed bookmarks\n"))
   502     ui.status(_("searching for changed bookmarks\n"))
   475 
   503 
   476     smarks = src.listkeys('bookmarks')
   504     smarks = src.listkeys('bookmarks')
   477     dmarks = dst.listkeys('bookmarks')
   505     dmarks = dst.listkeys('bookmarks')