Show More
@@ -40,18 +40,24 class basedag(object): | |||||
40 | raise NotImplementedError() |
|
40 | raise NotImplementedError() | |
41 |
|
41 | |||
42 | def ancestorset(self, starts, stops=None): |
|
42 | def ancestorset(self, starts, stops=None): | |
43 | '''set of all ancestors of starts (incl), but stop walk at stops (excl)''' |
|
43 | ''' | |
|
44 | set of all ancestors of starts (incl), but stop walk at stops (excl) | |||
|
45 | ''' | |||
44 | raise NotImplementedError() |
|
46 | raise NotImplementedError() | |
45 |
|
47 | |||
46 | def descendantset(self, starts, stops=None): |
|
48 | def descendantset(self, starts, stops=None): | |
47 | '''set of all descendants of starts (incl), but stop walk at stops (excl)''' |
|
49 | ''' | |
|
50 | set of all descendants of starts (incl), but stop walk at stops (excl) | |||
|
51 | ''' | |||
48 | return self.inverse().ancestorset(starts, stops) |
|
52 | return self.inverse().ancestorset(starts, stops) | |
49 |
|
53 | |||
50 | def headsetofconnecteds(self, ixs): |
|
54 | def headsetofconnecteds(self, ixs): | |
51 | '''subset of connected list of ixs so that no node has a descendant in it |
|
55 | ''' | |
|
56 | subset of connected list of ixs so that no node has a descendant in it | |||
52 |
|
57 | |||
53 | By "connected list" we mean that if an ancestor and a descendant are in |
|
58 | By "connected list" we mean that if an ancestor and a descendant are in | |
54 |
the list, then so is at least one path connecting them. |
|
59 | the list, then so is at least one path connecting them. | |
|
60 | ''' | |||
55 | raise NotImplementedError() |
|
61 | raise NotImplementedError() | |
56 |
|
62 | |||
57 | def externalize(self, ix): |
|
63 | def externalize(self, ix): |
@@ -82,8 +82,8 def findcommonheads(ui, local, remote, | |||||
82 | initialsamplesize=100, |
|
82 | initialsamplesize=100, | |
83 | fullsamplesize=200, |
|
83 | fullsamplesize=200, | |
84 | abortwhenunrelated=True): |
|
84 | abortwhenunrelated=True): | |
85 |
'''Return a tuple (common, anyincoming, remoteheads) used to identify |
|
85 | '''Return a tuple (common, anyincoming, remoteheads) used to identify | |
86 | nodes from or in remote. |
|
86 | missing nodes from or in remote. | |
87 |
|
87 | |||
88 | shortcutlocal determines whether we try use direct access to localrepo if |
|
88 | shortcutlocal determines whether we try use direct access to localrepo if | |
89 | remote is actually local. |
|
89 | remote is actually local. | |
@@ -106,8 +106,8 def findcommonheads(ui, local, remote, | |||||
106 | return [nullid], True, srvheadhashes |
|
106 | return [nullid], True, srvheadhashes | |
107 | return [nullid], False, [] |
|
107 | return [nullid], False, [] | |
108 |
|
108 | |||
109 |
# start actual discovery (we note this before the next "if" for |
|
109 | # start actual discovery (we note this before the next "if" for | |
110 | # reasons) |
|
110 | # compatibility reasons) | |
111 | ui.status(_("searching for changes\n")) |
|
111 | ui.status(_("searching for changes\n")) | |
112 |
|
112 | |||
113 | srvheads = dag.internalizeall(srvheadhashes, filterunknown=True) |
|
113 | srvheads = dag.internalizeall(srvheadhashes, filterunknown=True) |
General Comments 0
You need to be logged in to leave comments.
Login now