Show More
@@ -14,7 +14,7 b' from . import (' | |||||
14 | obsolete, |
|
14 | obsolete, | |
15 | ) |
|
15 | ) | |
16 |
|
16 | |||
17 |
def _destupdateobs(repo, clean |
|
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] | |
@@ -50,7 +50,7 b' def _destupdateobs(repo, clean, check):' | |||||
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 |
|
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 | |
@@ -59,7 +59,7 b' def _destupdatebook(repo, clean, check):' | |||||
59 | activemark = node |
|
59 | activemark = node | |
60 | return node, movemark, activemark |
|
60 | return node, movemark, activemark | |
61 |
|
61 | |||
62 |
def _destupdatebranch(repo, clean |
|
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. | |
@@ -85,7 +85,7 b' def _destupdatebranch(repo, clean, check' | |||||
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 |
|
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() | |
@@ -115,7 +115,7 b" destupdatestepmap = {'evolution': _destu" | |||||
115 | 'branchfallback': _destupdatebranchfallback, |
|
115 | 'branchfallback': _destupdatebranchfallback, | |
116 | } |
|
116 | } | |
117 |
|
117 | |||
118 |
def destupdate(repo, clean=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) | |
@@ -128,7 +128,7 b' def destupdate(repo, clean=False, check=' | |||||
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 |
|
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() |
@@ -732,7 +732,7 b' def updatetotally(ui, repo, checkout, br' | |||||
732 | movemarkfrom = None |
|
732 | movemarkfrom = None | |
733 | warndest = False |
|
733 | warndest = False | |
734 | if checkout is None: |
|
734 | if checkout is None: | |
735 |
updata = destutil.destupdate(repo, clean=clean |
|
735 | updata = destutil.destupdate(repo, clean=clean) | |
736 | checkout, movemarkfrom, brev = updata |
|
736 | checkout, movemarkfrom, brev = updata | |
737 | warndest = True |
|
737 | warndest = True | |
738 |
|
738 |
@@ -507,7 +507,7 b' predicate = registrar.revsetpredicate()' | |||||
507 | @predicate('_destupdate') |
|
507 | @predicate('_destupdate') | |
508 | def _destupdate(repo, subset, x): |
|
508 | def _destupdate(repo, subset, x): | |
509 | # experimental revset for update destination |
|
509 | # experimental revset for update destination | |
510 |
args = getargsdict(x, 'limit', 'clean |
|
510 | args = getargsdict(x, 'limit', 'clean') | |
511 | return subset & baseset([destutil.destupdate(repo, **args)[0]]) |
|
511 | return subset & baseset([destutil.destupdate(repo, **args)[0]]) | |
512 |
|
512 | |||
513 | @predicate('_destmerge') |
|
513 | @predicate('_destmerge') |
General Comments 0
You need to be logged in to leave comments.
Login now