Show More
@@ -469,13 +469,8 b' def _destupdate(repo, subset, x):' | |||||
469 | args = getargsdict(x, 'limit', 'clean check') |
|
469 | args = getargsdict(x, 'limit', 'clean check') | |
470 | return subset & baseset([destutil.destupdate(repo, **args)[0]]) |
|
470 | return subset & baseset([destutil.destupdate(repo, **args)[0]]) | |
471 |
|
471 | |||
472 |
def _merge |
|
472 | def _destmerge(repo, subset, x): | |
473 | # ``_mergedefaultdest()`` |
|
473 | # experimental revset for merge destination | |
474 |
|
||||
475 | # default destination for merge. |
|
|||
476 | # # XXX: Currently private because I expect the signature to change. |
|
|||
477 | # # XXX: - taking rev as arguments, |
|
|||
478 | # # XXX: - bailing out in case of ambiguity vs returning all data. |
|
|||
479 | getargs(x, 0, 0, _("_mergedefaultdest takes no arguments")) |
|
474 | getargs(x, 0, 0, _("_mergedefaultdest takes no arguments")) | |
480 | return subset & baseset([destutil.destmerge(repo)]) |
|
475 | return subset & baseset([destutil.destmerge(repo)]) | |
481 |
|
476 | |||
@@ -2098,7 +2093,7 b' def _hexlist(repo, subset, x):' | |||||
2098 |
|
2093 | |||
2099 | symbols = { |
|
2094 | symbols = { | |
2100 | "_destupdate": _destupdate, |
|
2095 | "_destupdate": _destupdate, | |
2101 | "_mergedefaultdest": _mergedefaultdest, |
|
2096 | "_destmerge": _destmerge, | |
2102 | "adds": adds, |
|
2097 | "adds": adds, | |
2103 | "all": getall, |
|
2098 | "all": getall, | |
2104 | "ancestor": ancestor, |
|
2099 | "ancestor": ancestor, |
@@ -108,3 +108,10 b' Merge preview not affected by common anc' | |||||
108 | 5:a431fabd6039 |
|
108 | 5:a431fabd6039 | |
109 | 6:e88e33f3bf62 |
|
109 | 6:e88e33f3bf62 | |
110 |
|
110 | |||
|
111 | Test experimental destination revset | |||
|
112 | ||||
|
113 | $ hg log -r '_destmerge()' | |||
|
114 | abort: branch 'foobranch' has one head - please merge with an explicit rev | |||
|
115 | (run 'hg heads' to see all heads) | |||
|
116 | [255] | |||
|
117 |
General Comments 0
You need to be logged in to leave comments.
Login now