Patchwork [01,of,12,V3] bookmarks: add function to centralize the logic to compare bookmarks

login
register
mail settings
Submitter Katsunori FUJIWARA
Date Oct. 2, 2013, 2:38 p.m.
Message ID <47300b7a97837455ff54.1380724718@feefifofum>
Download mbox | patch
Permalink /patch/2693/
State Superseded
Headers show

Comments

Katsunori FUJIWARA - Oct. 2, 2013, 2:38 p.m.
# HG changeset patch
# User FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
# Date 1380723659 -32400
#      Wed Oct 02 23:20:59 2013 +0900
# Node ID 47300b7a97837455ff54fb6c0488b687eb230d65
# Parent  5ba3cf17da9e5ccb89bb4f73582dbf26e0f75155
bookmarks: add function to centralize the logic to compare bookmarks

This patch adds "compare()" function to centralize the logic to
compare bookmarks between two repositories.
David Soria Parra - Oct. 2, 2013, 3:32 p.m.
On 10/02/2013 04:38 PM, FUJIWARA Katsunori wrote:
> diff --git a/mercurial/bookmarks.py b/mercurial/bookmarks.py
> --- a/mercurial/bookmarks.py
> +++ b/mercurial/bookmarks.py
> @@ -239,6 +239,92 @@
>      finally:
>          w.release()
>  
> +def compare(localrepo, srcmarks, dstmarks,
> +            srchex=None, dsthex=None, targets=None):

I don't want to be picky but usually we refer to the repo as 'repo'
unless we pass two repo objects.

> +    '''Compare bookmarks between srcmarks and dstmarks
> +
> +    This returns tuple "(addsrc, adddst, advsrc, advdst, diverge,
> +    differ, invalid)", each are list of bookmarks below:
> +
> +    :addsrc:  added on src side (removed on dst side, perhaps)
> +    :adddst:  added on dst side (removed on src side, perhaps)
> +    :advsrc:  advanced on src side
> +    :advdst:  advanced on dst side
> +    :diverge: diverge
> +    :differ:  changed, but no detail information
> +    :invalid: unknonw on both side
> +
> +    Each elements of lists in result tuple is tuple "(bookmark name,
> +    changeset ID on source side, changeset ID on destination
> +    side)". Each changeset IDs are 40 hexadecimal digit string or
> +    None.
> +
> +    Changeset IDs of tuples in "addsrc", "adddst", "differ" or
> +     "invalid" list may be unknown for localrepo.
> +
> +    This function expects that "srcmarks" and "dstmarks" return
> +    changeset ID in 40 hexadecimal digit string for specified
> +    bookmark. If not so (e.g. bmstore "repo._bookmarks" returning
> +    binary value), "srchex" or "dsthex" should be specified to convert
> +    into such form.
> +
> +    If "targets" is specified, only bookmarks listed in it are
> +    examined.
> +    '''
> +    if not srchex:
> +        srchex = lambda x: x
> +    if not dsthex:
> +        dsthex = lambda x: x
> +
> +    if targets:
> +        bset = set(targets)
> +    else:
> +        srcmarkset = set(srcmarks)
> +        dstmarkset = set(dstmarks)
> +        bset = (srcmarkset - dstmarkset) | (dstmarkset - srcmarkset)

this is equivalent to (symmetric_difference)

bset = srcmarkset ^ dstmarkset


David

Patch

diff --git a/mercurial/bookmarks.py b/mercurial/bookmarks.py
--- a/mercurial/bookmarks.py
+++ b/mercurial/bookmarks.py
@@ -239,6 +239,92 @@ 
     finally:
         w.release()
 
+def compare(localrepo, srcmarks, dstmarks,
+            srchex=None, dsthex=None, targets=None):
+    '''Compare bookmarks between srcmarks and dstmarks
+
+    This returns tuple "(addsrc, adddst, advsrc, advdst, diverge,
+    differ, invalid)", each are list of bookmarks below:
+
+    :addsrc:  added on src side (removed on dst side, perhaps)
+    :adddst:  added on dst side (removed on src side, perhaps)
+    :advsrc:  advanced on src side
+    :advdst:  advanced on dst side
+    :diverge: diverge
+    :differ:  changed, but no detail information
+    :invalid: unknonw on both side
+
+    Each elements of lists in result tuple is tuple "(bookmark name,
+    changeset ID on source side, changeset ID on destination
+    side)". Each changeset IDs are 40 hexadecimal digit string or
+    None.
+
+    Changeset IDs of tuples in "addsrc", "adddst", "differ" or
+     "invalid" list may be unknown for localrepo.
+
+    This function expects that "srcmarks" and "dstmarks" return
+    changeset ID in 40 hexadecimal digit string for specified
+    bookmark. If not so (e.g. bmstore "repo._bookmarks" returning
+    binary value), "srchex" or "dsthex" should be specified to convert
+    into such form.
+
+    If "targets" is specified, only bookmarks listed in it are
+    examined.
+    '''
+    if not srchex:
+        srchex = lambda x: x
+    if not dsthex:
+        dsthex = lambda x: x
+
+    if targets:
+        bset = set(targets)
+    else:
+        srcmarkset = set(srcmarks)
+        dstmarkset = set(dstmarks)
+        bset = (srcmarkset - dstmarkset) | (dstmarkset - srcmarkset)
+        for b in srcmarkset & dstmarkset:
+            if srchex(srcmarks[b]) != dsthex(dstmarks[b]):
+                bset.add(b)
+
+    results = ([], [], [], [], [], [], [])
+    addsrc = results[0].append
+    adddst = results[1].append
+    advsrc = results[2].append
+    advdst = results[3].append
+    diverge = results[4].append
+    differ = results[5].append
+    invalid = results[6].append
+
+    for b in sorted(bset):
+        if b not in srcmarks:
+            if b in dstmarks:
+                adddst((b, None, dsthex(dstmarks[b])))
+            else:
+                invalid((b, None, None))
+        elif b not in dstmarks:
+            addsrc((b, srchex(srcmarks[b]), None))
+        else:
+            scid = srchex(srcmarks[b])
+            dcid = dsthex(dstmarks[b])
+            if scid in localrepo and dcid in localrepo:
+                sctx = localrepo[scid]
+                dctx = localrepo[dcid]
+                if sctx.rev() < dctx.rev():
+                    if validdest(localrepo, sctx, dctx):
+                        advdst((b, scid, dcid))
+                    else:
+                        diverge((b, scid, dcid))
+                else:
+                    if validdest(localrepo, dctx, sctx):
+                        advsrc((b, scid, dcid))
+                    else:
+                        diverge((b, scid, dcid))
+            else:
+                # it is too expensive to examine in detail, in this case
+                differ((b, scid, dcid))
+
+    return results
+
 def updatefromremote(ui, repo, remotemarks, path):
     ui.debug("checking for updated bookmarks\n")
     changed = False