mercurial-scm/hg-stable: mercurial/destutil.py annotate

annotate mercurial/destutil.py @ 28236:e333cea74741

destutil: use cached branch information instead of query for efficiency Before this patch, calculation of "the tipmost branch head on current branch" uses revset query "max(.::(head() and branch(BRANCH)))", but this isn't efficiency, because: - head() predicate lists up heads on all branches, but - branch() predicate eliminates heads on other branches In addition to it, without "literal:" prefix for branch name, branch(BRANCH) tries to (1) look up BRANCH in "repo.branchmap()" and (2) look up BRANCH as symbol name again, if there is no branch matching against BRANCH. The latter looking up is obviously redundant. This patch uses repo.branchheads(closed=True) to get all branch heads on specified branch instead of "head() and branch(BRANCH)" revset query part. This patch also makes catching RepoLookupError meaningless, because it is only raised by revset predicate "branch()". But "currentbranch in repo.branchmap()" can detect whether currentbranch actually exists or not. Therefore, this patch replaces try/except for RepoLookupError by if/else for "currentbranch in repo.branchmap()".

author	FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date	Wed, 24 Feb 2016 23:00:33 +0900
parents	c2f0a47069ef
children	de8b09482fb7

rev	line source
26569 2aeeef1dc9a5 update: move default destination computation to a function Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	1 # destutil.py - Mercurial utility function for command destination
2aeeef1dc9a5 update: move default destination computation to a function Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	2 #
2aeeef1dc9a5 update: move default destination computation to a function Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	3 # Copyright Matt Mackall <mpm@selenic.com> and other
2aeeef1dc9a5 update: move default destination computation to a function Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	4 #
2aeeef1dc9a5 update: move default destination computation to a function Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	5 # This software may be used and distributed according to the terms of the
2aeeef1dc9a5 update: move default destination computation to a function Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	6 # GNU General Public License version 2 or any later version.
2aeeef1dc9a5 update: move default destination computation to a function Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	7
27333 2c60b4b2a0de destutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27262 diff changeset	8 from __future__ import absolute_import
2c60b4b2a0de destutil: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27262 diff changeset	9
26569 2aeeef1dc9a5 update: move default destination computation to a function Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	10 from .i18n import _
2aeeef1dc9a5 update: move default destination computation to a function Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	11 from . import (
26641 5c57d01fe64e destupdate: also include bookmark related logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 26629 diff changeset	12 bookmarks,
26569 2aeeef1dc9a5 update: move default destination computation to a function Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	13 error,
2aeeef1dc9a5 update: move default destination computation to a function Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	14 obsolete,
2aeeef1dc9a5 update: move default destination computation to a function Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	15 )
2aeeef1dc9a5 update: move default destination computation to a function Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	16
26720 6c22a17faa18 destupdate: extract validation logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 26714 diff changeset	17 def _destupdatevalidate(repo, rev, clean, check):
6c22a17faa18 destupdate: extract validation logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 26714 diff changeset	18 """validate that the destination comply to various rules
6c22a17faa18 destupdate: extract validation logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 26714 diff changeset	19
6c22a17faa18 destupdate: extract validation logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 26714 diff changeset	20 This exists as its own function to help wrapping from extensions."""
6c22a17faa18 destupdate: extract validation logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 26714 diff changeset	21 wc = repo[None]
6c22a17faa18 destupdate: extract validation logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 26714 diff changeset	22 p1 = wc.p1()
6c22a17faa18 destupdate: extract validation logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 26714 diff changeset	23 if not clean:
6c22a17faa18 destupdate: extract validation logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 26714 diff changeset	24 # Check that the update is linear.
6c22a17faa18 destupdate: extract validation logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 26714 diff changeset	25 #
6c22a17faa18 destupdate: extract validation logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 26714 diff changeset	26 # Mercurial do not allow update-merge for non linear pattern
6c22a17faa18 destupdate: extract validation logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 26714 diff changeset	27 # (that would be technically possible but was considered too confusing
6c22a17faa18 destupdate: extract validation logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 26714 diff changeset	28 # for user a long time ago)
6c22a17faa18 destupdate: extract validation logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 26714 diff changeset	29 #
6c22a17faa18 destupdate: extract validation logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 26714 diff changeset	30 # See mercurial.merge.update for details
6c22a17faa18 destupdate: extract validation logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 26714 diff changeset	31 if p1.rev() not in repo.changelog.ancestors([rev], inclusive=True):
6c22a17faa18 destupdate: extract validation logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 26714 diff changeset	32 dirty = wc.dirty(missing=True)
6c22a17faa18 destupdate: extract validation logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 26714 diff changeset	33 foreground = obsolete.foreground(repo, [p1.node()])
6c22a17faa18 destupdate: extract validation logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 26714 diff changeset	34 if not repo[rev].node() in foreground:
6c22a17faa18 destupdate: extract validation logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 26714 diff changeset	35 if dirty:
6c22a17faa18 destupdate: extract validation logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 26714 diff changeset	36 msg = _("uncommitted changes")
6c22a17faa18 destupdate: extract validation logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 26714 diff changeset	37 hint = _("commit and merge, or update --clean to"
6c22a17faa18 destupdate: extract validation logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 26714 diff changeset	38 " discard changes")
6c22a17faa18 destupdate: extract validation logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 26714 diff changeset	39 raise error.UpdateAbort(msg, hint=hint)
6c22a17faa18 destupdate: extract validation logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 26714 diff changeset	40 elif not check: # destination is not a descendant.
6c22a17faa18 destupdate: extract validation logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 26714 diff changeset	41 msg = _("not a linear update")
6c22a17faa18 destupdate: extract validation logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 26714 diff changeset	42 hint = _("merge or update --check to force update")
6c22a17faa18 destupdate: extract validation logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 26714 diff changeset	43 raise error.UpdateAbort(msg, hint=hint)
6c22a17faa18 destupdate: extract validation logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 26714 diff changeset	44
26723 52d08a93de1f destupdate: extract logic based on obsolescence marker in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26722 diff changeset	45 def _destupdateobs(repo, clean, check):
52d08a93de1f destupdate: extract logic based on obsolescence marker in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26722 diff changeset	46 """decide of an update destination from obsolescence markers"""
26569 2aeeef1dc9a5 update: move default destination computation to a function Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	47 node = None
2aeeef1dc9a5 update: move default destination computation to a function Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	48 wc = repo[None]
2aeeef1dc9a5 update: move default destination computation to a function Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	49 p1 = wc.p1()
26723 52d08a93de1f destupdate: extract logic based on obsolescence marker in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26722 diff changeset	50 movemark = None
26569 2aeeef1dc9a5 update: move default destination computation to a function Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	51
2aeeef1dc9a5 update: move default destination computation to a function Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	52 if p1.obsolete() and not p1.children():
2aeeef1dc9a5 update: move default destination computation to a function Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	53 # allow updating to successors
2aeeef1dc9a5 update: move default destination computation to a function Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	54 successors = obsolete.successorssets(repo, p1.node())
2aeeef1dc9a5 update: move default destination computation to a function Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	55
2aeeef1dc9a5 update: move default destination computation to a function Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	56 # behavior of certain cases is as follows,
2aeeef1dc9a5 update: move default destination computation to a function Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	57 #
2aeeef1dc9a5 update: move default destination computation to a function Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	58 # divergent changesets: update to highest rev, similar to what
2aeeef1dc9a5 update: move default destination computation to a function Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	59 # is currently done when there are more than one head
2aeeef1dc9a5 update: move default destination computation to a function Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	60 # (i.e. 'tip')
2aeeef1dc9a5 update: move default destination computation to a function Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	61 #
2aeeef1dc9a5 update: move default destination computation to a function Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	62 # replaced changesets: same as divergent except we know there
2aeeef1dc9a5 update: move default destination computation to a function Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	63 # is no conflict
2aeeef1dc9a5 update: move default destination computation to a function Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	64 #
2aeeef1dc9a5 update: move default destination computation to a function Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	65 # pruned changeset: no update is done; though, we could
2aeeef1dc9a5 update: move default destination computation to a function Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	66 # consider updating to the first non-obsolete parent,
2aeeef1dc9a5 update: move default destination computation to a function Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	67 # similar to what is current done for 'hg prune'
2aeeef1dc9a5 update: move default destination computation to a function Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	68
2aeeef1dc9a5 update: move default destination computation to a function Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	69 if successors:
2aeeef1dc9a5 update: move default destination computation to a function Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	70 # flatten the list here handles both divergent (len > 1)
2aeeef1dc9a5 update: move default destination computation to a function Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	71 # and the usual case (len = 1)
2aeeef1dc9a5 update: move default destination computation to a function Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	72 successors = [n for sub in successors for n in sub]
2aeeef1dc9a5 update: move default destination computation to a function Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	73
2aeeef1dc9a5 update: move default destination computation to a function Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	74 # get the max revision for the given successors set,
2aeeef1dc9a5 update: move default destination computation to a function Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	75 # i.e. the 'tip' of a set
2aeeef1dc9a5 update: move default destination computation to a function Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	76 node = repo.revs('max(%ln)', successors).first()
26722 6cd643a1d32c destupdate: move obsolete handling first Pierre-Yves David <pierre-yves.david@fb.com> parents: 26721 diff changeset	77 if bookmarks.isactivewdirparent(repo):
6cd643a1d32c destupdate: move obsolete handling first Pierre-Yves David <pierre-yves.david@fb.com> parents: 26721 diff changeset	78 movemark = repo['.'].node()
26723 52d08a93de1f destupdate: extract logic based on obsolescence marker in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26722 diff changeset	79 return node, movemark, None
52d08a93de1f destupdate: extract logic based on obsolescence marker in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26722 diff changeset	80
26724 7fc759c0c430 destupdate: extract logic based on bookmarks in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26723 diff changeset	81 def _destupdatebook(repo, clean, check):
7fc759c0c430 destupdate: extract logic based on bookmarks in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26723 diff changeset	82 """decide on an update destination from active bookmark"""
7fc759c0c430 destupdate: extract logic based on bookmarks in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26723 diff changeset	83 # we also move the active bookmark, if any
7fc759c0c430 destupdate: extract logic based on bookmarks in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26723 diff changeset	84 activemark = None
7fc759c0c430 destupdate: extract logic based on bookmarks in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26723 diff changeset	85 node, movemark = bookmarks.calculateupdate(repo.ui, repo, None)
7fc759c0c430 destupdate: extract logic based on bookmarks in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26723 diff changeset	86 if node is not None:
7fc759c0c430 destupdate: extract logic based on bookmarks in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26723 diff changeset	87 activemark = node
7fc759c0c430 destupdate: extract logic based on bookmarks in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26723 diff changeset	88 return node, movemark, activemark
7fc759c0c430 destupdate: extract logic based on bookmarks in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26723 diff changeset	89
26725 bde739aced83 destupdate: extract logic based on branch in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26724 diff changeset	90 def _destupdatebranch(repo, clean, check):
bde739aced83 destupdate: extract logic based on branch in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26724 diff changeset	91 """decide on an update destination from current branch"""
bde739aced83 destupdate: extract logic based on branch in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26724 diff changeset	92 wc = repo[None]
bde739aced83 destupdate: extract logic based on branch in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26724 diff changeset	93 movemark = node = None
28235 c2f0a47069ef destutil: replace wc.branch() invocations by cached value for efficiency FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28234 diff changeset	94 currentbranch = wc.branch()
28236 e333cea74741 destutil: use cached branch information instead of query for efficiency FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28235 diff changeset	95 if currentbranch in repo.branchmap():
e333cea74741 destutil: use cached branch information instead of query for efficiency FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28235 diff changeset	96 heads = repo.branchheads(currentbranch, closed=True)
e333cea74741 destutil: use cached branch information instead of query for efficiency FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28235 diff changeset	97 if heads:
e333cea74741 destutil: use cached branch information instead of query for efficiency FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28235 diff changeset	98 node = repo.revs('max(.::(%ln))', heads).first()
26725 bde739aced83 destupdate: extract logic based on branch in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26724 diff changeset	99 if bookmarks.isactivewdirparent(repo):
bde739aced83 destupdate: extract logic based on branch in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26724 diff changeset	100 movemark = repo['.'].node()
28236 e333cea74741 destutil: use cached branch information instead of query for efficiency FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28235 diff changeset	101 else:
28235 c2f0a47069ef destutil: replace wc.branch() invocations by cached value for efficiency FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28234 diff changeset	102 if currentbranch == 'default': # no default branch!
26725 bde739aced83 destupdate: extract logic based on branch in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26724 diff changeset	103 node = repo.lookup('tip') # update to tip
bde739aced83 destupdate: extract logic based on branch in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26724 diff changeset	104 else:
28235 c2f0a47069ef destutil: replace wc.branch() invocations by cached value for efficiency FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28234 diff changeset	105 raise error.Abort(_("branch %s not found") % currentbranch)
26725 bde739aced83 destupdate: extract logic based on branch in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26724 diff changeset	106 return node, movemark, None
bde739aced83 destupdate: extract logic based on branch in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26724 diff changeset	107
26726 8e6649616699 destupdate: have a generic and extensible way to run each step Pierre-Yves David <pierre-yves.david@fb.com> parents: 26725 diff changeset	108 # order in which each step should be evalutated
8e6649616699 destupdate: have a generic and extensible way to run each step Pierre-Yves David <pierre-yves.david@fb.com> parents: 26725 diff changeset	109 # steps are run until one finds a destination
8e6649616699 destupdate: have a generic and extensible way to run each step Pierre-Yves David <pierre-yves.david@fb.com> parents: 26725 diff changeset	110 destupdatesteps = ['evolution', 'bookmark', 'branch']
8e6649616699 destupdate: have a generic and extensible way to run each step Pierre-Yves David <pierre-yves.david@fb.com> parents: 26725 diff changeset	111 # mapping to ease extension overriding steps.
8e6649616699 destupdate: have a generic and extensible way to run each step Pierre-Yves David <pierre-yves.david@fb.com> parents: 26725 diff changeset	112 destupdatestepmap = {'evolution': _destupdateobs,
8e6649616699 destupdate: have a generic and extensible way to run each step Pierre-Yves David <pierre-yves.david@fb.com> parents: 26725 diff changeset	113 'bookmark': _destupdatebook,
8e6649616699 destupdate: have a generic and extensible way to run each step Pierre-Yves David <pierre-yves.david@fb.com> parents: 26725 diff changeset	114 'branch': _destupdatebranch,
8e6649616699 destupdate: have a generic and extensible way to run each step Pierre-Yves David <pierre-yves.david@fb.com> parents: 26725 diff changeset	115 }
8e6649616699 destupdate: have a generic and extensible way to run each step Pierre-Yves David <pierre-yves.david@fb.com> parents: 26725 diff changeset	116
26723 52d08a93de1f destupdate: extract logic based on obsolescence marker in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26722 diff changeset	117 def destupdate(repo, clean=False, check=False):
52d08a93de1f destupdate: extract logic based on obsolescence marker in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26722 diff changeset	118 """destination for bare update operation
52d08a93de1f destupdate: extract logic based on obsolescence marker in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26722 diff changeset	119
52d08a93de1f destupdate: extract logic based on obsolescence marker in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26722 diff changeset	120 return (rev, movemark, activemark)
52d08a93de1f destupdate: extract logic based on obsolescence marker in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26722 diff changeset	121
52d08a93de1f destupdate: extract logic based on obsolescence marker in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26722 diff changeset	122 - rev: the revision to update to,
52d08a93de1f destupdate: extract logic based on obsolescence marker in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26722 diff changeset	123 - movemark: node to move the active bookmark from
52d08a93de1f destupdate: extract logic based on obsolescence marker in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26722 diff changeset	124 (cf bookmark.calculate update),
52d08a93de1f destupdate: extract logic based on obsolescence marker in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26722 diff changeset	125 - activemark: a bookmark to activate at the end of the update.
52d08a93de1f destupdate: extract logic based on obsolescence marker in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26722 diff changeset	126 """
26726 8e6649616699 destupdate: have a generic and extensible way to run each step Pierre-Yves David <pierre-yves.david@fb.com> parents: 26725 diff changeset	127 node = movemark = activemark = None
26723 52d08a93de1f destupdate: extract logic based on obsolescence marker in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26722 diff changeset	128
26726 8e6649616699 destupdate: have a generic and extensible way to run each step Pierre-Yves David <pierre-yves.david@fb.com> parents: 26725 diff changeset	129 for step in destupdatesteps:
8e6649616699 destupdate: have a generic and extensible way to run each step Pierre-Yves David <pierre-yves.david@fb.com> parents: 26725 diff changeset	130 node, movemark, activemark = destupdatestepmap[step](repo, clean, check)
8e6649616699 destupdate: have a generic and extensible way to run each step Pierre-Yves David <pierre-yves.david@fb.com> parents: 26725 diff changeset	131 if node is not None:
8e6649616699 destupdate: have a generic and extensible way to run each step Pierre-Yves David <pierre-yves.david@fb.com> parents: 26725 diff changeset	132 break
26628 45b86dbabbda destupdate: move the check related to the "clean" logic in the function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26587 diff changeset	133 rev = repo[node].rev()
45b86dbabbda destupdate: move the check related to the "clean" logic in the function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26587 diff changeset	134
26720 6c22a17faa18 destupdate: extract validation logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 26714 diff changeset	135 _destupdatevalidate(repo, rev, clean, check)
26628 45b86dbabbda destupdate: move the check related to the "clean" logic in the function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26587 diff changeset	136
26641 5c57d01fe64e destupdate: also include bookmark related logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 26629 diff changeset	137 return rev, movemark, activemark
26714 9903261dcc81 destutil: move default merge destination into a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26683 diff changeset	138
28102 bd74b5e0d2c0 destutil: extract all 'mergedest' abort messages into a dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28065 diff changeset	139 msgdestmerge = {
bd74b5e0d2c0 destutil: extract all 'mergedest' abort messages into a dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28065 diff changeset	140 # too many matching divergent bookmark
bd74b5e0d2c0 destutil: extract all 'mergedest' abort messages into a dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28065 diff changeset	141 'toomanybookmarks':
28137 b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	142 {'merge':
b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	143 (_("multiple matching bookmarks to merge -"
b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	144 " please merge with an explicit rev or bookmark"),
b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	145 _("run 'hg heads' to see all heads")),
28189 fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28161 diff changeset	146 'rebase':
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28161 diff changeset	147 (_("multiple matching bookmarks to rebase -"
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28161 diff changeset	148 " please rebase to an explicit rev or bookmark"),
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28161 diff changeset	149 _("run 'hg heads' to see all heads")),
28137 b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	150 },
28102 bd74b5e0d2c0 destutil: extract all 'mergedest' abort messages into a dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28065 diff changeset	151 # no other matching divergent bookmark
bd74b5e0d2c0 destutil: extract all 'mergedest' abort messages into a dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28065 diff changeset	152 'nootherbookmarks':
28137 b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	153 {'merge':
b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	154 (_("no matching bookmark to merge - "
b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	155 "please merge with an explicit rev or bookmark"),
b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	156 _("run 'hg heads' to see all heads")),
28189 fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28161 diff changeset	157 'rebase':
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28161 diff changeset	158 (_("no matching bookmark to rebase - "
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28161 diff changeset	159 "please rebase to an explicit rev or bookmark"),
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28161 diff changeset	160 _("run 'hg heads' to see all heads")),
28137 b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	161 },
28102 bd74b5e0d2c0 destutil: extract all 'mergedest' abort messages into a dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28065 diff changeset	162 # branch have too many unbookmarked heads, no obvious destination
bd74b5e0d2c0 destutil: extract all 'mergedest' abort messages into a dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28065 diff changeset	163 'toomanyheads':
28137 b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	164 {'merge':
b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	165 (_("branch '%s' has %d heads - please merge with an explicit rev"),
b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	166 _("run 'hg heads .' to see heads")),
28189 fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28161 diff changeset	167 'rebase':
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28161 diff changeset	168 (_("branch '%s' has %d heads - please rebase to an explicit rev"),
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28161 diff changeset	169 _("run 'hg heads .' to see heads")),
28137 b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	170 },
28102 bd74b5e0d2c0 destutil: extract all 'mergedest' abort messages into a dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28065 diff changeset	171 # branch have no other unbookmarked heads
bd74b5e0d2c0 destutil: extract all 'mergedest' abort messages into a dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28065 diff changeset	172 'bookmarkedheads':
28137 b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	173 {'merge':
b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	174 (_("heads are bookmarked - please merge with an explicit rev"),
b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	175 _("run 'hg heads' to see all heads")),
28189 fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28161 diff changeset	176 'rebase':
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28161 diff changeset	177 (_("heads are bookmarked - please rebase to an explicit rev"),
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28161 diff changeset	178 _("run 'hg heads' to see all heads")),
28137 b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	179 },
28102 bd74b5e0d2c0 destutil: extract all 'mergedest' abort messages into a dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28065 diff changeset	180 # branch have just a single heads, but there is other branches
bd74b5e0d2c0 destutil: extract all 'mergedest' abort messages into a dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28065 diff changeset	181 'nootherbranchheads':
28137 b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	182 {'merge':
b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	183 (_("branch '%s' has one head - please merge with an explicit rev"),
b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	184 _("run 'hg heads' to see all heads")),
28189 fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28161 diff changeset	185 'rebase':
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28161 diff changeset	186 (_("branch '%s' has one head - please rebase to an explicit rev"),
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28161 diff changeset	187 _("run 'hg heads' to see all heads")),
28137 b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	188 },
28102 bd74b5e0d2c0 destutil: extract all 'mergedest' abort messages into a dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28065 diff changeset	189 # repository have a single head
bd74b5e0d2c0 destutil: extract all 'mergedest' abort messages into a dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28065 diff changeset	190 'nootherheads':
28189 fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28161 diff changeset	191 {'merge':
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28161 diff changeset	192 (_('nothing to merge'),
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28161 diff changeset	193 None),
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28161 diff changeset	194 'rebase':
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28161 diff changeset	195 (_('nothing to rebase'),
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28161 diff changeset	196 None),
28137 b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	197 },
28102 bd74b5e0d2c0 destutil: extract all 'mergedest' abort messages into a dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28065 diff changeset	198 # repository have a single head and we are not on it
bd74b5e0d2c0 destutil: extract all 'mergedest' abort messages into a dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28065 diff changeset	199 'nootherheadsbehind':
28137 b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	200 {'merge':
b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	201 (_('nothing to merge'),
b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	202 _("use 'hg update' instead")),
28189 fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28161 diff changeset	203 'rebase':
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28161 diff changeset	204 (_('nothing to rebase'),
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28161 diff changeset	205 _("use 'hg update' instead")),
28137 b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	206 },
28102 bd74b5e0d2c0 destutil: extract all 'mergedest' abort messages into a dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28065 diff changeset	207 # We are not on a head
bd74b5e0d2c0 destutil: extract all 'mergedest' abort messages into a dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28065 diff changeset	208 'notatheads':
28137 b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	209 {'merge':
b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	210 (_('working directory not at a head revision'),
28189 fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28161 diff changeset	211 _("use 'hg update' or merge with an explicit revision")),
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28161 diff changeset	212 'rebase':
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28161 diff changeset	213 (_('working directory not at a head revision'),
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28161 diff changeset	214 _("use 'hg update' or rebase to an explicit revision"))
28137 b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	215 },
28139 5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	216 'emptysourceset':
5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	217 {'merge':
5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	218 (_('source set is empty'),
28189 fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28161 diff changeset	219 None),
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28161 diff changeset	220 'rebase':
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28161 diff changeset	221 (_('source set is empty'),
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28161 diff changeset	222 None),
28139 5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	223 },
5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	224 'multiplebranchessourceset':
5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	225 {'merge':
5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	226 (_('source set is rooted in multiple branches'),
28189 fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28161 diff changeset	227 None),
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28161 diff changeset	228 'rebase':
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28161 diff changeset	229 (_('rebaseset is rooted in multiple named branches'),
fac3a24be50e rebase: choose default destination the same way as 'hg merge' (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28161 diff changeset	230 _('specify an explicit destination with --dest')),
28139 5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	231 },
28137 b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	232 }
28102 bd74b5e0d2c0 destutil: extract all 'mergedest' abort messages into a dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28065 diff changeset	233
28139 5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	234 def _destmergebook(repo, action='merge', sourceset=None):
26727 5b7fd48f9868 destmerge: extract logic based on bookmark into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26726 diff changeset	235 """find merge destination in the active bookmark case"""
5b7fd48f9868 destmerge: extract logic based on bookmark into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26726 diff changeset	236 node = None
5b7fd48f9868 destmerge: extract logic based on bookmark into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26726 diff changeset	237 bmheads = repo.bookmarkheads(repo._activebookmark)
5b7fd48f9868 destmerge: extract logic based on bookmark into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26726 diff changeset	238 curhead = repo[repo._activebookmark].node()
5b7fd48f9868 destmerge: extract logic based on bookmark into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26726 diff changeset	239 if len(bmheads) == 2:
5b7fd48f9868 destmerge: extract logic based on bookmark into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26726 diff changeset	240 if curhead == bmheads[0]:
5b7fd48f9868 destmerge: extract logic based on bookmark into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26726 diff changeset	241 node = bmheads[1]
5b7fd48f9868 destmerge: extract logic based on bookmark into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26726 diff changeset	242 else:
5b7fd48f9868 destmerge: extract logic based on bookmark into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26726 diff changeset	243 node = bmheads[0]
5b7fd48f9868 destmerge: extract logic based on bookmark into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26726 diff changeset	244 elif len(bmheads) > 2:
28137 b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	245 msg, hint = msgdestmerge['toomanybookmarks'][action]
28141 13bb8de97f87 destutil: add more precise error classes for destmerge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28140 diff changeset	246 raise error.ManyMergeDestAbort(msg, hint=hint)
26727 5b7fd48f9868 destmerge: extract logic based on bookmark into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26726 diff changeset	247 elif len(bmheads) <= 1:
28137 b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	248 msg, hint = msgdestmerge['nootherbookmarks'][action]
28141 13bb8de97f87 destutil: add more precise error classes for destmerge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28140 diff changeset	249 raise error.NoMergeDestAbort(msg, hint=hint)
26727 5b7fd48f9868 destmerge: extract logic based on bookmark into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26726 diff changeset	250 assert node is not None
5b7fd48f9868 destmerge: extract logic based on bookmark into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26726 diff changeset	251 return node
5b7fd48f9868 destmerge: extract logic based on bookmark into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26726 diff changeset	252
28140 276644ae9e8d destutil: allow to disable the "on head check" in destmerge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28139 diff changeset	253 def _destmergebranch(repo, action='merge', sourceset=None, onheadcheck=True):
26728 e8f1b7285917 destmerge: extract logic based on branch heads in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26727 diff changeset	254 """find merge destination based on branch heads"""
e8f1b7285917 destmerge: extract logic based on branch heads in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26727 diff changeset	255 node = None
28139 5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	256
5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	257 if sourceset is None:
5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	258 sourceset = [repo[repo.dirstate.p1()].rev()]
5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	259 branch = repo.dirstate.branch()
5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	260 elif not sourceset:
5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	261 msg, hint = msgdestmerge['emptysourceset'][action]
28141 13bb8de97f87 destutil: add more precise error classes for destmerge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28140 diff changeset	262 raise error.NoMergeDestAbort(msg, hint=hint)
28139 5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	263 else:
5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	264 branch = None
5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	265 for ctx in repo.set('roots(%ld::%ld)', sourceset, sourceset):
5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	266 if branch is not None and ctx.branch() != branch:
5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	267 msg, hint = msgdestmerge['multiplebranchessourceset'][action]
28141 13bb8de97f87 destutil: add more precise error classes for destmerge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28140 diff changeset	268 raise error.ManyMergeDestAbort(msg, hint=hint)
28139 5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	269 branch = ctx.branch()
5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	270
26728 e8f1b7285917 destmerge: extract logic based on branch heads in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26727 diff changeset	271 bheads = repo.branchheads(branch)
28161 3324345a498e destutil: ensure we offer 'hg update' hint when not at head in all cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 28141 diff changeset	272 onhead = repo.revs('%ld and %ln', sourceset, bheads)
3324345a498e destutil: ensure we offer 'hg update' hint when not at head in all cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 28141 diff changeset	273 if onheadcheck and not onhead:
28139 5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	274 # Case A: working copy if not on a head. (merge only)
28105 1fc7b5363871 destutil: document various failure cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 28104 diff changeset	275 #
1fc7b5363871 destutil: document various failure cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 28104 diff changeset	276 # This is probably a user mistake We bailout pointing at 'hg update'
28103 7d852bb47b0a merge: give priority to "not at head" failures for bare 'hg merge' Pierre-Yves David <pierre-yves.david@fb.com> parents: 28102 diff changeset	277 if len(repo.heads()) <= 1:
28137 b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	278 msg, hint = msgdestmerge['nootherheadsbehind'][action]
28103 7d852bb47b0a merge: give priority to "not at head" failures for bare 'hg merge' Pierre-Yves David <pierre-yves.david@fb.com> parents: 28102 diff changeset	279 else:
28137 b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	280 msg, hint = msgdestmerge['notatheads'][action]
28103 7d852bb47b0a merge: give priority to "not at head" failures for bare 'hg merge' Pierre-Yves David <pierre-yves.david@fb.com> parents: 28102 diff changeset	281 raise error.Abort(msg, hint=hint)
28139 5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	282 # remove heads descendants of source from the set
5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	283 bheads = list(repo.revs('%ln - (%ld::)', bheads, sourceset))
28138 5ad2017454ee destutil: remove current head from list of candidates early Pierre-Yves David <pierre-yves.david@fb.com> parents: 28137 diff changeset	284 # filters out bookmarked heads
28139 5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	285 nbhs = list(repo.revs('%ld - bookmark()', bheads))
28138 5ad2017454ee destutil: remove current head from list of candidates early Pierre-Yves David <pierre-yves.david@fb.com> parents: 28137 diff changeset	286 if len(nbhs) > 1:
5ad2017454ee destutil: remove current head from list of candidates early Pierre-Yves David <pierre-yves.david@fb.com> parents: 28137 diff changeset	287 # Case B: There is more than 1 other anonymous heads
28105 1fc7b5363871 destutil: document various failure cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 28104 diff changeset	288 #
1fc7b5363871 destutil: document various failure cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 28104 diff changeset	289 # This means that there will be more than 1 candidate. This is
1fc7b5363871 destutil: document various failure cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 28104 diff changeset	290 # ambiguous. We abort asking the user to pick as explicit destination
1fc7b5363871 destutil: document various failure cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 28104 diff changeset	291 # instead.
28137 b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	292 msg, hint = msgdestmerge['toomanyheads'][action]
28138 5ad2017454ee destutil: remove current head from list of candidates early Pierre-Yves David <pierre-yves.david@fb.com> parents: 28137 diff changeset	293 msg %= (branch, len(bheads) + 1)
28141 13bb8de97f87 destutil: add more precise error classes for destmerge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28140 diff changeset	294 raise error.ManyMergeDestAbort(msg, hint=hint)
28138 5ad2017454ee destutil: remove current head from list of candidates early Pierre-Yves David <pierre-yves.david@fb.com> parents: 28137 diff changeset	295 elif not nbhs:
5ad2017454ee destutil: remove current head from list of candidates early Pierre-Yves David <pierre-yves.david@fb.com> parents: 28137 diff changeset	296 # Case B: There is no other anonymous heads
28105 1fc7b5363871 destutil: document various failure cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 28104 diff changeset	297 #
1fc7b5363871 destutil: document various failure cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 28104 diff changeset	298 # This means that there is no natural candidate to merge with.
1fc7b5363871 destutil: document various failure cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 28104 diff changeset	299 # We abort, with various messages for various cases.
28138 5ad2017454ee destutil: remove current head from list of candidates early Pierre-Yves David <pierre-yves.david@fb.com> parents: 28137 diff changeset	300 if bheads:
28137 b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	301 msg, hint = msgdestmerge['bookmarkedheads'][action]
28102 bd74b5e0d2c0 destutil: extract all 'mergedest' abort messages into a dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28065 diff changeset	302 elif len(repo.heads()) > 1:
28137 b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	303 msg, hint = msgdestmerge['nootherbranchheads'][action]
28102 bd74b5e0d2c0 destutil: extract all 'mergedest' abort messages into a dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28065 diff changeset	304 msg %= branch
28161 3324345a498e destutil: ensure we offer 'hg update' hint when not at head in all cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 28141 diff changeset	305 elif not onhead:
3324345a498e destutil: ensure we offer 'hg update' hint when not at head in all cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 28141 diff changeset	306 # if 'onheadcheck == False' (rebase case),
3324345a498e destutil: ensure we offer 'hg update' hint when not at head in all cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 28141 diff changeset	307 # this was not caught in Case A.
3324345a498e destutil: ensure we offer 'hg update' hint when not at head in all cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 28141 diff changeset	308 msg, hint = msgdestmerge['nootherheadsbehind'][action]
28102 bd74b5e0d2c0 destutil: extract all 'mergedest' abort messages into a dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28065 diff changeset	309 else:
28137 b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	310 msg, hint = msgdestmerge['nootherheads'][action]
28141 13bb8de97f87 destutil: add more precise error classes for destmerge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28140 diff changeset	311 raise error.NoMergeDestAbort(msg, hint=hint)
26728 e8f1b7285917 destmerge: extract logic based on branch heads in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26727 diff changeset	312 else:
e8f1b7285917 destmerge: extract logic based on branch heads in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26727 diff changeset	313 node = nbhs[0]
e8f1b7285917 destmerge: extract logic based on branch heads in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26727 diff changeset	314 assert node is not None
e8f1b7285917 destmerge: extract logic based on branch heads in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26727 diff changeset	315 return node
e8f1b7285917 destmerge: extract logic based on branch heads in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26727 diff changeset	316
28140 276644ae9e8d destutil: allow to disable the "on head check" in destmerge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28139 diff changeset	317 def destmerge(repo, action='merge', sourceset=None, onheadcheck=True):
28137 b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	318 """return the default destination for a merge
b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	319
b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	320 (or raise exception about why it can't pick one)
b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	321
b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	322 :action: the action being performed, controls emitted error message
b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	323 """
26714 9903261dcc81 destutil: move default merge destination into a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26683 diff changeset	324 if repo._activebookmark:
28139 5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	325 node = _destmergebook(repo, action=action, sourceset=sourceset)
26714 9903261dcc81 destutil: move default merge destination into a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26683 diff changeset	326 else:
28140 276644ae9e8d destutil: allow to disable the "on head check" in destmerge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28139 diff changeset	327 node = _destmergebranch(repo, action=action, sourceset=sourceset,
276644ae9e8d destutil: allow to disable the "on head check" in destmerge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28139 diff changeset	328 onheadcheck=onheadcheck)
26714 9903261dcc81 destutil: move default merge destination into a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26683 diff changeset	329 return repo[node].rev()
27262 3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 26728 diff changeset	330
3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 26728 diff changeset	331 histeditdefaultrevset = 'reverse(only(.) and not public() and not ::merge())'
3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 26728 diff changeset	332
3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 26728 diff changeset	333 def desthistedit(ui, repo):
3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 26728 diff changeset	334 """Default base revision to edit for `hg histedit`."""
27559 d13bcc9fd656 destutil: use scmutil.revrange for desthistedit (issue5001) Gregory Szorc <gregory.szorc@gmail.com> parents: 27333 diff changeset	335 # Avoid cycle: scmutil -> revset -> destutil
d13bcc9fd656 destutil: use scmutil.revrange for desthistedit (issue5001) Gregory Szorc <gregory.szorc@gmail.com> parents: 27333 diff changeset	336 from . import scmutil
d13bcc9fd656 destutil: use scmutil.revrange for desthistedit (issue5001) Gregory Szorc <gregory.szorc@gmail.com> parents: 27333 diff changeset	337
27262 3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 26728 diff changeset	338 default = ui.config('histedit', 'defaultrev', histeditdefaultrevset)
3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 26728 diff changeset	339 if default:
27559 d13bcc9fd656 destutil: use scmutil.revrange for desthistedit (issue5001) Gregory Szorc <gregory.szorc@gmail.com> parents: 27333 diff changeset	340 revs = scmutil.revrange(repo, [default])
27262 3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 26728 diff changeset	341 if revs:
3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 26728 diff changeset	342 # The revset supplied by the user may not be in ascending order nor
3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 26728 diff changeset	343 # take the first revision. So do this manually.
3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 26728 diff changeset	344 revs.sort()
3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 26728 diff changeset	345 return revs.first()
3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 26728 diff changeset	346
3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 26728 diff changeset	347 return None
28029 72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27559 diff changeset	348
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27559 diff changeset	349 def _statusotherbook(ui, repo):
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27559 diff changeset	350 bmheads = repo.bookmarkheads(repo._activebookmark)
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27559 diff changeset	351 curhead = repo[repo._activebookmark].node()
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27559 diff changeset	352 if repo.revs('%n and parents()', curhead):
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27559 diff changeset	353 # we are on the active bookmark
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27559 diff changeset	354 bmheads = [b for b in bmheads if curhead != b]
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27559 diff changeset	355 if bmheads:
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27559 diff changeset	356 msg = _('%i other divergent bookmarks for "%s"\n')
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27559 diff changeset	357 ui.status(msg % (len(bmheads), repo._activebookmark))
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27559 diff changeset	358
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27559 diff changeset	359 def _statusotherbranchheads(ui, repo):
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27559 diff changeset	360 currentbranch = repo.dirstate.branch()
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27559 diff changeset	361 heads = repo.branchheads(currentbranch)
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27559 diff changeset	362 if repo.revs('%ln and parents()', heads):
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27559 diff changeset	363 # we are on a head
28233 9da2283d0c56 destutil: add new local variable to increase readability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28189 diff changeset	364 otherheads = repo.revs('%ln - parents()', heads)
28234 2c29f157463e destutil: remove redundant examination FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28233 diff changeset	365 if otherheads:
28029 72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27559 diff changeset	366 ui.status(_('%i other heads for branch "%s"\n') %
28233 9da2283d0c56 destutil: add new local variable to increase readability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28189 diff changeset	367 (len(otherheads), currentbranch))
28029 72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27559 diff changeset	368
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27559 diff changeset	369 def statusotherdests(ui, repo):
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27559 diff changeset	370 """Print message about other head"""
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27559 diff changeset	371 # XXX we should probably include a hint:
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27559 diff changeset	372 # - about what to do
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27559 diff changeset	373 # - how to see such heads
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27559 diff changeset	374 if repo._activebookmark:
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27559 diff changeset	375 _statusotherbook(ui, repo)
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27559 diff changeset	376 else:
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27559 diff changeset	377 _statusotherbranchheads(ui, repo)

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/destutil.py @ 28236:e333cea74741