Show More
@@ -1,92 +1,91 b'' | |||
|
1 | 1 | # closehead.py - Close arbitrary heads without checking them out first |
|
2 | 2 | # |
|
3 | 3 | # This software may be used and distributed according to the terms of the |
|
4 | 4 | # GNU General Public License version 2 or any later version. |
|
5 | 5 | |
|
6 | 6 | '''close arbitrary heads without checking them out first''' |
|
7 | 7 | |
|
8 | 8 | |
|
9 | 9 | from mercurial.i18n import _ |
|
10 | 10 | from mercurial import ( |
|
11 | 11 | bookmarks, |
|
12 | 12 | cmdutil, |
|
13 | 13 | context, |
|
14 | 14 | error, |
|
15 | 15 | logcmdutil, |
|
16 | 16 | pycompat, |
|
17 | 17 | registrar, |
|
18 | 18 | ) |
|
19 | 19 | |
|
20 | 20 | cmdtable = {} |
|
21 | 21 | command = registrar.command(cmdtable) |
|
22 | 22 | # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for |
|
23 | 23 | # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should |
|
24 | 24 | # be specifying the version(s) of Mercurial they are tested with, or |
|
25 | 25 | # leave the attribute unspecified. |
|
26 | 26 | testedwith = b'ships-with-hg-core' |
|
27 | 27 | |
|
28 | 28 | commitopts = cmdutil.commitopts |
|
29 | 29 | commitopts2 = cmdutil.commitopts2 |
|
30 | 30 | commitopts3 = [(b'r', b'rev', [], _(b'revision to check'), _(b'REV'))] |
|
31 | 31 | |
|
32 | 32 | |
|
33 | 33 | @command( |
|
34 | 34 | b'close-head|close-heads', |
|
35 | 35 | commitopts + commitopts2 + commitopts3, |
|
36 | 36 | _(b'[OPTION]... [REV]...'), |
|
37 | 37 | helpcategory=command.CATEGORY_CHANGE_MANAGEMENT, |
|
38 | 38 | inferrepo=True, |
|
39 | 39 | ) |
|
40 | 40 | def close_branch(ui, repo, *revs, **opts): |
|
41 | 41 | """close the given head revisions |
|
42 | 42 | |
|
43 | 43 | This is equivalent to checking out each revision in a clean tree and running |
|
44 | 44 | ``hg commit --close-branch``, except that it doesn't change the working |
|
45 | 45 | directory. |
|
46 | 46 | |
|
47 | 47 | The commit message must be specified with -l or -m. |
|
48 | 48 | """ |
|
49 | 49 | |
|
50 | 50 | def docommit(rev): |
|
51 | 51 | cctx = context.memctx( |
|
52 | 52 | repo, |
|
53 | 53 | parents=[rev, None], |
|
54 | 54 | text=message, |
|
55 | 55 | files=[], |
|
56 | 56 | filectxfn=None, |
|
57 | 57 | user=opts.get('user'), |
|
58 | 58 | date=opts.get('date'), |
|
59 | 59 | extra=extra, |
|
60 | 60 | ) |
|
61 |
|
|
|
62 | ret = repo.commitctx(cctx, True) | |
|
63 | bookmarks.update(repo, [rev, None], ret) | |
|
64 | cctx.markcommitted(ret) | |
|
65 | tr.close() | |
|
61 | with repo.transaction(b'commit'): | |
|
62 | ret = repo.commitctx(cctx, True) | |
|
63 | bookmarks.update(repo, [rev, None], ret) | |
|
64 | cctx.markcommitted(ret) | |
|
66 | 65 | |
|
67 | 66 | revs += tuple(opts.get('rev', [])) |
|
68 | 67 | revs = logcmdutil.revrange(repo, revs) |
|
69 | 68 | |
|
70 | 69 | if not revs: |
|
71 | 70 | raise error.Abort(_(b'no revisions specified')) |
|
72 | 71 | |
|
73 | 72 | heads = [] |
|
74 | 73 | for branch in repo.branchmap(): |
|
75 | 74 | heads.extend(repo.branchheads(branch)) |
|
76 | 75 | heads = {repo[h].rev() for h in heads} |
|
77 | 76 | for rev in revs: |
|
78 | 77 | if rev not in heads: |
|
79 | 78 | raise error.Abort(_(b'revision is not an open head: %d') % rev) |
|
80 | 79 | |
|
81 | 80 | message = cmdutil.logmessage(ui, pycompat.byteskwargs(opts)) |
|
82 | 81 | if not message: |
|
83 | 82 | raise error.Abort(_(b"no commit message specified with -l or -m")) |
|
84 | 83 | extra = {b'close': b'1'} |
|
85 | 84 | |
|
86 | 85 | with repo.wlock(), repo.lock(): |
|
87 | 86 | for rev in revs: |
|
88 | 87 | r = repo[rev] |
|
89 | 88 | branch = r.branch() |
|
90 | 89 | extra[b'branch'] = branch |
|
91 | 90 | docommit(r) |
|
92 | 91 | return 0 |
General Comments 0
You need to be logged in to leave comments.
Login now