evolve: hgext3rd/topic/__init_

annotate hgext3rd/topic/init.py @ 2712:f19b314d8475

topics: add t0 and b0 to the stack t0 or b0 will be the base of the stack and it's the parent of t1 or b1. The cool thing about this is that if you update to t0 using `hg up t0` or do `hg prev` on t1, you will be updated to t0 with the current topic preserved. This patch adds t0 to stack and implement the preserving topic case for t0 while using `hg update`.

author	Pulkit Goyal <7895pulkit@gmail.com>
date	Tue, 04 Jul 2017 01:30:14 +0530
parents	8c938e9af113
children	ed45a5fb4452

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
2709 5d54de9cf50f merge back with stable Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2708 diff changeset	116 version = '0.2.0.dev'
2705 a7b7471b4bed topic: update extensions metadata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2691 diff changeset	117 testedwith = '4.0.2 4.1.3 4.2.1'
a7b7471b4bed topic: update extensions metadata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2691 diff changeset	118 minimumhgversion = '4.0'
a7b7471b4bed topic: update extensions metadata Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2691 diff changeset	119 buglink = 'https://bz.mercurial-scm.org/'
1884 8a53f99d9061 testedwith: declare compatibility with Mercurial 3.7 Augie Fackler <raf@durin42.com> parents: 1877 diff changeset	120
2656 4a148ca3e80d topic: update the changectx method to respect phases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2655 diff changeset	121 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	122 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	123 return ''
1861 972d4e0c3d44 changectx: add topic method Matt Mackall <mpm@selenic.com> parents: 1860 diff changeset	124 return self.extra().get(constants.extrakey, '')
972d4e0c3d44 changectx: add topic method Matt Mackall <mpm@selenic.com> parents: 1860 diff changeset	125 context.basectx.topic = _contexttopic
972d4e0c3d44 changectx: add topic method Matt Mackall <mpm@selenic.com> parents: 1860 diff changeset	126
1904 f52c02bf47b7 stack: allow to refer to changeset using "t2" form Pierre-Yves David <pierre-yves.david@fb.com> parents: 1903 diff changeset	127 topicrev = re.compile(r'^t\d+$')
2669 b933a8068c17 topic: add some initial support for using stack on named branch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2668 diff changeset	128 branchrev = re.compile(r'^b\d+$')
1904 f52c02bf47b7 stack: allow to refer to changeset using "t2" form Pierre-Yves David <pierre-yves.david@fb.com> parents: 1903 diff changeset	129
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	130 def _namemap(repo, name):
2669 b933a8068c17 topic: add some initial support for using stack on named branch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2668 diff changeset	131 revs = None
1904 f52c02bf47b7 stack: allow to refer to changeset using "t2" form Pierre-Yves David <pierre-yves.david@fb.com> parents: 1903 diff changeset	132 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	133 idx = int(name[1:])
2669 b933a8068c17 topic: add some initial support for using stack on named branch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2668 diff changeset	134 ttype = 'topic'
b933a8068c17 topic: add some initial support for using stack on named branch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2668 diff changeset	135 tname = topic = repo.currenttopic
b933a8068c17 topic: add some initial support for using stack on named branch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2668 diff changeset	136 if not tname:
1904 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(_('cannot resolve "%s": no active topic') % name)
2668 1d2c66dc4ee3 topic: explicitly pass topic as a keyword argument Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2667 diff changeset	138 revs = list(stack.getstack(repo, topic=topic))
2669 b933a8068c17 topic: add some initial support for using stack on named branch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2668 diff changeset	139 elif branchrev.match(name):
b933a8068c17 topic: add some initial support for using stack on named branch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2668 diff changeset	140 ttype = 'branch'
b933a8068c17 topic: add some initial support for using stack on named branch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2668 diff changeset	141 idx = int(name[1:])
b933a8068c17 topic: add some initial support for using stack on named branch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2668 diff changeset	142 tname = branch = repo[None].branch()
b933a8068c17 topic: add some initial support for using stack on named branch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2668 diff changeset	143 revs = list(stack.getstack(repo, branch=branch))
b933a8068c17 topic: add some initial support for using stack on named branch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2668 diff changeset	144
b933a8068c17 topic: add some initial support for using stack on named branch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2668 diff changeset	145 if revs is not None:
1904 f52c02bf47b7 stack: allow to refer to changeset using "t2" form Pierre-Yves David <pierre-yves.david@fb.com> parents: 1903 diff changeset	146 try:
2712 f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2711 diff changeset	147 r = revs[idx]
1904 f52c02bf47b7 stack: allow to refer to changeset using "t2" form Pierre-Yves David <pierre-yves.david@fb.com> parents: 1903 diff changeset	148 except IndexError:
2669 b933a8068c17 topic: add some initial support for using stack on named branch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2668 diff changeset	149 msg = _('cannot resolve "%s": %s "%s" has only %d changesets')
2712 f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2711 diff changeset	150 raise error.Abort(msg % (name, ttype, tname, len(revs) - 1))
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2711 diff changeset	151 # b0 or t0 can be None
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2711 diff changeset	152 if r == -1 and idx == 0:
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2711 diff changeset	153 msg = _('the %s "%s" has no %s')
f19b314d8475 topics: add t0 and b0 to the stack Pulkit Goyal <7895pulkit@gmail.com> parents: 2711 diff changeset	154 raise error.Abort(msg % (ttype, tname, name))
1904 f52c02bf47b7 stack: allow to refer to changeset using "t2" form Pierre-Yves David <pierre-yves.david@fb.com> parents: 1903 diff changeset	155 return [repo[r].node()]
2008 e3ddd696394f flake8: fix E713 style Sean Farley <sean@farley.io> parents: 2007 diff changeset	156 if name not in repo.topics:
2000 c413e7c96265 init: guard _namemap with repo.topics (issue5351) timeless@gmail.com parents: 1999 diff changeset	157 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	158 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	159 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	160
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	161 def _nodemap(repo, node):
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	162 ctx = repo[node]
1861 972d4e0c3d44 changectx: add topic method Matt Mackall <mpm@selenic.com> parents: 1860 diff changeset	163 t = ctx.topic()
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	164 if t and ctx.phase() > phases.public:
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	165 return [t]
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	166 return []
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	167
1871 58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1867 diff changeset	168 def uisetup(ui):
1941 7eb737b7a902 destination: rename 'setupdest' to 'modsetup' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1939 diff changeset	169 destination.modsetup(ui)
1943 cd56f4d8b5a3 revset: add a ui argument to 'modsetup' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1942 diff changeset	170 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	171 discovery.modsetup(ui)
1952 665d6322994e uisetup: add call to 'topicmap.modsetup' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1951 diff changeset	172 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	173 setupimportexport(ui)
1871 58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1867 diff changeset	174
1951 0309cac5d91d uisetup: move all remaining wrapping into uisetup Pierre-Yves David <pierre-yves.david@fb.com> parents: 1950 diff changeset	175 extensions.afterloaded('rebase', _fixrebase)
0309cac5d91d uisetup: move all remaining wrapping into uisetup Pierre-Yves David <pierre-yves.david@fb.com> parents: 1950 diff changeset	176
0309cac5d91d uisetup: move all remaining wrapping into uisetup Pierre-Yves David <pierre-yves.david@fb.com> parents: 1950 diff changeset	177 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	178 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	179 _("use specified topic"), _('TOPIC')))
0309cac5d91d uisetup: move all remaining wrapping into uisetup Pierre-Yves David <pierre-yves.david@fb.com> parents: 1950 diff changeset	180
0309cac5d91d uisetup: move all remaining wrapping into uisetup Pierre-Yves David <pierre-yves.david@fb.com> parents: 1950 diff changeset	181 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	182 extensions.wrapfunction(merge, 'update', mergeupdatewrap)
2711 8c938e9af113 topics: wrap the update function to check if either t0 or b0 is passed as rev Pulkit Goyal <7895pulkit@gmail.com> parents: 2709 diff changeset	183 # We need to check whether t0 or b0 is passed to override the default update
8c938e9af113 topics: wrap the update function to check if either t0 or b0 is passed as rev Pulkit Goyal <7895pulkit@gmail.com> parents: 2709 diff changeset	184 # behaviour of changing topic and I can't find a better way
8c938e9af113 topics: wrap the update function to check if either t0 or b0 is passed as rev Pulkit Goyal <7895pulkit@gmail.com> parents: 2709 diff changeset	185 # to do that as scmutil.revsingle returns the rev number and hence we can't
8c938e9af113 topics: wrap the update function to check if either t0 or b0 is passed as rev Pulkit Goyal <7895pulkit@gmail.com> parents: 2709 diff changeset	186 # plug into logic for this into mergemod.update().
8c938e9af113 topics: wrap the update function to check if either t0 or b0 is passed as rev Pulkit Goyal <7895pulkit@gmail.com> parents: 2709 diff changeset	187 extensions.wrapcommand(commands.table, 'update', checkt0)
2667 e7079bba383d topic: makes split keep the topic Boris Feld <boris.feld@octobus.net> parents: 2665 diff changeset	188
e7079bba383d topic: makes split keep the topic Boris Feld <boris.feld@octobus.net> parents: 2665 diff changeset	189 try:
e7079bba383d topic: makes split keep the topic Boris Feld <boris.feld@octobus.net> parents: 2665 diff changeset	190 evolve = extensions.find('evolve')
e7079bba383d topic: makes split keep the topic Boris Feld <boris.feld@octobus.net> parents: 2665 diff changeset	191 extensions.wrapfunction(evolve, "presplitupdate", presplitupdatetopic)
e7079bba383d topic: makes split keep the topic Boris Feld <boris.feld@octobus.net> parents: 2665 diff changeset	192 except (KeyError, AttributeError):
e7079bba383d topic: makes split keep the topic Boris Feld <boris.feld@octobus.net> parents: 2665 diff changeset	193 pass
e7079bba383d topic: makes split keep the topic Boris Feld <boris.feld@octobus.net> parents: 2665 diff changeset	194
1951 0309cac5d91d uisetup: move all remaining wrapping into uisetup Pierre-Yves David <pierre-yves.david@fb.com> parents: 1950 diff changeset	195 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	196
0309cac5d91d uisetup: move all remaining wrapping into uisetup Pierre-Yves David <pierre-yves.david@fb.com> parents: 1950 diff changeset	197
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	198 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	199 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	200 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	201
2653 13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2652 diff changeset	202 repo = repo.unfiltered()
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2652 diff changeset	203
2339 f641cccbd119 topic: automatically configure thg to display topic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2288 diff changeset	204 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	205 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	206 source='topic-extension')
f641cccbd119 topic: automatically configure thg to display topic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2288 diff changeset	207
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	208 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	209
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	210 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	211 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	212 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	213 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	214
1858 4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	215 def commit(self, args, *kwargs):
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	216 backup = self.ui.backupconfig('ui', 'allowemptycommit')
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	217 try:
1861 972d4e0c3d44 changectx: add topic method Matt Mackall <mpm@selenic.com> parents: 1860 diff changeset	218 if repo.currenttopic != repo['.'].topic():
1858 4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	219 # bypass the core "nothing changed" logic
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	220 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	221 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	222 finally:
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	223 self.ui.restoreconfig(backup)
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	224
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	225 def commitctx(self, ctx, error=None):
2653 13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2652 diff changeset	226 topicfilter = topicmap.topicfilter(self.filtername)
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2652 diff changeset	227 if topicfilter != self.filtername:
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2652 diff changeset	228 other = repo.filtered(topicmap.topicfilter(repo.filtername))
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2652 diff changeset	229 other.commitctx(ctx, error=error)
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2652 diff changeset	230
1855 f241a00e93a7 topics: only apply topic to commits of the working copy Matt Mackall <mpm@selenic.com> parents: 1854 diff changeset	231 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	232 current = self.currenttopic
f241a00e93a7 topics: only apply topic to commits of the working copy Matt Mackall <mpm@selenic.com> parents: 1854 diff changeset	233 if current:
f241a00e93a7 topics: only apply topic to commits of the working copy Matt Mackall <mpm@selenic.com> parents: 1854 diff changeset	234 ctx.extra()[constants.extrakey] = current
1862 565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1861 diff changeset	235 if (isinstance(ctx, context.memctx) and
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1861 diff changeset	236 ctx.extra().get('amend_source') and
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1861 diff changeset	237 ctx.topic() and
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1861 diff changeset	238 not self.currenttopic):
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1861 diff changeset	239 # 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	240 del ctx.extra()[constants.extrakey]
2653 13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2652 diff changeset	241 return super(topicrepo, self).commitctx(ctx, error=error)
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	242
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	243 @property
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	244 def topics(self):
1999 fe76e9c92fff init: cache repo.topics timeless@gmail.com parents: 1998 diff changeset	245 if self._topics is not None:
fe76e9c92fff init: cache repo.topics timeless@gmail.com parents: 1998 diff changeset	246 return self._topics
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	247 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	248 for c in self.set('not public()'):
1861 972d4e0c3d44 changectx: add topic method Matt Mackall <mpm@selenic.com> parents: 1860 diff changeset	249 topics.add(c.topic())
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	250 topics.remove('')
1999 fe76e9c92fff init: cache repo.topics timeless@gmail.com parents: 1998 diff changeset	251 self._topics = topics
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	252 return topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	253
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	254 @property
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	255 def currenttopic(self):
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	256 return self.vfs.tryread('topic')
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	257
2653 13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2652 diff changeset	258 # overwritten at the instance level by topicmap.py
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2652 diff changeset	259 _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	260
2653 13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2652 diff changeset	261 def branchmap(self, topic=None):
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2652 diff changeset	262 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	263 topic = getattr(repo, '_autobranchmaptopic', False)
2653 13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2652 diff changeset	264 topicfilter = topicmap.topicfilter(self.filtername)
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2652 diff changeset	265 if not topic or topicfilter == self.filtername:
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2652 diff changeset	266 return super(topicrepo, self).branchmap()
13313d0cab71 topicmap: massive rework Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2652 diff changeset	267 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	268
1999 fe76e9c92fff init: cache repo.topics timeless@gmail.com parents: 1998 diff changeset	269 def invalidatevolatilesets(self):
fe76e9c92fff init: cache repo.topics timeless@gmail.com parents: 1998 diff changeset	270 # 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	271 super(topicrepo, self).invalidatevolatilesets()
fe76e9c92fff init: cache repo.topics timeless@gmail.com parents: 1998 diff changeset	272 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	273
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	274 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	275 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	276 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	277 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	278 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	279 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	280 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	281 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	282 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	283
1857 a506ed8ab8da topics: add listnames hook so completion works Matt Mackall <mpm@selenic.com> parents: 1856 diff changeset	284 repo.__class__ = topicrepo
1999 fe76e9c92fff init: cache repo.topics timeless@gmail.com parents: 1998 diff changeset	285 repo._topics = None
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	286 if util.safehasattr(repo, 'names'):
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	287 repo.names.addnamespace(namespaces.namespace(
1857 a506ed8ab8da topics: add listnames hook so completion works Matt Mackall <mpm@selenic.com> parents: 1856 diff changeset	288 'topics', 'topic', namemap=_namemap, nodemap=_nodemap,
a506ed8ab8da topics: add listnames hook so completion works Matt Mackall <mpm@selenic.com> parents: 1856 diff changeset	289 listnames=lambda repo: repo.topics))
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	290
1847 9fa5b8f4e98e topics: add command summary Matt Mackall <mpm@selenic.com> parents: 1846 diff changeset	291 @command('topics [TOPIC]', [
1963 7b7f073ed05e style: update __init__.py Sean Farley <sean@farley.io> parents: 1958 diff changeset	292 ('', '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	293 ('r', 'rev', '', 'revset of existing revisions', _('REV')),
1963 7b7f073ed05e style: update __init__.py Sean Farley <sean@farley.io> parents: 1958 diff changeset	294 ('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	295 ] + commands.formatteropts)
2643 a9ca94defc29 topics: rename '--change' flag to '--rev' flag Pulkit Goyal <7895pulkit@gmail.com> parents: 2642 diff changeset	296 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	297 """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	298
9c7665e3107b documentation: some basic update of the documentation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 2008 diff changeset	299 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	300 if list:
2643 a9ca94defc29 topics: rename '--change' flag to '--rev' flag Pulkit Goyal <7895pulkit@gmail.com> parents: 2642 diff changeset	301 if clear or rev:
a9ca94defc29 topics: rename '--change' flag to '--rev' flag Pulkit Goyal <7895pulkit@gmail.com> parents: 2642 diff changeset	302 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	303 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	304 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	305 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	306 raise error.Abort(_('no active topic to list'))
2669 b933a8068c17 topic: add some initial support for using stack on named branch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2668 diff changeset	307 return stack.showstack(ui, repo, topic=topic, opts=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	308
2643 a9ca94defc29 topics: rename '--change' flag to '--rev' flag Pulkit Goyal <7895pulkit@gmail.com> parents: 2642 diff changeset	309 if rev:
1851 67d53e8e0c1a topic: only require obsolete support for --change Matt Mackall <mpm@selenic.com> parents: 1850 diff changeset	310 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	311 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	312 if clear:
2e3f63f4a519 topic: further simplify the clear logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2644 diff changeset	313 topic = None
2e3f63f4a519 topic: further simplify the clear logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2644 diff changeset	314 elif not topic:
1894 f8ee36489d3c topic: get 'Abort' from error, not 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1890 diff changeset	315 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	316 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	317 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	318 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	319
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	320 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	321 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	322
1860 b7b9e5028c2a topics: consistently use empty string instead of None Matt Mackall <mpm@selenic.com> parents: 1859 diff changeset	323 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	324 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	325
1975 acbbf7f0751e topic: add formatter support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1974 diff changeset	326 _listtopics(ui, repo, opts)
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	327
1973 e97458bf53be stack: introduce and explicite command to display the stack Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1972 diff changeset	328 @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	329 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	330 """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	331
e97458bf53be stack: introduce and explicite command to display the stack Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1972 diff changeset	332 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	333 if not topic:
2669 b933a8068c17 topic: add some initial support for using stack on named branch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2668 diff changeset	334 topic = None
b933a8068c17 topic: add some initial support for using stack on named branch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2668 diff changeset	335 branch = None
b933a8068c17 topic: add some initial support for using stack on named branch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2668 diff changeset	336 if topic is None and repo.currenttopic:
1990 71410fa2c253 stack: extra argument validation logic outside of showstack Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1989 diff changeset	337 topic = repo.currenttopic
2669 b933a8068c17 topic: add some initial support for using stack on named branch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2668 diff changeset	338 if topic is None:
b933a8068c17 topic: add some initial support for using stack on named branch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2668 diff changeset	339 branch = repo[None].branch()
b933a8068c17 topic: add some initial support for using stack on named branch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2668 diff changeset	340 return stack.showstack(ui, repo, branch=branch, topic=topic, opts=opts)
1973 e97458bf53be stack: introduce and explicite command to display the stack Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1972 diff changeset	341
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	342 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	343 """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	344
9c0b293c2785 topics: move the logic to change or clear current topic into a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2657 diff changeset	345 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	346 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	347 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	348 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	349 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	350 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	351 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	352
2644 78de089a7830 topics: drop the clean argument from _changetopics() Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	353 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	354 rewrote = 0
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	355 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	356 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	357 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	358 l = repo.lock()
b9cfb8bd0965 topic-change: cleanup the locking and transaction mechanism Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2646 diff changeset	359 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	360 p1 = None
92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	361 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	362 successors = {}
2642 92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	363 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	364 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	365 try:
92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	366 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	367 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	368 return None
92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	369 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	370 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	371 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	372 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	373 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	374 continue
2644 78de089a7830 topics: drop the clean argument from _changetopics() Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	375 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	376 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	377 else:
2644 78de089a7830 topics: drop the clean argument from _changetopics() Pulkit Goyal <7895pulkit@gmail.com> parents: 2643 diff changeset	378 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	379 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	380 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	381 # 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	382 # 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	383 # 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	384 # --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	385 # 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	386 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	387 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	388 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	389 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	390 # 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	391 # 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	392 # 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	393 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	394 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	395 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	396 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	397 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	398 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	399 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	400 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	401 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	402 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	403 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	404 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	405 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	406 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	407 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	408 # 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	409 wctx = repo[None]
2665 0ade6e87346b topics: pass quietempty=True to suppress useless output while changing topics Pulkit Goyal <7895pulkit@gmail.com> parents: 2664 diff changeset	410 # in-progress merge is a bit too complex for now.
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	411 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	412 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	413 if newid is not None:
2665 0ade6e87346b topics: pass quietempty=True to suppress useless output while changing topics Pulkit Goyal <7895pulkit@gmail.com> parents: 2664 diff changeset	414 hg.update(repo, newid, quietempty=True)
2642 92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	415 txn.close()
92e882a82aaf topics: factor out the logic to change topic in a new function Pulkit Goyal <7895pulkit@gmail.com> parents: 2625 diff changeset	416 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	417 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	418 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	419 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	420
1975 acbbf7f0751e topic: add formatter support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1974 diff changeset	421 def _listtopics(ui, repo, opts):
2677 8cdee1b9ee92 topics: pass 'topics' to ui.formatter instead of 'bookmarks' Pulkit Goyal <7895pulkit@gmail.com> parents: 2669 diff changeset	422 fm = ui.formatter('topics', opts)
1975 acbbf7f0751e topic: add formatter support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1974 diff changeset	423 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	424 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	425 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	426 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	427 namemask = '%%-%is' % maxwidth
1975 acbbf7f0751e topic: add formatter support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1974 diff changeset	428 for topic in sorted(repo.topics):
acbbf7f0751e topic: add formatter support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1974 diff changeset	429 fm.startitem()
acbbf7f0751e topic: add formatter support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1974 diff changeset	430 marker = ' '
acbbf7f0751e topic: add formatter support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1974 diff changeset	431 label = 'topic'
acbbf7f0751e topic: add formatter support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1974 diff changeset	432 active = (topic == activetopic)
acbbf7f0751e topic: add formatter support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1974 diff changeset	433 if active:
acbbf7f0751e topic: add formatter support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1974 diff changeset	434 marker = '*'
acbbf7f0751e topic: add formatter support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1974 diff changeset	435 label = 'topic.active'
acbbf7f0751e topic: add formatter support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1974 diff changeset	436 if not ui.quiet:
acbbf7f0751e topic: add formatter support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1974 diff changeset	437 # 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	438 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	439 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	440 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	441 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	442 # XXX we should include the data even when not verbose
2668 1d2c66dc4ee3 topic: explicitly pass topic as a keyword argument Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2667 diff changeset	443 data = stack.stackdata(repo, topic=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	444 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	445 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	446 '+'.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	447 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	448 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	449 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	450 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	451 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	452 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	453 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	454 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	455 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	456 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	457 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	458 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	459 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	460 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	461 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	462 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	463 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	464 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	465 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	466 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	467 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	468 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	469 _('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	470 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	471 fm.plain(')')
1975 acbbf7f0751e topic: add formatter support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1974 diff changeset	472 fm.plain('\n')
acbbf7f0751e topic: add formatter support Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1974 diff changeset	473 fm.end()
1974 20fb4195bfc4 topic: extract the code listing all topics Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1973 diff changeset	474
1848 9a81657deec2 summary: add topic summary hook Matt Mackall <mpm@selenic.com> parents: 1847 diff changeset	475 def summaryhook(ui, repo):
9a81657deec2 summary: add topic summary hook Matt Mackall <mpm@selenic.com> parents: 1847 diff changeset	476 t = repo.currenttopic
9a81657deec2 summary: add topic summary hook Matt Mackall <mpm@selenic.com> parents: 1847 diff changeset	477 if not t:
9a81657deec2 summary: add topic summary hook Matt Mackall <mpm@selenic.com> parents: 1847 diff changeset	478 return
9a81657deec2 summary: add topic summary hook Matt Mackall <mpm@selenic.com> parents: 1847 diff changeset	479 # 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	480 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	481
1850 0da6bf86b718 commit: add a --topic flag Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	482 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	483 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	484 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	485 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	486 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	487 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	488 return orig(ui, repo, args, *opts)
1850 0da6bf86b718 commit: add a --topic flag Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	489
1852 3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	490 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	491 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	492 t = repo.currenttopic
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	493 if t:
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	494 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	495 "\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	496 return ret
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	497
1877 69077c65919d topic: handle merge.update function signature change Augie Fackler <raf@durin42.com> parents: 1874 diff changeset	498 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	499 matcher = kwargs.get('matcher')
e67c526c0a25 update: calculate 'partial' as core does Sean Farley <sean@farley.io> parents: 1963 diff changeset	500 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	501 wlock = repo.wlock()
2679 5156a67f66a6 topics: update current topic to the topic of newly rebased commit (issue5551) Pulkit Goyal <7895pulkit@gmail.com> parents: 2677 diff changeset	502 isrebase = False
2711 8c938e9af113 topics: wrap the update function to check if either t0 or b0 is passed as rev Pulkit Goyal <7895pulkit@gmail.com> parents: 2709 diff changeset	503 ist0 = False
1853 8db7828751b7 topic: wrap the underlying update function rather than the command Matt Mackall <mpm@selenic.com> parents: 1852 diff changeset	504 try:
1877 69077c65919d topic: handle merge.update function signature change Augie Fackler <raf@durin42.com> parents: 1874 diff changeset	505 ret = orig(repo, node, branchmerge, force, args, *kwargs)
2679 5156a67f66a6 topics: update current topic to the topic of newly rebased commit (issue5551) Pulkit Goyal <7895pulkit@gmail.com> parents: 2677 diff changeset	506 # The mergeupdatewrap function makes the destination's topic as the
5156a67f66a6 topics: update current topic to the topic of newly rebased commit (issue5551) Pulkit Goyal <7895pulkit@gmail.com> parents: 2677 diff changeset	507 # current topic. This is right for merge but wrong for rebase. We check
5156a67f66a6 topics: update current topic to the topic of newly rebased commit (issue5551) Pulkit Goyal <7895pulkit@gmail.com> parents: 2677 diff changeset	508 # if rebase is running and update the currenttopic to topic of new
5156a67f66a6 topics: update current topic to the topic of newly rebased commit (issue5551) Pulkit Goyal <7895pulkit@gmail.com> parents: 2677 diff changeset	509 # rebased commit. We have explicitly stored in config if rebase is
5156a67f66a6 topics: update current topic to the topic of newly rebased commit (issue5551) Pulkit Goyal <7895pulkit@gmail.com> parents: 2677 diff changeset	510 # running.
5156a67f66a6 topics: update current topic to the topic of newly rebased commit (issue5551) Pulkit Goyal <7895pulkit@gmail.com> parents: 2677 diff changeset	511 if repo.ui.hasconfig('experimental', 'topicrebase'):
5156a67f66a6 topics: update current topic to the topic of newly rebased commit (issue5551) Pulkit Goyal <7895pulkit@gmail.com> parents: 2677 diff changeset	512 isrebase = True
2711 8c938e9af113 topics: wrap the update function to check if either t0 or b0 is passed as rev Pulkit Goyal <7895pulkit@gmail.com> parents: 2709 diff changeset	513 if repo.ui.configbool('_internal', 'updating-to-t0'):
8c938e9af113 topics: wrap the update function to check if either t0 or b0 is passed as rev Pulkit Goyal <7895pulkit@gmail.com> parents: 2709 diff changeset	514 ist0 = True
8c938e9af113 topics: wrap the update function to check if either t0 or b0 is passed as rev Pulkit Goyal <7895pulkit@gmail.com> parents: 2709 diff changeset	515 if ((not partial and not branchmerge) or isrebase) and not ist0:
1853 8db7828751b7 topic: wrap the underlying update function rather than the command Matt Mackall <mpm@selenic.com> parents: 1852 diff changeset	516 ot = repo.currenttopic
8db7828751b7 topic: wrap the underlying update function rather than the command Matt Mackall <mpm@selenic.com> parents: 1852 diff changeset	517 t = ''
8db7828751b7 topic: wrap the underlying update function rather than the command Matt Mackall <mpm@selenic.com> parents: 1852 diff changeset	518 pctx = repo[node]
8db7828751b7 topic: wrap the underlying update function rather than the command Matt Mackall <mpm@selenic.com> parents: 1852 diff changeset	519 if pctx.phase() > phases.public:
1861 972d4e0c3d44 changectx: add topic method Matt Mackall <mpm@selenic.com> parents: 1860 diff changeset	520 t = pctx.topic()
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	521 with repo.vfs.open('topic', 'w') as f:
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	522 f.write(t)
1853 8db7828751b7 topic: wrap the underlying update function rather than the command Matt Mackall <mpm@selenic.com> parents: 1852 diff changeset	523 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	524 repo.ui.status(_("switching to topic %s\n") % t)
2711 8c938e9af113 topics: wrap the update function to check if either t0 or b0 is passed as rev Pulkit Goyal <7895pulkit@gmail.com> parents: 2709 diff changeset	525 elif ist0:
8c938e9af113 topics: wrap the update function to check if either t0 or b0 is passed as rev Pulkit Goyal <7895pulkit@gmail.com> parents: 2709 diff changeset	526 repo.ui.status(_("preserving the current topic '%s'\n") %
8c938e9af113 topics: wrap the update function to check if either t0 or b0 is passed as rev Pulkit Goyal <7895pulkit@gmail.com> parents: 2709 diff changeset	527 repo.currenttopic)
1853 8db7828751b7 topic: wrap the underlying update function rather than the command Matt Mackall <mpm@selenic.com> parents: 1852 diff changeset	528 return ret
8db7828751b7 topic: wrap the underlying update function rather than the command Matt Mackall <mpm@selenic.com> parents: 1852 diff changeset	529 finally:
8db7828751b7 topic: wrap the underlying update function rather than the command Matt Mackall <mpm@selenic.com> parents: 1852 diff changeset	530 wlock.release()
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	531
2711 8c938e9af113 topics: wrap the update function to check if either t0 or b0 is passed as rev Pulkit Goyal <7895pulkit@gmail.com> parents: 2709 diff changeset	532 def checkt0(orig, ui, repo, node=None, rev=None, clean=False, date=None,
8c938e9af113 topics: wrap the update function to check if either t0 or b0 is passed as rev Pulkit Goyal <7895pulkit@gmail.com> parents: 2709 diff changeset	533 check=False, merge=None, tool=None):
8c938e9af113 topics: wrap the update function to check if either t0 or b0 is passed as rev Pulkit Goyal <7895pulkit@gmail.com> parents: 2709 diff changeset	534
8c938e9af113 topics: wrap the update function to check if either t0 or b0 is passed as rev Pulkit Goyal <7895pulkit@gmail.com> parents: 2709 diff changeset	535 thezeros = set(['t0', 'b0'])
8c938e9af113 topics: wrap the update function to check if either t0 or b0 is passed as rev Pulkit Goyal <7895pulkit@gmail.com> parents: 2709 diff changeset	536 overrides = {}
8c938e9af113 topics: wrap the update function to check if either t0 or b0 is passed as rev Pulkit Goyal <7895pulkit@gmail.com> parents: 2709 diff changeset	537 if node in thezeros or rev in thezeros:
8c938e9af113 topics: wrap the update function to check if either t0 or b0 is passed as rev Pulkit Goyal <7895pulkit@gmail.com> parents: 2709 diff changeset	538 overrides[('_internal', 'updating-to-t0')] = 'yes'
8c938e9af113 topics: wrap the update function to check if either t0 or b0 is passed as rev Pulkit Goyal <7895pulkit@gmail.com> parents: 2709 diff changeset	539 with repo.ui.configoverride(overrides, source='topic-extension'):
8c938e9af113 topics: wrap the update function to check if either t0 or b0 is passed as rev Pulkit Goyal <7895pulkit@gmail.com> parents: 2709 diff changeset	540 return orig(ui, repo, node, rev, clean, date, check, merge, tool)
8c938e9af113 topics: wrap the update function to check if either t0 or b0 is passed as rev Pulkit Goyal <7895pulkit@gmail.com> parents: 2709 diff changeset	541
1854 67950fcf1c69 rebase: teach rebase how to copy topics Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	542 def _fixrebase(loaded):
67950fcf1c69 rebase: teach rebase how to copy topics Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	543 if not loaded:
67950fcf1c69 rebase: teach rebase how to copy topics Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	544 return
67950fcf1c69 rebase: teach rebase how to copy topics Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	545
67950fcf1c69 rebase: teach rebase how to copy topics Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	546 def savetopic(ctx, extra):
1861 972d4e0c3d44 changectx: add topic method Matt Mackall <mpm@selenic.com> parents: 1860 diff changeset	547 if ctx.topic():
972d4e0c3d44 changectx: add topic method Matt Mackall <mpm@selenic.com> parents: 1860 diff changeset	548 extra[constants.extrakey] = ctx.topic()
1854 67950fcf1c69 rebase: teach rebase how to copy topics Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	549
67950fcf1c69 rebase: teach rebase how to copy topics Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	550 def newmakeextrafn(orig, copiers):
67950fcf1c69 rebase: teach rebase how to copy topics Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	551 return orig(copiers + [savetopic])
67950fcf1c69 rebase: teach rebase how to copy topics Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	552
2679 5156a67f66a6 topics: update current topic to the topic of newly rebased commit (issue5551) Pulkit Goyal <7895pulkit@gmail.com> parents: 2677 diff changeset	553 def setrebaseconfig(orig, ui, repo, **opts):
5156a67f66a6 topics: update current topic to the topic of newly rebased commit (issue5551) Pulkit Goyal <7895pulkit@gmail.com> parents: 2677 diff changeset	554 repo.ui.setconfig('experimental', 'topicrebase', 'yes',
5156a67f66a6 topics: update current topic to the topic of newly rebased commit (issue5551) Pulkit Goyal <7895pulkit@gmail.com> parents: 2677 diff changeset	555 source='topic-extension')
5156a67f66a6 topics: update current topic to the topic of newly rebased commit (issue5551) Pulkit Goyal <7895pulkit@gmail.com> parents: 2677 diff changeset	556 return orig(ui, repo, **opts)
5156a67f66a6 topics: update current topic to the topic of newly rebased commit (issue5551) Pulkit Goyal <7895pulkit@gmail.com> parents: 2677 diff changeset	557
1969 a604423c1500 compat: tolerate missing rebase extension timeless@gmail.com parents: 1966 diff changeset	558 try:
a604423c1500 compat: tolerate missing rebase extension timeless@gmail.com parents: 1966 diff changeset	559 rebase = extensions.find("rebase")
a604423c1500 compat: tolerate missing rebase extension timeless@gmail.com parents: 1966 diff changeset	560 extensions.wrapfunction(rebase, '_makeextrafn', newmakeextrafn)
2679 5156a67f66a6 topics: update current topic to the topic of newly rebased commit (issue5551) Pulkit Goyal <7895pulkit@gmail.com> parents: 2677 diff changeset	561 # This exists to store in the config that rebase is running so that we can
5156a67f66a6 topics: update current topic to the topic of newly rebased commit (issue5551) Pulkit Goyal <7895pulkit@gmail.com> parents: 2677 diff changeset	562 # update the topic according to rebase. This is a hack and should be removed
5156a67f66a6 topics: update current topic to the topic of newly rebased commit (issue5551) Pulkit Goyal <7895pulkit@gmail.com> parents: 2677 diff changeset	563 # when we have better options.
5156a67f66a6 topics: update current topic to the topic of newly rebased commit (issue5551) Pulkit Goyal <7895pulkit@gmail.com> parents: 2677 diff changeset	564 extensions.wrapcommand(rebase.cmdtable, 'rebase', setrebaseconfig)
1969 a604423c1500 compat: tolerate missing rebase extension timeless@gmail.com parents: 1966 diff changeset	565 except KeyError:
a604423c1500 compat: tolerate missing rebase extension timeless@gmail.com parents: 1966 diff changeset	566 pass
1854 67950fcf1c69 rebase: teach rebase how to copy topics Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	567
1946 72246b13bd72 patch: document the section about import/export Pierre-Yves David <pierre-yves.david@fb.com> parents: 1945 diff changeset	568 ## 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	569
1866 13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1863 diff changeset	570 def _exporttopic(seq, ctx):
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1863 diff changeset	571 topic = ctx.topic()
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1863 diff changeset	572 if topic:
1917 ea4675c7a028 init: whitespace fixups Sean Farley <sean@farley.io> parents: 1916 diff changeset	573 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	574 return None
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1863 diff changeset	575
1867 c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	576 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	577 if 'topic' in patchdata:
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	578 extra['topic'] = patchdata['topic']
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	579
1948 54810b543bf4 patch: move setup of import/export logic into a function Pierre-Yves David <pierre-yves.david@fb.com> parents: 1947 diff changeset	580 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	581 """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	582 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	583 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	584 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	585 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	586 patch.patchheadermap.append(('EXP-Topic', 'topic'))
2667 e7079bba383d topic: makes split keep the topic Boris Feld <boris.feld@octobus.net> parents: 2665 diff changeset	587
e7079bba383d topic: makes split keep the topic Boris Feld <boris.feld@octobus.net> parents: 2665 diff changeset	588 ## preserve topic during split
e7079bba383d topic: makes split keep the topic Boris Feld <boris.feld@octobus.net> parents: 2665 diff changeset	589
e7079bba383d topic: makes split keep the topic Boris Feld <boris.feld@octobus.net> parents: 2665 diff changeset	590 def presplitupdatetopic(original, repo, ui, prev, ctx):
e7079bba383d topic: makes split keep the topic Boris Feld <boris.feld@octobus.net> parents: 2665 diff changeset	591 # Save topic of revision
e7079bba383d topic: makes split keep the topic Boris Feld <boris.feld@octobus.net> parents: 2665 diff changeset	592 topic = None
e7079bba383d topic: makes split keep the topic Boris Feld <boris.feld@octobus.net> parents: 2665 diff changeset	593 if util.safehasattr(ctx, 'topic'):
e7079bba383d topic: makes split keep the topic Boris Feld <boris.feld@octobus.net> parents: 2665 diff changeset	594 topic = ctx.topic()
e7079bba383d topic: makes split keep the topic Boris Feld <boris.feld@octobus.net> parents: 2665 diff changeset	595
e7079bba383d topic: makes split keep the topic Boris Feld <boris.feld@octobus.net> parents: 2665 diff changeset	596 # Update the working directory
e7079bba383d topic: makes split keep the topic Boris Feld <boris.feld@octobus.net> parents: 2665 diff changeset	597 original(repo, ui, prev, ctx)
e7079bba383d topic: makes split keep the topic Boris Feld <boris.feld@octobus.net> parents: 2665 diff changeset	598
e7079bba383d topic: makes split keep the topic Boris Feld <boris.feld@octobus.net> parents: 2665 diff changeset	599 # Restore the topic if need
e7079bba383d topic: makes split keep the topic Boris Feld <boris.feld@octobus.net> parents: 2665 diff changeset	600 if topic:
e7079bba383d topic: makes split keep the topic Boris Feld <boris.feld@octobus.net> parents: 2665 diff changeset	601 _changecurrenttopic(repo, topic)

Mercurial > evolve

annotate hgext3rd/topic/__init__.py @ 2712:f19b314d8475

annotate hgext3rd/topic/init.py @ 2712:f19b314d8475