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

annotate mercurial/destutil.py @ 28385:3f9e25a42e69

destutil: choose non-closed branch head at first (BC) Before this patch, destupdate() returns the tipmost (descendant) branch head regardless of closed or not. But updating to closed branch head isn't reasonable for ordinary workflow, because: - "hg heads" doesn't show closed heads (= updated parent itself) by default - subsequent committing on it re-opens closed branch even if inactivation of closed head is needed, update destination isn't it, because it should be merged into to another branch in such case. This patch chooses non-closed descendant branch head as default update destination at first. If all descendant branch heads are closed, destupdate() returns the tipmost closed branch head. For simplicity, this patch chooses adding _destupdatebranchfallback() instead largely changing _destupdatebranch(). This patch changes not only normal lookup code path, but also the "no default branch" code path, for consistency.

author	FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date	Mon, 07 Mar 2016 03:14:19 +0900
parents	de8b09482fb7
children	d0210a35c81a

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):
28385 3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	91 """decide on an update destination from current branch
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	92
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	93 This ignores closed branch heads.
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	94 """
26725 bde739aced83 destupdate: extract logic based on branch in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26724 diff changeset	95 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	96 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	97 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	98 if currentbranch in repo.branchmap():
28385 3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	99 heads = repo.branchheads(currentbranch)
28236 e333cea74741 destutil: use cached branch information instead of query for efficiency FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28235 diff changeset	100 if heads:
e333cea74741 destutil: use cached branch information instead of query for efficiency FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28235 diff changeset	101 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	102 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	103 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	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 if currentbranch == 'default': # no default branch!
28385 3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	106 # update to the tipmost non-closed branch head
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	107 node = repo.revs('max(head() and not closed())').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	108 else:
28235 c2f0a47069ef destutil: replace wc.branch() invocations by cached value for efficiency FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28234 diff changeset	109 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	110 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	111
28385 3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	112 def _destupdatebranchfallback(repo, clean, check):
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	113 """decide on an update destination from closed heads in current branch"""
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	114 wc = repo[None]
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	115 currentbranch = wc.branch()
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	116 movemark = None
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	117 if currentbranch in repo.branchmap():
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	118 # here, all descendant branch heads are closed
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	119 heads = repo.branchheads(currentbranch, closed=True)
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	120 assert heads, "any branch has at least one head"
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	121 node = repo.revs('max(.::(%ln))', heads).first()
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	122 assert node is not None, ("any revision has at least "
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	123 "one descendant branch head")
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	124 if bookmarks.isactivewdirparent(repo):
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	125 movemark = repo['.'].node()
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	126 else:
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	127 # here, no "default" branch, and all branches are closed
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	128 node = repo.lookup('tip')
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	129 assert node is not None, "'tip' exists even in empty repository"
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	130 return node, movemark, None
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	131
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	132 # 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	133 # steps are run until one finds a destination
28385 3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	134 destupdatesteps = ['evolution', 'bookmark', 'branch', 'branchfallback']
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	135 # 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	136 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	137 '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	138 'branch': _destupdatebranch,
28385 3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	139 'branchfallback': _destupdatebranchfallback,
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	140 }
8e6649616699 destupdate: have a generic and extensible way to run each step Pierre-Yves David <pierre-yves.david@fb.com> parents: 26725 diff changeset	141
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	142 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	143 """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	144
52d08a93de1f destupdate: extract logic based on obsolescence marker in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26722 diff changeset	145 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	146
52d08a93de1f destupdate: extract logic based on obsolescence marker in its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26722 diff changeset	147 - 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	148 - 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	149 (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	150 - 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	151 """
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	152 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	153
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	154 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	155 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	156 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	157 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	158 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	159
26720 6c22a17faa18 destupdate: extract validation logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 26714 diff changeset	160 _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	161
26641 5c57d01fe64e destupdate: also include bookmark related logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 26629 diff changeset	162 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	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 msgdestmerge = {
bd74b5e0d2c0 destutil: extract all 'mergedest' abort messages into a dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28065 diff changeset	165 # 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	166 '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	167 {'merge':
b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	168 (_("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	169 " 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	170 _("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	171 '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	172 (_("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	173 " 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	174 _("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	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 # 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	177 '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	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 (_("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	180 "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	181 _("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	182 '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	183 (_("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	184 "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	185 _("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	186 },
28102 bd74b5e0d2c0 destutil: extract all 'mergedest' abort messages into a dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28065 diff changeset	187 # 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	188 '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	189 {'merge':
b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	190 (_("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	191 _("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	192 '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	193 (_("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	194 _("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	195 },
28102 bd74b5e0d2c0 destutil: extract all 'mergedest' abort messages into a dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28065 diff changeset	196 # 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	197 '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	198 {'merge':
b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	199 (_("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	200 _("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	201 '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	202 (_("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	203 _("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	204 },
28102 bd74b5e0d2c0 destutil: extract all 'mergedest' abort messages into a dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28065 diff changeset	205 # 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	206 '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	207 {'merge':
b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	208 (_("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	209 _("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	210 '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	211 (_("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	212 _("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	213 },
28102 bd74b5e0d2c0 destutil: extract all 'mergedest' abort messages into a dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28065 diff changeset	214 # 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	215 '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	216 {'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	217 (_('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	218 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	219 '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	220 (_('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	221 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	222 },
28102 bd74b5e0d2c0 destutil: extract all 'mergedest' abort messages into a dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28065 diff changeset	223 # 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	224 '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	225 {'merge':
b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	226 (_('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	227 _("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	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 (_('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	230 _("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	231 },
28102 bd74b5e0d2c0 destutil: extract all 'mergedest' abort messages into a dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28065 diff changeset	232 # 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	233 '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	234 {'merge':
b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	235 (_('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	236 _("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	237 '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	238 (_('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	239 _("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	240 },
28139 5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	241 'emptysourceset':
5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	242 {'merge':
5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	243 (_('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	244 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	245 '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	246 (_('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	247 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	248 },
5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	249 'multiplebranchessourceset':
5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	250 {'merge':
5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	251 (_('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	252 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	253 '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	254 (_('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	255 _('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	256 },
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 }
28102 bd74b5e0d2c0 destutil: extract all 'mergedest' abort messages into a dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28065 diff changeset	258
28139 5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	259 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	260 """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	261 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	262 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	263 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	264 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	265 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	266 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	267 else:
5b7fd48f9868 destmerge: extract logic based on bookmark into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26726 diff changeset	268 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	269 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	270 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	271 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	272 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	273 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	274 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	275 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	276 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	277
28140 276644ae9e8d destutil: allow to disable the "on head check" in destmerge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28139 diff changeset	278 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	279 """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	280 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	281
5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	282 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	283 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	284 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	285 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	286 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	287 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	288 else:
5476a7a039c0 destutil: allow to specify an explicit source for the merge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28138 diff changeset	289 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	290 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	291 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	292 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	293 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	294 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	295
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	296 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	297 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	298 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	299 # 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	300 #
1fc7b5363871 destutil: document various failure cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 28104 diff changeset	301 # 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	302 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	303 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	304 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	305 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	306 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	307 # 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	308 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	309 # 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	310 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	311 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	312 # 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	313 #
1fc7b5363871 destutil: document various failure cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 28104 diff changeset	314 # 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	315 # 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	316 # 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	317 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	318 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	319 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	320 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	321 # 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	322 #
1fc7b5363871 destutil: document various failure cases Pierre-Yves David <pierre-yves.david@fb.com> parents: 28104 diff changeset	323 # 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	324 # 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	325 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	326 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	327 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	328 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	329 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	330 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	331 # 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	332 # 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	333 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	334 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	335 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	336 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	337 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	338 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	339 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	340 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	341
28140 276644ae9e8d destutil: allow to disable the "on head check" in destmerge Pierre-Yves David <pierre-yves.david@fb.com> parents: 28139 diff changeset	342 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	343 """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	344
b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	345 (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	346
b54c0246295b destutil: add an 'action' layer to the destmerge message dictionary Pierre-Yves David <pierre-yves.david@fb.com> parents: 28105 diff changeset	347 :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	348 """
26714 9903261dcc81 destutil: move default merge destination into a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26683 diff changeset	349 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	350 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	351 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	352 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	353 onheadcheck=onheadcheck)
26714 9903261dcc81 destutil: move default merge destination into a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 26683 diff changeset	354 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	355
3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 26728 diff changeset	356 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	357
3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 26728 diff changeset	358 def desthistedit(ui, repo):
3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 26728 diff changeset	359 """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	360 # Avoid cycle: scmutil -> revset -> destutil
d13bcc9fd656 destutil: use scmutil.revrange for desthistedit (issue5001) Gregory Szorc <gregory.szorc@gmail.com> parents: 27333 diff changeset	361 from . import scmutil
d13bcc9fd656 destutil: use scmutil.revrange for desthistedit (issue5001) Gregory Szorc <gregory.szorc@gmail.com> parents: 27333 diff changeset	362
27262 3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 26728 diff changeset	363 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	364 if default:
27559 d13bcc9fd656 destutil: use scmutil.revrange for desthistedit (issue5001) Gregory Szorc <gregory.szorc@gmail.com> parents: 27333 diff changeset	365 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	366 if revs:
3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 26728 diff changeset	367 # 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	368 # 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	369 revs.sort()
3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 26728 diff changeset	370 return revs.first()
3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 26728 diff changeset	371
3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 26728 diff changeset	372 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	373
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27559 diff changeset	374 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	375 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	376 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	377 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	378 # 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	379 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	380 if bmheads:
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27559 diff changeset	381 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	382 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	383
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27559 diff changeset	384 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	385 currentbranch = repo.dirstate.branch()
28266 de8b09482fb7 destutil: show message about other branch heads, even if on a closed head FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28236 diff changeset	386 allheads = repo.branchheads(currentbranch, closed=True)
28029 72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27559 diff changeset	387 heads = repo.branchheads(currentbranch)
28266 de8b09482fb7 destutil: show message about other branch heads, even if on a closed head FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28236 diff changeset	388 if repo.revs('%ln and parents()', allheads):
de8b09482fb7 destutil: show message about other branch heads, even if on a closed head FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28236 diff changeset	389 # we are on a head, even though it might be closed
28385 3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	390 #
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	391 # on closed otherheads
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	392 # ========= ==========
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	393 # o 0 all heads for current branch are closed
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	394 # N only descendant branch heads are closed
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	395 # x 0 there is only one non-closed branch head
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	396 # N there are some non-closed branch heads
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	397 # ========= ==========
28233 9da2283d0c56 destutil: add new local variable to increase readability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28189 diff changeset	398 otherheads = repo.revs('%ln - parents()', heads)
28385 3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	399 if repo['.'].closesbranch():
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	400 ui.status(_('updated to a closed branch head, '
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	401 'because all descendant heads are closed.\n'
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	402 'beware of re-opening closed head '
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	403 'by subsequent commit here.\n'))
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	404 if otherheads:
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	405 ui.status(_('%i other heads for branch "%s"\n') %
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	406 (len(otherheads), currentbranch))
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	407 else:
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	408 ui.status(_('all heads for branch "%s" are closed.\n') %
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	409 currentbranch)
3f9e25a42e69 destutil: choose non-closed branch head at first (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28266 diff changeset	410 elif otherheads:
28029 72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27559 diff changeset	411 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	412 (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	413
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27559 diff changeset	414 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	415 """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	416 # 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	417 # - 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	418 # - 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	419 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	420 _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	421 else:
72072cfc7e91 update: warn about other topological heads on bare update Pierre-Yves David <pierre-yves.david@fb.com> parents: 27559 diff changeset	422 _statusotherbranchheads(ui, repo)

Mercurial > public > mercurial-scm > hg

annotate mercurial/destutil.py @ 28385:3f9e25a42e69