Mercurial > evolve
annotate src/topic/__init__.py @ 1858:4ab1b854ce4e
topics: allow commits that only change topic (issue4725)
This allows amend to change topics. It also matches the behavior of branches.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 15 Jun 2015 17:29:07 -0500 |
parents | a506ed8ab8da |
children | fdfa611b8ab0 |
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 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
14 |
1848
9a81657deec2
summary: add topic summary hook
Matt Mackall <mpm@selenic.com>
parents:
1847
diff
changeset
|
15 from mercurial.i18n import _ |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
16 from mercurial import cmdutil |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
17 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
|
18 from mercurial import context |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
19 from mercurial import extensions |
1856
7d7f5f9e2f8c
rewrite: use a lock and transaction as spotted by devel warnings
Augie Fackler <augie@google.com>
parents:
1855
diff
changeset
|
20 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
|
21 from mercurial import merge |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
22 from mercurial import namespaces |
1842
94bbc18daa99
topic: disallow use of topics without obsolete enabled
Augie Fackler <augie@google.com>
parents:
1841
diff
changeset
|
23 from mercurial import obsolete |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
24 from mercurial import phases |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
25 from mercurial import util |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
26 |
1845
24d8053020a2
constants: extract key for extra into a constant
Augie Fackler <augie@google.com>
parents:
1844
diff
changeset
|
27 from . import constants |
1843
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1842
diff
changeset
|
28 from . import revset as topicrevset |
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1842
diff
changeset
|
29 |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
30 cmdtable = {} |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
31 command = cmdutil.command(cmdtable) |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
32 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
33 def _namemap(repo, name): |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
34 return [ctx.node() for ctx in |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
35 repo.set('not public() and extra(topic, %s)', name)] |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
36 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
37 def _nodemap(repo, node): |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
38 ctx = repo[node] |
1845
24d8053020a2
constants: extract key for extra into a constant
Augie Fackler <augie@google.com>
parents:
1844
diff
changeset
|
39 t = ctx.extra().get(constants.extrakey, '') |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
40 if t and ctx.phase() > phases.public: |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
41 return [t] |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
42 return [] |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
43 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
44 def reposetup(ui, repo): |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
45 orig = repo.__class__ |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
46 class topicrepo(repo.__class__): |
1858
4ab1b854ce4e
topics: allow commits that only change topic (issue4725)
Matt Mackall <mpm@selenic.com>
parents:
1857
diff
changeset
|
47 def commit(self, *args, **kwargs): |
4ab1b854ce4e
topics: allow commits that only change topic (issue4725)
Matt Mackall <mpm@selenic.com>
parents:
1857
diff
changeset
|
48 backup = self.ui.backupconfig('ui', 'allowemptycommit') |
4ab1b854ce4e
topics: allow commits that only change topic (issue4725)
Matt Mackall <mpm@selenic.com>
parents:
1857
diff
changeset
|
49 try: |
4ab1b854ce4e
topics: allow commits that only change topic (issue4725)
Matt Mackall <mpm@selenic.com>
parents:
1857
diff
changeset
|
50 if repo.currenttopic != repo['.'].extra().get('topic'): |
4ab1b854ce4e
topics: allow commits that only change topic (issue4725)
Matt Mackall <mpm@selenic.com>
parents:
1857
diff
changeset
|
51 # bypass the core "nothing changed" logic |
4ab1b854ce4e
topics: allow commits that only change topic (issue4725)
Matt Mackall <mpm@selenic.com>
parents:
1857
diff
changeset
|
52 self.ui.setconfig('ui', 'allowemptycommit', True) |
4ab1b854ce4e
topics: allow commits that only change topic (issue4725)
Matt Mackall <mpm@selenic.com>
parents:
1857
diff
changeset
|
53 return orig.commit(self, *args, **kwargs) |
4ab1b854ce4e
topics: allow commits that only change topic (issue4725)
Matt Mackall <mpm@selenic.com>
parents:
1857
diff
changeset
|
54 finally: |
4ab1b854ce4e
topics: allow commits that only change topic (issue4725)
Matt Mackall <mpm@selenic.com>
parents:
1857
diff
changeset
|
55 self.ui.restoreconfig(backup) |
4ab1b854ce4e
topics: allow commits that only change topic (issue4725)
Matt Mackall <mpm@selenic.com>
parents:
1857
diff
changeset
|
56 |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
57 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
|
58 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
|
59 current = self.currenttopic |
f241a00e93a7
topics: only apply topic to commits of the working copy
Matt Mackall <mpm@selenic.com>
parents:
1854
diff
changeset
|
60 if current: |
f241a00e93a7
topics: only apply topic to commits of the working copy
Matt Mackall <mpm@selenic.com>
parents:
1854
diff
changeset
|
61 ctx.extra()[constants.extrakey] = current |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
62 return orig.commitctx(self, ctx, error=error) |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
63 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
64 @property |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
65 def topics(self): |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
66 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
|
67 for c in self.set('not public()'): |
1845
24d8053020a2
constants: extract key for extra into a constant
Augie Fackler <augie@google.com>
parents:
1844
diff
changeset
|
68 topics.add(c.extra().get(constants.extrakey, '')) |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
69 topics.remove('') |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
70 return topics |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
71 |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
72 @property |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
73 def currenttopic(self): |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
74 return self.vfs.tryread('topic') |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
75 |
1857
a506ed8ab8da
topics: add listnames hook so completion works
Matt Mackall <mpm@selenic.com>
parents:
1856
diff
changeset
|
76 repo.__class__ = topicrepo |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
77 if util.safehasattr(repo, 'names'): |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
78 repo.names.addnamespace(namespaces.namespace( |
1857
a506ed8ab8da
topics: add listnames hook so completion works
Matt Mackall <mpm@selenic.com>
parents:
1856
diff
changeset
|
79 'topics', 'topic', namemap=_namemap, nodemap=_nodemap, |
a506ed8ab8da
topics: add listnames hook so completion works
Matt Mackall <mpm@selenic.com>
parents:
1856
diff
changeset
|
80 listnames=lambda repo: repo.topics)) |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
81 |
1847
9fa5b8f4e98e
topics: add command summary
Matt Mackall <mpm@selenic.com>
parents:
1846
diff
changeset
|
82 @command('topics [TOPIC]', [ |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
83 ('', '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
|
84 ('', 'change', '', 'revset of existing revisions to change topic'), |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
85 ]) |
1844
862cabc132fd
topic: add ability to change topic of non-public changes
Augie Fackler <augie@google.com>
parents:
1843
diff
changeset
|
86 def topics(ui, repo, topic=None, clear=False, change=None): |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
87 """View current topic, set current topic, or see all topics.""" |
1844
862cabc132fd
topic: add ability to change topic of non-public changes
Augie Fackler <augie@google.com>
parents:
1843
diff
changeset
|
88 if change: |
1851
67d53e8e0c1a
topic: only require obsolete support for --change
Matt Mackall <mpm@selenic.com>
parents:
1850
diff
changeset
|
89 if not obsolete.isenabled(repo, obsolete.createmarkersopt): |
67d53e8e0c1a
topic: only require obsolete support for --change
Matt Mackall <mpm@selenic.com>
parents:
1850
diff
changeset
|
90 raise util.Abort(_('must have obsolete enabled to use --change')) |
1844
862cabc132fd
topic: add ability to change topic of non-public changes
Augie Fackler <augie@google.com>
parents:
1843
diff
changeset
|
91 if topic is None and not clear: |
862cabc132fd
topic: add ability to change topic of non-public changes
Augie Fackler <augie@google.com>
parents:
1843
diff
changeset
|
92 raise util.Abort('changing topic requires a topic name or --clear') |
862cabc132fd
topic: add ability to change topic of non-public changes
Augie Fackler <augie@google.com>
parents:
1843
diff
changeset
|
93 if any(not c.mutable() for c in repo.set('%r and public()', change)): |
862cabc132fd
topic: add ability to change topic of non-public changes
Augie Fackler <augie@google.com>
parents:
1843
diff
changeset
|
94 raise util.Abort("can't change topic of a public change") |
862cabc132fd
topic: add ability to change topic of non-public changes
Augie Fackler <augie@google.com>
parents:
1843
diff
changeset
|
95 rewrote = 0 |
862cabc132fd
topic: add ability to change topic of non-public changes
Augie Fackler <augie@google.com>
parents:
1843
diff
changeset
|
96 needevolve = False |
1856
7d7f5f9e2f8c
rewrite: use a lock and transaction as spotted by devel warnings
Augie Fackler <augie@google.com>
parents:
1855
diff
changeset
|
97 l = repo.lock() |
7d7f5f9e2f8c
rewrite: use a lock and transaction as spotted by devel warnings
Augie Fackler <augie@google.com>
parents:
1855
diff
changeset
|
98 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
|
99 try: |
7d7f5f9e2f8c
rewrite: use a lock and transaction as spotted by devel warnings
Augie Fackler <augie@google.com>
parents:
1855
diff
changeset
|
100 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
|
101 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
|
102 try: |
7d7f5f9e2f8c
rewrite: use a lock and transaction as spotted by devel warnings
Augie Fackler <augie@google.com>
parents:
1855
diff
changeset
|
103 return c[path] |
7d7f5f9e2f8c
rewrite: use a lock and transaction as spotted by devel warnings
Augie Fackler <augie@google.com>
parents:
1855
diff
changeset
|
104 except error.ManifestLookupError: |
7d7f5f9e2f8c
rewrite: use a lock and transaction as spotted by devel warnings
Augie Fackler <augie@google.com>
parents:
1855
diff
changeset
|
105 return None |
7d7f5f9e2f8c
rewrite: use a lock and transaction as spotted by devel warnings
Augie Fackler <augie@google.com>
parents:
1855
diff
changeset
|
106 fixedextra = dict(c.extra()) |
7d7f5f9e2f8c
rewrite: use a lock and transaction as spotted by devel warnings
Augie Fackler <augie@google.com>
parents:
1855
diff
changeset
|
107 newtopic = None if clear else topic |
7d7f5f9e2f8c
rewrite: use a lock and transaction as spotted by devel warnings
Augie Fackler <augie@google.com>
parents:
1855
diff
changeset
|
108 if fixedextra.get(constants.extrakey, None) == topic: |
7d7f5f9e2f8c
rewrite: use a lock and transaction as spotted by devel warnings
Augie Fackler <augie@google.com>
parents:
1855
diff
changeset
|
109 continue |
7d7f5f9e2f8c
rewrite: use a lock and transaction as spotted by devel warnings
Augie Fackler <augie@google.com>
parents:
1855
diff
changeset
|
110 if clear and constants.extrakey in fixedextra: |
7d7f5f9e2f8c
rewrite: use a lock and transaction as spotted by devel warnings
Augie Fackler <augie@google.com>
parents:
1855
diff
changeset
|
111 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
|
112 else: |
7d7f5f9e2f8c
rewrite: use a lock and transaction as spotted by devel warnings
Augie Fackler <augie@google.com>
parents:
1855
diff
changeset
|
113 fixedextra[constants.extrakey] = topic |
7d7f5f9e2f8c
rewrite: use a lock and transaction as spotted by devel warnings
Augie Fackler <augie@google.com>
parents:
1855
diff
changeset
|
114 c.parents() |
7d7f5f9e2f8c
rewrite: use a lock and transaction as spotted by devel warnings
Augie Fackler <augie@google.com>
parents:
1855
diff
changeset
|
115 mc = context.memctx( |
7d7f5f9e2f8c
rewrite: use a lock and transaction as spotted by devel warnings
Augie Fackler <augie@google.com>
parents:
1855
diff
changeset
|
116 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
|
117 c.files(), filectxfn, |
7d7f5f9e2f8c
rewrite: use a lock and transaction as spotted by devel warnings
Augie Fackler <augie@google.com>
parents:
1855
diff
changeset
|
118 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
|
119 newnode = repo.commitctx(mc) |
7d7f5f9e2f8c
rewrite: use a lock and transaction as spotted by devel warnings
Augie Fackler <augie@google.com>
parents:
1855
diff
changeset
|
120 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
|
121 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
|
122 rewrote += 1 |
7d7f5f9e2f8c
rewrite: use a lock and transaction as spotted by devel warnings
Augie Fackler <augie@google.com>
parents:
1855
diff
changeset
|
123 txn.close() |
7d7f5f9e2f8c
rewrite: use a lock and transaction as spotted by devel warnings
Augie Fackler <augie@google.com>
parents:
1855
diff
changeset
|
124 except: |
7d7f5f9e2f8c
rewrite: use a lock and transaction as spotted by devel warnings
Augie Fackler <augie@google.com>
parents:
1855
diff
changeset
|
125 try: |
7d7f5f9e2f8c
rewrite: use a lock and transaction as spotted by devel warnings
Augie Fackler <augie@google.com>
parents:
1855
diff
changeset
|
126 txn.abort() |
7d7f5f9e2f8c
rewrite: use a lock and transaction as spotted by devel warnings
Augie Fackler <augie@google.com>
parents:
1855
diff
changeset
|
127 finally: |
7d7f5f9e2f8c
rewrite: use a lock and transaction as spotted by devel warnings
Augie Fackler <augie@google.com>
parents:
1855
diff
changeset
|
128 repo.invalidate() |
7d7f5f9e2f8c
rewrite: use a lock and transaction as spotted by devel warnings
Augie Fackler <augie@google.com>
parents:
1855
diff
changeset
|
129 raise |
7d7f5f9e2f8c
rewrite: use a lock and transaction as spotted by devel warnings
Augie Fackler <augie@google.com>
parents:
1855
diff
changeset
|
130 finally: |
7d7f5f9e2f8c
rewrite: use a lock and transaction as spotted by devel warnings
Augie Fackler <augie@google.com>
parents:
1855
diff
changeset
|
131 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
|
132 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
|
133 if needevolve: |
862cabc132fd
topic: add ability to change topic of non-public changes
Augie Fackler <augie@google.com>
parents:
1843
diff
changeset
|
134 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
|
135 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
|
136 if clear: |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
137 if repo.vfs.exists('topic'): |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
138 repo.vfs.unlink('topic') |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
139 return |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
140 if topic is not None: |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
141 with repo.vfs.open('topic', 'w') as f: |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
142 f.write(topic) |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
143 return |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
144 current = repo.currenttopic |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
145 for t in sorted(repo.topics): |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
146 marker = '*' if t == current else ' ' |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
147 ui.write(' %s %s\n' % (marker, t)) |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
148 |
1848
9a81657deec2
summary: add topic summary hook
Matt Mackall <mpm@selenic.com>
parents:
1847
diff
changeset
|
149 def summaryhook(ui, repo): |
9a81657deec2
summary: add topic summary hook
Matt Mackall <mpm@selenic.com>
parents:
1847
diff
changeset
|
150 t = repo.currenttopic |
9a81657deec2
summary: add topic summary hook
Matt Mackall <mpm@selenic.com>
parents:
1847
diff
changeset
|
151 if not t: |
9a81657deec2
summary: add topic summary hook
Matt Mackall <mpm@selenic.com>
parents:
1847
diff
changeset
|
152 return |
9a81657deec2
summary: add topic summary hook
Matt Mackall <mpm@selenic.com>
parents:
1847
diff
changeset
|
153 # i18n: column positioning for "hg summary" |
9a81657deec2
summary: add topic summary hook
Matt Mackall <mpm@selenic.com>
parents:
1847
diff
changeset
|
154 ui.write(_("topic: %s\n") % t) |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
155 |
1850 | 156 def commitwrap(orig, ui, repo, *args, **opts): |
157 if opts.get('topic'): | |
158 t = opts['topic'] | |
159 with repo.vfs.open('topic', 'w') as f: | |
160 f.write(t) | |
161 return orig(ui, repo, *args, **opts) | |
162 | |
1852
3084687f7994
commit: add a topic field to the in-editor commit text
Matt Mackall <mpm@selenic.com>
parents:
1851
diff
changeset
|
163 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
|
164 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
|
165 t = repo.currenttopic |
3084687f7994
commit: add a topic field to the in-editor commit text
Matt Mackall <mpm@selenic.com>
parents:
1851
diff
changeset
|
166 if t: |
3084687f7994
commit: add a topic field to the in-editor commit text
Matt Mackall <mpm@selenic.com>
parents:
1851
diff
changeset
|
167 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
|
168 "\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
|
169 return ret |
3084687f7994
commit: add a topic field to the in-editor commit text
Matt Mackall <mpm@selenic.com>
parents:
1851
diff
changeset
|
170 |
1853
8db7828751b7
topic: wrap the underlying update function rather than the command
Matt Mackall <mpm@selenic.com>
parents:
1852
diff
changeset
|
171 def mergeupdatewrap(orig, repo, node, branchmerge, force, partial, |
8db7828751b7
topic: wrap the underlying update function rather than the command
Matt Mackall <mpm@selenic.com>
parents:
1852
diff
changeset
|
172 ancestor=None, mergeancestor=False, labels=None): |
8db7828751b7
topic: wrap the underlying update function rather than the command
Matt Mackall <mpm@selenic.com>
parents:
1852
diff
changeset
|
173 wlock = repo.wlock() |
8db7828751b7
topic: wrap the underlying update function rather than the command
Matt Mackall <mpm@selenic.com>
parents:
1852
diff
changeset
|
174 try: |
8db7828751b7
topic: wrap the underlying update function rather than the command
Matt Mackall <mpm@selenic.com>
parents:
1852
diff
changeset
|
175 ret = orig(repo, node, branchmerge, force, partial, ancestor=ancestor, |
8db7828751b7
topic: wrap the underlying update function rather than the command
Matt Mackall <mpm@selenic.com>
parents:
1852
diff
changeset
|
176 mergeancestor=mergeancestor, labels=labels) |
8db7828751b7
topic: wrap the underlying update function rather than the command
Matt Mackall <mpm@selenic.com>
parents:
1852
diff
changeset
|
177 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
|
178 ot = repo.currenttopic |
8db7828751b7
topic: wrap the underlying update function rather than the command
Matt Mackall <mpm@selenic.com>
parents:
1852
diff
changeset
|
179 t = '' |
8db7828751b7
topic: wrap the underlying update function rather than the command
Matt Mackall <mpm@selenic.com>
parents:
1852
diff
changeset
|
180 pctx = repo[node] |
8db7828751b7
topic: wrap the underlying update function rather than the command
Matt Mackall <mpm@selenic.com>
parents:
1852
diff
changeset
|
181 if pctx.phase() > phases.public: |
8db7828751b7
topic: wrap the underlying update function rather than the command
Matt Mackall <mpm@selenic.com>
parents:
1852
diff
changeset
|
182 t = pctx.extra().get(constants.extrakey, '') |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
183 with repo.vfs.open('topic', 'w') as f: |
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
184 f.write(t) |
1853
8db7828751b7
topic: wrap the underlying update function rather than the command
Matt Mackall <mpm@selenic.com>
parents:
1852
diff
changeset
|
185 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
|
186 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
|
187 return ret |
8db7828751b7
topic: wrap the underlying update function rather than the command
Matt Mackall <mpm@selenic.com>
parents:
1852
diff
changeset
|
188 finally: |
8db7828751b7
topic: wrap the underlying update function rather than the command
Matt Mackall <mpm@selenic.com>
parents:
1852
diff
changeset
|
189 wlock.release() |
1839
1bc5e62fc0c7
Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
190 |
1854
67950fcf1c69
rebase: teach rebase how to copy topics
Matt Mackall <mpm@selenic.com>
parents:
1853
diff
changeset
|
191 def _fixrebase(loaded): |
67950fcf1c69
rebase: teach rebase how to copy topics
Matt Mackall <mpm@selenic.com>
parents:
1853
diff
changeset
|
192 if not loaded: |
67950fcf1c69
rebase: teach rebase how to copy topics
Matt Mackall <mpm@selenic.com>
parents:
1853
diff
changeset
|
193 return |
67950fcf1c69
rebase: teach rebase how to copy topics
Matt Mackall <mpm@selenic.com>
parents:
1853
diff
changeset
|
194 |
67950fcf1c69
rebase: teach rebase how to copy topics
Matt Mackall <mpm@selenic.com>
parents:
1853
diff
changeset
|
195 def savetopic(ctx, extra): |
67950fcf1c69
rebase: teach rebase how to copy topics
Matt Mackall <mpm@selenic.com>
parents:
1853
diff
changeset
|
196 e = ctx.extra() |
67950fcf1c69
rebase: teach rebase how to copy topics
Matt Mackall <mpm@selenic.com>
parents:
1853
diff
changeset
|
197 if constants.extrakey in e: |
67950fcf1c69
rebase: teach rebase how to copy topics
Matt Mackall <mpm@selenic.com>
parents:
1853
diff
changeset
|
198 print "copying topic" |
67950fcf1c69
rebase: teach rebase how to copy topics
Matt Mackall <mpm@selenic.com>
parents:
1853
diff
changeset
|
199 extra[constants.extrakey] = e[constants.extrakey] |
67950fcf1c69
rebase: teach rebase how to copy topics
Matt Mackall <mpm@selenic.com>
parents:
1853
diff
changeset
|
200 |
67950fcf1c69
rebase: teach rebase how to copy topics
Matt Mackall <mpm@selenic.com>
parents:
1853
diff
changeset
|
201 def newmakeextrafn(orig, copiers): |
67950fcf1c69
rebase: teach rebase how to copy topics
Matt Mackall <mpm@selenic.com>
parents:
1853
diff
changeset
|
202 return orig(copiers + [savetopic]) |
67950fcf1c69
rebase: teach rebase how to copy topics
Matt Mackall <mpm@selenic.com>
parents:
1853
diff
changeset
|
203 |
67950fcf1c69
rebase: teach rebase how to copy topics
Matt Mackall <mpm@selenic.com>
parents:
1853
diff
changeset
|
204 rebase = extensions.find("rebase") |
67950fcf1c69
rebase: teach rebase how to copy topics
Matt Mackall <mpm@selenic.com>
parents:
1853
diff
changeset
|
205 extensions.wrapfunction(rebase, '_makeextrafn', newmakeextrafn) |
67950fcf1c69
rebase: teach rebase how to copy topics
Matt Mackall <mpm@selenic.com>
parents:
1853
diff
changeset
|
206 |
67950fcf1c69
rebase: teach rebase how to copy topics
Matt Mackall <mpm@selenic.com>
parents:
1853
diff
changeset
|
207 extensions.afterloaded('rebase', _fixrebase) |
67950fcf1c69
rebase: teach rebase how to copy topics
Matt Mackall <mpm@selenic.com>
parents:
1853
diff
changeset
|
208 |
1850 | 209 entry = extensions.wrapcommand(commands.table, 'commit', commitwrap) |
210 entry[1].append(('t', 'topic', '', | |
211 _("use specified topic"), _('TOPIC'))) | |
212 | |
1852
3084687f7994
commit: add a topic field to the in-editor commit text
Matt Mackall <mpm@selenic.com>
parents:
1851
diff
changeset
|
213 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
|
214 extensions.wrapfunction(merge, 'update', mergeupdatewrap) |
1843
0ba067a97d06
revset: add a topic() revset for querying topics
Augie Fackler <augie@google.com>
parents:
1842
diff
changeset
|
215 topicrevset.modsetup() |
1848
9a81657deec2
summary: add topic summary hook
Matt Mackall <mpm@selenic.com>
parents:
1847
diff
changeset
|
216 cmdutil.summaryhooks.add('topic', summaryhook) |