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

annotate mercurial/destutil.py @ 28139:5476a7a039c0

destutil: allow to specify an explicit source for the merge We can now specify from where the merge is performed. The experimental revset is updated to take revisions as argument, allowing to test the feature. This will become very useful for pick the 'rebase' default destination. For this reason, we also exclude all descendants from the rebased set from the candidate destinations. This descendants exclusion was not necessary for merge as default destination would not be picked from anything else than a head. I'm not super excited with the current error messages, but I would prefer to delay an overall messages rework once 'hg rebase' is done getting a default destination aligned with 'hg merge'.

author	Pierre-Yves David <pierre-yves.david@fb.com>
date	Mon, 08 Feb 2016 19:32:29 +0100
parents	5ad2017454ee
children	276644ae9e8d

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
bde739aced83 destupdate: extract logic based on branch in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26724 diff changeset	94 try:
28065 6b1fc09c699a update: change default destination to tipmost descendant (issue4673) (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28029 diff changeset	95 node = repo.revs('max(.::(head() and branch(%s)))'
6b1fc09c699a update: change default destination to tipmost descendant (issue4673) (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 28029 diff changeset	96 , wc.branch()).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	97 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	98 movemark = repo['.'].node()
bde739aced83 destupdate: extract logic based on branch in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26724 diff changeset	99 except error.RepoLookupError:
bde739aced83 destupdate: extract logic based on branch in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26724 diff changeset	100 if wc.branch() == 'default': # no default branch!
bde739aced83 destupdate: extract logic based on branch in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26724 diff changeset	101 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	102 else:
bde739aced83 destupdate: extract logic based on branch in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26724 diff changeset	103 raise error.Abort(_("branch %s not found") % wc.branch())
bde739aced83 destupdate: extract logic based on branch in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26724 diff changeset	104 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	105
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	106 # 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	107 # 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	108 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	109 # 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	110 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	111 '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	112 '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	113 }
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
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	115 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	116 """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	117
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 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	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 - 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	121 - 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	122 (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	123 - 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	124 """
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	125 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	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 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	128 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	129 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	130 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	131 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	132
26720 6c22a17faa18 destupdate: extract validation logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 26714 diff changeset	133 _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	134
26641 5c57d01fe64e destupdate: also include bookmark related logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 26629 diff changeset	135 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	136
28102 bd74b5e0d2c0 destutil: extract all 'mergedest' abort messages into a dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28065 diff changeset	137 msgdestmerge = {
bd74b5e0d2c0 destutil: extract all 'mergedest' abort messages into a dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28065 diff changeset	138 # 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	139 '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	140 {'merge':
b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	141 (_("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	142 " 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	143 _("run 'hg heads' to see all heads")),
b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	144 },
28102 bd74b5e0d2c0 destutil: extract all 'mergedest' abort messages into a dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28065 diff changeset	145 # 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	146 '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	147 {'merge':
b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	148 (_("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	149 "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	150 _("run 'hg heads' to see all heads")),
b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	151 },
28102 bd74b5e0d2c0 destutil: extract all 'mergedest' abort messages into a dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28065 diff changeset	152 # 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	153 '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	154 {'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 (_("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	156 _("run 'hg heads .' to see heads")),
b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	157 },
28102 bd74b5e0d2c0 destutil: extract all 'mergedest' abort messages into a dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28065 diff changeset	158 # 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	159 '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	160 {'merge':
b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	161 (_("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	162 _("run 'hg heads' to see all heads")),
b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	163 },
28102 bd74b5e0d2c0 destutil: extract all 'mergedest' abort messages into a dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28065 diff changeset	164 # 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	165 '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	166 {'merge':
b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	167 (_("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	168 _("run 'hg heads' to see all heads")),
b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	169 },
28102 bd74b5e0d2c0 destutil: extract all 'mergedest' abort messages into a dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28065 diff changeset	170 # 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	171 'nootherheads':
28137 b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	172 {'merge':
b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	173 (_('nothing to merge'),
28102 bd74b5e0d2c0 destutil: extract all 'mergedest' abort messages into a dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28065 diff changeset	174 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	175 },
28102 bd74b5e0d2c0 destutil: extract all 'mergedest' abort messages into a dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28065 diff changeset	176 # 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	177 '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	178 {'merge':
b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	179 (_('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	180 _("use 'hg update' instead")),
b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	181 },
28102 bd74b5e0d2c0 destutil: extract all 'mergedest' abort messages into a dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28065 diff changeset	182 # 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	183 '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	184 {'merge':
b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	185 (_('working directory not at a head revision'),
b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	186 _("use 'hg update' or merge with an explicit revision"))
b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	187 },
28139 5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	188 'emptysourceset':
5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	189 {'merge':
5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	190 (_('source set is empty'),
5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	191 None)
5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	192 },
5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	193 'multiplebranchessourceset':
5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	194 {'merge':
5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	195 (_('source set is rooted in multiple branches'),
5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	196 None)
5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	197 },
28137 b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	198 }
28102 bd74b5e0d2c0 destutil: extract all 'mergedest' abort messages into a dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28065 diff changeset	199
28139 5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	200 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	201 """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	202 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	203 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	204 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	205 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	206 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	207 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	208 else:
5b7fd48f9868 destmerge: extract logic based on bookmark into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26726 diff changeset	209 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	210 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	211 msg, hint = msgdestmerge['toomanybookmarks'][action]
28102 bd74b5e0d2c0 destutil: extract all 'mergedest' abort messages into a dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28065 diff changeset	212 raise error.Abort(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	213 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	214 msg, hint = msgdestmerge['nootherbookmarks'][action]
28102 bd74b5e0d2c0 destutil: extract all 'mergedest' abort messages into a dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28065 diff changeset	215 raise error.Abort(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	216 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	217 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	218
28139 5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	219 def _destmergebranch(repo, action='merge', sourceset=None):
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	220 """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	221 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	222
5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	223 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	224 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	225 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	226 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	227 msg, hint = msgdestmerge['emptysourceset'][action]
5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	228 raise error.Abort(msg, hint=hint)
5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	229 else:
5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	230 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	231 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	232 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	233 msg, hint = msgdestmerge['multiplebranchessourceset'][action]
5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	234 raise error.Abort(msg, hint=hint)
5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	235 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	236
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	237 bheads = repo.branchheads(branch)
28139 5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	238 if not repo.revs('%ld and %ln', sourceset, bheads):
5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	239 # 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	240 #
1fc7b5363871 destutil: document various failure cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 28104 diff changeset	241 # 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	242 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	243 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	244 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	245 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	246 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	247 # 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	248 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	249 # 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	250 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	251 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	252 # 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	253 #
1fc7b5363871 destutil: document various failure cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 28104 diff changeset	254 # 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	255 # 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	256 # 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	257 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	258 msg %= (branch, len(bheads) + 1)
28102 bd74b5e0d2c0 destutil: extract all 'mergedest' abort messages into a dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28065 diff changeset	259 raise error.Abort(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	260 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	261 # 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	262 #
1fc7b5363871 destutil: document various failure cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 28104 diff changeset	263 # 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	264 # 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	265 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	266 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	267 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	268 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	269 msg %= branch
bd74b5e0d2c0 destutil: extract all 'mergedest' abort messages into a dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28065 diff changeset	270 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	271 msg, hint = msgdestmerge['nootherheads'][action]
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	272 raise error.Abort(msg, hint=hint)
e8f1b7285917 destmerge: extract logic based on branch heads in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26727 diff changeset	273 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	274 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	275 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	276 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	277
28139 5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	278 def destmerge(repo, action='merge', sourceset=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	279 """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	280
b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	281 (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	282
b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	283 :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	284 """
26714 9903261dcc81 destutil: move default merge destination into a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26683 diff changeset	285 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	286 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	287 else:
28139 5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	288 node = _destmergebranch(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	289 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	290
3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 26728 diff changeset	291 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	292
3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 26728 diff changeset	293 def desthistedit(ui, repo):
3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 26728 diff changeset	294 """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	295 # Avoid cycle: scmutil -> revset -> destutil
d13bcc9fd656 destutil: use scmutil.revrange for desthistedit (issue5001) Gregory Szorc <gregory.szorc@gmail.com> parents: 27333 diff changeset	296 from . import scmutil
d13bcc9fd656 destutil: use scmutil.revrange for desthistedit (issue5001) Gregory Szorc <gregory.szorc@gmail.com> parents: 27333 diff changeset	297
27262 3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 26728 diff changeset	298 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	299 if default:
27559 d13bcc9fd656 destutil: use scmutil.revrange for desthistedit (issue5001) Gregory Szorc <gregory.szorc@gmail.com> parents: 27333 diff changeset	300 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	301 if revs:
3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 26728 diff changeset	302 # 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	303 # 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	304 revs.sort()
3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 26728 diff changeset	305 return revs.first()
3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 26728 diff changeset	306
3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 26728 diff changeset	307 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	308
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27559 diff changeset	309 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	310 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	311 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	312 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	313 # 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	314 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	315 if bmheads:
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27559 diff changeset	316 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	317 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	318
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27559 diff changeset	319 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	320 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	321 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	322 l = len(heads)
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27559 diff changeset	323 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	324 # we are on a head
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27559 diff changeset	325 heads = repo.revs('%ln - parents()', heads)
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27559 diff changeset	326 if heads and l != len(heads):
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27559 diff changeset	327 ui.status(_('%i other heads for branch "%s"\n') %
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27559 diff changeset	328 (len(heads), currentbranch))
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27559 diff changeset	329
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27559 diff changeset	330 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	331 """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	332 # 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	333 # - 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	334 # - 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	335 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	336 _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	337 else:
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27559 diff changeset	338 _statusotherbranchheads(ui, repo)

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/destutil.py @ 28139:5476a7a039c0