evolve: hgext3rd/topic/__init_

annotate hgext3rd/topic/init.py @ 2664:ed6fb5f20b24

topics: return early so that other if conditions don't get execute (issue5600) We were not returning after the _changetopics() call and hence the if's below it were also executed which resulted in changing of current topic. This prevent current topic to be updated even when we only affect changeset unrelated to the working copy. Not that the rebase output change as it expose a new bug (rebased changeset gain a topic)

author	Pulkit Goyal <7895pulkit@gmail.com>
date	Sun, 25 Jun 2017 06:53:22 +0530
parents	9c0b293c2785
children	0ade6e87346b

rev	line source
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	1 # __init__.py - topic extension
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	2 #
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	3 # This software may be used and distributed according to the terms of the
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	4 # GNU General Public License version 2 or any later version.
1846 0b5b757ca812 docs: fix format of extension docstring Matt Mackall <mpm@selenic.com> parents: 1845 diff changeset	5 """support for topic branches
0b5b757ca812 docs: fix format of extension docstring Matt Mackall <mpm@selenic.com> parents: 1845 diff changeset	6
2011 9c7665e3107b documentation: some basic update of the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2008 diff changeset	7 Topic branches are lightweight branches which disappear when changes are
9c7665e3107b documentation: some basic update of the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2008 diff changeset	8 finalized (move to the public phase).
9c7665e3107b documentation: some basic update of the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2008 diff changeset	9
9c7665e3107b documentation: some basic update of the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2008 diff changeset	10 Compared to bookmark, topic is reference carried by each changesets of the
9c7665e3107b documentation: some basic update of the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2008 diff changeset	11 series instead of just the single head revision. Topic are quite similar to
9c7665e3107b documentation: some basic update of the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2008 diff changeset	12 the way named branch work, except they eventualy fade away when the changeset
2625 8f2901f4749e topics: some minute fixes to the documentation which shows up in help Pulkit Goyal <7895pulkit@gmail.com> parents: 2624 diff changeset	13 becomes part of the immutable history. Changeset can belong to both a topic and
2011 9c7665e3107b documentation: some basic update of the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2008 diff changeset	14 a named branch, but as long as it is mutable, its topic identity will prevail.
9c7665e3107b documentation: some basic update of the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2008 diff changeset	15 As a result, default destination for 'update', 'merge', etc... will take topic
9c7665e3107b documentation: some basic update of the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2008 diff changeset	16 into account. When a topic is active these operations will only consider other
9c7665e3107b documentation: some basic update of the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2008 diff changeset	17 changesets on that topic (and, in some occurence, bare changeset on same
9c7665e3107b documentation: some basic update of the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2008 diff changeset	18 branch). When no topic is active, changeset with topic will be ignored and
9c7665e3107b documentation: some basic update of the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2008 diff changeset	19 only bare one on the same branch will be taken in account.
9c7665e3107b documentation: some basic update of the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2008 diff changeset	20
9c7665e3107b documentation: some basic update of the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2008 diff changeset	21 There is currently two commands to be used with that extension: 'topics' and
9c7665e3107b documentation: some basic update of the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2008 diff changeset	22 'stack'.
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	23
2625 8f2901f4749e topics: some minute fixes to the documentation which shows up in help Pulkit Goyal <7895pulkit@gmail.com> parents: 2624 diff changeset	24 The 'hg topics' command is used to set the current topic, change and list
8f2901f4749e topics: some minute fixes to the documentation which shows up in help Pulkit Goyal <7895pulkit@gmail.com> parents: 2624 diff changeset	25 existing one. 'hg topics --verbose' will list various information related to
8f2901f4749e topics: some minute fixes to the documentation which shows up in help Pulkit Goyal <7895pulkit@gmail.com> parents: 2624 diff changeset	26 each topic.
2011 9c7665e3107b documentation: some basic update of the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2008 diff changeset	27
2625 8f2901f4749e topics: some minute fixes to the documentation which shows up in help Pulkit Goyal <7895pulkit@gmail.com> parents: 2624 diff changeset	28 The 'stack' will show you information about the stack of commit belonging to
2011 9c7665e3107b documentation: some basic update of the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2008 diff changeset	29 your current topic.
9c7665e3107b documentation: some basic update of the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2008 diff changeset	30
2012 dc34d5317001 doc: add more details about the head checking Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2011 diff changeset	31 Topic is offering you aliases reference to changeset in your current topic
dc34d5317001 doc: add more details about the head checking Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2011 diff changeset	32 stack as 't#'. For example, 't1' refers to the root of your stack, 't2' to the
dc34d5317001 doc: add more details about the head checking Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2011 diff changeset	33 second commits, etc. The 'hg stack' command show these number.
2011 9c7665e3107b documentation: some basic update of the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2008 diff changeset	34
2012 dc34d5317001 doc: add more details about the head checking Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2011 diff changeset	35 Push behavior will change a bit with topic. When pushing to a publishing
dc34d5317001 doc: add more details about the head checking Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2011 diff changeset	36 repository the changesets will turn public and the topic data on them will fade
dc34d5317001 doc: add more details about the head checking Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2011 diff changeset	37 away. The logic regarding pushing new heads will behave has before, ignore any
dc34d5317001 doc: add more details about the head checking Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2011 diff changeset	38 topic related data. When pushing to a non-publishing repository (supporting
dc34d5317001 doc: add more details about the head checking Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2011 diff changeset	39 topic), the head checking will be done taking topic data into account.
dc34d5317001 doc: add more details about the head checking Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2011 diff changeset	40 Push will complain about multiple heads on a branch if you push multiple heads
dc34d5317001 doc: add more details about the head checking Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2011 diff changeset	41 with no topic information on them (or multiple public heads). But pushing a new
dc34d5317001 doc: add more details about the head checking Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2011 diff changeset	42 topic will not requires any specific flag. However, pushing multiple heads on a
dc34d5317001 doc: add more details about the head checking Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2011 diff changeset	43 topic will be met with the usual warning.
dc34d5317001 doc: add more details about the head checking Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2011 diff changeset	44
dc34d5317001 doc: add more details about the head checking Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2011 diff changeset	45 The 'evolve' extension takes 'topic' into account. 'hg evolve --all'
2011 9c7665e3107b documentation: some basic update of the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2008 diff changeset	46 will evolve all changesets in the active topic. In addition, by default. 'hg
9c7665e3107b documentation: some basic update of the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2008 diff changeset	47 next' and 'hg prev' will stick to the current topic.
9c7665e3107b documentation: some basic update of the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2008 diff changeset	48
9c7665e3107b documentation: some basic update of the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2008 diff changeset	49 Be aware that this extension is still an experiment, commands and other features
9c7665e3107b documentation: some basic update of the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2008 diff changeset	50 are likely to be change/adjusted/dropped over time as we refine the concept.
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	51 """
2011 9c7665e3107b documentation: some basic update of the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2008 diff changeset	52
1932 880aac9dbfa6 init: move to new style import Pierre-Yves David <pierre-yves.david@fb.com> parents: 1918 diff changeset	53 from __future__ import absolute_import
880aac9dbfa6 init: move to new style import Pierre-Yves David <pierre-yves.david@fb.com> parents: 1918 diff changeset	54
1904 f52c02bf47b7 stack: allow to refer to changeset using "t2" form Pierre-Yves David <pierre-yves.david@fb.com> parents: 1903 diff changeset	55 import re
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	56
1848 9a81657deec2 summary: add topic summary hook Matt Mackall <mpm@selenic.com> parents: 1847 diff changeset	57 from mercurial.i18n import _
1932 880aac9dbfa6 init: move to new style import Pierre-Yves David <pierre-yves.david@fb.com> parents: 1918 diff changeset	58 from mercurial import (
880aac9dbfa6 init: move to new style import Pierre-Yves David <pierre-yves.david@fb.com> parents: 1918 diff changeset	59 cmdutil,
880aac9dbfa6 init: move to new style import Pierre-Yves David <pierre-yves.david@fb.com> parents: 1918 diff changeset	60 commands,
880aac9dbfa6 init: move to new style import Pierre-Yves David <pierre-yves.david@fb.com> parents: 1918 diff changeset	61 context,
880aac9dbfa6 init: move to new style import Pierre-Yves David <pierre-yves.david@fb.com> parents: 1918 diff changeset	62 error,
880aac9dbfa6 init: move to new style import Pierre-Yves David <pierre-yves.david@fb.com> parents: 1918 diff changeset	63 extensions,
2648 d8b47d961c77 topic-change: update the working copy along when changing topic of '.' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2647 diff changeset	64 hg,
1932 880aac9dbfa6 init: move to new style import Pierre-Yves David <pierre-yves.david@fb.com> parents: 1918 diff changeset	65 localrepo,
880aac9dbfa6 init: move to new style import Pierre-Yves David <pierre-yves.david@fb.com> parents: 1918 diff changeset	66 lock,
880aac9dbfa6 init: move to new style import Pierre-Yves David <pierre-yves.david@fb.com> parents: 1918 diff changeset	67 merge,
880aac9dbfa6 init: move to new style import Pierre-Yves David <pierre-yves.david@fb.com> parents: 1918 diff changeset	68 namespaces,
880aac9dbfa6 init: move to new style import Pierre-Yves David <pierre-yves.david@fb.com> parents: 1918 diff changeset	69 node,
880aac9dbfa6 init: move to new style import Pierre-Yves David <pierre-yves.david@fb.com> parents: 1918 diff changeset	70 obsolete,
880aac9dbfa6 init: move to new style import Pierre-Yves David <pierre-yves.david@fb.com> parents: 1918 diff changeset	71 patch,
880aac9dbfa6 init: move to new style import Pierre-Yves David <pierre-yves.david@fb.com> parents: 1918 diff changeset	72 phases,
2464 2b53a2a21bbb deprecation: fix cmdutil.command deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2428 diff changeset	73 registrar,
1932 880aac9dbfa6 init: move to new style import Pierre-Yves David <pierre-yves.david@fb.com> parents: 1918 diff changeset	74 util,
880aac9dbfa6 init: move to new style import Pierre-Yves David <pierre-yves.david@fb.com> parents: 1918 diff changeset	75 )
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	76
1932 880aac9dbfa6 init: move to new style import Pierre-Yves David <pierre-yves.david@fb.com> parents: 1918 diff changeset	77 from . import (
880aac9dbfa6 init: move to new style import Pierre-Yves David <pierre-yves.david@fb.com> parents: 1918 diff changeset	78 constants,
880aac9dbfa6 init: move to new style import Pierre-Yves David <pierre-yves.david@fb.com> parents: 1918 diff changeset	79 revset as topicrevset,
880aac9dbfa6 init: move to new style import Pierre-Yves David <pierre-yves.david@fb.com> parents: 1918 diff changeset	80 destination,
880aac9dbfa6 init: move to new style import Pierre-Yves David <pierre-yves.david@fb.com> parents: 1918 diff changeset	81 stack,
880aac9dbfa6 init: move to new style import Pierre-Yves David <pierre-yves.david@fb.com> parents: 1918 diff changeset	82 topicmap,
880aac9dbfa6 init: move to new style import Pierre-Yves David <pierre-yves.david@fb.com> parents: 1918 diff changeset	83 discovery,
880aac9dbfa6 init: move to new style import Pierre-Yves David <pierre-yves.david@fb.com> parents: 1918 diff changeset	84 )
1843 0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1842 diff changeset	85
2464 2b53a2a21bbb deprecation: fix cmdutil.command deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2428 diff changeset	86 if util.safehasattr(registrar, 'command'):
2b53a2a21bbb deprecation: fix cmdutil.command deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2428 diff changeset	87 commandfunc = registrar.command
2b53a2a21bbb deprecation: fix cmdutil.command deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2428 diff changeset	88 else: # compat with hg < 4.3
2b53a2a21bbb deprecation: fix cmdutil.command deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2428 diff changeset	89 commandfunc = cmdutil.command
2b53a2a21bbb deprecation: fix cmdutil.command deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2428 diff changeset	90
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	91 cmdtable = {}
2464 2b53a2a21bbb deprecation: fix cmdutil.command deprecation warning Boris Feld <boris.feld@octobus.net> parents: 2428 diff changeset	92 command = commandfunc(cmdtable)
1976 ebdc2a6a9a25 topic: add color for the active topic Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1975 diff changeset	93 colortable = {'topic.active': 'green',
1978 e42dd4523c0d topic: list the number of troubled changesets when --verbose is used Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1977 diff changeset	94 'topic.list.troubledcount': 'red',
1979 bee7a1ef8ba8 topic: list the number of head when --verbose is used Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1978 diff changeset	95 'topic.list.headcount.multiple': 'yellow',
1985 03d6b685c16a topic: list the number of 'behind' changeset when --verbose is used Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1979 diff changeset	96 'topic.list.behindcount': 'cyan',
03d6b685c16a topic: list the number of 'behind' changeset when --verbose is used Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1979 diff changeset	97 'topic.list.behinderror': 'red',
1976 ebdc2a6a9a25 topic: add color for the active topic Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1975 diff changeset	98 'topic.stack.index': 'yellow',
1991 ba79d23594d6 stack: reusing the index number in base when applicable Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1990 diff changeset	99 'topic.stack.index.base': 'none dim',
1992 28fbc627b704 stack: also dim bases Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1991 diff changeset	100 'topic.stack.desc.base': 'none dim',
1909 36112e361ee4 stack: display the base of the stack Pierre-Yves David <pierre-yves.david@fb.com> parents: 1908 diff changeset	101 'topic.stack.state.base': 'dim',
36112e361ee4 stack: display the base of the stack Pierre-Yves David <pierre-yves.david@fb.com> parents: 1908 diff changeset	102 'topic.stack.state.clean': 'green',
1963 7b7f073ed05e style: update __init__.py Sean Farley <sean@farley.io> parents: 1958 diff changeset	103 'topic.stack.index.current': 'cyan', # random pick
7b7f073ed05e style: update __init__.py Sean Farley <sean@farley.io> parents: 1958 diff changeset	104 'topic.stack.state.current': 'cyan bold', # random pick
7b7f073ed05e style: update __init__.py Sean Farley <sean@farley.io> parents: 1958 diff changeset	105 'topic.stack.desc.current': 'cyan', # random pick
1908 dbd6d51e63f1 stack: add some default color configuration Pierre-Yves David <pierre-yves.david@fb.com> parents: 1907 diff changeset	106 'topic.stack.state.unstable': 'red',
1997 ce86f7bb4b7b stack: add some behind information Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1992 diff changeset	107 'topic.stack.summary.behindcount': 'cyan',
ce86f7bb4b7b stack: add some behind information Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1992 diff changeset	108 'topic.stack.summary.behinderror': 'red',
1998 302be26a3fd8 stack: add warning about multiple heads Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1997 diff changeset	109 'topic.stack.summary.headcount.multiple': 'yellow',
2340 e6d3b83b306b topic: configure some default color for topic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2339 diff changeset	110 # default color to help log output and thg
e6d3b83b306b topic: configure some default color for topic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2339 diff changeset	111 # (first pick I could think off, update as needed
e6d3b83b306b topic: configure some default color for topic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2339 diff changeset	112 'log.topic': 'green_background',
e6d3b83b306b topic: configure some default color for topic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2339 diff changeset	113 'topic.active': 'green',
1908 dbd6d51e63f1 stack: add some default color configuration Pierre-Yves David <pierre-yves.david@fb.com> parents: 1907 diff changeset	114 }
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	115
2428 7c15b494bacc topic: update 'tested with' and readme Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2340 diff changeset	116 testedwith = '4.0.2 4.1.3 4.2'
1884 8a53f99d9061 testedwith: declare compatibility with Mercurial 3.7 Augie Fackler <raf@durin42.com> parents: 1877 diff changeset	117
2656 4a148ca3e80d topic: update the changectx method to respect phases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2655 diff changeset	118 def _contexttopic(self, force=False):
4a148ca3e80d topic: update the changectx method to respect phases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2655 diff changeset	119 if not (force or self.mutable()):
4a148ca3e80d topic: update the changectx method to respect phases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2655 diff changeset	120 return ''
1861 972d4e0c3d44 changectx: add topic method Matt Mackall <mpm@selenic.com> parents: 1860 diff changeset	121 return self.extra().get(constants.extrakey, '')
972d4e0c3d44 changectx: add topic method Matt Mackall <mpm@selenic.com> parents: 1860 diff changeset	122 context.basectx.topic = _contexttopic
972d4e0c3d44 changectx: add topic method Matt Mackall <mpm@selenic.com> parents: 1860 diff changeset	123
1904 f52c02bf47b7 stack: allow to refer to changeset using "t2" form Pierre-Yves David <pierre-yves.david@fb.com> parents: 1903 diff changeset	124 topicrev = re.compile(r'^t\d+$')
f52c02bf47b7 stack: allow to refer to changeset using "t2" form Pierre-Yves David <pierre-yves.david@fb.com> parents: 1903 diff changeset	125
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	126 def _namemap(repo, name):
1904 f52c02bf47b7 stack: allow to refer to changeset using "t2" form Pierre-Yves David <pierre-yves.david@fb.com> parents: 1903 diff changeset	127 if topicrev.match(name):
f52c02bf47b7 stack: allow to refer to changeset using "t2" form Pierre-Yves David <pierre-yves.david@fb.com> parents: 1903 diff changeset	128 idx = int(name[1:])
f52c02bf47b7 stack: allow to refer to changeset using "t2" form Pierre-Yves David <pierre-yves.david@fb.com> parents: 1903 diff changeset	129 topic = repo.currenttopic
f52c02bf47b7 stack: allow to refer to changeset using "t2" form Pierre-Yves David <pierre-yves.david@fb.com> parents: 1903 diff changeset	130 if not topic:
f52c02bf47b7 stack: allow to refer to changeset using "t2" form Pierre-Yves David <pierre-yves.david@fb.com> parents: 1903 diff changeset	131 raise error.Abort(_('cannot resolve "%s": no active topic') % name)
f52c02bf47b7 stack: allow to refer to changeset using "t2" form Pierre-Yves David <pierre-yves.david@fb.com> parents: 1903 diff changeset	132 revs = list(stack.getstack(repo, topic))
f52c02bf47b7 stack: allow to refer to changeset using "t2" form Pierre-Yves David <pierre-yves.david@fb.com> parents: 1903 diff changeset	133 try:
1958 62d5d4206840 stack: also change the indexing of the t# reference Pierre-Yves David <pierre-yves.david@fb.com> parents: 1952 diff changeset	134 r = revs[idx - 1]
1904 f52c02bf47b7 stack: allow to refer to changeset using "t2" form Pierre-Yves David <pierre-yves.david@fb.com> parents: 1903 diff changeset	135 except IndexError:
f52c02bf47b7 stack: allow to refer to changeset using "t2" form Pierre-Yves David <pierre-yves.david@fb.com> parents: 1903 diff changeset	136 msg = _('cannot resolve "%s": topic "%s" has only %d changesets')
f52c02bf47b7 stack: allow to refer to changeset using "t2" form Pierre-Yves David <pierre-yves.david@fb.com> parents: 1903 diff changeset	137 raise error.Abort(msg % (name, topic, len(revs)))
f52c02bf47b7 stack: allow to refer to changeset using "t2" form Pierre-Yves David <pierre-yves.david@fb.com> parents: 1903 diff changeset	138 return [repo[r].node()]
2008 e3ddd696394f flake8: fix E713 style Sean Farley <sean@farley.io> parents: 2007 diff changeset	139 if name not in repo.topics:
2000 c413e7c96265 init: guard _namemap with repo.topics (issue5351) timeless@gmail.com parents: 1999 diff changeset	140 return []
2657 58719183d383 topic: improve the revset used to return name->nodes mapping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2656 diff changeset	141 node = repo.changelog.node
58719183d383 topic: improve the revset used to return name->nodes mapping Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2656 diff changeset	142 return [node(rev) for rev in repo.revs('topic(%s)', name)]
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	143
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	144 def _nodemap(repo, node):
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	145 ctx = repo[node]
1861 972d4e0c3d44 changectx: add topic method Matt Mackall <mpm@selenic.com> parents: 1860 diff changeset	146 t = ctx.topic()
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	147 if t and ctx.phase() > phases.public:
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	148 return [t]
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	149 return []
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	150
1871 58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1867 diff changeset	151 def uisetup(ui):
1941 7eb737b7a902 destination: rename 'setupdest' to 'modsetup' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1939 diff changeset	152 destination.modsetup(ui)
1943 cd56f4d8b5a3 revset: add a ui argument to 'modsetup' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1942 diff changeset	153 topicrevset.modsetup(ui)
1944 daad8249d5cf discovery: move all setup into a 'modsetup' function Pierre-Yves David <pierre-yves.david@fb.com> parents: 1943 diff changeset	154 discovery.modsetup(ui)
1952 665d6322994e uisetup: add call to 'topicmap.modsetup' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1951 diff changeset	155 topicmap.modsetup(ui)
1948 54810b543bf4 patch: move setup of import/export logic into a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 1947 diff changeset	156 setupimportexport(ui)
1871 58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1867 diff changeset	157
1951 0309cac5d91d uisetup: move all remaining wrapping into uisetup Pierre-Yves David <pierre-yves.david@fb.com> parents: 1950 diff changeset	158 extensions.afterloaded('rebase', _fixrebase)
0309cac5d91d uisetup: move all remaining wrapping into uisetup Pierre-Yves David <pierre-yves.david@fb.com> parents: 1950 diff changeset	159
0309cac5d91d uisetup: move all remaining wrapping into uisetup Pierre-Yves David <pierre-yves.david@fb.com> parents: 1950 diff changeset	160 entry = extensions.wrapcommand(commands.table, 'commit', commitwrap)
0309cac5d91d uisetup: move all remaining wrapping into uisetup Pierre-Yves David <pierre-yves.david@fb.com> parents: 1950 diff changeset	161 entry[1].append(('t', 'topic', '',
0309cac5d91d uisetup: move all remaining wrapping into uisetup Pierre-Yves David <pierre-yves.david@fb.com> parents: 1950 diff changeset	162 _("use specified topic"), _('TOPIC')))
0309cac5d91d uisetup: move all remaining wrapping into uisetup Pierre-Yves David <pierre-yves.david@fb.com> parents: 1950 diff changeset	163
0309cac5d91d uisetup: move all remaining wrapping into uisetup Pierre-Yves David <pierre-yves.david@fb.com> parents: 1950 diff changeset	164 extensions.wrapfunction(cmdutil, 'buildcommittext', committextwrap)
0309cac5d91d uisetup: move all remaining wrapping into uisetup Pierre-Yves David <pierre-yves.david@fb.com> parents: 1950 diff changeset	165 extensions.wrapfunction(merge, 'update', mergeupdatewrap)
0309cac5d91d uisetup: move all remaining wrapping into uisetup Pierre-Yves David <pierre-yves.david@fb.com> parents: 1950 diff changeset	166 cmdutil.summaryhooks.add('topic', summaryhook)
0309cac5d91d uisetup: move all remaining wrapping into uisetup Pierre-Yves David <pierre-yves.david@fb.com> parents: 1950 diff changeset	167
0309cac5d91d uisetup: move all remaining wrapping into uisetup Pierre-Yves David <pierre-yves.david@fb.com> parents: 1950 diff changeset	168
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	169 def reposetup(ui, repo):
1886 0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	170 if not isinstance(repo, localrepo.localrepository):
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	171 return # this can be a peer in the ssh case (puzzling)
2007 aa3b6cfdf493 flake8: fix E301 style Sean Farley <sean@farley.io> parents: 2000 diff changeset	172
2653 13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2652 diff changeset	173 repo = repo.unfiltered()
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2652 diff changeset	174
2339 f641cccbd119 topic: automatically configure thg to display topic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2288 diff changeset	175 if repo.ui.config('experimental', 'thg.displaynames', None) is None:
f641cccbd119 topic: automatically configure thg to display topic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2288 diff changeset	176 repo.ui.setconfig('experimental', 'thg.displaynames', 'topics',
f641cccbd119 topic: automatically configure thg to display topic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2288 diff changeset	177 source='topic-extension')
f641cccbd119 topic: automatically configure thg to display topic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2288 diff changeset	178
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	179 class topicrepo(repo.__class__):
1903 58cdf061d49a topic: don't take topic into account when pushing to non-topic repo Pierre-Yves David <pierre-yves.david@fb.com> parents: 1901 diff changeset	180
58cdf061d49a topic: don't take topic into account when pushing to non-topic repo Pierre-Yves David <pierre-yves.david@fb.com> parents: 1901 diff changeset	181 def _restrictcapabilities(self, caps):
58cdf061d49a topic: don't take topic into account when pushing to non-topic repo Pierre-Yves David <pierre-yves.david@fb.com> parents: 1901 diff changeset	182 caps = super(topicrepo, self)._restrictcapabilities(caps)
58cdf061d49a topic: don't take topic into account when pushing to non-topic repo Pierre-Yves David <pierre-yves.david@fb.com> parents: 1901 diff changeset	183 caps.add('topics')
58cdf061d49a topic: don't take topic into account when pushing to non-topic repo Pierre-Yves David <pierre-yves.david@fb.com> parents: 1901 diff changeset	184 return caps
58cdf061d49a topic: don't take topic into account when pushing to non-topic repo Pierre-Yves David <pierre-yves.david@fb.com> parents: 1901 diff changeset	185
1858 4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	186 def commit(self, args, *kwargs):
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	187 backup = self.ui.backupconfig('ui', 'allowemptycommit')
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	188 try:
1861 972d4e0c3d44 changectx: add topic method Matt Mackall <mpm@selenic.com> parents: 1860 diff changeset	189 if repo.currenttopic != repo['.'].topic():
1858 4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	190 # bypass the core "nothing changed" logic
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	191 self.ui.setconfig('ui', 'allowemptycommit', True)
2288 b6ea9049693d topic: directly use "super" call Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2012 diff changeset	192 return super(topicrepo, self).commit(args, *kwargs)
1858 4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	193 finally:
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	194 self.ui.restoreconfig(backup)
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	195
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	196 def commitctx(self, ctx, error=None):
2653 13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2652 diff changeset	197 topicfilter = topicmap.topicfilter(self.filtername)
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2652 diff changeset	198 if topicfilter != self.filtername:
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2652 diff changeset	199 other = repo.filtered(topicmap.topicfilter(repo.filtername))
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2652 diff changeset	200 other.commitctx(ctx, error=error)
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2652 diff changeset	201
1855 f241a00e93a7 topics: only apply topic to commits of the working copy Matt Mackall <mpm@selenic.com> parents: 1854 diff changeset	202 if isinstance(ctx, context.workingcommitctx):
f241a00e93a7 topics: only apply topic to commits of the working copy Matt Mackall <mpm@selenic.com> parents: 1854 diff changeset	203 current = self.currenttopic
f241a00e93a7 topics: only apply topic to commits of the working copy Matt Mackall <mpm@selenic.com> parents: 1854 diff changeset	204 if current:
f241a00e93a7 topics: only apply topic to commits of the working copy Matt Mackall <mpm@selenic.com> parents: 1854 diff changeset	205 ctx.extra()[constants.extrakey] = current
1862 565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1861 diff changeset	206 if (isinstance(ctx, context.memctx) and
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1861 diff changeset	207 ctx.extra().get('amend_source') and
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1861 diff changeset	208 ctx.topic() and
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1861 diff changeset	209 not self.currenttopic):
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1861 diff changeset	210 # we are amending and need to remove a topic
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1861 diff changeset	211 del ctx.extra()[constants.extrakey]
2653 13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2652 diff changeset	212 return super(topicrepo, self).commitctx(ctx, error=error)
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	213
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	214 @property
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	215 def topics(self):
1999 fe76e9c92fff init: cache repo.topics timeless@gmail.com parents: 1998 diff changeset	216 if self._topics is not None:
fe76e9c92fff init: cache repo.topics timeless@gmail.com parents: 1998 diff changeset	217 return self._topics
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	218 topics = set(['', self.currenttopic])
1841 72a58a5bfb62 topic: use repo.set() where we need a changectx anyway Augie Fackler <augie@google.com> parents: 1839 diff changeset	219 for c in self.set('not public()'):
1861 972d4e0c3d44 changectx: add topic method Matt Mackall <mpm@selenic.com> parents: 1860 diff changeset	220 topics.add(c.topic())
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	221 topics.remove('')
1999 fe76e9c92fff init: cache repo.topics timeless@gmail.com parents: 1998 diff changeset	222 self._topics = topics
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	223 return topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	224
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	225 @property
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	226 def currenttopic(self):
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	227 return self.vfs.tryread('topic')
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	228
2653 13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2652 diff changeset	229 # overwritten at the instance level by topicmap.py
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2652 diff changeset	230 _autobranchmaptopic = True
1885 d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: 1884 diff changeset	231
2653 13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2652 diff changeset	232 def branchmap(self, topic=None):
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2652 diff changeset	233 if topic is None:
2655 417490bdf28a topic: avoid crash when topic is loaded but not enabled for a repository Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2653 diff changeset	234 topic = getattr(repo, '_autobranchmaptopic', False)
2653 13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2652 diff changeset	235 topicfilter = topicmap.topicfilter(self.filtername)
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2652 diff changeset	236 if not topic or topicfilter == self.filtername:
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2652 diff changeset	237 return super(topicrepo, self).branchmap()
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2652 diff changeset	238 return self.filtered(topicfilter).branchmap()
1889 d9b929bcc3ad topicmap: ensure that 'served' view is updated with topicmap Pierre-Yves David <pierre-yves.david@fb.com> parents: 1888 diff changeset	239
1999 fe76e9c92fff init: cache repo.topics timeless@gmail.com parents: 1998 diff changeset	240 def invalidatevolatilesets(self):
fe76e9c92fff init: cache repo.topics timeless@gmail.com parents: 1998 diff changeset	241 # XXX we might be able to move this to something invalidated less often
fe76e9c92fff init: cache repo.topics timeless@gmail.com parents: 1998 diff changeset	242 super(topicrepo, self).invalidatevolatilesets()
fe76e9c92fff init: cache repo.topics timeless@gmail.com parents: 1998 diff changeset	243 self._topics = None
1885 d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: 1884 diff changeset	244
1886 0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	245 def peer(self):
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	246 peer = super(topicrepo, self).peer()
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	247 if getattr(peer, '_repo', None) is not None: # localpeer
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	248 class topicpeer(peer.__class__):
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	249 def branchmap(self):
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	250 usetopic = not self._repo.publishing()
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	251 return self._repo.branchmap(topic=usetopic)
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	252 peer.__class__ = topicpeer
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	253 return peer
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	254
1857 a506ed8ab8da topics: add listnames hook so completion works Matt Mackall <mpm@selenic.com> parents: 1856 diff changeset	255 repo.__class__ = topicrepo
1999 fe76e9c92fff init: cache repo.topics timeless@gmail.com parents: 1998 diff changeset	256 repo._topics = None
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	257 if util.safehasattr(repo, 'names'):
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	258 repo.names.addnamespace(namespaces.namespace(
1857 a506ed8ab8da topics: add listnames hook so completion works Matt Mackall <mpm@selenic.com> parents: 1856 diff changeset	259 'topics', 'topic', namemap=_namemap, nodemap=_nodemap,
a506ed8ab8da topics: add listnames hook so completion works Matt Mackall <mpm@selenic.com> parents: 1856 diff changeset	260 listnames=lambda repo: repo.topics))
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	261
1847 9fa5b8f4e98e topics: add command summary Matt Mackall <mpm@selenic.com> parents: 1846 diff changeset	262 @command('topics [TOPIC]', [
1963 7b7f073ed05e style: update __init__.py Sean Farley <sean@farley.io> parents: 1958 diff changeset	263 ('', 'clear', False, 'clear active topic if any'),
2643 a9ca94defc29 topics: rename '--change' flag to '--rev' flag Pulkit Goyal <7895pulkit@gmail.com> parents: 2642 diff changeset	264 ('r', 'rev', '', 'revset of existing revisions', _('REV')),
1963 7b7f073ed05e style: update __init__.py Sean Farley <sean@farley.io> parents: 1958 diff changeset	265 ('l', 'list', False, 'show the stack of changeset in the topic'),
1907 95874e8fc5f2 stack: add basic formatter and label support Pierre-Yves David <pierre-yves.david@fb.com> parents: 1904 diff changeset	266 ] + commands.formatteropts)
2643 a9ca94defc29 topics: rename '--change' flag to '--rev' flag Pulkit Goyal <7895pulkit@gmail.com> parents: 2642 diff changeset	267 def topics(ui, repo, topic='', clear=False, rev=None, list=False, **opts):
2011 9c7665e3107b documentation: some basic update of the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2008 diff changeset	268 """View current topic, set current topic, or see all topics.
9c7665e3107b documentation: some basic update of the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2008 diff changeset	269
9c7665e3107b documentation: some basic update of the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2008 diff changeset	270 The --verbose version of this command display various information on the state of each topic."""
1895 c8e4c6e03957 stack: add a very first version of stack display with 'hg topic --list' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1894 diff changeset	271 if list:
2643 a9ca94defc29 topics: rename '--change' flag to '--rev' flag Pulkit Goyal <7895pulkit@gmail.com> parents: 2642 diff changeset	272 if clear or rev:
a9ca94defc29 topics: rename '--change' flag to '--rev' flag Pulkit Goyal <7895pulkit@gmail.com> parents: 2642 diff changeset	273 raise error.Abort(_("cannot use --clear or --rev with --list"))
1990 71410fa2c253 stack: extra argument validation logic outside of showstack Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1989 diff changeset	274 if not topic:
71410fa2c253 stack: extra argument validation logic outside of showstack Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1989 diff changeset	275 topic = repo.currenttopic
71410fa2c253 stack: extra argument validation logic outside of showstack Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1989 diff changeset	276 if not topic:
71410fa2c253 stack: extra argument validation logic outside of showstack Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1989 diff changeset	277 raise error.Abort(_('no active topic to list'))
1907 95874e8fc5f2 stack: add basic formatter and label support Pierre-Yves David <pierre-yves.david@fb.com> parents: 1904 diff changeset	278 return stack.showstack(ui, repo, topic, opts)
1895 c8e4c6e03957 stack: add a very first version of stack display with 'hg topic --list' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1894 diff changeset	279
2643 a9ca94defc29 topics: rename '--change' flag to '--rev' flag Pulkit Goyal <7895pulkit@gmail.com> parents: 2642 diff changeset	280 if rev:
1851 67d53e8e0c1a topic: only require obsolete support for --change Matt Mackall <mpm@selenic.com> parents: 1850 diff changeset	281 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2643 a9ca94defc29 topics: rename '--change' flag to '--rev' flag Pulkit Goyal <7895pulkit@gmail.com> parents: 2642 diff changeset	282 raise error.Abort(_('must have obsolete enabled to change topics'))
2645 2e3f63f4a519 topic: further simplify the clear logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2644 diff changeset	283 if clear:
2e3f63f4a519 topic: further simplify the clear logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2644 diff changeset	284 topic = None
2e3f63f4a519 topic: further simplify the clear logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2644 diff changeset	285 elif not topic:
1894 f8ee36489d3c topic: get 'Abort' from error, not 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1890 diff changeset	286 raise error.Abort('changing topic requires a topic name or --clear')
2643 a9ca94defc29 topics: rename '--change' flag to '--rev' flag Pulkit Goyal <7895pulkit@gmail.com> parents: 2642 diff changeset	287 if any(not c.mutable() for c in repo.set('%r and public()', rev)):
1894 f8ee36489d3c topic: get 'Abort' from error, not 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1890 diff changeset	288 raise error.Abort("can't change topic of a public change")
2664 ed6fb5f20b24 topics: return early so that other if conditions don't get execute (issue5600) Pulkit Goyal <7895pulkit@gmail.com> parents: 2662 diff changeset	289 return _changetopics(ui, repo, rev, topic)
ed6fb5f20b24 topics: return early so that other if conditions don't get execute (issue5600) Pulkit Goyal <7895pulkit@gmail.com> parents: 2662 diff changeset	290
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	291 if clear:
2662 9c0b293c2785 topics: move the logic to change or clear current topic into a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2657 diff changeset	292 return _changecurrenttopic(repo, None)
9c0b293c2785 topics: move the logic to change or clear current topic into a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2657 diff changeset	293
1860 b7b9e5028c2a topics: consistently use empty string instead of None Matt Mackall <mpm@selenic.com> parents: 1859 diff changeset	294 if topic:
2662 9c0b293c2785 topics: move the logic to change or clear current topic into a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2657 diff changeset	295 return _changecurrenttopic(repo, topic)
9c0b293c2785 topics: move the logic to change or clear current topic into a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2657 diff changeset	296
1975 acbbf7f0751e topic: add formatter support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1974 diff changeset	297 _listtopics(ui, repo, opts)
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	298
1973 e97458bf53be stack: introduce and explicite command to display the stack Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1972 diff changeset	299 @command('stack [TOPIC]', [] + commands.formatteropts)
e97458bf53be stack: introduce and explicite command to display the stack Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1972 diff changeset	300 def cmdstack(ui, repo, topic='', **opts):
2011 9c7665e3107b documentation: some basic update of the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2008 diff changeset	301 """list all changesets in a topic and other information
1973 e97458bf53be stack: introduce and explicite command to display the stack Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1972 diff changeset	302
e97458bf53be stack: introduce and explicite command to display the stack Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1972 diff changeset	303 List the current topic by default."""
1990 71410fa2c253 stack: extra argument validation logic outside of showstack Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1989 diff changeset	304 if not topic:
71410fa2c253 stack: extra argument validation logic outside of showstack Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1989 diff changeset	305 topic = repo.currenttopic
71410fa2c253 stack: extra argument validation logic outside of showstack Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1989 diff changeset	306 if not topic:
71410fa2c253 stack: extra argument validation logic outside of showstack Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1989 diff changeset	307 raise error.Abort(_('no active topic to list'))
1973 e97458bf53be stack: introduce and explicite command to display the stack Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1972 diff changeset	308 return stack.showstack(ui, repo, topic, opts)
e97458bf53be stack: introduce and explicite command to display the stack Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1972 diff changeset	309
2662 9c0b293c2785 topics: move the logic to change or clear current topic into a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2657 diff changeset	310 def _changecurrenttopic(repo, newtopic):
9c0b293c2785 topics: move the logic to change or clear current topic into a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2657 diff changeset	311 """changes the current topic."""
9c0b293c2785 topics: move the logic to change or clear current topic into a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2657 diff changeset	312
9c0b293c2785 topics: move the logic to change or clear current topic into a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2657 diff changeset	313 if newtopic:
9c0b293c2785 topics: move the logic to change or clear current topic into a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2657 diff changeset	314 with repo.wlock():
9c0b293c2785 topics: move the logic to change or clear current topic into a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2657 diff changeset	315 with repo.vfs.open('topic', 'w') as f:
9c0b293c2785 topics: move the logic to change or clear current topic into a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2657 diff changeset	316 f.write(newtopic)
9c0b293c2785 topics: move the logic to change or clear current topic into a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2657 diff changeset	317 else:
9c0b293c2785 topics: move the logic to change or clear current topic into a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2657 diff changeset	318 if repo.vfs.exists('topic'):
9c0b293c2785 topics: move the logic to change or clear current topic into a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2657 diff changeset	319 repo.vfs.unlink('topic')
9c0b293c2785 topics: move the logic to change or clear current topic into a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2657 diff changeset	320
2644 78de089a7830 topics: drop the clean argument from _changetopics() Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	321 def _changetopics(ui, repo, revset, newtopic):
2642 92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	322 rewrote = 0
92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	323 needevolve = False
2648 d8b47d961c77 topic-change: update the working copy along when changing topic of '.' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2647 diff changeset	324 wl = l = txn = None
2642 92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	325 try:
2648 d8b47d961c77 topic-change: update the working copy along when changing topic of '.' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2647 diff changeset	326 wl = repo.wlock()
2647 b9cfb8bd0965 topic-change: cleanup the locking and transaction mechanism Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2646 diff changeset	327 l = repo.lock()
b9cfb8bd0965 topic-change: cleanup the locking and transaction mechanism Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2646 diff changeset	328 txn = repo.transaction('rewrite-topics')
2642 92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	329 p1 = None
92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	330 p2 = None
2646 b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2645 diff changeset	331 successors = {}
2642 92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	332 for c in repo.set('%r', revset):
92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	333 def filectxfn(repo, ctx, path):
92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	334 try:
92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	335 return c[path]
92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	336 except error.ManifestLookupError:
92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	337 return None
92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	338 fixedextra = dict(c.extra())
92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	339 ui.debug('old node id is %s\n' % node.hex(c.node()))
92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	340 ui.debug('origextra: %r\n' % fixedextra)
92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	341 oldtopic = fixedextra.get(constants.extrakey, None)
92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	342 if oldtopic == newtopic:
92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	343 continue
2644 78de089a7830 topics: drop the clean argument from _changetopics() Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	344 if newtopic is None:
2642 92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	345 del fixedextra[constants.extrakey]
92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	346 else:
2644 78de089a7830 topics: drop the clean argument from _changetopics() Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	347 fixedextra[constants.extrakey] = newtopic
2649 cf930521f14d topics: add some noise to rewrittent changeset to prevent hash cycle Pulkit Goyal <7895pulkit@gmail.com> parents: 2648 diff changeset	348 fixedextra[constants.changekey] = c.hex()
2642 92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	349 if 'amend_source' in fixedextra:
92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	350 # TODO: right now the commitctx wrapper in
92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	351 # topicrepo overwrites the topic in extra if
92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	352 # amend_source is set to support 'hg commit
92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	353 # --amend'. Support for amend should be adjusted
92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	354 # to not be so invasive.
92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	355 del fixedextra['amend_source']
92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	356 ui.debug('changing topic of %s from %s to %s\n' % (
92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	357 c, oldtopic, newtopic))
92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	358 ui.debug('fixedextra: %r\n' % fixedextra)
92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	359 # While changing topic of set of linear commits, make sure that
92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	360 # we base our commits on new parent rather than old parent which
92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	361 # was obsoleted while changing the topic
2646 b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2645 diff changeset	362 p1 = c.p1().node()
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2645 diff changeset	363 p2 = c.p2().node()
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2645 diff changeset	364 if p1 in successors:
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2645 diff changeset	365 p1 = successors[p1]
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2645 diff changeset	366 if p2 in successors:
b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2645 diff changeset	367 p2 = successors[p2]
2642 92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	368 mc = context.memctx(
92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	369 repo, (p1, p2), c.description(),
92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	370 c.files(), filectxfn,
92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	371 user=c.user(), date=c.date(), extra=fixedextra)
92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	372 newnode = repo.commitctx(mc)
2646 b5723184fc62 topics: use a dict for successors of changesets produced by topic change Pulkit Goyal <7895pulkit@gmail.com> parents: 2645 diff changeset	373 successors[c.node()] = newnode
2642 92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	374 ui.debug('new node id is %s\n' % node.hex(newnode))
92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	375 needevolve = needevolve or (len(c.children()) > 0)
92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	376 obsolete.createmarkers(repo, [(c, (repo[newnode],))])
92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	377 rewrote += 1
2648 d8b47d961c77 topic-change: update the working copy along when changing topic of '.' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2647 diff changeset	378 # move the working copy too
d8b47d961c77 topic-change: update the working copy along when changing topic of '.' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2647 diff changeset	379 wctx = repo[None]
d8b47d961c77 topic-change: update the working copy along when changing topic of '.' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2647 diff changeset	380 # in-progress merge is a bit too complexe for now.
d8b47d961c77 topic-change: update the working copy along when changing topic of '.' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2647 diff changeset	381 if len(wctx.parents()) == 1:
d8b47d961c77 topic-change: update the working copy along when changing topic of '.' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2647 diff changeset	382 newid = successors.get(wctx.p1().node())
d8b47d961c77 topic-change: update the working copy along when changing topic of '.' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2647 diff changeset	383 if newid is not None:
d8b47d961c77 topic-change: update the working copy along when changing topic of '.' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2647 diff changeset	384 # this provide some useless output we shoudl eventually suppress
d8b47d961c77 topic-change: update the working copy along when changing topic of '.' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2647 diff changeset	385 #
d8b47d961c77 topic-change: update the working copy along when changing topic of '.' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2647 diff changeset	386 # 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
d8b47d961c77 topic-change: update the working copy along when changing topic of '.' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2647 diff changeset	387 hg.update(repo, newid)
2642 92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	388 txn.close()
92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	389 finally:
2648 d8b47d961c77 topic-change: update the working copy along when changing topic of '.' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2647 diff changeset	390 lock.release(txn, l, wl)
2647 b9cfb8bd0965 topic-change: cleanup the locking and transaction mechanism Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2646 diff changeset	391 repo.invalidate()
2642 92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	392 ui.status('changed topic on %d changes\n' % rewrote)
92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	393 if needevolve:
2644 78de089a7830 topics: drop the clean argument from _changetopics() Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	394 evolvetarget = 'topic(%s)' % newtopic if newtopic else 'not topic()'
2642 92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	395 ui.status('please run hg evolve --rev "%s" now\n' % evolvetarget)
92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	396
1975 acbbf7f0751e topic: add formatter support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1974 diff changeset	397 def _listtopics(ui, repo, opts):
acbbf7f0751e topic: add formatter support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1974 diff changeset	398 fm = ui.formatter('bookmarks', opts)
acbbf7f0751e topic: add formatter support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1974 diff changeset	399 activetopic = repo.currenttopic
1987 d427fd97c9d5 topic: properly justify the verbose data when listing topic Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1985 diff changeset	400 namemask = '%s'
d427fd97c9d5 topic: properly justify the verbose data when listing topic Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1985 diff changeset	401 if repo.topics and ui.verbose:
d427fd97c9d5 topic: properly justify the verbose data when listing topic Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1985 diff changeset	402 maxwidth = max(len(t) for t in repo.topics)
d427fd97c9d5 topic: properly justify the verbose data when listing topic Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1985 diff changeset	403 namemask = '%%-%is' % maxwidth
1975 acbbf7f0751e topic: add formatter support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1974 diff changeset	404 for topic in sorted(repo.topics):
acbbf7f0751e topic: add formatter support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1974 diff changeset	405 fm.startitem()
acbbf7f0751e topic: add formatter support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1974 diff changeset	406 marker = ' '
acbbf7f0751e topic: add formatter support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1974 diff changeset	407 label = 'topic'
acbbf7f0751e topic: add formatter support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1974 diff changeset	408 active = (topic == activetopic)
acbbf7f0751e topic: add formatter support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1974 diff changeset	409 if active:
acbbf7f0751e topic: add formatter support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1974 diff changeset	410 marker = '*'
acbbf7f0751e topic: add formatter support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1974 diff changeset	411 label = 'topic.active'
acbbf7f0751e topic: add formatter support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1974 diff changeset	412 if not ui.quiet:
acbbf7f0751e topic: add formatter support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1974 diff changeset	413 # registering the active data is made explicitly later
acbbf7f0751e topic: add formatter support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1974 diff changeset	414 fm.plain(' %s ' % marker, label=label)
1987 d427fd97c9d5 topic: properly justify the verbose data when listing topic Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1985 diff changeset	415 fm.write('topic', namemask, topic, label=label)
1975 acbbf7f0751e topic: add formatter support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1974 diff changeset	416 fm.data(active=active)
1977 137f8b04901e topic: list the number of changesets when --verbose is used Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1976 diff changeset	417 if ui.verbose:
137f8b04901e topic: list the number of changesets when --verbose is used Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1976 diff changeset	418 # XXX we should include the data even when not verbose
137f8b04901e topic: list the number of changesets when --verbose is used Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1976 diff changeset	419 data = stack.stackdata(repo, topic)
1987 d427fd97c9d5 topic: properly justify the verbose data when listing topic Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1985 diff changeset	420 fm.plain(' (')
1988 9a5d797d25be topic: list the branches this topic belong to when verbose Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1987 diff changeset	421 fm.write('branches+', 'on branch: %s',
9a5d797d25be topic: list the branches this topic belong to when verbose Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1987 diff changeset	422 '+'.join(data['branches']), # XXX use list directly after 4.0 is released
9a5d797d25be topic: list the branches this topic belong to when verbose Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1987 diff changeset	423 label='topic.list.branches')
9a5d797d25be topic: list the branches this topic belong to when verbose Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1987 diff changeset	424 fm.plain(', ')
1977 137f8b04901e topic: list the number of changesets when --verbose is used Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1976 diff changeset	425 fm.write('changesetcount', '%d changesets', data['changesetcount'],
137f8b04901e topic: list the number of changesets when --verbose is used Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1976 diff changeset	426 label='topic.list.changesetcount')
1978 e42dd4523c0d topic: list the number of troubled changesets when --verbose is used Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1977 diff changeset	427 if data['troubledcount']:
e42dd4523c0d topic: list the number of troubled changesets when --verbose is used Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1977 diff changeset	428 fm.plain(', ')
e42dd4523c0d topic: list the number of troubled changesets when --verbose is used Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1977 diff changeset	429 fm.write('troubledcount', '%d troubled',
e42dd4523c0d topic: list the number of troubled changesets when --verbose is used Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1977 diff changeset	430 data['troubledcount'],
e42dd4523c0d topic: list the number of troubled changesets when --verbose is used Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1977 diff changeset	431 label='topic.list.troubledcount')
1979 bee7a1ef8ba8 topic: list the number of head when --verbose is used Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1978 diff changeset	432 if 1 < data['headcount']:
bee7a1ef8ba8 topic: list the number of head when --verbose is used Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1978 diff changeset	433 fm.plain(', ')
bee7a1ef8ba8 topic: list the number of head when --verbose is used Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1978 diff changeset	434 fm.write('headcount', '%d heads',
bee7a1ef8ba8 topic: list the number of head when --verbose is used Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1978 diff changeset	435 data['headcount'],
bee7a1ef8ba8 topic: list the number of head when --verbose is used Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1978 diff changeset	436 label='topic.list.headcount.multiple')
1985 03d6b685c16a topic: list the number of 'behind' changeset when --verbose is used Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1979 diff changeset	437 if 0 < data['behindcount']:
03d6b685c16a topic: list the number of 'behind' changeset when --verbose is used Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1979 diff changeset	438 fm.plain(', ')
03d6b685c16a topic: list the number of 'behind' changeset when --verbose is used Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1979 diff changeset	439 fm.write('behindcount', '%d behind',
03d6b685c16a topic: list the number of 'behind' changeset when --verbose is used Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1979 diff changeset	440 data['behindcount'],
03d6b685c16a topic: list the number of 'behind' changeset when --verbose is used Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1979 diff changeset	441 label='topic.list.behindcount')
03d6b685c16a topic: list the number of 'behind' changeset when --verbose is used Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1979 diff changeset	442 elif -1 == data['behindcount']:
03d6b685c16a topic: list the number of 'behind' changeset when --verbose is used Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1979 diff changeset	443 fm.plain(', ')
03d6b685c16a topic: list the number of 'behind' changeset when --verbose is used Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1979 diff changeset	444 fm.write('behinderror', '%s',
03d6b685c16a topic: list the number of 'behind' changeset when --verbose is used Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1979 diff changeset	445 _('ambiguous destination'),
03d6b685c16a topic: list the number of 'behind' changeset when --verbose is used Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1979 diff changeset	446 label='topic.list.behinderror')
1977 137f8b04901e topic: list the number of changesets when --verbose is used Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1976 diff changeset	447 fm.plain(')')
1975 acbbf7f0751e topic: add formatter support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1974 diff changeset	448 fm.plain('\n')
acbbf7f0751e topic: add formatter support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1974 diff changeset	449 fm.end()
1974 20fb4195bfc4 topic: extract the code listing all topics Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1973 diff changeset	450
1848 9a81657deec2 summary: add topic summary hook Matt Mackall <mpm@selenic.com> parents: 1847 diff changeset	451 def summaryhook(ui, repo):
9a81657deec2 summary: add topic summary hook Matt Mackall <mpm@selenic.com> parents: 1847 diff changeset	452 t = repo.currenttopic
9a81657deec2 summary: add topic summary hook Matt Mackall <mpm@selenic.com> parents: 1847 diff changeset	453 if not t:
9a81657deec2 summary: add topic summary hook Matt Mackall <mpm@selenic.com> parents: 1847 diff changeset	454 return
9a81657deec2 summary: add topic summary hook Matt Mackall <mpm@selenic.com> parents: 1847 diff changeset	455 # i18n: column positioning for "hg summary"
1989 cf9414f2b5cd summary: properly label the topic name in summary Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1988 diff changeset	456 ui.write(_("topic: %s\n") % ui.label(t, 'topic.active'))
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	457
1850 0da6bf86b718 commit: add a --topic flag Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	458 def commitwrap(orig, ui, repo, args, *opts):
1971 ec4924ea8bc6 topic: make sure we have the 'wlock' when setting topic Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1969 diff changeset	459 with repo.wlock():
ec4924ea8bc6 topic: make sure we have the 'wlock' when setting topic Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1969 diff changeset	460 if opts.get('topic'):
ec4924ea8bc6 topic: make sure we have the 'wlock' when setting topic Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1969 diff changeset	461 t = opts['topic']
ec4924ea8bc6 topic: make sure we have the 'wlock' when setting topic Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1969 diff changeset	462 with repo.vfs.open('topic', 'w') as f:
ec4924ea8bc6 topic: make sure we have the 'wlock' when setting topic Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1969 diff changeset	463 f.write(t)
ec4924ea8bc6 topic: make sure we have the 'wlock' when setting topic Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1969 diff changeset	464 return orig(ui, repo, args, *opts)
1850 0da6bf86b718 commit: add a --topic flag Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	465
1852 3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	466 def committextwrap(orig, repo, ctx, subs, extramsg):
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	467 ret = orig(repo, ctx, subs, extramsg)
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	468 t = repo.currenttopic
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	469 if t:
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	470 ret = ret.replace("\nHG: branch",
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	471 "\nHG: topic '%s'\nHG: branch" % t)
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	472 return ret
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	473
1877 69077c65919d topic: handle merge.update function signature change Augie Fackler <raf@durin42.com> parents: 1874 diff changeset	474 def mergeupdatewrap(orig, repo, node, branchmerge, force, args, *kwargs):
1966 e67c526c0a25 update: calculate 'partial' as core does Sean Farley <sean@farley.io> parents: 1963 diff changeset	475 matcher = kwargs.get('matcher')
e67c526c0a25 update: calculate 'partial' as core does Sean Farley <sean@farley.io> parents: 1963 diff changeset	476 partial = not (matcher is None or matcher.always())
1853 8db7828751b7 topic: wrap the underlying update function rather than the command Matt Mackall <mpm@selenic.com> parents: 1852 diff changeset	477 wlock = repo.wlock()
8db7828751b7 topic: wrap the underlying update function rather than the command Matt Mackall <mpm@selenic.com> parents: 1852 diff changeset	478 try:
1877 69077c65919d topic: handle merge.update function signature change Augie Fackler <raf@durin42.com> parents: 1874 diff changeset	479 ret = orig(repo, node, branchmerge, force, args, *kwargs)
1853 8db7828751b7 topic: wrap the underlying update function rather than the command Matt Mackall <mpm@selenic.com> parents: 1852 diff changeset	480 if not partial and not branchmerge:
8db7828751b7 topic: wrap the underlying update function rather than the command Matt Mackall <mpm@selenic.com> parents: 1852 diff changeset	481 ot = repo.currenttopic
8db7828751b7 topic: wrap the underlying update function rather than the command Matt Mackall <mpm@selenic.com> parents: 1852 diff changeset	482 t = ''
8db7828751b7 topic: wrap the underlying update function rather than the command Matt Mackall <mpm@selenic.com> parents: 1852 diff changeset	483 pctx = repo[node]
8db7828751b7 topic: wrap the underlying update function rather than the command Matt Mackall <mpm@selenic.com> parents: 1852 diff changeset	484 if pctx.phase() > phases.public:
1861 972d4e0c3d44 changectx: add topic method Matt Mackall <mpm@selenic.com> parents: 1860 diff changeset	485 t = pctx.topic()
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	486 with repo.vfs.open('topic', 'w') as f:
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	487 f.write(t)
1853 8db7828751b7 topic: wrap the underlying update function rather than the command Matt Mackall <mpm@selenic.com> parents: 1852 diff changeset	488 if t and t != ot:
8db7828751b7 topic: wrap the underlying update function rather than the command Matt Mackall <mpm@selenic.com> parents: 1852 diff changeset	489 repo.ui.status(_("switching to topic %s\n") % t)
8db7828751b7 topic: wrap the underlying update function rather than the command Matt Mackall <mpm@selenic.com> parents: 1852 diff changeset	490 return ret
8db7828751b7 topic: wrap the underlying update function rather than the command Matt Mackall <mpm@selenic.com> parents: 1852 diff changeset	491 finally:
8db7828751b7 topic: wrap the underlying update function rather than the command Matt Mackall <mpm@selenic.com> parents: 1852 diff changeset	492 wlock.release()
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	493
1854 67950fcf1c69 rebase: teach rebase how to copy topics Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	494 def _fixrebase(loaded):
67950fcf1c69 rebase: teach rebase how to copy topics Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	495 if not loaded:
67950fcf1c69 rebase: teach rebase how to copy topics Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	496 return
67950fcf1c69 rebase: teach rebase how to copy topics Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	497
67950fcf1c69 rebase: teach rebase how to copy topics Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	498 def savetopic(ctx, extra):
1861 972d4e0c3d44 changectx: add topic method Matt Mackall <mpm@selenic.com> parents: 1860 diff changeset	499 if ctx.topic():
972d4e0c3d44 changectx: add topic method Matt Mackall <mpm@selenic.com> parents: 1860 diff changeset	500 extra[constants.extrakey] = ctx.topic()
1854 67950fcf1c69 rebase: teach rebase how to copy topics Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	501
67950fcf1c69 rebase: teach rebase how to copy topics Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	502 def newmakeextrafn(orig, copiers):
67950fcf1c69 rebase: teach rebase how to copy topics Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	503 return orig(copiers + [savetopic])
67950fcf1c69 rebase: teach rebase how to copy topics Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	504
1969 a604423c1500 compat: tolerate missing rebase extension timeless@gmail.com parents: 1966 diff changeset	505 try:
a604423c1500 compat: tolerate missing rebase extension timeless@gmail.com parents: 1966 diff changeset	506 rebase = extensions.find("rebase")
a604423c1500 compat: tolerate missing rebase extension timeless@gmail.com parents: 1966 diff changeset	507 extensions.wrapfunction(rebase, '_makeextrafn', newmakeextrafn)
a604423c1500 compat: tolerate missing rebase extension timeless@gmail.com parents: 1966 diff changeset	508 except KeyError:
a604423c1500 compat: tolerate missing rebase extension timeless@gmail.com parents: 1966 diff changeset	509 pass
1854 67950fcf1c69 rebase: teach rebase how to copy topics Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	510
1946 72246b13bd72 patch: document the section about import/export Pierre-Yves David <pierre-yves.david@fb.com> parents: 1945 diff changeset	511 ## preserve topic during import/export
72246b13bd72 patch: document the section about import/export Pierre-Yves David <pierre-yves.david@fb.com> parents: 1945 diff changeset	512
1866 13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1863 diff changeset	513 def _exporttopic(seq, ctx):
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1863 diff changeset	514 topic = ctx.topic()
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1863 diff changeset	515 if topic:
1917 ea4675c7a028 init: whitespace fixups Sean Farley <sean@farley.io> parents: 1916 diff changeset	516 return 'EXP-Topic %s' % topic
1866 13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1863 diff changeset	517 return None
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1863 diff changeset	518
1867 c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	519 def _importtopic(repo, patchdata, extra, opts):
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	520 if 'topic' in patchdata:
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	521 extra['topic'] = patchdata['topic']
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	522
1948 54810b543bf4 patch: move setup of import/export logic into a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 1947 diff changeset	523 def setupimportexport(ui):
54810b543bf4 patch: move setup of import/export logic into a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 1947 diff changeset	524 """run at ui setup time to install import/export logic"""
54810b543bf4 patch: move setup of import/export logic into a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 1947 diff changeset	525 cmdutil.extraexport.append('topic')
54810b543bf4 patch: move setup of import/export logic into a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 1947 diff changeset	526 cmdutil.extraexportmap['topic'] = _exporttopic
54810b543bf4 patch: move setup of import/export logic into a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 1947 diff changeset	527 cmdutil.extrapreimport.append('topic')
54810b543bf4 patch: move setup of import/export logic into a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 1947 diff changeset	528 cmdutil.extrapreimportmap['topic'] = _importtopic
54810b543bf4 patch: move setup of import/export logic into a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 1947 diff changeset	529 patch.patchheadermap.append(('EXP-Topic', 'topic'))

Mercurial > evolve

annotate hgext3rd/topic/__init__.py @ 2664:ed6fb5f20b24

annotate hgext3rd/topic/init.py @ 2664:ed6fb5f20b24