comparison mercurial/destutil.py @ 30962:11c253997b0e

destutil: drop now-unused "check" parameter from destupdate()
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 13 Feb 2017 11:32:09 -0800
parents 330fbd515512
children 6cf2857526c7
comparison
equal deleted inserted replaced
30961:330fbd515512 30962:11c253997b0e
12 bookmarks, 12 bookmarks,
13 error, 13 error,
14 obsolete, 14 obsolete,
15 ) 15 )
16 16
17 def _destupdateobs(repo, clean, check): 17 def _destupdateobs(repo, clean):
18 """decide of an update destination from obsolescence markers""" 18 """decide of an update destination from obsolescence markers"""
19 node = None 19 node = None
20 wc = repo[None] 20 wc = repo[None]
21 p1 = wc.p1() 21 p1 = wc.p1()
22 movemark = None 22 movemark = None
48 node = repo.revs('max(%ln)', successors).first() 48 node = repo.revs('max(%ln)', successors).first()
49 if bookmarks.isactivewdirparent(repo): 49 if bookmarks.isactivewdirparent(repo):
50 movemark = repo['.'].node() 50 movemark = repo['.'].node()
51 return node, movemark, None 51 return node, movemark, None
52 52
53 def _destupdatebook(repo, clean, check): 53 def _destupdatebook(repo, clean):
54 """decide on an update destination from active bookmark""" 54 """decide on an update destination from active bookmark"""
55 # we also move the active bookmark, if any 55 # we also move the active bookmark, if any
56 activemark = None 56 activemark = None
57 node, movemark = bookmarks.calculateupdate(repo.ui, repo, None) 57 node, movemark = bookmarks.calculateupdate(repo.ui, repo, None)
58 if node is not None: 58 if node is not None:
59 activemark = node 59 activemark = node
60 return node, movemark, activemark 60 return node, movemark, activemark
61 61
62 def _destupdatebranch(repo, clean, check): 62 def _destupdatebranch(repo, clean):
63 """decide on an update destination from current branch 63 """decide on an update destination from current branch
64 64
65 This ignores closed branch heads. 65 This ignores closed branch heads.
66 """ 66 """
67 wc = repo[None] 67 wc = repo[None]
83 node = repo.revs('max(head() and not closed())').first() 83 node = repo.revs('max(head() and not closed())').first()
84 else: 84 else:
85 node = repo['.'].node() 85 node = repo['.'].node()
86 return node, movemark, None 86 return node, movemark, None
87 87
88 def _destupdatebranchfallback(repo, clean, check): 88 def _destupdatebranchfallback(repo, clean):
89 """decide on an update destination from closed heads in current branch""" 89 """decide on an update destination from closed heads in current branch"""
90 wc = repo[None] 90 wc = repo[None]
91 currentbranch = wc.branch() 91 currentbranch = wc.branch()
92 movemark = None 92 movemark = None
93 if currentbranch in repo.branchmap(): 93 if currentbranch in repo.branchmap():
113 'bookmark': _destupdatebook, 113 'bookmark': _destupdatebook,
114 'branch': _destupdatebranch, 114 'branch': _destupdatebranch,
115 'branchfallback': _destupdatebranchfallback, 115 'branchfallback': _destupdatebranchfallback,
116 } 116 }
117 117
118 def destupdate(repo, clean=False, check=False): 118 def destupdate(repo, clean=False):
119 """destination for bare update operation 119 """destination for bare update operation
120 120
121 return (rev, movemark, activemark) 121 return (rev, movemark, activemark)
122 122
123 - rev: the revision to update to, 123 - rev: the revision to update to,
126 - activemark: a bookmark to activate at the end of the update. 126 - activemark: a bookmark to activate at the end of the update.
127 """ 127 """
128 node = movemark = activemark = None 128 node = movemark = activemark = None
129 129
130 for step in destupdatesteps: 130 for step in destupdatesteps:
131 node, movemark, activemark = destupdatestepmap[step](repo, clean, check) 131 node, movemark, activemark = destupdatestepmap[step](repo, clean)
132 if node is not None: 132 if node is not None:
133 break 133 break
134 rev = repo[node].rev() 134 rev = repo[node].rev()
135 135
136 return rev, movemark, activemark 136 return rev, movemark, activemark