evolve: hgext3rd/topic/__init_

annotate hgext3rd/topic/init.py @ 1909:36112e361ee4

stack: display the base of the stack Displaying the first parent of the stack seems useful. I'm even tempted to call it 't0' and have the topic still active when 'hg up t0' is used to move to the base. As a side effect we gain a way to denote that the stack is not linear. I'm not super convinced that it is the right way to display it, but this is better than no information.

author	Pierre-Yves David <pierre-yves.david@fb.com>
date	Mon, 14 Mar 2016 23:37:58 +0000
parents	dbd6d51e63f1
children	535d975d3886

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
0b5b757ca812 docs: fix format of extension docstring Matt Mackall <mpm@selenic.com> parents: 1845 diff changeset	7 Topic branches are lightweight branches which
0b5b757ca812 docs: fix format of extension docstring Matt Mackall <mpm@selenic.com> parents: 1845 diff changeset	8 disappear when changes are finalized.
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	9
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	10 This is sort of similar to a bookmark, but it applies to a whole
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	11 series instead of a single revision.
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	12 """
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	13 import functools
1888 dfaf0de6f4d8 topicmap: move the monkey patching into a context manager Pierre-Yves David <pierre-yves.david@fb.com> parents: 1887 diff changeset	14 import contextlib
1904 f52c02bf47b7 stack: allow to refer to changeset using "t2" form Pierre-Yves David <pierre-yves.david@fb.com> parents: 1903 diff changeset	15 import re
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	16
1848 9a81657deec2 summary: add topic summary hook Matt Mackall <mpm@selenic.com> parents: 1847 diff changeset	17 from mercurial.i18n import _
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	18 from mercurial import branchmap
1887 68125d026b07 push: hackish handeling of new branch head from phase move Pierre-Yves David <pierre-yves.david@fb.com> parents: 1886 diff changeset	19 from mercurial import bundle2
1889 d9b929bcc3ad topicmap: ensure that 'served' view is updated with topicmap Pierre-Yves David <pierre-yves.david@fb.com> parents: 1888 diff changeset	20 from mercurial import changegroup
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	21 from mercurial import cmdutil
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	22 from mercurial import commands
1844 862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	23 from mercurial import context
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	24 from mercurial import discovery as discoverymod
1863 29fc43f24948 topic: fix missing error import Augie Fackler <raf@durin42.com> parents: 1862 diff changeset	25 from mercurial import error
1887 68125d026b07 push: hackish handeling of new branch head from phase move Pierre-Yves David <pierre-yves.david@fb.com> parents: 1886 diff changeset	26 from mercurial import exchange
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	27 from mercurial import extensions
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	28 from mercurial import localrepo
1856 7d7f5f9e2f8c rewrite: use a lock and transaction as spotted by devel warnings Augie Fackler <augie@google.com> parents: 1855 diff changeset	29 from mercurial import lock
7d7f5f9e2f8c rewrite: use a lock and transaction as spotted by devel warnings Augie Fackler <augie@google.com> parents: 1855 diff changeset	30 from mercurial import merge
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	31 from mercurial import namespaces
1872 4fcee38d71d6 topic: fix up change logic a little and add debug logging Augie Fackler <raf@durin42.com> parents: 1871 diff changeset	32 from mercurial import node
1842 94bbc18daa99 topic: disallow use of topics without obsolete enabled Augie Fackler <augie@google.com> parents: 1841 diff changeset	33 from mercurial import obsolete
1867 c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	34 from mercurial import patch
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	35 from mercurial import phases
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	36 from mercurial import util
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	37 from mercurial import wireproto
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	38
1845 24d8053020a2 constants: extract key for extra into a constant Augie Fackler <augie@google.com> parents: 1844 diff changeset	39 from . import constants
1843 0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1842 diff changeset	40 from . import revset as topicrevset
1871 58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1867 diff changeset	41 from . import destination
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	42 from . import stack
1885 d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: 1884 diff changeset	43 from . import topicmap
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	44 from . import discovery
1843 0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1842 diff changeset	45
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	46 cmdtable = {}
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	47 command = cmdutil.command(cmdtable)
1908 dbd6d51e63f1 stack: add some default color configuration Pierre-Yves David <pierre-yves.david@fb.com> parents: 1907 diff changeset	48 colortable = {'topic.stack.index': 'yellow',
1909 36112e361ee4 stack: display the base of the stack Pierre-Yves David <pierre-yves.david@fb.com> parents: 1908 diff changeset	49 '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	50 'topic.stack.state.clean': 'green',
1908 dbd6d51e63f1 stack: add some default color configuration Pierre-Yves David <pierre-yves.david@fb.com> parents: 1907 diff changeset	51 'topic.stack.index.current': 'cyan', # random pick
dbd6d51e63f1 stack: add some default color configuration Pierre-Yves David <pierre-yves.david@fb.com> parents: 1907 diff changeset	52 'topic.stack.state.current': 'cyan bold', # random pick
dbd6d51e63f1 stack: add some default color configuration Pierre-Yves David <pierre-yves.david@fb.com> parents: 1907 diff changeset	53 'topic.stack.desc.current': 'cyan', # random pick
dbd6d51e63f1 stack: add some default color configuration Pierre-Yves David <pierre-yves.david@fb.com> parents: 1907 diff changeset	54 'topic.stack.state.unstable': 'red',
dbd6d51e63f1 stack: add some default color configuration Pierre-Yves David <pierre-yves.david@fb.com> parents: 1907 diff changeset	55 }
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	56
1884 8a53f99d9061 testedwith: declare compatibility with Mercurial 3.7 Augie Fackler <raf@durin42.com> parents: 1877 diff changeset	57 testedwith = '3.7'
8a53f99d9061 testedwith: declare compatibility with Mercurial 3.7 Augie Fackler <raf@durin42.com> parents: 1877 diff changeset	58
1861 972d4e0c3d44 changectx: add topic method Matt Mackall <mpm@selenic.com> parents: 1860 diff changeset	59 def _contexttopic(self):
972d4e0c3d44 changectx: add topic method Matt Mackall <mpm@selenic.com> parents: 1860 diff changeset	60 return self.extra().get(constants.extrakey, '')
972d4e0c3d44 changectx: add topic method Matt Mackall <mpm@selenic.com> parents: 1860 diff changeset	61 context.basectx.topic = _contexttopic
972d4e0c3d44 changectx: add topic method Matt Mackall <mpm@selenic.com> parents: 1860 diff changeset	62
1904 f52c02bf47b7 stack: allow to refer to changeset using "t2" form Pierre-Yves David <pierre-yves.david@fb.com> parents: 1903 diff changeset	63 topicrev = re.compile(r'^t\d+$')
f52c02bf47b7 stack: allow to refer to changeset using "t2" form Pierre-Yves David <pierre-yves.david@fb.com> parents: 1903 diff changeset	64
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	65 def _namemap(repo, name):
1904 f52c02bf47b7 stack: allow to refer to changeset using "t2" form Pierre-Yves David <pierre-yves.david@fb.com> parents: 1903 diff changeset	66 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	67 idx = int(name[1:])
f52c02bf47b7 stack: allow to refer to changeset using "t2" form Pierre-Yves David <pierre-yves.david@fb.com> parents: 1903 diff changeset	68 topic = repo.currenttopic
f52c02bf47b7 stack: allow to refer to changeset using "t2" form Pierre-Yves David <pierre-yves.david@fb.com> parents: 1903 diff changeset	69 if not topic:
f52c02bf47b7 stack: allow to refer to changeset using "t2" form Pierre-Yves David <pierre-yves.david@fb.com> parents: 1903 diff changeset	70 raise error.Abort(_('cannot resolve "%s": no active topic') % name)
f52c02bf47b7 stack: allow to refer to changeset using "t2" form Pierre-Yves David <pierre-yves.david@fb.com> parents: 1903 diff changeset	71 revs = list(stack.getstack(repo, topic))
f52c02bf47b7 stack: allow to refer to changeset using "t2" form Pierre-Yves David <pierre-yves.david@fb.com> parents: 1903 diff changeset	72 try:
f52c02bf47b7 stack: allow to refer to changeset using "t2" form Pierre-Yves David <pierre-yves.david@fb.com> parents: 1903 diff changeset	73 r = revs[idx]
f52c02bf47b7 stack: allow to refer to changeset using "t2" form Pierre-Yves David <pierre-yves.david@fb.com> parents: 1903 diff changeset	74 except IndexError:
f52c02bf47b7 stack: allow to refer to changeset using "t2" form Pierre-Yves David <pierre-yves.david@fb.com> parents: 1903 diff changeset	75 msg = _('cannot resolve "%s": topic "%s" has only %d changesets')
f52c02bf47b7 stack: allow to refer to changeset using "t2" form Pierre-Yves David <pierre-yves.david@fb.com> parents: 1903 diff changeset	76 raise error.Abort(msg % (name, topic, len(revs)))
f52c02bf47b7 stack: allow to refer to changeset using "t2" form Pierre-Yves David <pierre-yves.david@fb.com> parents: 1903 diff changeset	77 return [repo[r].node()]
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	78 return [ctx.node() for ctx in
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	79 repo.set('not public() and extra(topic, %s)', name)]
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	80
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	81 def _nodemap(repo, node):
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	82 ctx = repo[node]
1861 972d4e0c3d44 changectx: add topic method Matt Mackall <mpm@selenic.com> parents: 1860 diff changeset	83 t = ctx.topic()
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	84 if t and ctx.phase() > phases.public:
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	85 return [t]
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	86 return []
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	87
1871 58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1867 diff changeset	88 def uisetup(ui):
58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1867 diff changeset	89 destination.setupdest()
58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1867 diff changeset	90
1888 dfaf0de6f4d8 topicmap: move the monkey patching into a context manager Pierre-Yves David <pierre-yves.david@fb.com> parents: 1887 diff changeset	91 @contextlib.contextmanager
dfaf0de6f4d8 topicmap: move the monkey patching into a context manager Pierre-Yves David <pierre-yves.david@fb.com> parents: 1887 diff changeset	92 def usetopicmap(repo):
dfaf0de6f4d8 topicmap: move the monkey patching into a context manager Pierre-Yves David <pierre-yves.david@fb.com> parents: 1887 diff changeset	93 """use awful monkey patching to update the topic cache"""
dfaf0de6f4d8 topicmap: move the monkey patching into a context manager Pierre-Yves David <pierre-yves.david@fb.com> parents: 1887 diff changeset	94 oldbranchcache = branchmap.branchcache
dfaf0de6f4d8 topicmap: move the monkey patching into a context manager Pierre-Yves David <pierre-yves.david@fb.com> parents: 1887 diff changeset	95 oldfilename = branchmap._filename
1890 e846b8f402d0 topicmap: write and read format from disc Pierre-Yves David <pierre-yves.david@fb.com> parents: 1889 diff changeset	96 oldread = branchmap.read
1888 dfaf0de6f4d8 topicmap: move the monkey patching into a context manager Pierre-Yves David <pierre-yves.david@fb.com> parents: 1887 diff changeset	97 oldcaches = getattr(repo, '_branchcaches', {})
dfaf0de6f4d8 topicmap: move the monkey patching into a context manager Pierre-Yves David <pierre-yves.david@fb.com> parents: 1887 diff changeset	98 try:
dfaf0de6f4d8 topicmap: move the monkey patching into a context manager Pierre-Yves David <pierre-yves.david@fb.com> parents: 1887 diff changeset	99 branchmap.branchcache = topicmap.topiccache
dfaf0de6f4d8 topicmap: move the monkey patching into a context manager Pierre-Yves David <pierre-yves.david@fb.com> parents: 1887 diff changeset	100 branchmap._filename = topicmap._filename
1890 e846b8f402d0 topicmap: write and read format from disc Pierre-Yves David <pierre-yves.david@fb.com> parents: 1889 diff changeset	101 branchmap.read = topicmap.readtopicmap
1888 dfaf0de6f4d8 topicmap: move the monkey patching into a context manager Pierre-Yves David <pierre-yves.david@fb.com> parents: 1887 diff changeset	102 repo._branchcaches = getattr(repo, '_topiccaches', {})
dfaf0de6f4d8 topicmap: move the monkey patching into a context manager Pierre-Yves David <pierre-yves.david@fb.com> parents: 1887 diff changeset	103 yield
dfaf0de6f4d8 topicmap: move the monkey patching into a context manager Pierre-Yves David <pierre-yves.david@fb.com> parents: 1887 diff changeset	104 repo._topiccaches = repo._branchcaches
dfaf0de6f4d8 topicmap: move the monkey patching into a context manager Pierre-Yves David <pierre-yves.david@fb.com> parents: 1887 diff changeset	105 finally:
dfaf0de6f4d8 topicmap: move the monkey patching into a context manager Pierre-Yves David <pierre-yves.david@fb.com> parents: 1887 diff changeset	106 repo._branchcaches = oldcaches
dfaf0de6f4d8 topicmap: move the monkey patching into a context manager Pierre-Yves David <pierre-yves.david@fb.com> parents: 1887 diff changeset	107 branchmap.branchcache = oldbranchcache
dfaf0de6f4d8 topicmap: move the monkey patching into a context manager Pierre-Yves David <pierre-yves.david@fb.com> parents: 1887 diff changeset	108 branchmap._filename = oldfilename
1890 e846b8f402d0 topicmap: write and read format from disc Pierre-Yves David <pierre-yves.david@fb.com> parents: 1889 diff changeset	109 branchmap.read = oldread
1888 dfaf0de6f4d8 topicmap: move the monkey patching into a context manager Pierre-Yves David <pierre-yves.david@fb.com> parents: 1887 diff changeset	110
1889 d9b929bcc3ad topicmap: ensure that 'served' view is updated with topicmap Pierre-Yves David <pierre-yves.david@fb.com> parents: 1888 diff changeset	111 def cgapply(orig, repo, args, *kwargs):
d9b929bcc3ad topicmap: ensure that 'served' view is updated with topicmap Pierre-Yves David <pierre-yves.david@fb.com> parents: 1888 diff changeset	112 with usetopicmap(repo):
d9b929bcc3ad topicmap: ensure that 'served' view is updated with topicmap Pierre-Yves David <pierre-yves.david@fb.com> parents: 1888 diff changeset	113 return orig(repo, args, *kwargs)
d9b929bcc3ad topicmap: ensure that 'served' view is updated with topicmap Pierre-Yves David <pierre-yves.david@fb.com> parents: 1888 diff changeset	114
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	115 def reposetup(ui, repo):
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	116 orig = repo.__class__
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	117 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	118 return # this can be a peer in the ssh case (puzzling)
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	119 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	120
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	121 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	122 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	123 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	124 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	125
1858 4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	126 def commit(self, args, *kwargs):
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	127 backup = self.ui.backupconfig('ui', 'allowemptycommit')
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	128 try:
1861 972d4e0c3d44 changectx: add topic method Matt Mackall <mpm@selenic.com> parents: 1860 diff changeset	129 if repo.currenttopic != repo['.'].topic():
1858 4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	130 # bypass the core "nothing changed" logic
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	131 self.ui.setconfig('ui', 'allowemptycommit', True)
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	132 return orig.commit(self, args, *kwargs)
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	133 finally:
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	134 self.ui.restoreconfig(backup)
4ab1b854ce4e topics: allow commits that only change topic (issue4725) Matt Mackall <mpm@selenic.com> parents: 1857 diff changeset	135
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	136 def commitctx(self, ctx, error=None):
1855 f241a00e93a7 topics: only apply topic to commits of the working copy Matt Mackall <mpm@selenic.com> parents: 1854 diff changeset	137 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	138 current = self.currenttopic
f241a00e93a7 topics: only apply topic to commits of the working copy Matt Mackall <mpm@selenic.com> parents: 1854 diff changeset	139 if current:
f241a00e93a7 topics: only apply topic to commits of the working copy Matt Mackall <mpm@selenic.com> parents: 1854 diff changeset	140 ctx.extra()[constants.extrakey] = current
1862 565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1861 diff changeset	141 if (isinstance(ctx, context.memctx) and
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1861 diff changeset	142 ctx.extra().get('amend_source') and
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1861 diff changeset	143 ctx.topic() and
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1861 diff changeset	144 not self.currenttopic):
565f057bdc08 amend: allow clearing topics on amend Matt Mackall <mpm@selenic.com> parents: 1861 diff changeset	145 # 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	146 del ctx.extra()[constants.extrakey]
1889 d9b929bcc3ad topicmap: ensure that 'served' view is updated with topicmap Pierre-Yves David <pierre-yves.david@fb.com> parents: 1888 diff changeset	147 with usetopicmap(self):
d9b929bcc3ad topicmap: ensure that 'served' view is updated with topicmap Pierre-Yves David <pierre-yves.david@fb.com> parents: 1888 diff changeset	148 return orig.commitctx(self, ctx, error=error)
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	149
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	150 @property
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	151 def topics(self):
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	152 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	153 for c in self.set('not public()'):
1861 972d4e0c3d44 changectx: add topic method Matt Mackall <mpm@selenic.com> parents: 1860 diff changeset	154 topics.add(c.topic())
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	155 topics.remove('')
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	156 return topics
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	157
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	158 @property
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	159 def currenttopic(self):
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	160 return self.vfs.tryread('topic')
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	161
1885 d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: 1884 diff changeset	162 def branchmap(self, topic=True):
d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: 1884 diff changeset	163 if not topic:
d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: 1884 diff changeset	164 super(topicrepo, self).branchmap()
1888 dfaf0de6f4d8 topicmap: move the monkey patching into a context manager Pierre-Yves David <pierre-yves.david@fb.com> parents: 1887 diff changeset	165 with usetopicmap(self):
1885 d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: 1884 diff changeset	166 branchmap.updatecache(self)
1888 dfaf0de6f4d8 topicmap: move the monkey patching into a context manager Pierre-Yves David <pierre-yves.david@fb.com> parents: 1887 diff changeset	167 return self._topiccaches[self.filtername]
1885 d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: 1884 diff changeset	168
1889 d9b929bcc3ad topicmap: ensure that 'served' view is updated with topicmap Pierre-Yves David <pierre-yves.david@fb.com> parents: 1888 diff changeset	169 def destroyed(self, args, *kwargs):
d9b929bcc3ad topicmap: ensure that 'served' view is updated with topicmap Pierre-Yves David <pierre-yves.david@fb.com> parents: 1888 diff changeset	170 with usetopicmap(self):
d9b929bcc3ad topicmap: ensure that 'served' view is updated with topicmap Pierre-Yves David <pierre-yves.david@fb.com> parents: 1888 diff changeset	171 return super(topicrepo, self).destroyed(args, *kwargs)
d9b929bcc3ad topicmap: ensure that 'served' view is updated with topicmap Pierre-Yves David <pierre-yves.david@fb.com> parents: 1888 diff changeset	172
1885 d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: 1884 diff changeset	173 def invalidatecaches(self):
d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: 1884 diff changeset	174 super(topicrepo, self).invalidatecaches()
d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: 1884 diff changeset	175 if '_topiccaches' in vars(self.unfiltered()):
d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: 1884 diff changeset	176 self.unfiltered()._topiccaches.clear()
d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: 1884 diff changeset	177
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	178 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	179 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	180 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	181 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	182 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	183 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	184 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	185 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	186 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	187
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	188
1857 a506ed8ab8da topics: add listnames hook so completion works Matt Mackall <mpm@selenic.com> parents: 1856 diff changeset	189 repo.__class__ = topicrepo
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	190 if util.safehasattr(repo, 'names'):
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	191 repo.names.addnamespace(namespaces.namespace(
1857 a506ed8ab8da topics: add listnames hook so completion works Matt Mackall <mpm@selenic.com> parents: 1856 diff changeset	192 'topics', 'topic', namemap=_namemap, nodemap=_nodemap,
a506ed8ab8da topics: add listnames hook so completion works Matt Mackall <mpm@selenic.com> parents: 1856 diff changeset	193 listnames=lambda repo: repo.topics))
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	194
1847 9fa5b8f4e98e topics: add command summary Matt Mackall <mpm@selenic.com> parents: 1846 diff changeset	195 @command('topics [TOPIC]', [
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	196 ('', 'clear', False, 'clear active topic if any'),
1844 862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	197 ('', 'change', '', 'revset of existing revisions to change 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	198 ('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	199 ] + commands.formatteropts)
95874e8fc5f2 stack: add basic formatter and label support Pierre-Yves David <pierre-yves.david@fb.com> parents: 1904 diff changeset	200 def topics(ui, repo, topic='', clear=False, change=None, list=False, **opts):
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	201 """View current topic, set current topic, or see all topics."""
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	202 if list:
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	203 if clear or change:
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	204 raise error.Abort(_("cannot use --clear or --change with --list"))
1907 95874e8fc5f2 stack: add basic formatter and label support Pierre-Yves David <pierre-yves.david@fb.com> parents: 1904 diff changeset	205 return stack.showstack(ui, repo, topic, opts)
1895 c8e4c6e03957 stack: add a very first version of stack display with 'hg topic --list' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1894 diff changeset	206
1844 862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	207 if change:
1851 67d53e8e0c1a topic: only require obsolete support for --change Matt Mackall <mpm@selenic.com> parents: 1850 diff changeset	208 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1894 f8ee36489d3c topic: get 'Abort' from error, not 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1890 diff changeset	209 raise error.Abort(_('must have obsolete enabled to use --change'))
1860 b7b9e5028c2a topics: consistently use empty string instead of None Matt Mackall <mpm@selenic.com> parents: 1859 diff changeset	210 if not topic and not clear:
1894 f8ee36489d3c topic: get 'Abort' from error, not 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1890 diff changeset	211 raise error.Abort('changing topic requires a topic name or --clear')
1844 862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	212 if any(not c.mutable() for c in repo.set('%r and public()', change)):
1894 f8ee36489d3c topic: get 'Abort' from error, not 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1890 diff changeset	213 raise error.Abort("can't change topic of a public change")
1844 862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	214 rewrote = 0
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	215 needevolve = False
1856 7d7f5f9e2f8c rewrite: use a lock and transaction as spotted by devel warnings Augie Fackler <augie@google.com> parents: 1855 diff changeset	216 l = repo.lock()
7d7f5f9e2f8c rewrite: use a lock and transaction as spotted by devel warnings Augie Fackler <augie@google.com> parents: 1855 diff changeset	217 txn = repo.transaction('rewrite-topics')
7d7f5f9e2f8c rewrite: use a lock and transaction as spotted by devel warnings Augie Fackler <augie@google.com> parents: 1855 diff changeset	218 try:
7d7f5f9e2f8c rewrite: use a lock and transaction as spotted by devel warnings Augie Fackler <augie@google.com> parents: 1855 diff changeset	219 for c in repo.set('%r', change):
7d7f5f9e2f8c rewrite: use a lock and transaction as spotted by devel warnings Augie Fackler <augie@google.com> parents: 1855 diff changeset	220 def filectxfn(repo, ctx, path):
7d7f5f9e2f8c rewrite: use a lock and transaction as spotted by devel warnings Augie Fackler <augie@google.com> parents: 1855 diff changeset	221 try:
7d7f5f9e2f8c rewrite: use a lock and transaction as spotted by devel warnings Augie Fackler <augie@google.com> parents: 1855 diff changeset	222 return c[path]
7d7f5f9e2f8c rewrite: use a lock and transaction as spotted by devel warnings Augie Fackler <augie@google.com> parents: 1855 diff changeset	223 except error.ManifestLookupError:
7d7f5f9e2f8c rewrite: use a lock and transaction as spotted by devel warnings Augie Fackler <augie@google.com> parents: 1855 diff changeset	224 return None
7d7f5f9e2f8c rewrite: use a lock and transaction as spotted by devel warnings Augie Fackler <augie@google.com> parents: 1855 diff changeset	225 fixedextra = dict(c.extra())
1872 4fcee38d71d6 topic: fix up change logic a little and add debug logging Augie Fackler <raf@durin42.com> parents: 1871 diff changeset	226 ui.debug('old node id is %s\n' % node.hex(c.node()))
4fcee38d71d6 topic: fix up change logic a little and add debug logging Augie Fackler <raf@durin42.com> parents: 1871 diff changeset	227 ui.debug('origextra: %r\n' % fixedextra)
1856 7d7f5f9e2f8c rewrite: use a lock and transaction as spotted by devel warnings Augie Fackler <augie@google.com> parents: 1855 diff changeset	228 newtopic = None if clear else topic
1872 4fcee38d71d6 topic: fix up change logic a little and add debug logging Augie Fackler <raf@durin42.com> parents: 1871 diff changeset	229 oldtopic = fixedextra.get(constants.extrakey, None)
4fcee38d71d6 topic: fix up change logic a little and add debug logging Augie Fackler <raf@durin42.com> parents: 1871 diff changeset	230 if oldtopic == newtopic:
1856 7d7f5f9e2f8c rewrite: use a lock and transaction as spotted by devel warnings Augie Fackler <augie@google.com> parents: 1855 diff changeset	231 continue
1872 4fcee38d71d6 topic: fix up change logic a little and add debug logging Augie Fackler <raf@durin42.com> parents: 1871 diff changeset	232 if clear:
1856 7d7f5f9e2f8c rewrite: use a lock and transaction as spotted by devel warnings Augie Fackler <augie@google.com> parents: 1855 diff changeset	233 del fixedextra[constants.extrakey]
7d7f5f9e2f8c rewrite: use a lock and transaction as spotted by devel warnings Augie Fackler <augie@google.com> parents: 1855 diff changeset	234 else:
7d7f5f9e2f8c rewrite: use a lock and transaction as spotted by devel warnings Augie Fackler <augie@google.com> parents: 1855 diff changeset	235 fixedextra[constants.extrakey] = topic
1874 ec28b6c3414a topic: fix changing topics of commits that have an amend_source Augie Fackler <raf@durin42.com> parents: 1873 diff changeset	236 if 'amend_source' in fixedextra:
ec28b6c3414a topic: fix changing topics of commits that have an amend_source Augie Fackler <raf@durin42.com> parents: 1873 diff changeset	237 # TODO: right now the commitctx wrapper in
ec28b6c3414a topic: fix changing topics of commits that have an amend_source Augie Fackler <raf@durin42.com> parents: 1873 diff changeset	238 # topicrepo overwrites the topic in extra if
ec28b6c3414a topic: fix changing topics of commits that have an amend_source Augie Fackler <raf@durin42.com> parents: 1873 diff changeset	239 # amend_source is set to support 'hg commit
ec28b6c3414a topic: fix changing topics of commits that have an amend_source Augie Fackler <raf@durin42.com> parents: 1873 diff changeset	240 # --amend'. Support for amend should be adjusted
ec28b6c3414a topic: fix changing topics of commits that have an amend_source Augie Fackler <raf@durin42.com> parents: 1873 diff changeset	241 # to not be so invasive.
ec28b6c3414a topic: fix changing topics of commits that have an amend_source Augie Fackler <raf@durin42.com> parents: 1873 diff changeset	242 del fixedextra['amend_source']
1872 4fcee38d71d6 topic: fix up change logic a little and add debug logging Augie Fackler <raf@durin42.com> parents: 1871 diff changeset	243 ui.debug('changing topic of %s from %s to %s\n' % (
4fcee38d71d6 topic: fix up change logic a little and add debug logging Augie Fackler <raf@durin42.com> parents: 1871 diff changeset	244 c, oldtopic, newtopic))
4fcee38d71d6 topic: fix up change logic a little and add debug logging Augie Fackler <raf@durin42.com> parents: 1871 diff changeset	245 ui.debug('fixedextra: %r\n' % fixedextra)
1856 7d7f5f9e2f8c rewrite: use a lock and transaction as spotted by devel warnings Augie Fackler <augie@google.com> parents: 1855 diff changeset	246 mc = context.memctx(
7d7f5f9e2f8c rewrite: use a lock and transaction as spotted by devel warnings Augie Fackler <augie@google.com> parents: 1855 diff changeset	247 repo, (c.p1().node(), c.p2().node()), c.description(),
7d7f5f9e2f8c rewrite: use a lock and transaction as spotted by devel warnings Augie Fackler <augie@google.com> parents: 1855 diff changeset	248 c.files(), filectxfn,
7d7f5f9e2f8c rewrite: use a lock and transaction as spotted by devel warnings Augie Fackler <augie@google.com> parents: 1855 diff changeset	249 user=c.user(), date=c.date(), extra=fixedextra)
7d7f5f9e2f8c rewrite: use a lock and transaction as spotted by devel warnings Augie Fackler <augie@google.com> parents: 1855 diff changeset	250 newnode = repo.commitctx(mc)
1872 4fcee38d71d6 topic: fix up change logic a little and add debug logging Augie Fackler <raf@durin42.com> parents: 1871 diff changeset	251 ui.debug('new node id is %s\n' % node.hex(newnode))
1856 7d7f5f9e2f8c rewrite: use a lock and transaction as spotted by devel warnings Augie Fackler <augie@google.com> parents: 1855 diff changeset	252 needevolve = needevolve or (len(c.children()) > 0)
7d7f5f9e2f8c rewrite: use a lock and transaction as spotted by devel warnings Augie Fackler <augie@google.com> parents: 1855 diff changeset	253 obsolete.createmarkers(repo, [(c, (repo[newnode],))])
7d7f5f9e2f8c rewrite: use a lock and transaction as spotted by devel warnings Augie Fackler <augie@google.com> parents: 1855 diff changeset	254 rewrote += 1
7d7f5f9e2f8c rewrite: use a lock and transaction as spotted by devel warnings Augie Fackler <augie@google.com> parents: 1855 diff changeset	255 txn.close()
7d7f5f9e2f8c rewrite: use a lock and transaction as spotted by devel warnings Augie Fackler <augie@google.com> parents: 1855 diff changeset	256 except:
7d7f5f9e2f8c rewrite: use a lock and transaction as spotted by devel warnings Augie Fackler <augie@google.com> parents: 1855 diff changeset	257 try:
7d7f5f9e2f8c rewrite: use a lock and transaction as spotted by devel warnings Augie Fackler <augie@google.com> parents: 1855 diff changeset	258 txn.abort()
7d7f5f9e2f8c rewrite: use a lock and transaction as spotted by devel warnings Augie Fackler <augie@google.com> parents: 1855 diff changeset	259 finally:
7d7f5f9e2f8c rewrite: use a lock and transaction as spotted by devel warnings Augie Fackler <augie@google.com> parents: 1855 diff changeset	260 repo.invalidate()
7d7f5f9e2f8c rewrite: use a lock and transaction as spotted by devel warnings Augie Fackler <augie@google.com> parents: 1855 diff changeset	261 raise
7d7f5f9e2f8c rewrite: use a lock and transaction as spotted by devel warnings Augie Fackler <augie@google.com> parents: 1855 diff changeset	262 finally:
7d7f5f9e2f8c rewrite: use a lock and transaction as spotted by devel warnings Augie Fackler <augie@google.com> parents: 1855 diff changeset	263 lock.release(txn, l)
1844 862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	264 ui.status('changed topic on %d changes\n' % rewrote)
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	265 if needevolve:
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	266 evolvetarget = 'topic(%s)' % topic if topic else 'not topic()'
862cabc132fd topic: add ability to change topic of non-public changes Augie Fackler <augie@google.com> parents: 1843 diff changeset	267 ui.status('please run hg evolve --rev "%s" now\n' % evolvetarget)
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	268 if clear:
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	269 if repo.vfs.exists('topic'):
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	270 repo.vfs.unlink('topic')
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	271 return
1860 b7b9e5028c2a topics: consistently use empty string instead of None Matt Mackall <mpm@selenic.com> parents: 1859 diff changeset	272 if topic:
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	273 with repo.vfs.open('topic', 'w') as f:
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	274 f.write(topic)
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	275 return
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	276 current = repo.currenttopic
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	277 for t in sorted(repo.topics):
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	278 marker = '*' if t == current else ' '
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	279 ui.write(' %s %s\n' % (marker, t))
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	280
1848 9a81657deec2 summary: add topic summary hook Matt Mackall <mpm@selenic.com> parents: 1847 diff changeset	281 def summaryhook(ui, repo):
9a81657deec2 summary: add topic summary hook Matt Mackall <mpm@selenic.com> parents: 1847 diff changeset	282 t = repo.currenttopic
9a81657deec2 summary: add topic summary hook Matt Mackall <mpm@selenic.com> parents: 1847 diff changeset	283 if not t:
9a81657deec2 summary: add topic summary hook Matt Mackall <mpm@selenic.com> parents: 1847 diff changeset	284 return
9a81657deec2 summary: add topic summary hook Matt Mackall <mpm@selenic.com> parents: 1847 diff changeset	285 # i18n: column positioning for "hg summary"
9a81657deec2 summary: add topic summary hook Matt Mackall <mpm@selenic.com> parents: 1847 diff changeset	286 ui.write(_("topic: %s\n") % t)
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	287
1850 0da6bf86b718 commit: add a --topic flag Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	288 def commitwrap(orig, ui, repo, args, *opts):
0da6bf86b718 commit: add a --topic flag Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	289 if opts.get('topic'):
0da6bf86b718 commit: add a --topic flag Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	290 t = opts['topic']
0da6bf86b718 commit: add a --topic flag Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	291 with repo.vfs.open('topic', 'w') as f:
0da6bf86b718 commit: add a --topic flag Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	292 f.write(t)
0da6bf86b718 commit: add a --topic flag Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	293 return orig(ui, repo, args, *opts)
0da6bf86b718 commit: add a --topic flag Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	294
1852 3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	295 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	296 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	297 t = repo.currenttopic
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	298 if t:
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	299 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	300 "\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	301 return ret
3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	302
1877 69077c65919d topic: handle merge.update function signature change Augie Fackler <raf@durin42.com> parents: 1874 diff changeset	303 def mergeupdatewrap(orig, repo, node, branchmerge, force, args, *kwargs):
69077c65919d topic: handle merge.update function signature change Augie Fackler <raf@durin42.com> parents: 1874 diff changeset	304 partial = bool(len(args)) or 'matcher' in kwargs
1853 8db7828751b7 topic: wrap the underlying update function rather than the command Matt Mackall <mpm@selenic.com> parents: 1852 diff changeset	305 wlock = repo.wlock()
8db7828751b7 topic: wrap the underlying update function rather than the command Matt Mackall <mpm@selenic.com> parents: 1852 diff changeset	306 try:
1877 69077c65919d topic: handle merge.update function signature change Augie Fackler <raf@durin42.com> parents: 1874 diff changeset	307 ret = orig(repo, node, branchmerge, force, args, *kwargs)
1853 8db7828751b7 topic: wrap the underlying update function rather than the command Matt Mackall <mpm@selenic.com> parents: 1852 diff changeset	308 if not partial and not branchmerge:
8db7828751b7 topic: wrap the underlying update function rather than the command Matt Mackall <mpm@selenic.com> parents: 1852 diff changeset	309 ot = repo.currenttopic
8db7828751b7 topic: wrap the underlying update function rather than the command Matt Mackall <mpm@selenic.com> parents: 1852 diff changeset	310 t = ''
8db7828751b7 topic: wrap the underlying update function rather than the command Matt Mackall <mpm@selenic.com> parents: 1852 diff changeset	311 pctx = repo[node]
8db7828751b7 topic: wrap the underlying update function rather than the command Matt Mackall <mpm@selenic.com> parents: 1852 diff changeset	312 if pctx.phase() > phases.public:
1861 972d4e0c3d44 changectx: add topic method Matt Mackall <mpm@selenic.com> parents: 1860 diff changeset	313 t = pctx.topic()
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	314 with repo.vfs.open('topic', 'w') as f:
1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	315 f.write(t)
1853 8db7828751b7 topic: wrap the underlying update function rather than the command Matt Mackall <mpm@selenic.com> parents: 1852 diff changeset	316 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	317 repo.ui.status(_("switching to topic %s\n") % t)
8db7828751b7 topic: wrap the underlying update function rather than the command Matt Mackall <mpm@selenic.com> parents: 1852 diff changeset	318 return ret
8db7828751b7 topic: wrap the underlying update function rather than the command Matt Mackall <mpm@selenic.com> parents: 1852 diff changeset	319 finally:
8db7828751b7 topic: wrap the underlying update function rather than the command Matt Mackall <mpm@selenic.com> parents: 1852 diff changeset	320 wlock.release()
1839 1bc5e62fc0c7 Initial dumb version of topics. Augie Fackler <augie@google.com> parents: diff changeset	321
1854 67950fcf1c69 rebase: teach rebase how to copy topics Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	322 def _fixrebase(loaded):
67950fcf1c69 rebase: teach rebase how to copy topics Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	323 if not loaded:
67950fcf1c69 rebase: teach rebase how to copy topics Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	324 return
67950fcf1c69 rebase: teach rebase how to copy topics Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	325
67950fcf1c69 rebase: teach rebase how to copy topics Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	326 def savetopic(ctx, extra):
1861 972d4e0c3d44 changectx: add topic method Matt Mackall <mpm@selenic.com> parents: 1860 diff changeset	327 if ctx.topic():
972d4e0c3d44 changectx: add topic method Matt Mackall <mpm@selenic.com> parents: 1860 diff changeset	328 extra[constants.extrakey] = ctx.topic()
1854 67950fcf1c69 rebase: teach rebase how to copy topics Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	329
67950fcf1c69 rebase: teach rebase how to copy topics Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	330 def newmakeextrafn(orig, copiers):
67950fcf1c69 rebase: teach rebase how to copy topics Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	331 return orig(copiers + [savetopic])
67950fcf1c69 rebase: teach rebase how to copy topics Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	332
67950fcf1c69 rebase: teach rebase how to copy topics Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	333 rebase = extensions.find("rebase")
67950fcf1c69 rebase: teach rebase how to copy topics Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	334 extensions.wrapfunction(rebase, '_makeextrafn', newmakeextrafn)
67950fcf1c69 rebase: teach rebase how to copy topics Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	335
1866 13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1863 diff changeset	336 def _exporttopic(seq, ctx):
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1863 diff changeset	337 topic = ctx.topic()
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1863 diff changeset	338 if topic:
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1863 diff changeset	339 return 'EXP-Topic %s' % topic
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1863 diff changeset	340 return None
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1863 diff changeset	341
1867 c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	342 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	343 if 'topic' in patchdata:
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	344 extra['topic'] = patchdata['topic']
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	345
1854 67950fcf1c69 rebase: teach rebase how to copy topics Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	346 extensions.afterloaded('rebase', _fixrebase)
67950fcf1c69 rebase: teach rebase how to copy topics Matt Mackall <mpm@selenic.com> parents: 1853 diff changeset	347
1850 0da6bf86b718 commit: add a --topic flag Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	348 entry = extensions.wrapcommand(commands.table, 'commit', commitwrap)
0da6bf86b718 commit: add a --topic flag Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	349 entry[1].append(('t', 'topic', '',
0da6bf86b718 commit: add a --topic flag Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	350 _("use specified topic"), _('TOPIC')))
0da6bf86b718 commit: add a --topic flag Matt Mackall <mpm@selenic.com> parents: 1849 diff changeset	351
1852 3084687f7994 commit: add a topic field to the in-editor commit text Matt Mackall <mpm@selenic.com> parents: 1851 diff changeset	352 extensions.wrapfunction(cmdutil, 'buildcommittext', committextwrap)
1853 8db7828751b7 topic: wrap the underlying update function rather than the command Matt Mackall <mpm@selenic.com> parents: 1852 diff changeset	353 extensions.wrapfunction(merge, 'update', mergeupdatewrap)
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	354 extensions.wrapfunction(discoverymod, '_headssummary', discovery._headssummary)
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	355 extensions.wrapfunction(wireproto, 'branchmap', discovery.wireprotobranchmap)
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	356 extensions.wrapfunction(wireproto, '_capabilities', discovery.wireprotocaps)
1887 68125d026b07 push: hackish handeling of new branch head from phase move Pierre-Yves David <pierre-yves.david@fb.com> parents: 1886 diff changeset	357 extensions.wrapfunction(bundle2, 'handlecheckheads', discovery.handlecheckheads)
68125d026b07 push: hackish handeling of new branch head from phase move Pierre-Yves David <pierre-yves.david@fb.com> parents: 1886 diff changeset	358 bundle2.handlecheckheads.params = frozenset() # we need a proper wrape b2 part stuff
68125d026b07 push: hackish handeling of new branch head from phase move Pierre-Yves David <pierre-yves.david@fb.com> parents: 1886 diff changeset	359 bundle2.parthandlermapping['check:heads'] = bundle2.handlecheckheads
68125d026b07 push: hackish handeling of new branch head from phase move Pierre-Yves David <pierre-yves.david@fb.com> parents: 1886 diff changeset	360 extensions.wrapfunction(exchange, '_pushb2phases', discovery._pushb2phases)
1889 d9b929bcc3ad topicmap: ensure that 'served' view is updated with topicmap Pierre-Yves David <pierre-yves.david@fb.com> parents: 1888 diff changeset	361 extensions.wrapfunction(changegroup.cg1unpacker, 'apply', cgapply)
1887 68125d026b07 push: hackish handeling of new branch head from phase move Pierre-Yves David <pierre-yves.david@fb.com> parents: 1886 diff changeset	362 exchange.b2partsgenmapping['phase'] = exchange._pushb2phases
1843 0ba067a97d06 revset: add a topic() revset for querying topics Augie Fackler <augie@google.com> parents: 1842 diff changeset	363 topicrevset.modsetup()
1848 9a81657deec2 summary: add topic summary hook Matt Mackall <mpm@selenic.com> parents: 1847 diff changeset	364 cmdutil.summaryhooks.add('topic', summaryhook)
1866 13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1863 diff changeset	365
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1863 diff changeset	366 if util.safehasattr(cmdutil, 'extraexport'):
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1863 diff changeset	367 cmdutil.extraexport.append('topic')
13fc93fb7fbe patch: add topic to exported patch Pierre-Yves David <pierre-yves.david@fb.com> parents: 1863 diff changeset	368 cmdutil.extraexportmap['topic'] = _exporttopic
1867 c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	369 if util.safehasattr(cmdutil, 'extrapreimport'):
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	370 cmdutil.extrapreimport.append('topic')
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	371 cmdutil.extrapreimportmap['topic'] = _importtopic
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	372 if util.safehasattr(patch, 'patchheadermap'):
c9cacc62fa17 patch: import topic from patch header Pierre-Yves David <pierre-yves.david@fb.com> parents: 1866 diff changeset	373 patch.patchheadermap.append(('EXP-Topic', 'topic'))

Mercurial > evolve

annotate hgext3rd/topic/__init__.py @ 1909:36112e361ee4

annotate hgext3rd/topic/init.py @ 1909:36112e361ee4