Show More
| @@ -1,27 +1,27 b'' | |||
|
|
1 | 1 | Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ |
|
|
2 | 2 | Upstream-Name: mercurial |
|
|
3 | 3 | Source: https://www.mercurial-scm.org/ |
|
|
4 | 4 | |
|
|
5 | 5 | Files: * |
|
|
6 |
Copyright: 2005-202 |
|
|
|
6 | Copyright: 2005-2021, Matt Mackall <mpm@selenic.com> and others. | |
|
|
7 | 7 | License: GPL-2+ |
|
|
8 | 8 | This program is free software; you can redistribute it |
|
|
9 | 9 | and/or modify it under the terms of the GNU General Public |
|
|
10 | 10 | License as published by the Free Software Foundation; either |
|
|
11 | 11 | version 2 of the License, or (at your option) any later |
|
|
12 | 12 | version. |
|
|
13 | 13 | . |
|
|
14 | 14 | This program is distributed in the hope that it will be |
|
|
15 | 15 | useful, but WITHOUT ANY WARRANTY; without even the implied |
|
|
16 | 16 | warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR |
|
|
17 | 17 | PURPOSE. See the GNU General Public License for more |
|
|
18 | 18 | details. |
|
|
19 | 19 | . |
|
|
20 | 20 | You should have received a copy of the GNU General Public |
|
|
21 | 21 | License along with this package; if not, write to the Free |
|
|
22 | 22 | Software Foundation, Inc., 51 Franklin St, Fifth Floor, |
|
|
23 | 23 | Boston, MA 02110-1301 USA |
|
|
24 | 24 | . |
|
|
25 | 25 | On Debian systems, the full text of the GNU General Public |
|
|
26 | 26 | License version 2 can be found in the file |
|
|
27 | 27 | `/usr/share/common-licenses/GPL-2'. |
| @@ -1,82 +1,82 b'' | |||
|
|
1 | 1 | ; Script generated by the Inno Setup Script Wizard. |
|
|
2 | 2 | ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! |
|
|
3 | 3 | |
|
|
4 | 4 | #ifndef ARCH |
|
|
5 | 5 | #define ARCH = "x86" |
|
|
6 | 6 | #endif |
|
|
7 | 7 | |
|
|
8 | 8 | [Setup] |
|
|
9 |
AppCopyright=Copyright 2005-202 |
|
|
|
9 | AppCopyright=Copyright 2005-2021 Matt Mackall and others | |
|
|
10 | 10 | AppName=Mercurial |
|
|
11 | 11 | AppVersion={#VERSION} |
|
|
12 | 12 | OutputBaseFilename=Mercurial-{#VERSION}{#SUFFIX} |
|
|
13 | 13 | #if ARCH == "x64" |
|
|
14 | 14 | AppVerName=Mercurial {#VERSION} (64-bit) |
|
|
15 | 15 | ArchitecturesAllowed=x64 |
|
|
16 | 16 | ArchitecturesInstallIn64BitMode=x64 |
|
|
17 | 17 | #else |
|
|
18 | 18 | AppVerName=Mercurial {#VERSION} |
|
|
19 | 19 | #endif |
|
|
20 | 20 | InfoAfterFile=../postinstall.txt |
|
|
21 | 21 | LicenseFile=Copying.txt |
|
|
22 | 22 | ShowLanguageDialog=yes |
|
|
23 | 23 | AppPublisher=Matt Mackall and others |
|
|
24 | 24 | AppPublisherURL=https://mercurial-scm.org/ |
|
|
25 | 25 | AppSupportURL=https://mercurial-scm.org/ |
|
|
26 | 26 | AppUpdatesURL=https://mercurial-scm.org/ |
|
|
27 | 27 | {{ 'AppID={{4B95A5F1-EF59-4B08-BED8-C891C46121B3}' }} |
|
|
28 | 28 | AppContact=mercurial@mercurial-scm.org |
|
|
29 | 29 | DefaultDirName={pf}\Mercurial |
|
|
30 | 30 | SourceDir=stage |
|
|
31 | 31 | VersionInfoDescription=Mercurial distributed SCM (version {#VERSION}) |
|
|
32 |
VersionInfoCopyright=Copyright 2005-202 |
|
|
|
32 | VersionInfoCopyright=Copyright 2005-2021 Matt Mackall and others | |
|
|
33 | 33 | VersionInfoCompany=Matt Mackall and others |
|
|
34 | 34 | VersionInfoVersion={#QUAD_VERSION} |
|
|
35 | 35 | InternalCompressLevel=max |
|
|
36 | 36 | SolidCompression=true |
|
|
37 | 37 | SetupIconFile=../mercurial.ico |
|
|
38 | 38 | AllowNoIcons=true |
|
|
39 | 39 | DefaultGroupName=Mercurial |
|
|
40 | 40 | PrivilegesRequired=none |
|
|
41 | 41 | ChangesEnvironment=true |
|
|
42 | 42 | |
|
|
43 | 43 | [Files] |
|
|
44 | 44 | {% for entry in package_files -%} |
|
|
45 | 45 | Source: {{ entry.source }}; DestDir: {{ entry.dest_dir }} |
|
|
46 | 46 | {%- if entry.metadata %}; {{ entry.metadata }}{% endif %} |
|
|
47 | 47 | {% endfor %} |
|
|
48 | 48 | |
|
|
49 | 49 | [INI] |
|
|
50 | 50 | Filename: {app}\Mercurial.url; Section: InternetShortcut; Key: URL; String: https://mercurial-scm.org/ |
|
|
51 | 51 | |
|
|
52 | 52 | [UninstallDelete] |
|
|
53 | 53 | Type: files; Name: {app}\Mercurial.url |
|
|
54 | 54 | Type: filesandordirs; Name: {app}\defaultrc |
|
|
55 | 55 | |
|
|
56 | 56 | [Icons] |
|
|
57 | 57 | Name: {group}\Uninstall Mercurial; Filename: {uninstallexe} |
|
|
58 | 58 | Name: {group}\Mercurial Command Reference; Filename: {app}\Docs\hg.1.html |
|
|
59 | 59 | Name: {group}\Mercurial Configuration Files; Filename: {app}\Docs\hgrc.5.html |
|
|
60 | 60 | Name: {group}\Mercurial Ignore Files; Filename: {app}\Docs\hgignore.5.html |
|
|
61 | 61 | Name: {group}\Mercurial Web Site; Filename: {app}\Mercurial.url |
|
|
62 | 62 | |
|
|
63 | 63 | [Tasks] |
|
|
64 | 64 | Name: modifypath; Description: Add the installation path to the search path; Flags: unchecked |
|
|
65 | 65 | |
|
|
66 | 66 | [Code] |
|
|
67 | 67 | procedure Touch(fn: String); |
|
|
68 | 68 | begin |
|
|
69 | 69 | SaveStringToFile(ExpandConstant(fn), '', False); |
|
|
70 | 70 | end; |
|
|
71 | 71 | |
|
|
72 | 72 | const |
|
|
73 | 73 | ModPathName = 'modifypath'; |
|
|
74 | 74 | ModPathType = 'user'; |
|
|
75 | 75 | |
|
|
76 | 76 | function ModPathDir(): TArrayOfString; |
|
|
77 | 77 | begin |
|
|
78 | 78 | setArrayLength(Result, 1) |
|
|
79 | 79 | Result[0] := ExpandConstant('{app}'); |
|
|
80 | 80 | end; |
|
|
81 | 81 | |
|
|
82 | 82 | {% include 'modpath.iss' %} |
|
|
1 | NO CONTENT: modified file, binary diff hidden |
| @@ -1,161 +1,161 b'' | |||
|
|
1 | 1 | <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> |
|
|
2 | 2 | <html> |
|
|
3 | 3 | <head> |
|
|
4 | 4 | <title>Mercurial for Windows</title> |
|
|
5 | 5 | <meta http-equiv="Content-Type" content="text/html;charset=utf-8" > |
|
|
6 | 6 | <style type="text/css"> |
|
|
7 | 7 | <!-- |
|
|
8 | 8 | html { |
|
|
9 | 9 | font-family: sans-serif; |
|
|
10 | 10 | margin: 1em 2em; |
|
|
11 | 11 | } |
|
|
12 | 12 | |
|
|
13 | 13 | p { |
|
|
14 | 14 | margin-top: 0.5em; |
|
|
15 | 15 | margin-bottom: 0.5em; |
|
|
16 | 16 | } |
|
|
17 | 17 | |
|
|
18 | 18 | pre { |
|
|
19 | 19 | margin: 0.25em 0em; |
|
|
20 | 20 | padding: 0.5em; |
|
|
21 | 21 | background-color: #EEE; |
|
|
22 | 22 | border: thin solid #CCC; |
|
|
23 | 23 | } |
|
|
24 | 24 | |
|
|
25 | 25 | .indented { |
|
|
26 | 26 | padding-left: 10pt; |
|
|
27 | 27 | } |
|
|
28 | 28 | --> |
|
|
29 | 29 | </style> |
|
|
30 | 30 | </head> |
|
|
31 | 31 | |
|
|
32 | 32 | <body> |
|
|
33 | 33 | <h1>Mercurial for Windows</h1> |
|
|
34 | 34 | |
|
|
35 | 35 | <p>Welcome to Mercurial for Windows!</p> |
|
|
36 | 36 | |
|
|
37 | 37 | <p> |
|
|
38 | 38 | Mercurial is a command-line application. You must run it from |
|
|
39 | 39 | the Windows command prompt (or if you're hard core, a <a |
|
|
40 | 40 | href="http://www.mingw.org/">MinGW</a> shell). |
|
|
41 | 41 | </p> |
|
|
42 | 42 | |
|
|
43 | 43 | <p class="indented"> |
|
|
44 | 44 | <i>Note: the standard <a href="http://www.mingw.org/">MinGW</a> |
|
|
45 | 45 | msys startup script uses rxvt which has problems setting up |
|
|
46 | 46 | standard input and output. Running bash directly works |
|
|
47 | 47 | correctly.</i> |
|
|
48 | 48 | </p> |
|
|
49 | 49 | |
|
|
50 | 50 | <p> |
|
|
51 | 51 | For documentation, please visit the <a |
|
|
52 | 52 | href="https://mercurial-scm.org/">Mercurial web site</a>. |
|
|
53 | 53 | You can also download a free book, <a |
|
|
54 | 54 | href="https://book.mercurial-scm.org/">Mercurial: The Definitive |
|
|
55 | 55 | Guide</a>. |
|
|
56 | 56 | </p> |
|
|
57 | 57 | |
|
|
58 | 58 | <p> |
|
|
59 | 59 | By default, Mercurial installs to <tt>C:\Program |
|
|
60 | 60 | Files\Mercurial</tt>. The Mercurial command is called |
|
|
61 | 61 | <tt>hg.exe</tt>. |
|
|
62 | 62 | </p> |
|
|
63 | 63 | |
|
|
64 | 64 | <h1>Testing Mercurial after you've installed it</h1> |
|
|
65 | 65 | |
|
|
66 | 66 | <p> |
|
|
67 | 67 | The easiest way to check that Mercurial is installed properly is |
|
|
68 | 68 | to just type the following at the command prompt: |
|
|
69 | 69 | </p> |
|
|
70 | 70 | |
|
|
71 | 71 | <pre> |
|
|
72 | 72 | hg |
|
|
73 | 73 | </pre> |
|
|
74 | 74 | |
|
|
75 | 75 | <p> |
|
|
76 | 76 | This command should print a useful help message. If it does, |
|
|
77 | 77 | other Mercurial commands should work fine for you. |
|
|
78 | 78 | </p> |
|
|
79 | 79 | |
|
|
80 | 80 | <h1>Configuration notes</h1> |
|
|
81 | 81 | <h4>Default editor</h4> |
|
|
82 | 82 | <p> |
|
|
83 | 83 | The default editor for commit messages is 'notepad'. You can set |
|
|
84 | 84 | the <tt>EDITOR</tt> (or <tt>HGEDITOR</tt>) environment variable |
|
|
85 | 85 | to specify your preference or set it in <tt>mercurial.ini</tt>: |
|
|
86 | 86 | </p> |
|
|
87 | 87 | <pre> |
|
|
88 | 88 | [ui] |
|
|
89 | 89 | editor = whatever |
|
|
90 | 90 | </pre> |
|
|
91 | 91 | |
|
|
92 | 92 | <h4>Configuring a Merge program</h4> |
|
|
93 | 93 | <p> |
|
|
94 | 94 | It should be emphasized that Mercurial by itself doesn't attempt |
|
|
95 | 95 | to do a Merge at the file level, neither does it make any |
|
|
96 | 96 | attempt to Resolve the conflicts. |
|
|
97 | 97 | </p> |
|
|
98 | 98 | |
|
|
99 | 99 | <p> |
|
|
100 | 100 | By default, Mercurial will use the merge program defined by the |
|
|
101 | 101 | <tt>HGMERGE</tt> environment variable, or uses the one defined |
|
|
102 | 102 | in the <tt>mercurial.ini</tt> file. (see <a |
|
|
103 | 103 | href="https://mercurial-scm.org/wiki/MergeProgram">MergeProgram</a> |
|
|
104 | 104 | on the Mercurial Wiki for more information) |
|
|
105 | 105 | </p> |
|
|
106 | 106 | |
|
|
107 | 107 | <h1>Reporting problems</h1> |
|
|
108 | 108 | |
|
|
109 | 109 | <p> |
|
|
110 | 110 | Before you report any problems, please consult the <a |
|
|
111 | 111 | href="https://mercurial-scm.org/">Mercurial web site</a> |
|
|
112 | 112 | and see if your question is already in our list of <a |
|
|
113 | 113 | href="https://mercurial-scm.org/wiki/FAQ">Frequently |
|
|
114 | 114 | Answered Questions</a> (the "FAQ"). |
|
|
115 | 115 | </p> |
|
|
116 | 116 | |
|
|
117 | 117 | <p> |
|
|
118 | 118 | If you cannot find an answer to your question, please feel free |
|
|
119 | 119 | to send mail to the Mercurial mailing list, at <a |
|
|
120 | 120 | href="mailto:mercurial@mercurial-scm.org">mercurial@mercurial-scm.org</a>. |
|
|
121 | 121 | <b>Remember</b>, the more useful information you include in your |
|
|
122 | 122 | report, the easier it will be for us to help you! |
|
|
123 | 123 | </p> |
|
|
124 | 124 | |
|
|
125 | 125 | <p> |
|
|
126 | 126 | If you are IRC-savvy, that's usually the fastest way to get |
|
|
127 | 127 | help. Go to <tt>#mercurial</tt> on <tt>irc.freenode.net</tt>. |
|
|
128 | 128 | </p> |
|
|
129 | 129 | |
|
|
130 | 130 | <h1>Author and copyright information</h1> |
|
|
131 | 131 | |
|
|
132 | 132 | <p> |
|
|
133 | 133 | Mercurial was written by <a href="http://www.selenic.com">Matt |
|
|
134 | 134 | Mackall</a>, and is maintained by Matt and a team of volunteers. |
|
|
135 | 135 | </p> |
|
|
136 | 136 | |
|
|
137 | 137 | <p> |
|
|
138 | 138 | The Windows installer was written by <a |
|
|
139 | 139 | href="http://www.serpentine.com/blog">Bryan O'Sullivan</a>. |
|
|
140 | 140 | </p> |
|
|
141 | 141 | |
|
|
142 | 142 | <p> |
|
|
143 |
Mercurial is Copyright 2005-202 |
|
|
|
143 | Mercurial is Copyright 2005-2021 Matt Mackall and others. | |
|
|
144 | 144 | </p> |
|
|
145 | 145 | |
|
|
146 | 146 | <p> |
|
|
147 | 147 | Mercurial is free software; you can redistribute it and/or |
|
|
148 | 148 | modify it under the terms of the <a |
|
|
149 | 149 | href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt">GNU |
|
|
150 | 150 | General Public License version 2</a> or any later version. |
|
|
151 | 151 | </p> |
|
|
152 | 152 | |
|
|
153 | 153 | <p> |
|
|
154 | 154 | Mercurial is distributed in the hope that it will be useful, but |
|
|
155 | 155 | <b>without any warranty</b>; without even the implied warranty |
|
|
156 | 156 | of <b>merchantability</b> or <b>fitness for a particular |
|
|
157 | 157 | purpose</b>. See the GNU General Public License for more |
|
|
158 | 158 | details. |
|
|
159 | 159 | </p> |
|
|
160 | 160 | </body> |
|
|
161 | 161 | </html> |
| @@ -1,7753 +1,7753 b'' | |||
|
|
1 | 1 | # commands.py - command processing for mercurial |
|
|
2 | 2 | # |
|
|
3 | 3 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> |
|
|
4 | 4 | # |
|
|
5 | 5 | # This software may be used and distributed according to the terms of the |
|
|
6 | 6 | # GNU General Public License version 2 or any later version. |
|
|
7 | 7 | |
|
|
8 | 8 | from __future__ import absolute_import |
|
|
9 | 9 | |
|
|
10 | 10 | import errno |
|
|
11 | 11 | import os |
|
|
12 | 12 | import re |
|
|
13 | 13 | import sys |
|
|
14 | 14 | |
|
|
15 | 15 | from .i18n import _ |
|
|
16 | 16 | from .node import ( |
|
|
17 | 17 | hex, |
|
|
18 | 18 | nullid, |
|
|
19 | 19 | nullrev, |
|
|
20 | 20 | short, |
|
|
21 | 21 | wdirhex, |
|
|
22 | 22 | wdirrev, |
|
|
23 | 23 | ) |
|
|
24 | 24 | from .pycompat import open |
|
|
25 | 25 | from . import ( |
|
|
26 | 26 | archival, |
|
|
27 | 27 | bookmarks, |
|
|
28 | 28 | bundle2, |
|
|
29 | 29 | bundlecaches, |
|
|
30 | 30 | changegroup, |
|
|
31 | 31 | cmdutil, |
|
|
32 | 32 | copies, |
|
|
33 | 33 | debugcommands as debugcommandsmod, |
|
|
34 | 34 | destutil, |
|
|
35 | 35 | dirstateguard, |
|
|
36 | 36 | discovery, |
|
|
37 | 37 | encoding, |
|
|
38 | 38 | error, |
|
|
39 | 39 | exchange, |
|
|
40 | 40 | extensions, |
|
|
41 | 41 | filemerge, |
|
|
42 | 42 | formatter, |
|
|
43 | 43 | graphmod, |
|
|
44 | 44 | grep as grepmod, |
|
|
45 | 45 | hbisect, |
|
|
46 | 46 | help, |
|
|
47 | 47 | hg, |
|
|
48 | 48 | logcmdutil, |
|
|
49 | 49 | merge as mergemod, |
|
|
50 | 50 | mergestate as mergestatemod, |
|
|
51 | 51 | narrowspec, |
|
|
52 | 52 | obsolete, |
|
|
53 | 53 | obsutil, |
|
|
54 | 54 | patch, |
|
|
55 | 55 | phases, |
|
|
56 | 56 | pycompat, |
|
|
57 | 57 | rcutil, |
|
|
58 | 58 | registrar, |
|
|
59 | 59 | requirements, |
|
|
60 | 60 | revsetlang, |
|
|
61 | 61 | rewriteutil, |
|
|
62 | 62 | scmutil, |
|
|
63 | 63 | server, |
|
|
64 | 64 | shelve as shelvemod, |
|
|
65 | 65 | state as statemod, |
|
|
66 | 66 | streamclone, |
|
|
67 | 67 | tags as tagsmod, |
|
|
68 | 68 | ui as uimod, |
|
|
69 | 69 | util, |
|
|
70 | 70 | verify as verifymod, |
|
|
71 | 71 | vfs as vfsmod, |
|
|
72 | 72 | wireprotoserver, |
|
|
73 | 73 | ) |
|
|
74 | 74 | from .utils import ( |
|
|
75 | 75 | dateutil, |
|
|
76 | 76 | stringutil, |
|
|
77 | 77 | ) |
|
|
78 | 78 | |
|
|
79 | 79 | table = {} |
|
|
80 | 80 | table.update(debugcommandsmod.command._table) |
|
|
81 | 81 | |
|
|
82 | 82 | command = registrar.command(table) |
|
|
83 | 83 | INTENT_READONLY = registrar.INTENT_READONLY |
|
|
84 | 84 | |
|
|
85 | 85 | # common command options |
|
|
86 | 86 | |
|
|
87 | 87 | globalopts = [ |
|
|
88 | 88 | ( |
|
|
89 | 89 | b'R', |
|
|
90 | 90 | b'repository', |
|
|
91 | 91 | b'', |
|
|
92 | 92 | _(b'repository root directory or name of overlay bundle file'), |
|
|
93 | 93 | _(b'REPO'), |
|
|
94 | 94 | ), |
|
|
95 | 95 | (b'', b'cwd', b'', _(b'change working directory'), _(b'DIR')), |
|
|
96 | 96 | ( |
|
|
97 | 97 | b'y', |
|
|
98 | 98 | b'noninteractive', |
|
|
99 | 99 | None, |
|
|
100 | 100 | _( |
|
|
101 | 101 | b'do not prompt, automatically pick the first choice for all prompts' |
|
|
102 | 102 | ), |
|
|
103 | 103 | ), |
|
|
104 | 104 | (b'q', b'quiet', None, _(b'suppress output')), |
|
|
105 | 105 | (b'v', b'verbose', None, _(b'enable additional output')), |
|
|
106 | 106 | ( |
|
|
107 | 107 | b'', |
|
|
108 | 108 | b'color', |
|
|
109 | 109 | b'', |
|
|
110 | 110 | # i18n: 'always', 'auto', 'never', and 'debug' are keywords |
|
|
111 | 111 | # and should not be translated |
|
|
112 | 112 | _(b"when to colorize (boolean, always, auto, never, or debug)"), |
|
|
113 | 113 | _(b'TYPE'), |
|
|
114 | 114 | ), |
|
|
115 | 115 | ( |
|
|
116 | 116 | b'', |
|
|
117 | 117 | b'config', |
|
|
118 | 118 | [], |
|
|
119 | 119 | _(b'set/override config option (use \'section.name=value\')'), |
|
|
120 | 120 | _(b'CONFIG'), |
|
|
121 | 121 | ), |
|
|
122 | 122 | (b'', b'debug', None, _(b'enable debugging output')), |
|
|
123 | 123 | (b'', b'debugger', None, _(b'start debugger')), |
|
|
124 | 124 | ( |
|
|
125 | 125 | b'', |
|
|
126 | 126 | b'encoding', |
|
|
127 | 127 | encoding.encoding, |
|
|
128 | 128 | _(b'set the charset encoding'), |
|
|
129 | 129 | _(b'ENCODE'), |
|
|
130 | 130 | ), |
|
|
131 | 131 | ( |
|
|
132 | 132 | b'', |
|
|
133 | 133 | b'encodingmode', |
|
|
134 | 134 | encoding.encodingmode, |
|
|
135 | 135 | _(b'set the charset encoding mode'), |
|
|
136 | 136 | _(b'MODE'), |
|
|
137 | 137 | ), |
|
|
138 | 138 | (b'', b'traceback', None, _(b'always print a traceback on exception')), |
|
|
139 | 139 | (b'', b'time', None, _(b'time how long the command takes')), |
|
|
140 | 140 | (b'', b'profile', None, _(b'print command execution profile')), |
|
|
141 | 141 | (b'', b'version', None, _(b'output version information and exit')), |
|
|
142 | 142 | (b'h', b'help', None, _(b'display help and exit')), |
|
|
143 | 143 | (b'', b'hidden', False, _(b'consider hidden changesets')), |
|
|
144 | 144 | ( |
|
|
145 | 145 | b'', |
|
|
146 | 146 | b'pager', |
|
|
147 | 147 | b'auto', |
|
|
148 | 148 | _(b"when to paginate (boolean, always, auto, or never)"), |
|
|
149 | 149 | _(b'TYPE'), |
|
|
150 | 150 | ), |
|
|
151 | 151 | ] |
|
|
152 | 152 | |
|
|
153 | 153 | dryrunopts = cmdutil.dryrunopts |
|
|
154 | 154 | remoteopts = cmdutil.remoteopts |
|
|
155 | 155 | walkopts = cmdutil.walkopts |
|
|
156 | 156 | commitopts = cmdutil.commitopts |
|
|
157 | 157 | commitopts2 = cmdutil.commitopts2 |
|
|
158 | 158 | commitopts3 = cmdutil.commitopts3 |
|
|
159 | 159 | formatteropts = cmdutil.formatteropts |
|
|
160 | 160 | templateopts = cmdutil.templateopts |
|
|
161 | 161 | logopts = cmdutil.logopts |
|
|
162 | 162 | diffopts = cmdutil.diffopts |
|
|
163 | 163 | diffwsopts = cmdutil.diffwsopts |
|
|
164 | 164 | diffopts2 = cmdutil.diffopts2 |
|
|
165 | 165 | mergetoolopts = cmdutil.mergetoolopts |
|
|
166 | 166 | similarityopts = cmdutil.similarityopts |
|
|
167 | 167 | subrepoopts = cmdutil.subrepoopts |
|
|
168 | 168 | debugrevlogopts = cmdutil.debugrevlogopts |
|
|
169 | 169 | |
|
|
170 | 170 | # Commands start here, listed alphabetically |
|
|
171 | 171 | |
|
|
172 | 172 | |
|
|
173 | 173 | @command( |
|
|
174 | 174 | b'abort', |
|
|
175 | 175 | dryrunopts, |
|
|
176 | 176 | helpcategory=command.CATEGORY_CHANGE_MANAGEMENT, |
|
|
177 | 177 | helpbasic=True, |
|
|
178 | 178 | ) |
|
|
179 | 179 | def abort(ui, repo, **opts): |
|
|
180 | 180 | """abort an unfinished operation (EXPERIMENTAL) |
|
|
181 | 181 | |
|
|
182 | 182 | Aborts a multistep operation like graft, histedit, rebase, merge, |
|
|
183 | 183 | and unshelve if they are in an unfinished state. |
|
|
184 | 184 | |
|
|
185 | 185 | use --dry-run/-n to dry run the command. |
|
|
186 | 186 | """ |
|
|
187 | 187 | dryrun = opts.get('dry_run') |
|
|
188 | 188 | abortstate = cmdutil.getunfinishedstate(repo) |
|
|
189 | 189 | if not abortstate: |
|
|
190 | 190 | raise error.StateError(_(b'no operation in progress')) |
|
|
191 | 191 | if not abortstate.abortfunc: |
|
|
192 | 192 | raise error.InputError( |
|
|
193 | 193 | ( |
|
|
194 | 194 | _(b"%s in progress but does not support 'hg abort'") |
|
|
195 | 195 | % (abortstate._opname) |
|
|
196 | 196 | ), |
|
|
197 | 197 | hint=abortstate.hint(), |
|
|
198 | 198 | ) |
|
|
199 | 199 | if dryrun: |
|
|
200 | 200 | ui.status( |
|
|
201 | 201 | _(b'%s in progress, will be aborted\n') % (abortstate._opname) |
|
|
202 | 202 | ) |
|
|
203 | 203 | return |
|
|
204 | 204 | return abortstate.abortfunc(ui, repo) |
|
|
205 | 205 | |
|
|
206 | 206 | |
|
|
207 | 207 | @command( |
|
|
208 | 208 | b'add', |
|
|
209 | 209 | walkopts + subrepoopts + dryrunopts, |
|
|
210 | 210 | _(b'[OPTION]... [FILE]...'), |
|
|
211 | 211 | helpcategory=command.CATEGORY_WORKING_DIRECTORY, |
|
|
212 | 212 | helpbasic=True, |
|
|
213 | 213 | inferrepo=True, |
|
|
214 | 214 | ) |
|
|
215 | 215 | def add(ui, repo, *pats, **opts): |
|
|
216 | 216 | """add the specified files on the next commit |
|
|
217 | 217 | |
|
|
218 | 218 | Schedule files to be version controlled and added to the |
|
|
219 | 219 | repository. |
|
|
220 | 220 | |
|
|
221 | 221 | The files will be added to the repository at the next commit. To |
|
|
222 | 222 | undo an add before that, see :hg:`forget`. |
|
|
223 | 223 | |
|
|
224 | 224 | If no names are given, add all files to the repository (except |
|
|
225 | 225 | files matching ``.hgignore``). |
|
|
226 | 226 | |
|
|
227 | 227 | .. container:: verbose |
|
|
228 | 228 | |
|
|
229 | 229 | Examples: |
|
|
230 | 230 | |
|
|
231 | 231 | - New (unknown) files are added |
|
|
232 | 232 | automatically by :hg:`add`:: |
|
|
233 | 233 | |
|
|
234 | 234 | $ ls |
|
|
235 | 235 | foo.c |
|
|
236 | 236 | $ hg status |
|
|
237 | 237 | ? foo.c |
|
|
238 | 238 | $ hg add |
|
|
239 | 239 | adding foo.c |
|
|
240 | 240 | $ hg status |
|
|
241 | 241 | A foo.c |
|
|
242 | 242 | |
|
|
243 | 243 | - Specific files to be added can be specified:: |
|
|
244 | 244 | |
|
|
245 | 245 | $ ls |
|
|
246 | 246 | bar.c foo.c |
|
|
247 | 247 | $ hg status |
|
|
248 | 248 | ? bar.c |
|
|
249 | 249 | ? foo.c |
|
|
250 | 250 | $ hg add bar.c |
|
|
251 | 251 | $ hg status |
|
|
252 | 252 | A bar.c |
|
|
253 | 253 | ? foo.c |
|
|
254 | 254 | |
|
|
255 | 255 | Returns 0 if all files are successfully added. |
|
|
256 | 256 | """ |
|
|
257 | 257 | |
|
|
258 | 258 | m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts)) |
|
|
259 | 259 | uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True) |
|
|
260 | 260 | rejected = cmdutil.add(ui, repo, m, b"", uipathfn, False, **opts) |
|
|
261 | 261 | return rejected and 1 or 0 |
|
|
262 | 262 | |
|
|
263 | 263 | |
|
|
264 | 264 | @command( |
|
|
265 | 265 | b'addremove', |
|
|
266 | 266 | similarityopts + subrepoopts + walkopts + dryrunopts, |
|
|
267 | 267 | _(b'[OPTION]... [FILE]...'), |
|
|
268 | 268 | helpcategory=command.CATEGORY_WORKING_DIRECTORY, |
|
|
269 | 269 | inferrepo=True, |
|
|
270 | 270 | ) |
|
|
271 | 271 | def addremove(ui, repo, *pats, **opts): |
|
|
272 | 272 | """add all new files, delete all missing files |
|
|
273 | 273 | |
|
|
274 | 274 | Add all new files and remove all missing files from the |
|
|
275 | 275 | repository. |
|
|
276 | 276 | |
|
|
277 | 277 | Unless names are given, new files are ignored if they match any of |
|
|
278 | 278 | the patterns in ``.hgignore``. As with add, these changes take |
|
|
279 | 279 | effect at the next commit. |
|
|
280 | 280 | |
|
|
281 | 281 | Use the -s/--similarity option to detect renamed files. This |
|
|
282 | 282 | option takes a percentage between 0 (disabled) and 100 (files must |
|
|
283 | 283 | be identical) as its parameter. With a parameter greater than 0, |
|
|
284 | 284 | this compares every removed file with every added file and records |
|
|
285 | 285 | those similar enough as renames. Detecting renamed files this way |
|
|
286 | 286 | can be expensive. After using this option, :hg:`status -C` can be |
|
|
287 | 287 | used to check which files were identified as moved or renamed. If |
|
|
288 | 288 | not specified, -s/--similarity defaults to 100 and only renames of |
|
|
289 | 289 | identical files are detected. |
|
|
290 | 290 | |
|
|
291 | 291 | .. container:: verbose |
|
|
292 | 292 | |
|
|
293 | 293 | Examples: |
|
|
294 | 294 | |
|
|
295 | 295 | - A number of files (bar.c and foo.c) are new, |
|
|
296 | 296 | while foobar.c has been removed (without using :hg:`remove`) |
|
|
297 | 297 | from the repository:: |
|
|
298 | 298 | |
|
|
299 | 299 | $ ls |
|
|
300 | 300 | bar.c foo.c |
|
|
301 | 301 | $ hg status |
|
|
302 | 302 | ! foobar.c |
|
|
303 | 303 | ? bar.c |
|
|
304 | 304 | ? foo.c |
|
|
305 | 305 | $ hg addremove |
|
|
306 | 306 | adding bar.c |
|
|
307 | 307 | adding foo.c |
|
|
308 | 308 | removing foobar.c |
|
|
309 | 309 | $ hg status |
|
|
310 | 310 | A bar.c |
|
|
311 | 311 | A foo.c |
|
|
312 | 312 | R foobar.c |
|
|
313 | 313 | |
|
|
314 | 314 | - A file foobar.c was moved to foo.c without using :hg:`rename`. |
|
|
315 | 315 | Afterwards, it was edited slightly:: |
|
|
316 | 316 | |
|
|
317 | 317 | $ ls |
|
|
318 | 318 | foo.c |
|
|
319 | 319 | $ hg status |
|
|
320 | 320 | ! foobar.c |
|
|
321 | 321 | ? foo.c |
|
|
322 | 322 | $ hg addremove --similarity 90 |
|
|
323 | 323 | removing foobar.c |
|
|
324 | 324 | adding foo.c |
|
|
325 | 325 | recording removal of foobar.c as rename to foo.c (94% similar) |
|
|
326 | 326 | $ hg status -C |
|
|
327 | 327 | A foo.c |
|
|
328 | 328 | foobar.c |
|
|
329 | 329 | R foobar.c |
|
|
330 | 330 | |
|
|
331 | 331 | Returns 0 if all files are successfully added. |
|
|
332 | 332 | """ |
|
|
333 | 333 | opts = pycompat.byteskwargs(opts) |
|
|
334 | 334 | if not opts.get(b'similarity'): |
|
|
335 | 335 | opts[b'similarity'] = b'100' |
|
|
336 | 336 | matcher = scmutil.match(repo[None], pats, opts) |
|
|
337 | 337 | relative = scmutil.anypats(pats, opts) |
|
|
338 | 338 | uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative) |
|
|
339 | 339 | return scmutil.addremove(repo, matcher, b"", uipathfn, opts) |
|
|
340 | 340 | |
|
|
341 | 341 | |
|
|
342 | 342 | @command( |
|
|
343 | 343 | b'annotate|blame', |
|
|
344 | 344 | [ |
|
|
345 | 345 | (b'r', b'rev', b'', _(b'annotate the specified revision'), _(b'REV')), |
|
|
346 | 346 | ( |
|
|
347 | 347 | b'', |
|
|
348 | 348 | b'follow', |
|
|
349 | 349 | None, |
|
|
350 | 350 | _(b'follow copies/renames and list the filename (DEPRECATED)'), |
|
|
351 | 351 | ), |
|
|
352 | 352 | (b'', b'no-follow', None, _(b"don't follow copies and renames")), |
|
|
353 | 353 | (b'a', b'text', None, _(b'treat all files as text')), |
|
|
354 | 354 | (b'u', b'user', None, _(b'list the author (long with -v)')), |
|
|
355 | 355 | (b'f', b'file', None, _(b'list the filename')), |
|
|
356 | 356 | (b'd', b'date', None, _(b'list the date (short with -q)')), |
|
|
357 | 357 | (b'n', b'number', None, _(b'list the revision number (default)')), |
|
|
358 | 358 | (b'c', b'changeset', None, _(b'list the changeset')), |
|
|
359 | 359 | ( |
|
|
360 | 360 | b'l', |
|
|
361 | 361 | b'line-number', |
|
|
362 | 362 | None, |
|
|
363 | 363 | _(b'show line number at the first appearance'), |
|
|
364 | 364 | ), |
|
|
365 | 365 | ( |
|
|
366 | 366 | b'', |
|
|
367 | 367 | b'skip', |
|
|
368 | 368 | [], |
|
|
369 | 369 | _(b'revset to not display (EXPERIMENTAL)'), |
|
|
370 | 370 | _(b'REV'), |
|
|
371 | 371 | ), |
|
|
372 | 372 | ] |
|
|
373 | 373 | + diffwsopts |
|
|
374 | 374 | + walkopts |
|
|
375 | 375 | + formatteropts, |
|
|
376 | 376 | _(b'[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'), |
|
|
377 | 377 | helpcategory=command.CATEGORY_FILE_CONTENTS, |
|
|
378 | 378 | helpbasic=True, |
|
|
379 | 379 | inferrepo=True, |
|
|
380 | 380 | ) |
|
|
381 | 381 | def annotate(ui, repo, *pats, **opts): |
|
|
382 | 382 | """show changeset information by line for each file |
|
|
383 | 383 | |
|
|
384 | 384 | List changes in files, showing the revision id responsible for |
|
|
385 | 385 | each line. |
|
|
386 | 386 | |
|
|
387 | 387 | This command is useful for discovering when a change was made and |
|
|
388 | 388 | by whom. |
|
|
389 | 389 | |
|
|
390 | 390 | If you include --file, --user, or --date, the revision number is |
|
|
391 | 391 | suppressed unless you also include --number. |
|
|
392 | 392 | |
|
|
393 | 393 | Without the -a/--text option, annotate will avoid processing files |
|
|
394 | 394 | it detects as binary. With -a, annotate will annotate the file |
|
|
395 | 395 | anyway, although the results will probably be neither useful |
|
|
396 | 396 | nor desirable. |
|
|
397 | 397 | |
|
|
398 | 398 | .. container:: verbose |
|
|
399 | 399 | |
|
|
400 | 400 | Template: |
|
|
401 | 401 | |
|
|
402 | 402 | The following keywords are supported in addition to the common template |
|
|
403 | 403 | keywords and functions. See also :hg:`help templates`. |
|
|
404 | 404 | |
|
|
405 | 405 | :lines: List of lines with annotation data. |
|
|
406 | 406 | :path: String. Repository-absolute path of the specified file. |
|
|
407 | 407 | |
|
|
408 | 408 | And each entry of ``{lines}`` provides the following sub-keywords in |
|
|
409 | 409 | addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc. |
|
|
410 | 410 | |
|
|
411 | 411 | :line: String. Line content. |
|
|
412 | 412 | :lineno: Integer. Line number at that revision. |
|
|
413 | 413 | :path: String. Repository-absolute path of the file at that revision. |
|
|
414 | 414 | |
|
|
415 | 415 | See :hg:`help templates.operators` for the list expansion syntax. |
|
|
416 | 416 | |
|
|
417 | 417 | Returns 0 on success. |
|
|
418 | 418 | """ |
|
|
419 | 419 | opts = pycompat.byteskwargs(opts) |
|
|
420 | 420 | if not pats: |
|
|
421 | 421 | raise error.InputError( |
|
|
422 | 422 | _(b'at least one filename or pattern is required') |
|
|
423 | 423 | ) |
|
|
424 | 424 | |
|
|
425 | 425 | if opts.get(b'follow'): |
|
|
426 | 426 | # --follow is deprecated and now just an alias for -f/--file |
|
|
427 | 427 | # to mimic the behavior of Mercurial before version 1.5 |
|
|
428 | 428 | opts[b'file'] = True |
|
|
429 | 429 | |
|
|
430 | 430 | if ( |
|
|
431 | 431 | not opts.get(b'user') |
|
|
432 | 432 | and not opts.get(b'changeset') |
|
|
433 | 433 | and not opts.get(b'date') |
|
|
434 | 434 | and not opts.get(b'file') |
|
|
435 | 435 | ): |
|
|
436 | 436 | opts[b'number'] = True |
|
|
437 | 437 | |
|
|
438 | 438 | linenumber = opts.get(b'line_number') is not None |
|
|
439 | 439 | if ( |
|
|
440 | 440 | linenumber |
|
|
441 | 441 | and (not opts.get(b'changeset')) |
|
|
442 | 442 | and (not opts.get(b'number')) |
|
|
443 | 443 | ): |
|
|
444 | 444 | raise error.InputError(_(b'at least one of -n/-c is required for -l')) |
|
|
445 | 445 | |
|
|
446 | 446 | rev = opts.get(b'rev') |
|
|
447 | 447 | if rev: |
|
|
448 | 448 | repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn') |
|
|
449 | 449 | ctx = scmutil.revsingle(repo, rev) |
|
|
450 | 450 | |
|
|
451 | 451 | ui.pager(b'annotate') |
|
|
452 | 452 | rootfm = ui.formatter(b'annotate', opts) |
|
|
453 | 453 | if ui.debugflag: |
|
|
454 | 454 | shorthex = pycompat.identity |
|
|
455 | 455 | else: |
|
|
456 | 456 | |
|
|
457 | 457 | def shorthex(h): |
|
|
458 | 458 | return h[:12] |
|
|
459 | 459 | |
|
|
460 | 460 | if ui.quiet: |
|
|
461 | 461 | datefunc = dateutil.shortdate |
|
|
462 | 462 | else: |
|
|
463 | 463 | datefunc = dateutil.datestr |
|
|
464 | 464 | if ctx.rev() is None: |
|
|
465 | 465 | if opts.get(b'changeset'): |
|
|
466 | 466 | # omit "+" suffix which is appended to node hex |
|
|
467 | 467 | def formatrev(rev): |
|
|
468 | 468 | if rev == wdirrev: |
|
|
469 | 469 | return b'%d' % ctx.p1().rev() |
|
|
470 | 470 | else: |
|
|
471 | 471 | return b'%d' % rev |
|
|
472 | 472 | |
|
|
473 | 473 | else: |
|
|
474 | 474 | |
|
|
475 | 475 | def formatrev(rev): |
|
|
476 | 476 | if rev == wdirrev: |
|
|
477 | 477 | return b'%d+' % ctx.p1().rev() |
|
|
478 | 478 | else: |
|
|
479 | 479 | return b'%d ' % rev |
|
|
480 | 480 | |
|
|
481 | 481 | def formathex(h): |
|
|
482 | 482 | if h == wdirhex: |
|
|
483 | 483 | return b'%s+' % shorthex(hex(ctx.p1().node())) |
|
|
484 | 484 | else: |
|
|
485 | 485 | return b'%s ' % shorthex(h) |
|
|
486 | 486 | |
|
|
487 | 487 | else: |
|
|
488 | 488 | formatrev = b'%d'.__mod__ |
|
|
489 | 489 | formathex = shorthex |
|
|
490 | 490 | |
|
|
491 | 491 | opmap = [ |
|
|
492 | 492 | (b'user', b' ', lambda x: x.fctx.user(), ui.shortuser), |
|
|
493 | 493 | (b'rev', b' ', lambda x: scmutil.intrev(x.fctx), formatrev), |
|
|
494 | 494 | (b'node', b' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex), |
|
|
495 | 495 | (b'date', b' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)), |
|
|
496 | 496 | (b'path', b' ', lambda x: x.fctx.path(), pycompat.bytestr), |
|
|
497 | 497 | (b'lineno', b':', lambda x: x.lineno, pycompat.bytestr), |
|
|
498 | 498 | ] |
|
|
499 | 499 | opnamemap = { |
|
|
500 | 500 | b'rev': b'number', |
|
|
501 | 501 | b'node': b'changeset', |
|
|
502 | 502 | b'path': b'file', |
|
|
503 | 503 | b'lineno': b'line_number', |
|
|
504 | 504 | } |
|
|
505 | 505 | |
|
|
506 | 506 | if rootfm.isplain(): |
|
|
507 | 507 | |
|
|
508 | 508 | def makefunc(get, fmt): |
|
|
509 | 509 | return lambda x: fmt(get(x)) |
|
|
510 | 510 | |
|
|
511 | 511 | else: |
|
|
512 | 512 | |
|
|
513 | 513 | def makefunc(get, fmt): |
|
|
514 | 514 | return get |
|
|
515 | 515 | |
|
|
516 | 516 | datahint = rootfm.datahint() |
|
|
517 | 517 | funcmap = [ |
|
|
518 | 518 | (makefunc(get, fmt), sep) |
|
|
519 | 519 | for fn, sep, get, fmt in opmap |
|
|
520 | 520 | if opts.get(opnamemap.get(fn, fn)) or fn in datahint |
|
|
521 | 521 | ] |
|
|
522 | 522 | funcmap[0] = (funcmap[0][0], b'') # no separator in front of first column |
|
|
523 | 523 | fields = b' '.join( |
|
|
524 | 524 | fn |
|
|
525 | 525 | for fn, sep, get, fmt in opmap |
|
|
526 | 526 | if opts.get(opnamemap.get(fn, fn)) or fn in datahint |
|
|
527 | 527 | ) |
|
|
528 | 528 | |
|
|
529 | 529 | def bad(x, y): |
|
|
530 | 530 | raise error.Abort(b"%s: %s" % (x, y)) |
|
|
531 | 531 | |
|
|
532 | 532 | m = scmutil.match(ctx, pats, opts, badfn=bad) |
|
|
533 | 533 | |
|
|
534 | 534 | follow = not opts.get(b'no_follow') |
|
|
535 | 535 | diffopts = patch.difffeatureopts( |
|
|
536 | 536 | ui, opts, section=b'annotate', whitespace=True |
|
|
537 | 537 | ) |
|
|
538 | 538 | skiprevs = opts.get(b'skip') |
|
|
539 | 539 | if skiprevs: |
|
|
540 | 540 | skiprevs = scmutil.revrange(repo, skiprevs) |
|
|
541 | 541 | |
|
|
542 | 542 | uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True) |
|
|
543 | 543 | for abs in ctx.walk(m): |
|
|
544 | 544 | fctx = ctx[abs] |
|
|
545 | 545 | rootfm.startitem() |
|
|
546 | 546 | rootfm.data(path=abs) |
|
|
547 | 547 | if not opts.get(b'text') and fctx.isbinary(): |
|
|
548 | 548 | rootfm.plain(_(b"%s: binary file\n") % uipathfn(abs)) |
|
|
549 | 549 | continue |
|
|
550 | 550 | |
|
|
551 | 551 | fm = rootfm.nested(b'lines', tmpl=b'{rev}: {line}') |
|
|
552 | 552 | lines = fctx.annotate( |
|
|
553 | 553 | follow=follow, skiprevs=skiprevs, diffopts=diffopts |
|
|
554 | 554 | ) |
|
|
555 | 555 | if not lines: |
|
|
556 | 556 | fm.end() |
|
|
557 | 557 | continue |
|
|
558 | 558 | formats = [] |
|
|
559 | 559 | pieces = [] |
|
|
560 | 560 | |
|
|
561 | 561 | for f, sep in funcmap: |
|
|
562 | 562 | l = [f(n) for n in lines] |
|
|
563 | 563 | if fm.isplain(): |
|
|
564 | 564 | sizes = [encoding.colwidth(x) for x in l] |
|
|
565 | 565 | ml = max(sizes) |
|
|
566 | 566 | formats.append([sep + b' ' * (ml - w) + b'%s' for w in sizes]) |
|
|
567 | 567 | else: |
|
|
568 | 568 | formats.append([b'%s'] * len(l)) |
|
|
569 | 569 | pieces.append(l) |
|
|
570 | 570 | |
|
|
571 | 571 | for f, p, n in zip(zip(*formats), zip(*pieces), lines): |
|
|
572 | 572 | fm.startitem() |
|
|
573 | 573 | fm.context(fctx=n.fctx) |
|
|
574 | 574 | fm.write(fields, b"".join(f), *p) |
|
|
575 | 575 | if n.skip: |
|
|
576 | 576 | fmt = b"* %s" |
|
|
577 | 577 | else: |
|
|
578 | 578 | fmt = b": %s" |
|
|
579 | 579 | fm.write(b'line', fmt, n.text) |
|
|
580 | 580 | |
|
|
581 | 581 | if not lines[-1].text.endswith(b'\n'): |
|
|
582 | 582 | fm.plain(b'\n') |
|
|
583 | 583 | fm.end() |
|
|
584 | 584 | |
|
|
585 | 585 | rootfm.end() |
|
|
586 | 586 | |
|
|
587 | 587 | |
|
|
588 | 588 | @command( |
|
|
589 | 589 | b'archive', |
|
|
590 | 590 | [ |
|
|
591 | 591 | (b'', b'no-decode', None, _(b'do not pass files through decoders')), |
|
|
592 | 592 | ( |
|
|
593 | 593 | b'p', |
|
|
594 | 594 | b'prefix', |
|
|
595 | 595 | b'', |
|
|
596 | 596 | _(b'directory prefix for files in archive'), |
|
|
597 | 597 | _(b'PREFIX'), |
|
|
598 | 598 | ), |
|
|
599 | 599 | (b'r', b'rev', b'', _(b'revision to distribute'), _(b'REV')), |
|
|
600 | 600 | (b't', b'type', b'', _(b'type of distribution to create'), _(b'TYPE')), |
|
|
601 | 601 | ] |
|
|
602 | 602 | + subrepoopts |
|
|
603 | 603 | + walkopts, |
|
|
604 | 604 | _(b'[OPTION]... DEST'), |
|
|
605 | 605 | helpcategory=command.CATEGORY_IMPORT_EXPORT, |
|
|
606 | 606 | ) |
|
|
607 | 607 | def archive(ui, repo, dest, **opts): |
|
|
608 | 608 | """create an unversioned archive of a repository revision |
|
|
609 | 609 | |
|
|
610 | 610 | By default, the revision used is the parent of the working |
|
|
611 | 611 | directory; use -r/--rev to specify a different revision. |
|
|
612 | 612 | |
|
|
613 | 613 | The archive type is automatically detected based on file |
|
|
614 | 614 | extension (to override, use -t/--type). |
|
|
615 | 615 | |
|
|
616 | 616 | .. container:: verbose |
|
|
617 | 617 | |
|
|
618 | 618 | Examples: |
|
|
619 | 619 | |
|
|
620 | 620 | - create a zip file containing the 1.0 release:: |
|
|
621 | 621 | |
|
|
622 | 622 | hg archive -r 1.0 project-1.0.zip |
|
|
623 | 623 | |
|
|
624 | 624 | - create a tarball excluding .hg files:: |
|
|
625 | 625 | |
|
|
626 | 626 | hg archive project.tar.gz -X ".hg*" |
|
|
627 | 627 | |
|
|
628 | 628 | Valid types are: |
|
|
629 | 629 | |
|
|
630 | 630 | :``files``: a directory full of files (default) |
|
|
631 | 631 | :``tar``: tar archive, uncompressed |
|
|
632 | 632 | :``tbz2``: tar archive, compressed using bzip2 |
|
|
633 | 633 | :``tgz``: tar archive, compressed using gzip |
|
|
634 | 634 | :``txz``: tar archive, compressed using lzma (only in Python 3) |
|
|
635 | 635 | :``uzip``: zip archive, uncompressed |
|
|
636 | 636 | :``zip``: zip archive, compressed using deflate |
|
|
637 | 637 | |
|
|
638 | 638 | The exact name of the destination archive or directory is given |
|
|
639 | 639 | using a format string; see :hg:`help export` for details. |
|
|
640 | 640 | |
|
|
641 | 641 | Each member added to an archive file has a directory prefix |
|
|
642 | 642 | prepended. Use -p/--prefix to specify a format string for the |
|
|
643 | 643 | prefix. The default is the basename of the archive, with suffixes |
|
|
644 | 644 | removed. |
|
|
645 | 645 | |
|
|
646 | 646 | Returns 0 on success. |
|
|
647 | 647 | """ |
|
|
648 | 648 | |
|
|
649 | 649 | opts = pycompat.byteskwargs(opts) |
|
|
650 | 650 | rev = opts.get(b'rev') |
|
|
651 | 651 | if rev: |
|
|
652 | 652 | repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn') |
|
|
653 | 653 | ctx = scmutil.revsingle(repo, rev) |
|
|
654 | 654 | if not ctx: |
|
|
655 | 655 | raise error.InputError( |
|
|
656 | 656 | _(b'no working directory: please specify a revision') |
|
|
657 | 657 | ) |
|
|
658 | 658 | node = ctx.node() |
|
|
659 | 659 | dest = cmdutil.makefilename(ctx, dest) |
|
|
660 | 660 | if os.path.realpath(dest) == repo.root: |
|
|
661 | 661 | raise error.InputError(_(b'repository root cannot be destination')) |
|
|
662 | 662 | |
|
|
663 | 663 | kind = opts.get(b'type') or archival.guesskind(dest) or b'files' |
|
|
664 | 664 | prefix = opts.get(b'prefix') |
|
|
665 | 665 | |
|
|
666 | 666 | if dest == b'-': |
|
|
667 | 667 | if kind == b'files': |
|
|
668 | 668 | raise error.InputError(_(b'cannot archive plain files to stdout')) |
|
|
669 | 669 | dest = cmdutil.makefileobj(ctx, dest) |
|
|
670 | 670 | if not prefix: |
|
|
671 | 671 | prefix = os.path.basename(repo.root) + b'-%h' |
|
|
672 | 672 | |
|
|
673 | 673 | prefix = cmdutil.makefilename(ctx, prefix) |
|
|
674 | 674 | match = scmutil.match(ctx, [], opts) |
|
|
675 | 675 | archival.archive( |
|
|
676 | 676 | repo, |
|
|
677 | 677 | dest, |
|
|
678 | 678 | node, |
|
|
679 | 679 | kind, |
|
|
680 | 680 | not opts.get(b'no_decode'), |
|
|
681 | 681 | match, |
|
|
682 | 682 | prefix, |
|
|
683 | 683 | subrepos=opts.get(b'subrepos'), |
|
|
684 | 684 | ) |
|
|
685 | 685 | |
|
|
686 | 686 | |
|
|
687 | 687 | @command( |
|
|
688 | 688 | b'backout', |
|
|
689 | 689 | [ |
|
|
690 | 690 | ( |
|
|
691 | 691 | b'', |
|
|
692 | 692 | b'merge', |
|
|
693 | 693 | None, |
|
|
694 | 694 | _(b'merge with old dirstate parent after backout'), |
|
|
695 | 695 | ), |
|
|
696 | 696 | ( |
|
|
697 | 697 | b'', |
|
|
698 | 698 | b'commit', |
|
|
699 | 699 | None, |
|
|
700 | 700 | _(b'commit if no conflicts were encountered (DEPRECATED)'), |
|
|
701 | 701 | ), |
|
|
702 | 702 | (b'', b'no-commit', None, _(b'do not commit')), |
|
|
703 | 703 | ( |
|
|
704 | 704 | b'', |
|
|
705 | 705 | b'parent', |
|
|
706 | 706 | b'', |
|
|
707 | 707 | _(b'parent to choose when backing out merge (DEPRECATED)'), |
|
|
708 | 708 | _(b'REV'), |
|
|
709 | 709 | ), |
|
|
710 | 710 | (b'r', b'rev', b'', _(b'revision to backout'), _(b'REV')), |
|
|
711 | 711 | (b'e', b'edit', False, _(b'invoke editor on commit messages')), |
|
|
712 | 712 | ] |
|
|
713 | 713 | + mergetoolopts |
|
|
714 | 714 | + walkopts |
|
|
715 | 715 | + commitopts |
|
|
716 | 716 | + commitopts2, |
|
|
717 | 717 | _(b'[OPTION]... [-r] REV'), |
|
|
718 | 718 | helpcategory=command.CATEGORY_CHANGE_MANAGEMENT, |
|
|
719 | 719 | ) |
|
|
720 | 720 | def backout(ui, repo, node=None, rev=None, **opts): |
|
|
721 | 721 | """reverse effect of earlier changeset |
|
|
722 | 722 | |
|
|
723 | 723 | Prepare a new changeset with the effect of REV undone in the |
|
|
724 | 724 | current working directory. If no conflicts were encountered, |
|
|
725 | 725 | it will be committed immediately. |
|
|
726 | 726 | |
|
|
727 | 727 | If REV is the parent of the working directory, then this new changeset |
|
|
728 | 728 | is committed automatically (unless --no-commit is specified). |
|
|
729 | 729 | |
|
|
730 | 730 | .. note:: |
|
|
731 | 731 | |
|
|
732 | 732 | :hg:`backout` cannot be used to fix either an unwanted or |
|
|
733 | 733 | incorrect merge. |
|
|
734 | 734 | |
|
|
735 | 735 | .. container:: verbose |
|
|
736 | 736 | |
|
|
737 | 737 | Examples: |
|
|
738 | 738 | |
|
|
739 | 739 | - Reverse the effect of the parent of the working directory. |
|
|
740 | 740 | This backout will be committed immediately:: |
|
|
741 | 741 | |
|
|
742 | 742 | hg backout -r . |
|
|
743 | 743 | |
|
|
744 | 744 | - Reverse the effect of previous bad revision 23:: |
|
|
745 | 745 | |
|
|
746 | 746 | hg backout -r 23 |
|
|
747 | 747 | |
|
|
748 | 748 | - Reverse the effect of previous bad revision 23 and |
|
|
749 | 749 | leave changes uncommitted:: |
|
|
750 | 750 | |
|
|
751 | 751 | hg backout -r 23 --no-commit |
|
|
752 | 752 | hg commit -m "Backout revision 23" |
|
|
753 | 753 | |
|
|
754 | 754 | By default, the pending changeset will have one parent, |
|
|
755 | 755 | maintaining a linear history. With --merge, the pending |
|
|
756 | 756 | changeset will instead have two parents: the old parent of the |
|
|
757 | 757 | working directory and a new child of REV that simply undoes REV. |
|
|
758 | 758 | |
|
|
759 | 759 | Before version 1.7, the behavior without --merge was equivalent |
|
|
760 | 760 | to specifying --merge followed by :hg:`update --clean .` to |
|
|
761 | 761 | cancel the merge and leave the child of REV as a head to be |
|
|
762 | 762 | merged separately. |
|
|
763 | 763 | |
|
|
764 | 764 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
|
765 | 765 | |
|
|
766 | 766 | See :hg:`help revert` for a way to restore files to the state |
|
|
767 | 767 | of another revision. |
|
|
768 | 768 | |
|
|
769 | 769 | Returns 0 on success, 1 if nothing to backout or there are unresolved |
|
|
770 | 770 | files. |
|
|
771 | 771 | """ |
|
|
772 | 772 | with repo.wlock(), repo.lock(): |
|
|
773 | 773 | return _dobackout(ui, repo, node, rev, **opts) |
|
|
774 | 774 | |
|
|
775 | 775 | |
|
|
776 | 776 | def _dobackout(ui, repo, node=None, rev=None, **opts): |
|
|
777 | 777 | cmdutil.check_incompatible_arguments(opts, 'no_commit', ['commit', 'merge']) |
|
|
778 | 778 | opts = pycompat.byteskwargs(opts) |
|
|
779 | 779 | |
|
|
780 | 780 | if rev and node: |
|
|
781 | 781 | raise error.InputError(_(b"please specify just one revision")) |
|
|
782 | 782 | |
|
|
783 | 783 | if not rev: |
|
|
784 | 784 | rev = node |
|
|
785 | 785 | |
|
|
786 | 786 | if not rev: |
|
|
787 | 787 | raise error.InputError(_(b"please specify a revision to backout")) |
|
|
788 | 788 | |
|
|
789 | 789 | date = opts.get(b'date') |
|
|
790 | 790 | if date: |
|
|
791 | 791 | opts[b'date'] = dateutil.parsedate(date) |
|
|
792 | 792 | |
|
|
793 | 793 | cmdutil.checkunfinished(repo) |
|
|
794 | 794 | cmdutil.bailifchanged(repo) |
|
|
795 | 795 | ctx = scmutil.revsingle(repo, rev) |
|
|
796 | 796 | node = ctx.node() |
|
|
797 | 797 | |
|
|
798 | 798 | op1, op2 = repo.dirstate.parents() |
|
|
799 | 799 | if not repo.changelog.isancestor(node, op1): |
|
|
800 | 800 | raise error.InputError( |
|
|
801 | 801 | _(b'cannot backout change that is not an ancestor') |
|
|
802 | 802 | ) |
|
|
803 | 803 | |
|
|
804 | 804 | p1, p2 = repo.changelog.parents(node) |
|
|
805 | 805 | if p1 == nullid: |
|
|
806 | 806 | raise error.InputError(_(b'cannot backout a change with no parents')) |
|
|
807 | 807 | if p2 != nullid: |
|
|
808 | 808 | if not opts.get(b'parent'): |
|
|
809 | 809 | raise error.InputError(_(b'cannot backout a merge changeset')) |
|
|
810 | 810 | p = repo.lookup(opts[b'parent']) |
|
|
811 | 811 | if p not in (p1, p2): |
|
|
812 | 812 | raise error.InputError( |
|
|
813 | 813 | _(b'%s is not a parent of %s') % (short(p), short(node)) |
|
|
814 | 814 | ) |
|
|
815 | 815 | parent = p |
|
|
816 | 816 | else: |
|
|
817 | 817 | if opts.get(b'parent'): |
|
|
818 | 818 | raise error.InputError( |
|
|
819 | 819 | _(b'cannot use --parent on non-merge changeset') |
|
|
820 | 820 | ) |
|
|
821 | 821 | parent = p1 |
|
|
822 | 822 | |
|
|
823 | 823 | # the backout should appear on the same branch |
|
|
824 | 824 | branch = repo.dirstate.branch() |
|
|
825 | 825 | bheads = repo.branchheads(branch) |
|
|
826 | 826 | rctx = scmutil.revsingle(repo, hex(parent)) |
|
|
827 | 827 | if not opts.get(b'merge') and op1 != node: |
|
|
828 | 828 | with dirstateguard.dirstateguard(repo, b'backout'): |
|
|
829 | 829 | overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')} |
|
|
830 | 830 | with ui.configoverride(overrides, b'backout'): |
|
|
831 | 831 | stats = mergemod.back_out(ctx, parent=repo[parent]) |
|
|
832 | 832 | repo.setparents(op1, op2) |
|
|
833 | 833 | hg._showstats(repo, stats) |
|
|
834 | 834 | if stats.unresolvedcount: |
|
|
835 | 835 | repo.ui.status( |
|
|
836 | 836 | _(b"use 'hg resolve' to retry unresolved file merges\n") |
|
|
837 | 837 | ) |
|
|
838 | 838 | return 1 |
|
|
839 | 839 | else: |
|
|
840 | 840 | hg.clean(repo, node, show_stats=False) |
|
|
841 | 841 | repo.dirstate.setbranch(branch) |
|
|
842 | 842 | cmdutil.revert(ui, repo, rctx) |
|
|
843 | 843 | |
|
|
844 | 844 | if opts.get(b'no_commit'): |
|
|
845 | 845 | msg = _(b"changeset %s backed out, don't forget to commit.\n") |
|
|
846 | 846 | ui.status(msg % short(node)) |
|
|
847 | 847 | return 0 |
|
|
848 | 848 | |
|
|
849 | 849 | def commitfunc(ui, repo, message, match, opts): |
|
|
850 | 850 | editform = b'backout' |
|
|
851 | 851 | e = cmdutil.getcommiteditor( |
|
|
852 | 852 | editform=editform, **pycompat.strkwargs(opts) |
|
|
853 | 853 | ) |
|
|
854 | 854 | if not message: |
|
|
855 | 855 | # we don't translate commit messages |
|
|
856 | 856 | message = b"Backed out changeset %s" % short(node) |
|
|
857 | 857 | e = cmdutil.getcommiteditor(edit=True, editform=editform) |
|
|
858 | 858 | return repo.commit( |
|
|
859 | 859 | message, opts.get(b'user'), opts.get(b'date'), match, editor=e |
|
|
860 | 860 | ) |
|
|
861 | 861 | |
|
|
862 | 862 | # save to detect changes |
|
|
863 | 863 | tip = repo.changelog.tip() |
|
|
864 | 864 | |
|
|
865 | 865 | newnode = cmdutil.commit(ui, repo, commitfunc, [], opts) |
|
|
866 | 866 | if not newnode: |
|
|
867 | 867 | ui.status(_(b"nothing changed\n")) |
|
|
868 | 868 | return 1 |
|
|
869 | 869 | cmdutil.commitstatus(repo, newnode, branch, bheads, tip) |
|
|
870 | 870 | |
|
|
871 | 871 | def nice(node): |
|
|
872 | 872 | return b'%d:%s' % (repo.changelog.rev(node), short(node)) |
|
|
873 | 873 | |
|
|
874 | 874 | ui.status( |
|
|
875 | 875 | _(b'changeset %s backs out changeset %s\n') |
|
|
876 | 876 | % (nice(newnode), nice(node)) |
|
|
877 | 877 | ) |
|
|
878 | 878 | if opts.get(b'merge') and op1 != node: |
|
|
879 | 879 | hg.clean(repo, op1, show_stats=False) |
|
|
880 | 880 | ui.status(_(b'merging with changeset %s\n') % nice(newnode)) |
|
|
881 | 881 | overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')} |
|
|
882 | 882 | with ui.configoverride(overrides, b'backout'): |
|
|
883 | 883 | return hg.merge(repo[b'tip']) |
|
|
884 | 884 | return 0 |
|
|
885 | 885 | |
|
|
886 | 886 | |
|
|
887 | 887 | @command( |
|
|
888 | 888 | b'bisect', |
|
|
889 | 889 | [ |
|
|
890 | 890 | (b'r', b'reset', False, _(b'reset bisect state')), |
|
|
891 | 891 | (b'g', b'good', False, _(b'mark changeset good')), |
|
|
892 | 892 | (b'b', b'bad', False, _(b'mark changeset bad')), |
|
|
893 | 893 | (b's', b'skip', False, _(b'skip testing changeset')), |
|
|
894 | 894 | (b'e', b'extend', False, _(b'extend the bisect range')), |
|
|
895 | 895 | ( |
|
|
896 | 896 | b'c', |
|
|
897 | 897 | b'command', |
|
|
898 | 898 | b'', |
|
|
899 | 899 | _(b'use command to check changeset state'), |
|
|
900 | 900 | _(b'CMD'), |
|
|
901 | 901 | ), |
|
|
902 | 902 | (b'U', b'noupdate', False, _(b'do not update to target')), |
|
|
903 | 903 | ], |
|
|
904 | 904 | _(b"[-gbsr] [-U] [-c CMD] [REV]"), |
|
|
905 | 905 | helpcategory=command.CATEGORY_CHANGE_NAVIGATION, |
|
|
906 | 906 | ) |
|
|
907 | 907 | def bisect( |
|
|
908 | 908 | ui, |
|
|
909 | 909 | repo, |
|
|
910 | 910 | positional_1=None, |
|
|
911 | 911 | positional_2=None, |
|
|
912 | 912 | command=None, |
|
|
913 | 913 | reset=None, |
|
|
914 | 914 | good=None, |
|
|
915 | 915 | bad=None, |
|
|
916 | 916 | skip=None, |
|
|
917 | 917 | extend=None, |
|
|
918 | 918 | noupdate=None, |
|
|
919 | 919 | ): |
|
|
920 | 920 | """subdivision search of changesets |
|
|
921 | 921 | |
|
|
922 | 922 | This command helps to find changesets which introduce problems. To |
|
|
923 | 923 | use, mark the earliest changeset you know exhibits the problem as |
|
|
924 | 924 | bad, then mark the latest changeset which is free from the problem |
|
|
925 | 925 | as good. Bisect will update your working directory to a revision |
|
|
926 | 926 | for testing (unless the -U/--noupdate option is specified). Once |
|
|
927 | 927 | you have performed tests, mark the working directory as good or |
|
|
928 | 928 | bad, and bisect will either update to another candidate changeset |
|
|
929 | 929 | or announce that it has found the bad revision. |
|
|
930 | 930 | |
|
|
931 | 931 | As a shortcut, you can also use the revision argument to mark a |
|
|
932 | 932 | revision as good or bad without checking it out first. |
|
|
933 | 933 | |
|
|
934 | 934 | If you supply a command, it will be used for automatic bisection. |
|
|
935 | 935 | The environment variable HG_NODE will contain the ID of the |
|
|
936 | 936 | changeset being tested. The exit status of the command will be |
|
|
937 | 937 | used to mark revisions as good or bad: status 0 means good, 125 |
|
|
938 | 938 | means to skip the revision, 127 (command not found) will abort the |
|
|
939 | 939 | bisection, and any other non-zero exit status means the revision |
|
|
940 | 940 | is bad. |
|
|
941 | 941 | |
|
|
942 | 942 | .. container:: verbose |
|
|
943 | 943 | |
|
|
944 | 944 | Some examples: |
|
|
945 | 945 | |
|
|
946 | 946 | - start a bisection with known bad revision 34, and good revision 12:: |
|
|
947 | 947 | |
|
|
948 | 948 | hg bisect --bad 34 |
|
|
949 | 949 | hg bisect --good 12 |
|
|
950 | 950 | |
|
|
951 | 951 | - advance the current bisection by marking current revision as good or |
|
|
952 | 952 | bad:: |
|
|
953 | 953 | |
|
|
954 | 954 | hg bisect --good |
|
|
955 | 955 | hg bisect --bad |
|
|
956 | 956 | |
|
|
957 | 957 | - mark the current revision, or a known revision, to be skipped (e.g. if |
|
|
958 | 958 | that revision is not usable because of another issue):: |
|
|
959 | 959 | |
|
|
960 | 960 | hg bisect --skip |
|
|
961 | 961 | hg bisect --skip 23 |
|
|
962 | 962 | |
|
|
963 | 963 | - skip all revisions that do not touch directories ``foo`` or ``bar``:: |
|
|
964 | 964 | |
|
|
965 | 965 | hg bisect --skip "!( file('path:foo') & file('path:bar') )" |
|
|
966 | 966 | |
|
|
967 | 967 | - forget the current bisection:: |
|
|
968 | 968 | |
|
|
969 | 969 | hg bisect --reset |
|
|
970 | 970 | |
|
|
971 | 971 | - use 'make && make tests' to automatically find the first broken |
|
|
972 | 972 | revision:: |
|
|
973 | 973 | |
|
|
974 | 974 | hg bisect --reset |
|
|
975 | 975 | hg bisect --bad 34 |
|
|
976 | 976 | hg bisect --good 12 |
|
|
977 | 977 | hg bisect --command "make && make tests" |
|
|
978 | 978 | |
|
|
979 | 979 | - see all changesets whose states are already known in the current |
|
|
980 | 980 | bisection:: |
|
|
981 | 981 | |
|
|
982 | 982 | hg log -r "bisect(pruned)" |
|
|
983 | 983 | |
|
|
984 | 984 | - see the changeset currently being bisected (especially useful |
|
|
985 | 985 | if running with -U/--noupdate):: |
|
|
986 | 986 | |
|
|
987 | 987 | hg log -r "bisect(current)" |
|
|
988 | 988 | |
|
|
989 | 989 | - see all changesets that took part in the current bisection:: |
|
|
990 | 990 | |
|
|
991 | 991 | hg log -r "bisect(range)" |
|
|
992 | 992 | |
|
|
993 | 993 | - you can even get a nice graph:: |
|
|
994 | 994 | |
|
|
995 | 995 | hg log --graph -r "bisect(range)" |
|
|
996 | 996 | |
|
|
997 | 997 | See :hg:`help revisions.bisect` for more about the `bisect()` predicate. |
|
|
998 | 998 | |
|
|
999 | 999 | Returns 0 on success. |
|
|
1000 | 1000 | """ |
|
|
1001 | 1001 | rev = [] |
|
|
1002 | 1002 | # backward compatibility |
|
|
1003 | 1003 | if positional_1 in (b"good", b"bad", b"reset", b"init"): |
|
|
1004 | 1004 | ui.warn(_(b"(use of 'hg bisect <cmd>' is deprecated)\n")) |
|
|
1005 | 1005 | cmd = positional_1 |
|
|
1006 | 1006 | rev.append(positional_2) |
|
|
1007 | 1007 | if cmd == b"good": |
|
|
1008 | 1008 | good = True |
|
|
1009 | 1009 | elif cmd == b"bad": |
|
|
1010 | 1010 | bad = True |
|
|
1011 | 1011 | else: |
|
|
1012 | 1012 | reset = True |
|
|
1013 | 1013 | elif positional_2: |
|
|
1014 | 1014 | raise error.InputError(_(b'incompatible arguments')) |
|
|
1015 | 1015 | elif positional_1 is not None: |
|
|
1016 | 1016 | rev.append(positional_1) |
|
|
1017 | 1017 | |
|
|
1018 | 1018 | incompatibles = { |
|
|
1019 | 1019 | b'--bad': bad, |
|
|
1020 | 1020 | b'--command': bool(command), |
|
|
1021 | 1021 | b'--extend': extend, |
|
|
1022 | 1022 | b'--good': good, |
|
|
1023 | 1023 | b'--reset': reset, |
|
|
1024 | 1024 | b'--skip': skip, |
|
|
1025 | 1025 | } |
|
|
1026 | 1026 | |
|
|
1027 | 1027 | enabled = [x for x in incompatibles if incompatibles[x]] |
|
|
1028 | 1028 | |
|
|
1029 | 1029 | if len(enabled) > 1: |
|
|
1030 | 1030 | raise error.InputError( |
|
|
1031 | 1031 | _(b'%s and %s are incompatible') % tuple(sorted(enabled)[0:2]) |
|
|
1032 | 1032 | ) |
|
|
1033 | 1033 | |
|
|
1034 | 1034 | if reset: |
|
|
1035 | 1035 | hbisect.resetstate(repo) |
|
|
1036 | 1036 | return |
|
|
1037 | 1037 | |
|
|
1038 | 1038 | state = hbisect.load_state(repo) |
|
|
1039 | 1039 | |
|
|
1040 | 1040 | if rev: |
|
|
1041 | 1041 | nodes = [repo[i].node() for i in scmutil.revrange(repo, rev)] |
|
|
1042 | 1042 | else: |
|
|
1043 | 1043 | nodes = [repo.lookup(b'.')] |
|
|
1044 | 1044 | |
|
|
1045 | 1045 | # update state |
|
|
1046 | 1046 | if good or bad or skip: |
|
|
1047 | 1047 | if good: |
|
|
1048 | 1048 | state[b'good'] += nodes |
|
|
1049 | 1049 | elif bad: |
|
|
1050 | 1050 | state[b'bad'] += nodes |
|
|
1051 | 1051 | elif skip: |
|
|
1052 | 1052 | state[b'skip'] += nodes |
|
|
1053 | 1053 | hbisect.save_state(repo, state) |
|
|
1054 | 1054 | if not (state[b'good'] and state[b'bad']): |
|
|
1055 | 1055 | return |
|
|
1056 | 1056 | |
|
|
1057 | 1057 | def mayupdate(repo, node, show_stats=True): |
|
|
1058 | 1058 | """common used update sequence""" |
|
|
1059 | 1059 | if noupdate: |
|
|
1060 | 1060 | return |
|
|
1061 | 1061 | cmdutil.checkunfinished(repo) |
|
|
1062 | 1062 | cmdutil.bailifchanged(repo) |
|
|
1063 | 1063 | return hg.clean(repo, node, show_stats=show_stats) |
|
|
1064 | 1064 | |
|
|
1065 | 1065 | displayer = logcmdutil.changesetdisplayer(ui, repo, {}) |
|
|
1066 | 1066 | |
|
|
1067 | 1067 | if command: |
|
|
1068 | 1068 | changesets = 1 |
|
|
1069 | 1069 | if noupdate: |
|
|
1070 | 1070 | try: |
|
|
1071 | 1071 | node = state[b'current'][0] |
|
|
1072 | 1072 | except LookupError: |
|
|
1073 | 1073 | raise error.StateError( |
|
|
1074 | 1074 | _( |
|
|
1075 | 1075 | b'current bisect revision is unknown - ' |
|
|
1076 | 1076 | b'start a new bisect to fix' |
|
|
1077 | 1077 | ) |
|
|
1078 | 1078 | ) |
|
|
1079 | 1079 | else: |
|
|
1080 | 1080 | node, p2 = repo.dirstate.parents() |
|
|
1081 | 1081 | if p2 != nullid: |
|
|
1082 | 1082 | raise error.StateError(_(b'current bisect revision is a merge')) |
|
|
1083 | 1083 | if rev: |
|
|
1084 | 1084 | if not nodes: |
|
|
1085 | 1085 | raise error.Abort(_(b'empty revision set')) |
|
|
1086 | 1086 | node = repo[nodes.last()].node() |
|
|
1087 | 1087 | with hbisect.restore_state(repo, state, node): |
|
|
1088 | 1088 | while changesets: |
|
|
1089 | 1089 | # update state |
|
|
1090 | 1090 | state[b'current'] = [node] |
|
|
1091 | 1091 | hbisect.save_state(repo, state) |
|
|
1092 | 1092 | status = ui.system( |
|
|
1093 | 1093 | command, |
|
|
1094 | 1094 | environ={b'HG_NODE': hex(node)}, |
|
|
1095 | 1095 | blockedtag=b'bisect_check', |
|
|
1096 | 1096 | ) |
|
|
1097 | 1097 | if status == 125: |
|
|
1098 | 1098 | transition = b"skip" |
|
|
1099 | 1099 | elif status == 0: |
|
|
1100 | 1100 | transition = b"good" |
|
|
1101 | 1101 | # status < 0 means process was killed |
|
|
1102 | 1102 | elif status == 127: |
|
|
1103 | 1103 | raise error.Abort(_(b"failed to execute %s") % command) |
|
|
1104 | 1104 | elif status < 0: |
|
|
1105 | 1105 | raise error.Abort(_(b"%s killed") % command) |
|
|
1106 | 1106 | else: |
|
|
1107 | 1107 | transition = b"bad" |
|
|
1108 | 1108 | state[transition].append(node) |
|
|
1109 | 1109 | ctx = repo[node] |
|
|
1110 | 1110 | ui.status( |
|
|
1111 | 1111 | _(b'changeset %d:%s: %s\n') % (ctx.rev(), ctx, transition) |
|
|
1112 | 1112 | ) |
|
|
1113 | 1113 | hbisect.checkstate(state) |
|
|
1114 | 1114 | # bisect |
|
|
1115 | 1115 | nodes, changesets, bgood = hbisect.bisect(repo, state) |
|
|
1116 | 1116 | # update to next check |
|
|
1117 | 1117 | node = nodes[0] |
|
|
1118 | 1118 | mayupdate(repo, node, show_stats=False) |
|
|
1119 | 1119 | hbisect.printresult(ui, repo, state, displayer, nodes, bgood) |
|
|
1120 | 1120 | return |
|
|
1121 | 1121 | |
|
|
1122 | 1122 | hbisect.checkstate(state) |
|
|
1123 | 1123 | |
|
|
1124 | 1124 | # actually bisect |
|
|
1125 | 1125 | nodes, changesets, good = hbisect.bisect(repo, state) |
|
|
1126 | 1126 | if extend: |
|
|
1127 | 1127 | if not changesets: |
|
|
1128 | 1128 | extendnode = hbisect.extendrange(repo, state, nodes, good) |
|
|
1129 | 1129 | if extendnode is not None: |
|
|
1130 | 1130 | ui.write( |
|
|
1131 | 1131 | _(b"Extending search to changeset %d:%s\n") |
|
|
1132 | 1132 | % (extendnode.rev(), extendnode) |
|
|
1133 | 1133 | ) |
|
|
1134 | 1134 | state[b'current'] = [extendnode.node()] |
|
|
1135 | 1135 | hbisect.save_state(repo, state) |
|
|
1136 | 1136 | return mayupdate(repo, extendnode.node()) |
|
|
1137 | 1137 | raise error.StateError(_(b"nothing to extend")) |
|
|
1138 | 1138 | |
|
|
1139 | 1139 | if changesets == 0: |
|
|
1140 | 1140 | hbisect.printresult(ui, repo, state, displayer, nodes, good) |
|
|
1141 | 1141 | else: |
|
|
1142 | 1142 | assert len(nodes) == 1 # only a single node can be tested next |
|
|
1143 | 1143 | node = nodes[0] |
|
|
1144 | 1144 | # compute the approximate number of remaining tests |
|
|
1145 | 1145 | tests, size = 0, 2 |
|
|
1146 | 1146 | while size <= changesets: |
|
|
1147 | 1147 | tests, size = tests + 1, size * 2 |
|
|
1148 | 1148 | rev = repo.changelog.rev(node) |
|
|
1149 | 1149 | ui.write( |
|
|
1150 | 1150 | _( |
|
|
1151 | 1151 | b"Testing changeset %d:%s " |
|
|
1152 | 1152 | b"(%d changesets remaining, ~%d tests)\n" |
|
|
1153 | 1153 | ) |
|
|
1154 | 1154 | % (rev, short(node), changesets, tests) |
|
|
1155 | 1155 | ) |
|
|
1156 | 1156 | state[b'current'] = [node] |
|
|
1157 | 1157 | hbisect.save_state(repo, state) |
|
|
1158 | 1158 | return mayupdate(repo, node) |
|
|
1159 | 1159 | |
|
|
1160 | 1160 | |
|
|
1161 | 1161 | @command( |
|
|
1162 | 1162 | b'bookmarks|bookmark', |
|
|
1163 | 1163 | [ |
|
|
1164 | 1164 | (b'f', b'force', False, _(b'force')), |
|
|
1165 | 1165 | (b'r', b'rev', b'', _(b'revision for bookmark action'), _(b'REV')), |
|
|
1166 | 1166 | (b'd', b'delete', False, _(b'delete a given bookmark')), |
|
|
1167 | 1167 | (b'm', b'rename', b'', _(b'rename a given bookmark'), _(b'OLD')), |
|
|
1168 | 1168 | (b'i', b'inactive', False, _(b'mark a bookmark inactive')), |
|
|
1169 | 1169 | (b'l', b'list', False, _(b'list existing bookmarks')), |
|
|
1170 | 1170 | ] |
|
|
1171 | 1171 | + formatteropts, |
|
|
1172 | 1172 | _(b'hg bookmarks [OPTIONS]... [NAME]...'), |
|
|
1173 | 1173 | helpcategory=command.CATEGORY_CHANGE_ORGANIZATION, |
|
|
1174 | 1174 | ) |
|
|
1175 | 1175 | def bookmark(ui, repo, *names, **opts): |
|
|
1176 | 1176 | """create a new bookmark or list existing bookmarks |
|
|
1177 | 1177 | |
|
|
1178 | 1178 | Bookmarks are labels on changesets to help track lines of development. |
|
|
1179 | 1179 | Bookmarks are unversioned and can be moved, renamed and deleted. |
|
|
1180 | 1180 | Deleting or moving a bookmark has no effect on the associated changesets. |
|
|
1181 | 1181 | |
|
|
1182 | 1182 | Creating or updating to a bookmark causes it to be marked as 'active'. |
|
|
1183 | 1183 | The active bookmark is indicated with a '*'. |
|
|
1184 | 1184 | When a commit is made, the active bookmark will advance to the new commit. |
|
|
1185 | 1185 | A plain :hg:`update` will also advance an active bookmark, if possible. |
|
|
1186 | 1186 | Updating away from a bookmark will cause it to be deactivated. |
|
|
1187 | 1187 | |
|
|
1188 | 1188 | Bookmarks can be pushed and pulled between repositories (see |
|
|
1189 | 1189 | :hg:`help push` and :hg:`help pull`). If a shared bookmark has |
|
|
1190 | 1190 | diverged, a new 'divergent bookmark' of the form 'name@path' will |
|
|
1191 | 1191 | be created. Using :hg:`merge` will resolve the divergence. |
|
|
1192 | 1192 | |
|
|
1193 | 1193 | Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying |
|
|
1194 | 1194 | the active bookmark's name. |
|
|
1195 | 1195 | |
|
|
1196 | 1196 | A bookmark named '@' has the special property that :hg:`clone` will |
|
|
1197 | 1197 | check it out by default if it exists. |
|
|
1198 | 1198 | |
|
|
1199 | 1199 | .. container:: verbose |
|
|
1200 | 1200 | |
|
|
1201 | 1201 | Template: |
|
|
1202 | 1202 | |
|
|
1203 | 1203 | The following keywords are supported in addition to the common template |
|
|
1204 | 1204 | keywords and functions such as ``{bookmark}``. See also |
|
|
1205 | 1205 | :hg:`help templates`. |
|
|
1206 | 1206 | |
|
|
1207 | 1207 | :active: Boolean. True if the bookmark is active. |
|
|
1208 | 1208 | |
|
|
1209 | 1209 | Examples: |
|
|
1210 | 1210 | |
|
|
1211 | 1211 | - create an active bookmark for a new line of development:: |
|
|
1212 | 1212 | |
|
|
1213 | 1213 | hg book new-feature |
|
|
1214 | 1214 | |
|
|
1215 | 1215 | - create an inactive bookmark as a place marker:: |
|
|
1216 | 1216 | |
|
|
1217 | 1217 | hg book -i reviewed |
|
|
1218 | 1218 | |
|
|
1219 | 1219 | - create an inactive bookmark on another changeset:: |
|
|
1220 | 1220 | |
|
|
1221 | 1221 | hg book -r .^ tested |
|
|
1222 | 1222 | |
|
|
1223 | 1223 | - rename bookmark turkey to dinner:: |
|
|
1224 | 1224 | |
|
|
1225 | 1225 | hg book -m turkey dinner |
|
|
1226 | 1226 | |
|
|
1227 | 1227 | - move the '@' bookmark from another branch:: |
|
|
1228 | 1228 | |
|
|
1229 | 1229 | hg book -f @ |
|
|
1230 | 1230 | |
|
|
1231 | 1231 | - print only the active bookmark name:: |
|
|
1232 | 1232 | |
|
|
1233 | 1233 | hg book -ql . |
|
|
1234 | 1234 | """ |
|
|
1235 | 1235 | opts = pycompat.byteskwargs(opts) |
|
|
1236 | 1236 | force = opts.get(b'force') |
|
|
1237 | 1237 | rev = opts.get(b'rev') |
|
|
1238 | 1238 | inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark |
|
|
1239 | 1239 | |
|
|
1240 | 1240 | action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list') |
|
|
1241 | 1241 | if action: |
|
|
1242 | 1242 | cmdutil.check_incompatible_arguments(opts, action, [b'rev']) |
|
|
1243 | 1243 | elif names or rev: |
|
|
1244 | 1244 | action = b'add' |
|
|
1245 | 1245 | elif inactive: |
|
|
1246 | 1246 | action = b'inactive' # meaning deactivate |
|
|
1247 | 1247 | else: |
|
|
1248 | 1248 | action = b'list' |
|
|
1249 | 1249 | |
|
|
1250 | 1250 | cmdutil.check_incompatible_arguments( |
|
|
1251 | 1251 | opts, b'inactive', [b'delete', b'list'] |
|
|
1252 | 1252 | ) |
|
|
1253 | 1253 | if not names and action in {b'add', b'delete'}: |
|
|
1254 | 1254 | raise error.InputError(_(b"bookmark name required")) |
|
|
1255 | 1255 | |
|
|
1256 | 1256 | if action in {b'add', b'delete', b'rename', b'inactive'}: |
|
|
1257 | 1257 | with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr: |
|
|
1258 | 1258 | if action == b'delete': |
|
|
1259 | 1259 | names = pycompat.maplist(repo._bookmarks.expandname, names) |
|
|
1260 | 1260 | bookmarks.delete(repo, tr, names) |
|
|
1261 | 1261 | elif action == b'rename': |
|
|
1262 | 1262 | if not names: |
|
|
1263 | 1263 | raise error.InputError(_(b"new bookmark name required")) |
|
|
1264 | 1264 | elif len(names) > 1: |
|
|
1265 | 1265 | raise error.InputError( |
|
|
1266 | 1266 | _(b"only one new bookmark name allowed") |
|
|
1267 | 1267 | ) |
|
|
1268 | 1268 | oldname = repo._bookmarks.expandname(opts[b'rename']) |
|
|
1269 | 1269 | bookmarks.rename(repo, tr, oldname, names[0], force, inactive) |
|
|
1270 | 1270 | elif action == b'add': |
|
|
1271 | 1271 | bookmarks.addbookmarks(repo, tr, names, rev, force, inactive) |
|
|
1272 | 1272 | elif action == b'inactive': |
|
|
1273 | 1273 | if len(repo._bookmarks) == 0: |
|
|
1274 | 1274 | ui.status(_(b"no bookmarks set\n")) |
|
|
1275 | 1275 | elif not repo._activebookmark: |
|
|
1276 | 1276 | ui.status(_(b"no active bookmark\n")) |
|
|
1277 | 1277 | else: |
|
|
1278 | 1278 | bookmarks.deactivate(repo) |
|
|
1279 | 1279 | elif action == b'list': |
|
|
1280 | 1280 | names = pycompat.maplist(repo._bookmarks.expandname, names) |
|
|
1281 | 1281 | with ui.formatter(b'bookmarks', opts) as fm: |
|
|
1282 | 1282 | bookmarks.printbookmarks(ui, repo, fm, names) |
|
|
1283 | 1283 | else: |
|
|
1284 | 1284 | raise error.ProgrammingError(b'invalid action: %s' % action) |
|
|
1285 | 1285 | |
|
|
1286 | 1286 | |
|
|
1287 | 1287 | @command( |
|
|
1288 | 1288 | b'branch', |
|
|
1289 | 1289 | [ |
|
|
1290 | 1290 | ( |
|
|
1291 | 1291 | b'f', |
|
|
1292 | 1292 | b'force', |
|
|
1293 | 1293 | None, |
|
|
1294 | 1294 | _(b'set branch name even if it shadows an existing branch'), |
|
|
1295 | 1295 | ), |
|
|
1296 | 1296 | (b'C', b'clean', None, _(b'reset branch name to parent branch name')), |
|
|
1297 | 1297 | ( |
|
|
1298 | 1298 | b'r', |
|
|
1299 | 1299 | b'rev', |
|
|
1300 | 1300 | [], |
|
|
1301 | 1301 | _(b'change branches of the given revs (EXPERIMENTAL)'), |
|
|
1302 | 1302 | ), |
|
|
1303 | 1303 | ], |
|
|
1304 | 1304 | _(b'[-fC] [NAME]'), |
|
|
1305 | 1305 | helpcategory=command.CATEGORY_CHANGE_ORGANIZATION, |
|
|
1306 | 1306 | ) |
|
|
1307 | 1307 | def branch(ui, repo, label=None, **opts): |
|
|
1308 | 1308 | """set or show the current branch name |
|
|
1309 | 1309 | |
|
|
1310 | 1310 | .. note:: |
|
|
1311 | 1311 | |
|
|
1312 | 1312 | Branch names are permanent and global. Use :hg:`bookmark` to create a |
|
|
1313 | 1313 | light-weight bookmark instead. See :hg:`help glossary` for more |
|
|
1314 | 1314 | information about named branches and bookmarks. |
|
|
1315 | 1315 | |
|
|
1316 | 1316 | With no argument, show the current branch name. With one argument, |
|
|
1317 | 1317 | set the working directory branch name (the branch will not exist |
|
|
1318 | 1318 | in the repository until the next commit). Standard practice |
|
|
1319 | 1319 | recommends that primary development take place on the 'default' |
|
|
1320 | 1320 | branch. |
|
|
1321 | 1321 | |
|
|
1322 | 1322 | Unless -f/--force is specified, branch will not let you set a |
|
|
1323 | 1323 | branch name that already exists. |
|
|
1324 | 1324 | |
|
|
1325 | 1325 | Use -C/--clean to reset the working directory branch to that of |
|
|
1326 | 1326 | the parent of the working directory, negating a previous branch |
|
|
1327 | 1327 | change. |
|
|
1328 | 1328 | |
|
|
1329 | 1329 | Use the command :hg:`update` to switch to an existing branch. Use |
|
|
1330 | 1330 | :hg:`commit --close-branch` to mark this branch head as closed. |
|
|
1331 | 1331 | When all heads of a branch are closed, the branch will be |
|
|
1332 | 1332 | considered closed. |
|
|
1333 | 1333 | |
|
|
1334 | 1334 | Returns 0 on success. |
|
|
1335 | 1335 | """ |
|
|
1336 | 1336 | opts = pycompat.byteskwargs(opts) |
|
|
1337 | 1337 | revs = opts.get(b'rev') |
|
|
1338 | 1338 | if label: |
|
|
1339 | 1339 | label = label.strip() |
|
|
1340 | 1340 | |
|
|
1341 | 1341 | if not opts.get(b'clean') and not label: |
|
|
1342 | 1342 | if revs: |
|
|
1343 | 1343 | raise error.InputError( |
|
|
1344 | 1344 | _(b"no branch name specified for the revisions") |
|
|
1345 | 1345 | ) |
|
|
1346 | 1346 | ui.write(b"%s\n" % repo.dirstate.branch()) |
|
|
1347 | 1347 | return |
|
|
1348 | 1348 | |
|
|
1349 | 1349 | with repo.wlock(): |
|
|
1350 | 1350 | if opts.get(b'clean'): |
|
|
1351 | 1351 | label = repo[b'.'].branch() |
|
|
1352 | 1352 | repo.dirstate.setbranch(label) |
|
|
1353 | 1353 | ui.status(_(b'reset working directory to branch %s\n') % label) |
|
|
1354 | 1354 | elif label: |
|
|
1355 | 1355 | |
|
|
1356 | 1356 | scmutil.checknewlabel(repo, label, b'branch') |
|
|
1357 | 1357 | if revs: |
|
|
1358 | 1358 | return cmdutil.changebranch(ui, repo, revs, label, opts) |
|
|
1359 | 1359 | |
|
|
1360 | 1360 | if not opts.get(b'force') and label in repo.branchmap(): |
|
|
1361 | 1361 | if label not in [p.branch() for p in repo[None].parents()]: |
|
|
1362 | 1362 | raise error.InputError( |
|
|
1363 | 1363 | _(b'a branch of the same name already exists'), |
|
|
1364 | 1364 | # i18n: "it" refers to an existing branch |
|
|
1365 | 1365 | hint=_(b"use 'hg update' to switch to it"), |
|
|
1366 | 1366 | ) |
|
|
1367 | 1367 | |
|
|
1368 | 1368 | repo.dirstate.setbranch(label) |
|
|
1369 | 1369 | ui.status(_(b'marked working directory as branch %s\n') % label) |
|
|
1370 | 1370 | |
|
|
1371 | 1371 | # find any open named branches aside from default |
|
|
1372 | 1372 | for n, h, t, c in repo.branchmap().iterbranches(): |
|
|
1373 | 1373 | if n != b"default" and not c: |
|
|
1374 | 1374 | return 0 |
|
|
1375 | 1375 | ui.status( |
|
|
1376 | 1376 | _( |
|
|
1377 | 1377 | b'(branches are permanent and global, ' |
|
|
1378 | 1378 | b'did you want a bookmark?)\n' |
|
|
1379 | 1379 | ) |
|
|
1380 | 1380 | ) |
|
|
1381 | 1381 | |
|
|
1382 | 1382 | |
|
|
1383 | 1383 | @command( |
|
|
1384 | 1384 | b'branches', |
|
|
1385 | 1385 | [ |
|
|
1386 | 1386 | ( |
|
|
1387 | 1387 | b'a', |
|
|
1388 | 1388 | b'active', |
|
|
1389 | 1389 | False, |
|
|
1390 | 1390 | _(b'show only branches that have unmerged heads (DEPRECATED)'), |
|
|
1391 | 1391 | ), |
|
|
1392 | 1392 | (b'c', b'closed', False, _(b'show normal and closed branches')), |
|
|
1393 | 1393 | (b'r', b'rev', [], _(b'show branch name(s) of the given rev')), |
|
|
1394 | 1394 | ] |
|
|
1395 | 1395 | + formatteropts, |
|
|
1396 | 1396 | _(b'[-c]'), |
|
|
1397 | 1397 | helpcategory=command.CATEGORY_CHANGE_ORGANIZATION, |
|
|
1398 | 1398 | intents={INTENT_READONLY}, |
|
|
1399 | 1399 | ) |
|
|
1400 | 1400 | def branches(ui, repo, active=False, closed=False, **opts): |
|
|
1401 | 1401 | """list repository named branches |
|
|
1402 | 1402 | |
|
|
1403 | 1403 | List the repository's named branches, indicating which ones are |
|
|
1404 | 1404 | inactive. If -c/--closed is specified, also list branches which have |
|
|
1405 | 1405 | been marked closed (see :hg:`commit --close-branch`). |
|
|
1406 | 1406 | |
|
|
1407 | 1407 | Use the command :hg:`update` to switch to an existing branch. |
|
|
1408 | 1408 | |
|
|
1409 | 1409 | .. container:: verbose |
|
|
1410 | 1410 | |
|
|
1411 | 1411 | Template: |
|
|
1412 | 1412 | |
|
|
1413 | 1413 | The following keywords are supported in addition to the common template |
|
|
1414 | 1414 | keywords and functions such as ``{branch}``. See also |
|
|
1415 | 1415 | :hg:`help templates`. |
|
|
1416 | 1416 | |
|
|
1417 | 1417 | :active: Boolean. True if the branch is active. |
|
|
1418 | 1418 | :closed: Boolean. True if the branch is closed. |
|
|
1419 | 1419 | :current: Boolean. True if it is the current branch. |
|
|
1420 | 1420 | |
|
|
1421 | 1421 | Returns 0. |
|
|
1422 | 1422 | """ |
|
|
1423 | 1423 | |
|
|
1424 | 1424 | opts = pycompat.byteskwargs(opts) |
|
|
1425 | 1425 | revs = opts.get(b'rev') |
|
|
1426 | 1426 | selectedbranches = None |
|
|
1427 | 1427 | if revs: |
|
|
1428 | 1428 | revs = scmutil.revrange(repo, revs) |
|
|
1429 | 1429 | getbi = repo.revbranchcache().branchinfo |
|
|
1430 | 1430 | selectedbranches = {getbi(r)[0] for r in revs} |
|
|
1431 | 1431 | |
|
|
1432 | 1432 | ui.pager(b'branches') |
|
|
1433 | 1433 | fm = ui.formatter(b'branches', opts) |
|
|
1434 | 1434 | hexfunc = fm.hexfunc |
|
|
1435 | 1435 | |
|
|
1436 | 1436 | allheads = set(repo.heads()) |
|
|
1437 | 1437 | branches = [] |
|
|
1438 | 1438 | for tag, heads, tip, isclosed in repo.branchmap().iterbranches(): |
|
|
1439 | 1439 | if selectedbranches is not None and tag not in selectedbranches: |
|
|
1440 | 1440 | continue |
|
|
1441 | 1441 | isactive = False |
|
|
1442 | 1442 | if not isclosed: |
|
|
1443 | 1443 | openheads = set(repo.branchmap().iteropen(heads)) |
|
|
1444 | 1444 | isactive = bool(openheads & allheads) |
|
|
1445 | 1445 | branches.append((tag, repo[tip], isactive, not isclosed)) |
|
|
1446 | 1446 | branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), reverse=True) |
|
|
1447 | 1447 | |
|
|
1448 | 1448 | for tag, ctx, isactive, isopen in branches: |
|
|
1449 | 1449 | if active and not isactive: |
|
|
1450 | 1450 | continue |
|
|
1451 | 1451 | if isactive: |
|
|
1452 | 1452 | label = b'branches.active' |
|
|
1453 | 1453 | notice = b'' |
|
|
1454 | 1454 | elif not isopen: |
|
|
1455 | 1455 | if not closed: |
|
|
1456 | 1456 | continue |
|
|
1457 | 1457 | label = b'branches.closed' |
|
|
1458 | 1458 | notice = _(b' (closed)') |
|
|
1459 | 1459 | else: |
|
|
1460 | 1460 | label = b'branches.inactive' |
|
|
1461 | 1461 | notice = _(b' (inactive)') |
|
|
1462 | 1462 | current = tag == repo.dirstate.branch() |
|
|
1463 | 1463 | if current: |
|
|
1464 | 1464 | label = b'branches.current' |
|
|
1465 | 1465 | |
|
|
1466 | 1466 | fm.startitem() |
|
|
1467 | 1467 | fm.write(b'branch', b'%s', tag, label=label) |
|
|
1468 | 1468 | rev = ctx.rev() |
|
|
1469 | 1469 | padsize = max(31 - len(b"%d" % rev) - encoding.colwidth(tag), 0) |
|
|
1470 | 1470 | fmt = b' ' * padsize + b' %d:%s' |
|
|
1471 | 1471 | fm.condwrite( |
|
|
1472 | 1472 | not ui.quiet, |
|
|
1473 | 1473 | b'rev node', |
|
|
1474 | 1474 | fmt, |
|
|
1475 | 1475 | rev, |
|
|
1476 | 1476 | hexfunc(ctx.node()), |
|
|
1477 | 1477 | label=b'log.changeset changeset.%s' % ctx.phasestr(), |
|
|
1478 | 1478 | ) |
|
|
1479 | 1479 | fm.context(ctx=ctx) |
|
|
1480 | 1480 | fm.data(active=isactive, closed=not isopen, current=current) |
|
|
1481 | 1481 | if not ui.quiet: |
|
|
1482 | 1482 | fm.plain(notice) |
|
|
1483 | 1483 | fm.plain(b'\n') |
|
|
1484 | 1484 | fm.end() |
|
|
1485 | 1485 | |
|
|
1486 | 1486 | |
|
|
1487 | 1487 | @command( |
|
|
1488 | 1488 | b'bundle', |
|
|
1489 | 1489 | [ |
|
|
1490 | 1490 | ( |
|
|
1491 | 1491 | b'f', |
|
|
1492 | 1492 | b'force', |
|
|
1493 | 1493 | None, |
|
|
1494 | 1494 | _(b'run even when the destination is unrelated'), |
|
|
1495 | 1495 | ), |
|
|
1496 | 1496 | ( |
|
|
1497 | 1497 | b'r', |
|
|
1498 | 1498 | b'rev', |
|
|
1499 | 1499 | [], |
|
|
1500 | 1500 | _(b'a changeset intended to be added to the destination'), |
|
|
1501 | 1501 | _(b'REV'), |
|
|
1502 | 1502 | ), |
|
|
1503 | 1503 | ( |
|
|
1504 | 1504 | b'b', |
|
|
1505 | 1505 | b'branch', |
|
|
1506 | 1506 | [], |
|
|
1507 | 1507 | _(b'a specific branch you would like to bundle'), |
|
|
1508 | 1508 | _(b'BRANCH'), |
|
|
1509 | 1509 | ), |
|
|
1510 | 1510 | ( |
|
|
1511 | 1511 | b'', |
|
|
1512 | 1512 | b'base', |
|
|
1513 | 1513 | [], |
|
|
1514 | 1514 | _(b'a base changeset assumed to be available at the destination'), |
|
|
1515 | 1515 | _(b'REV'), |
|
|
1516 | 1516 | ), |
|
|
1517 | 1517 | (b'a', b'all', None, _(b'bundle all changesets in the repository')), |
|
|
1518 | 1518 | ( |
|
|
1519 | 1519 | b't', |
|
|
1520 | 1520 | b'type', |
|
|
1521 | 1521 | b'bzip2', |
|
|
1522 | 1522 | _(b'bundle compression type to use'), |
|
|
1523 | 1523 | _(b'TYPE'), |
|
|
1524 | 1524 | ), |
|
|
1525 | 1525 | ] |
|
|
1526 | 1526 | + remoteopts, |
|
|
1527 | 1527 | _(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'), |
|
|
1528 | 1528 | helpcategory=command.CATEGORY_IMPORT_EXPORT, |
|
|
1529 | 1529 | ) |
|
|
1530 | 1530 | def bundle(ui, repo, fname, dest=None, **opts): |
|
|
1531 | 1531 | """create a bundle file |
|
|
1532 | 1532 | |
|
|
1533 | 1533 | Generate a bundle file containing data to be transferred to another |
|
|
1534 | 1534 | repository. |
|
|
1535 | 1535 | |
|
|
1536 | 1536 | To create a bundle containing all changesets, use -a/--all |
|
|
1537 | 1537 | (or --base null). Otherwise, hg assumes the destination will have |
|
|
1538 | 1538 | all the nodes you specify with --base parameters. Otherwise, hg |
|
|
1539 | 1539 | will assume the repository has all the nodes in destination, or |
|
|
1540 | 1540 | default-push/default if no destination is specified, where destination |
|
|
1541 | 1541 | is the repository you provide through DEST option. |
|
|
1542 | 1542 | |
|
|
1543 | 1543 | You can change bundle format with the -t/--type option. See |
|
|
1544 | 1544 | :hg:`help bundlespec` for documentation on this format. By default, |
|
|
1545 | 1545 | the most appropriate format is used and compression defaults to |
|
|
1546 | 1546 | bzip2. |
|
|
1547 | 1547 | |
|
|
1548 | 1548 | The bundle file can then be transferred using conventional means |
|
|
1549 | 1549 | and applied to another repository with the unbundle or pull |
|
|
1550 | 1550 | command. This is useful when direct push and pull are not |
|
|
1551 | 1551 | available or when exporting an entire repository is undesirable. |
|
|
1552 | 1552 | |
|
|
1553 | 1553 | Applying bundles preserves all changeset contents including |
|
|
1554 | 1554 | permissions, copy/rename information, and revision history. |
|
|
1555 | 1555 | |
|
|
1556 | 1556 | Returns 0 on success, 1 if no changes found. |
|
|
1557 | 1557 | """ |
|
|
1558 | 1558 | opts = pycompat.byteskwargs(opts) |
|
|
1559 | 1559 | revs = None |
|
|
1560 | 1560 | if b'rev' in opts: |
|
|
1561 | 1561 | revstrings = opts[b'rev'] |
|
|
1562 | 1562 | revs = scmutil.revrange(repo, revstrings) |
|
|
1563 | 1563 | if revstrings and not revs: |
|
|
1564 | 1564 | raise error.InputError(_(b'no commits to bundle')) |
|
|
1565 | 1565 | |
|
|
1566 | 1566 | bundletype = opts.get(b'type', b'bzip2').lower() |
|
|
1567 | 1567 | try: |
|
|
1568 | 1568 | bundlespec = bundlecaches.parsebundlespec( |
|
|
1569 | 1569 | repo, bundletype, strict=False |
|
|
1570 | 1570 | ) |
|
|
1571 | 1571 | except error.UnsupportedBundleSpecification as e: |
|
|
1572 | 1572 | raise error.InputError( |
|
|
1573 | 1573 | pycompat.bytestr(e), |
|
|
1574 | 1574 | hint=_(b"see 'hg help bundlespec' for supported values for --type"), |
|
|
1575 | 1575 | ) |
|
|
1576 | 1576 | cgversion = bundlespec.contentopts[b"cg.version"] |
|
|
1577 | 1577 | |
|
|
1578 | 1578 | # Packed bundles are a pseudo bundle format for now. |
|
|
1579 | 1579 | if cgversion == b's1': |
|
|
1580 | 1580 | raise error.InputError( |
|
|
1581 | 1581 | _(b'packed bundles cannot be produced by "hg bundle"'), |
|
|
1582 | 1582 | hint=_(b"use 'hg debugcreatestreamclonebundle'"), |
|
|
1583 | 1583 | ) |
|
|
1584 | 1584 | |
|
|
1585 | 1585 | if opts.get(b'all'): |
|
|
1586 | 1586 | if dest: |
|
|
1587 | 1587 | raise error.InputError( |
|
|
1588 | 1588 | _(b"--all is incompatible with specifying a destination") |
|
|
1589 | 1589 | ) |
|
|
1590 | 1590 | if opts.get(b'base'): |
|
|
1591 | 1591 | ui.warn(_(b"ignoring --base because --all was specified\n")) |
|
|
1592 | 1592 | base = [nullrev] |
|
|
1593 | 1593 | else: |
|
|
1594 | 1594 | base = scmutil.revrange(repo, opts.get(b'base')) |
|
|
1595 | 1595 | if cgversion not in changegroup.supportedoutgoingversions(repo): |
|
|
1596 | 1596 | raise error.Abort( |
|
|
1597 | 1597 | _(b"repository does not support bundle version %s") % cgversion |
|
|
1598 | 1598 | ) |
|
|
1599 | 1599 | |
|
|
1600 | 1600 | if base: |
|
|
1601 | 1601 | if dest: |
|
|
1602 | 1602 | raise error.InputError( |
|
|
1603 | 1603 | _(b"--base is incompatible with specifying a destination") |
|
|
1604 | 1604 | ) |
|
|
1605 | 1605 | common = [repo[rev].node() for rev in base] |
|
|
1606 | 1606 | heads = [repo[r].node() for r in revs] if revs else None |
|
|
1607 | 1607 | outgoing = discovery.outgoing(repo, common, heads) |
|
|
1608 | 1608 | else: |
|
|
1609 | 1609 | dest = ui.expandpath(dest or b'default-push', dest or b'default') |
|
|
1610 | 1610 | dest, branches = hg.parseurl(dest, opts.get(b'branch')) |
|
|
1611 | 1611 | other = hg.peer(repo, opts, dest) |
|
|
1612 | 1612 | revs = [repo[r].hex() for r in revs] |
|
|
1613 | 1613 | revs, checkout = hg.addbranchrevs(repo, repo, branches, revs) |
|
|
1614 | 1614 | heads = revs and pycompat.maplist(repo.lookup, revs) or revs |
|
|
1615 | 1615 | outgoing = discovery.findcommonoutgoing( |
|
|
1616 | 1616 | repo, |
|
|
1617 | 1617 | other, |
|
|
1618 | 1618 | onlyheads=heads, |
|
|
1619 | 1619 | force=opts.get(b'force'), |
|
|
1620 | 1620 | portable=True, |
|
|
1621 | 1621 | ) |
|
|
1622 | 1622 | |
|
|
1623 | 1623 | if not outgoing.missing: |
|
|
1624 | 1624 | scmutil.nochangesfound(ui, repo, not base and outgoing.excluded) |
|
|
1625 | 1625 | return 1 |
|
|
1626 | 1626 | |
|
|
1627 | 1627 | if cgversion == b'01': # bundle1 |
|
|
1628 | 1628 | bversion = b'HG10' + bundlespec.wirecompression |
|
|
1629 | 1629 | bcompression = None |
|
|
1630 | 1630 | elif cgversion in (b'02', b'03'): |
|
|
1631 | 1631 | bversion = b'HG20' |
|
|
1632 | 1632 | bcompression = bundlespec.wirecompression |
|
|
1633 | 1633 | else: |
|
|
1634 | 1634 | raise error.ProgrammingError( |
|
|
1635 | 1635 | b'bundle: unexpected changegroup version %s' % cgversion |
|
|
1636 | 1636 | ) |
|
|
1637 | 1637 | |
|
|
1638 | 1638 | # TODO compression options should be derived from bundlespec parsing. |
|
|
1639 | 1639 | # This is a temporary hack to allow adjusting bundle compression |
|
|
1640 | 1640 | # level without a) formalizing the bundlespec changes to declare it |
|
|
1641 | 1641 | # b) introducing a command flag. |
|
|
1642 | 1642 | compopts = {} |
|
|
1643 | 1643 | complevel = ui.configint( |
|
|
1644 | 1644 | b'experimental', b'bundlecomplevel.' + bundlespec.compression |
|
|
1645 | 1645 | ) |
|
|
1646 | 1646 | if complevel is None: |
|
|
1647 | 1647 | complevel = ui.configint(b'experimental', b'bundlecomplevel') |
|
|
1648 | 1648 | if complevel is not None: |
|
|
1649 | 1649 | compopts[b'level'] = complevel |
|
|
1650 | 1650 | |
|
|
1651 | 1651 | # Bundling of obsmarker and phases is optional as not all clients |
|
|
1652 | 1652 | # support the necessary features. |
|
|
1653 | 1653 | cfg = ui.configbool |
|
|
1654 | 1654 | contentopts = { |
|
|
1655 | 1655 | b'obsolescence': cfg(b'experimental', b'evolution.bundle-obsmarker'), |
|
|
1656 | 1656 | b'obsolescence-mandatory': cfg( |
|
|
1657 | 1657 | b'experimental', b'evolution.bundle-obsmarker:mandatory' |
|
|
1658 | 1658 | ), |
|
|
1659 | 1659 | b'phases': cfg(b'experimental', b'bundle-phases'), |
|
|
1660 | 1660 | } |
|
|
1661 | 1661 | bundlespec.contentopts.update(contentopts) |
|
|
1662 | 1662 | |
|
|
1663 | 1663 | bundle2.writenewbundle( |
|
|
1664 | 1664 | ui, |
|
|
1665 | 1665 | repo, |
|
|
1666 | 1666 | b'bundle', |
|
|
1667 | 1667 | fname, |
|
|
1668 | 1668 | bversion, |
|
|
1669 | 1669 | outgoing, |
|
|
1670 | 1670 | bundlespec.contentopts, |
|
|
1671 | 1671 | compression=bcompression, |
|
|
1672 | 1672 | compopts=compopts, |
|
|
1673 | 1673 | ) |
|
|
1674 | 1674 | |
|
|
1675 | 1675 | |
|
|
1676 | 1676 | @command( |
|
|
1677 | 1677 | b'cat', |
|
|
1678 | 1678 | [ |
|
|
1679 | 1679 | ( |
|
|
1680 | 1680 | b'o', |
|
|
1681 | 1681 | b'output', |
|
|
1682 | 1682 | b'', |
|
|
1683 | 1683 | _(b'print output to file with formatted name'), |
|
|
1684 | 1684 | _(b'FORMAT'), |
|
|
1685 | 1685 | ), |
|
|
1686 | 1686 | (b'r', b'rev', b'', _(b'print the given revision'), _(b'REV')), |
|
|
1687 | 1687 | (b'', b'decode', None, _(b'apply any matching decode filter')), |
|
|
1688 | 1688 | ] |
|
|
1689 | 1689 | + walkopts |
|
|
1690 | 1690 | + formatteropts, |
|
|
1691 | 1691 | _(b'[OPTION]... FILE...'), |
|
|
1692 | 1692 | helpcategory=command.CATEGORY_FILE_CONTENTS, |
|
|
1693 | 1693 | inferrepo=True, |
|
|
1694 | 1694 | intents={INTENT_READONLY}, |
|
|
1695 | 1695 | ) |
|
|
1696 | 1696 | def cat(ui, repo, file1, *pats, **opts): |
|
|
1697 | 1697 | """output the current or given revision of files |
|
|
1698 | 1698 | |
|
|
1699 | 1699 | Print the specified files as they were at the given revision. If |
|
|
1700 | 1700 | no revision is given, the parent of the working directory is used. |
|
|
1701 | 1701 | |
|
|
1702 | 1702 | Output may be to a file, in which case the name of the file is |
|
|
1703 | 1703 | given using a template string. See :hg:`help templates`. In addition |
|
|
1704 | 1704 | to the common template keywords, the following formatting rules are |
|
|
1705 | 1705 | supported: |
|
|
1706 | 1706 | |
|
|
1707 | 1707 | :``%%``: literal "%" character |
|
|
1708 | 1708 | :``%s``: basename of file being printed |
|
|
1709 | 1709 | :``%d``: dirname of file being printed, or '.' if in repository root |
|
|
1710 | 1710 | :``%p``: root-relative path name of file being printed |
|
|
1711 | 1711 | :``%H``: changeset hash (40 hexadecimal digits) |
|
|
1712 | 1712 | :``%R``: changeset revision number |
|
|
1713 | 1713 | :``%h``: short-form changeset hash (12 hexadecimal digits) |
|
|
1714 | 1714 | :``%r``: zero-padded changeset revision number |
|
|
1715 | 1715 | :``%b``: basename of the exporting repository |
|
|
1716 | 1716 | :``\\``: literal "\\" character |
|
|
1717 | 1717 | |
|
|
1718 | 1718 | .. container:: verbose |
|
|
1719 | 1719 | |
|
|
1720 | 1720 | Template: |
|
|
1721 | 1721 | |
|
|
1722 | 1722 | The following keywords are supported in addition to the common template |
|
|
1723 | 1723 | keywords and functions. See also :hg:`help templates`. |
|
|
1724 | 1724 | |
|
|
1725 | 1725 | :data: String. File content. |
|
|
1726 | 1726 | :path: String. Repository-absolute path of the file. |
|
|
1727 | 1727 | |
|
|
1728 | 1728 | Returns 0 on success. |
|
|
1729 | 1729 | """ |
|
|
1730 | 1730 | opts = pycompat.byteskwargs(opts) |
|
|
1731 | 1731 | rev = opts.get(b'rev') |
|
|
1732 | 1732 | if rev: |
|
|
1733 | 1733 | repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn') |
|
|
1734 | 1734 | ctx = scmutil.revsingle(repo, rev) |
|
|
1735 | 1735 | m = scmutil.match(ctx, (file1,) + pats, opts) |
|
|
1736 | 1736 | fntemplate = opts.pop(b'output', b'') |
|
|
1737 | 1737 | if cmdutil.isstdiofilename(fntemplate): |
|
|
1738 | 1738 | fntemplate = b'' |
|
|
1739 | 1739 | |
|
|
1740 | 1740 | if fntemplate: |
|
|
1741 | 1741 | fm = formatter.nullformatter(ui, b'cat', opts) |
|
|
1742 | 1742 | else: |
|
|
1743 | 1743 | ui.pager(b'cat') |
|
|
1744 | 1744 | fm = ui.formatter(b'cat', opts) |
|
|
1745 | 1745 | with fm: |
|
|
1746 | 1746 | return cmdutil.cat( |
|
|
1747 | 1747 | ui, repo, ctx, m, fm, fntemplate, b'', **pycompat.strkwargs(opts) |
|
|
1748 | 1748 | ) |
|
|
1749 | 1749 | |
|
|
1750 | 1750 | |
|
|
1751 | 1751 | @command( |
|
|
1752 | 1752 | b'clone', |
|
|
1753 | 1753 | [ |
|
|
1754 | 1754 | ( |
|
|
1755 | 1755 | b'U', |
|
|
1756 | 1756 | b'noupdate', |
|
|
1757 | 1757 | None, |
|
|
1758 | 1758 | _( |
|
|
1759 | 1759 | b'the clone will include an empty working ' |
|
|
1760 | 1760 | b'directory (only a repository)' |
|
|
1761 | 1761 | ), |
|
|
1762 | 1762 | ), |
|
|
1763 | 1763 | ( |
|
|
1764 | 1764 | b'u', |
|
|
1765 | 1765 | b'updaterev', |
|
|
1766 | 1766 | b'', |
|
|
1767 | 1767 | _(b'revision, tag, or branch to check out'), |
|
|
1768 | 1768 | _(b'REV'), |
|
|
1769 | 1769 | ), |
|
|
1770 | 1770 | ( |
|
|
1771 | 1771 | b'r', |
|
|
1772 | 1772 | b'rev', |
|
|
1773 | 1773 | [], |
|
|
1774 | 1774 | _( |
|
|
1775 | 1775 | b'do not clone everything, but include this changeset' |
|
|
1776 | 1776 | b' and its ancestors' |
|
|
1777 | 1777 | ), |
|
|
1778 | 1778 | _(b'REV'), |
|
|
1779 | 1779 | ), |
|
|
1780 | 1780 | ( |
|
|
1781 | 1781 | b'b', |
|
|
1782 | 1782 | b'branch', |
|
|
1783 | 1783 | [], |
|
|
1784 | 1784 | _( |
|
|
1785 | 1785 | b'do not clone everything, but include this branch\'s' |
|
|
1786 | 1786 | b' changesets and their ancestors' |
|
|
1787 | 1787 | ), |
|
|
1788 | 1788 | _(b'BRANCH'), |
|
|
1789 | 1789 | ), |
|
|
1790 | 1790 | (b'', b'pull', None, _(b'use pull protocol to copy metadata')), |
|
|
1791 | 1791 | (b'', b'uncompressed', None, _(b'an alias to --stream (DEPRECATED)')), |
|
|
1792 | 1792 | (b'', b'stream', None, _(b'clone with minimal data processing')), |
|
|
1793 | 1793 | ] |
|
|
1794 | 1794 | + remoteopts, |
|
|
1795 | 1795 | _(b'[OPTION]... SOURCE [DEST]'), |
|
|
1796 | 1796 | helpcategory=command.CATEGORY_REPO_CREATION, |
|
|
1797 | 1797 | helpbasic=True, |
|
|
1798 | 1798 | norepo=True, |
|
|
1799 | 1799 | ) |
|
|
1800 | 1800 | def clone(ui, source, dest=None, **opts): |
|
|
1801 | 1801 | """make a copy of an existing repository |
|
|
1802 | 1802 | |
|
|
1803 | 1803 | Create a copy of an existing repository in a new directory. |
|
|
1804 | 1804 | |
|
|
1805 | 1805 | If no destination directory name is specified, it defaults to the |
|
|
1806 | 1806 | basename of the source. |
|
|
1807 | 1807 | |
|
|
1808 | 1808 | The location of the source is added to the new repository's |
|
|
1809 | 1809 | ``.hg/hgrc`` file, as the default to be used for future pulls. |
|
|
1810 | 1810 | |
|
|
1811 | 1811 | Only local paths and ``ssh://`` URLs are supported as |
|
|
1812 | 1812 | destinations. For ``ssh://`` destinations, no working directory or |
|
|
1813 | 1813 | ``.hg/hgrc`` will be created on the remote side. |
|
|
1814 | 1814 | |
|
|
1815 | 1815 | If the source repository has a bookmark called '@' set, that |
|
|
1816 | 1816 | revision will be checked out in the new repository by default. |
|
|
1817 | 1817 | |
|
|
1818 | 1818 | To check out a particular version, use -u/--update, or |
|
|
1819 | 1819 | -U/--noupdate to create a clone with no working directory. |
|
|
1820 | 1820 | |
|
|
1821 | 1821 | To pull only a subset of changesets, specify one or more revisions |
|
|
1822 | 1822 | identifiers with -r/--rev or branches with -b/--branch. The |
|
|
1823 | 1823 | resulting clone will contain only the specified changesets and |
|
|
1824 | 1824 | their ancestors. These options (or 'clone src#rev dest') imply |
|
|
1825 | 1825 | --pull, even for local source repositories. |
|
|
1826 | 1826 | |
|
|
1827 | 1827 | In normal clone mode, the remote normalizes repository data into a common |
|
|
1828 | 1828 | exchange format and the receiving end translates this data into its local |
|
|
1829 | 1829 | storage format. --stream activates a different clone mode that essentially |
|
|
1830 | 1830 | copies repository files from the remote with minimal data processing. This |
|
|
1831 | 1831 | significantly reduces the CPU cost of a clone both remotely and locally. |
|
|
1832 | 1832 | However, it often increases the transferred data size by 30-40%. This can |
|
|
1833 | 1833 | result in substantially faster clones where I/O throughput is plentiful, |
|
|
1834 | 1834 | especially for larger repositories. A side-effect of --stream clones is |
|
|
1835 | 1835 | that storage settings and requirements on the remote are applied locally: |
|
|
1836 | 1836 | a modern client may inherit legacy or inefficient storage used by the |
|
|
1837 | 1837 | remote or a legacy Mercurial client may not be able to clone from a |
|
|
1838 | 1838 | modern Mercurial remote. |
|
|
1839 | 1839 | |
|
|
1840 | 1840 | .. note:: |
|
|
1841 | 1841 | |
|
|
1842 | 1842 | Specifying a tag will include the tagged changeset but not the |
|
|
1843 | 1843 | changeset containing the tag. |
|
|
1844 | 1844 | |
|
|
1845 | 1845 | .. container:: verbose |
|
|
1846 | 1846 | |
|
|
1847 | 1847 | For efficiency, hardlinks are used for cloning whenever the |
|
|
1848 | 1848 | source and destination are on the same filesystem (note this |
|
|
1849 | 1849 | applies only to the repository data, not to the working |
|
|
1850 | 1850 | directory). Some filesystems, such as AFS, implement hardlinking |
|
|
1851 | 1851 | incorrectly, but do not report errors. In these cases, use the |
|
|
1852 | 1852 | --pull option to avoid hardlinking. |
|
|
1853 | 1853 | |
|
|
1854 | 1854 | Mercurial will update the working directory to the first applicable |
|
|
1855 | 1855 | revision from this list: |
|
|
1856 | 1856 | |
|
|
1857 | 1857 | a) null if -U or the source repository has no changesets |
|
|
1858 | 1858 | b) if -u . and the source repository is local, the first parent of |
|
|
1859 | 1859 | the source repository's working directory |
|
|
1860 | 1860 | c) the changeset specified with -u (if a branch name, this means the |
|
|
1861 | 1861 | latest head of that branch) |
|
|
1862 | 1862 | d) the changeset specified with -r |
|
|
1863 | 1863 | e) the tipmost head specified with -b |
|
|
1864 | 1864 | f) the tipmost head specified with the url#branch source syntax |
|
|
1865 | 1865 | g) the revision marked with the '@' bookmark, if present |
|
|
1866 | 1866 | h) the tipmost head of the default branch |
|
|
1867 | 1867 | i) tip |
|
|
1868 | 1868 | |
|
|
1869 | 1869 | When cloning from servers that support it, Mercurial may fetch |
|
|
1870 | 1870 | pre-generated data from a server-advertised URL or inline from the |
|
|
1871 | 1871 | same stream. When this is done, hooks operating on incoming changesets |
|
|
1872 | 1872 | and changegroups may fire more than once, once for each pre-generated |
|
|
1873 | 1873 | bundle and as well as for any additional remaining data. In addition, |
|
|
1874 | 1874 | if an error occurs, the repository may be rolled back to a partial |
|
|
1875 | 1875 | clone. This behavior may change in future releases. |
|
|
1876 | 1876 | See :hg:`help -e clonebundles` for more. |
|
|
1877 | 1877 | |
|
|
1878 | 1878 | Examples: |
|
|
1879 | 1879 | |
|
|
1880 | 1880 | - clone a remote repository to a new directory named hg/:: |
|
|
1881 | 1881 | |
|
|
1882 | 1882 | hg clone https://www.mercurial-scm.org/repo/hg/ |
|
|
1883 | 1883 | |
|
|
1884 | 1884 | - create a lightweight local clone:: |
|
|
1885 | 1885 | |
|
|
1886 | 1886 | hg clone project/ project-feature/ |
|
|
1887 | 1887 | |
|
|
1888 | 1888 | - clone from an absolute path on an ssh server (note double-slash):: |
|
|
1889 | 1889 | |
|
|
1890 | 1890 | hg clone ssh://user@server//home/projects/alpha/ |
|
|
1891 | 1891 | |
|
|
1892 | 1892 | - do a streaming clone while checking out a specified version:: |
|
|
1893 | 1893 | |
|
|
1894 | 1894 | hg clone --stream http://server/repo -u 1.5 |
|
|
1895 | 1895 | |
|
|
1896 | 1896 | - create a repository without changesets after a particular revision:: |
|
|
1897 | 1897 | |
|
|
1898 | 1898 | hg clone -r 04e544 experimental/ good/ |
|
|
1899 | 1899 | |
|
|
1900 | 1900 | - clone (and track) a particular named branch:: |
|
|
1901 | 1901 | |
|
|
1902 | 1902 | hg clone https://www.mercurial-scm.org/repo/hg/#stable |
|
|
1903 | 1903 | |
|
|
1904 | 1904 | See :hg:`help urls` for details on specifying URLs. |
|
|
1905 | 1905 | |
|
|
1906 | 1906 | Returns 0 on success. |
|
|
1907 | 1907 | """ |
|
|
1908 | 1908 | opts = pycompat.byteskwargs(opts) |
|
|
1909 | 1909 | cmdutil.check_at_most_one_arg(opts, b'noupdate', b'updaterev') |
|
|
1910 | 1910 | |
|
|
1911 | 1911 | # --include/--exclude can come from narrow or sparse. |
|
|
1912 | 1912 | includepats, excludepats = None, None |
|
|
1913 | 1913 | |
|
|
1914 | 1914 | # hg.clone() differentiates between None and an empty set. So make sure |
|
|
1915 | 1915 | # patterns are sets if narrow is requested without patterns. |
|
|
1916 | 1916 | if opts.get(b'narrow'): |
|
|
1917 | 1917 | includepats = set() |
|
|
1918 | 1918 | excludepats = set() |
|
|
1919 | 1919 | |
|
|
1920 | 1920 | if opts.get(b'include'): |
|
|
1921 | 1921 | includepats = narrowspec.parsepatterns(opts.get(b'include')) |
|
|
1922 | 1922 | if opts.get(b'exclude'): |
|
|
1923 | 1923 | excludepats = narrowspec.parsepatterns(opts.get(b'exclude')) |
|
|
1924 | 1924 | |
|
|
1925 | 1925 | r = hg.clone( |
|
|
1926 | 1926 | ui, |
|
|
1927 | 1927 | opts, |
|
|
1928 | 1928 | source, |
|
|
1929 | 1929 | dest, |
|
|
1930 | 1930 | pull=opts.get(b'pull'), |
|
|
1931 | 1931 | stream=opts.get(b'stream') or opts.get(b'uncompressed'), |
|
|
1932 | 1932 | revs=opts.get(b'rev'), |
|
|
1933 | 1933 | update=opts.get(b'updaterev') or not opts.get(b'noupdate'), |
|
|
1934 | 1934 | branch=opts.get(b'branch'), |
|
|
1935 | 1935 | shareopts=opts.get(b'shareopts'), |
|
|
1936 | 1936 | storeincludepats=includepats, |
|
|
1937 | 1937 | storeexcludepats=excludepats, |
|
|
1938 | 1938 | depth=opts.get(b'depth') or None, |
|
|
1939 | 1939 | ) |
|
|
1940 | 1940 | |
|
|
1941 | 1941 | return r is None |
|
|
1942 | 1942 | |
|
|
1943 | 1943 | |
|
|
1944 | 1944 | @command( |
|
|
1945 | 1945 | b'commit|ci', |
|
|
1946 | 1946 | [ |
|
|
1947 | 1947 | ( |
|
|
1948 | 1948 | b'A', |
|
|
1949 | 1949 | b'addremove', |
|
|
1950 | 1950 | None, |
|
|
1951 | 1951 | _(b'mark new/missing files as added/removed before committing'), |
|
|
1952 | 1952 | ), |
|
|
1953 | 1953 | (b'', b'close-branch', None, _(b'mark a branch head as closed')), |
|
|
1954 | 1954 | (b'', b'amend', None, _(b'amend the parent of the working directory')), |
|
|
1955 | 1955 | (b's', b'secret', None, _(b'use the secret phase for committing')), |
|
|
1956 | 1956 | (b'e', b'edit', None, _(b'invoke editor on commit messages')), |
|
|
1957 | 1957 | ( |
|
|
1958 | 1958 | b'', |
|
|
1959 | 1959 | b'force-close-branch', |
|
|
1960 | 1960 | None, |
|
|
1961 | 1961 | _(b'forcibly close branch from a non-head changeset (ADVANCED)'), |
|
|
1962 | 1962 | ), |
|
|
1963 | 1963 | (b'i', b'interactive', None, _(b'use interactive mode')), |
|
|
1964 | 1964 | ] |
|
|
1965 | 1965 | + walkopts |
|
|
1966 | 1966 | + commitopts |
|
|
1967 | 1967 | + commitopts2 |
|
|
1968 | 1968 | + subrepoopts, |
|
|
1969 | 1969 | _(b'[OPTION]... [FILE]...'), |
|
|
1970 | 1970 | helpcategory=command.CATEGORY_COMMITTING, |
|
|
1971 | 1971 | helpbasic=True, |
|
|
1972 | 1972 | inferrepo=True, |
|
|
1973 | 1973 | ) |
|
|
1974 | 1974 | def commit(ui, repo, *pats, **opts): |
|
|
1975 | 1975 | """commit the specified files or all outstanding changes |
|
|
1976 | 1976 | |
|
|
1977 | 1977 | Commit changes to the given files into the repository. Unlike a |
|
|
1978 | 1978 | centralized SCM, this operation is a local operation. See |
|
|
1979 | 1979 | :hg:`push` for a way to actively distribute your changes. |
|
|
1980 | 1980 | |
|
|
1981 | 1981 | If a list of files is omitted, all changes reported by :hg:`status` |
|
|
1982 | 1982 | will be committed. |
|
|
1983 | 1983 | |
|
|
1984 | 1984 | If you are committing the result of a merge, do not provide any |
|
|
1985 | 1985 | filenames or -I/-X filters. |
|
|
1986 | 1986 | |
|
|
1987 | 1987 | If no commit message is specified, Mercurial starts your |
|
|
1988 | 1988 | configured editor where you can enter a message. In case your |
|
|
1989 | 1989 | commit fails, you will find a backup of your message in |
|
|
1990 | 1990 | ``.hg/last-message.txt``. |
|
|
1991 | 1991 | |
|
|
1992 | 1992 | The --close-branch flag can be used to mark the current branch |
|
|
1993 | 1993 | head closed. When all heads of a branch are closed, the branch |
|
|
1994 | 1994 | will be considered closed and no longer listed. |
|
|
1995 | 1995 | |
|
|
1996 | 1996 | The --amend flag can be used to amend the parent of the |
|
|
1997 | 1997 | working directory with a new commit that contains the changes |
|
|
1998 | 1998 | in the parent in addition to those currently reported by :hg:`status`, |
|
|
1999 | 1999 | if there are any. The old commit is stored in a backup bundle in |
|
|
2000 | 2000 | ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle` |
|
|
2001 | 2001 | on how to restore it). |
|
|
2002 | 2002 | |
|
|
2003 | 2003 | Message, user and date are taken from the amended commit unless |
|
|
2004 | 2004 | specified. When a message isn't specified on the command line, |
|
|
2005 | 2005 | the editor will open with the message of the amended commit. |
|
|
2006 | 2006 | |
|
|
2007 | 2007 | It is not possible to amend public changesets (see :hg:`help phases`) |
|
|
2008 | 2008 | or changesets that have children. |
|
|
2009 | 2009 | |
|
|
2010 | 2010 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
|
2011 | 2011 | |
|
|
2012 | 2012 | Returns 0 on success, 1 if nothing changed. |
|
|
2013 | 2013 | |
|
|
2014 | 2014 | .. container:: verbose |
|
|
2015 | 2015 | |
|
|
2016 | 2016 | Examples: |
|
|
2017 | 2017 | |
|
|
2018 | 2018 | - commit all files ending in .py:: |
|
|
2019 | 2019 | |
|
|
2020 | 2020 | hg commit --include "set:**.py" |
|
|
2021 | 2021 | |
|
|
2022 | 2022 | - commit all non-binary files:: |
|
|
2023 | 2023 | |
|
|
2024 | 2024 | hg commit --exclude "set:binary()" |
|
|
2025 | 2025 | |
|
|
2026 | 2026 | - amend the current commit and set the date to now:: |
|
|
2027 | 2027 | |
|
|
2028 | 2028 | hg commit --amend --date now |
|
|
2029 | 2029 | """ |
|
|
2030 | 2030 | with repo.wlock(), repo.lock(): |
|
|
2031 | 2031 | return _docommit(ui, repo, *pats, **opts) |
|
|
2032 | 2032 | |
|
|
2033 | 2033 | |
|
|
2034 | 2034 | def _docommit(ui, repo, *pats, **opts): |
|
|
2035 | 2035 | if opts.get('interactive'): |
|
|
2036 | 2036 | opts.pop('interactive') |
|
|
2037 | 2037 | ret = cmdutil.dorecord( |
|
|
2038 | 2038 | ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts |
|
|
2039 | 2039 | ) |
|
|
2040 | 2040 | # ret can be 0 (no changes to record) or the value returned by |
|
|
2041 | 2041 | # commit(), 1 if nothing changed or None on success. |
|
|
2042 | 2042 | return 1 if ret == 0 else ret |
|
|
2043 | 2043 | |
|
|
2044 | 2044 | opts = pycompat.byteskwargs(opts) |
|
|
2045 | 2045 | if opts.get(b'subrepos'): |
|
|
2046 | 2046 | cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'amend']) |
|
|
2047 | 2047 | # Let --subrepos on the command line override config setting. |
|
|
2048 | 2048 | ui.setconfig(b'ui', b'commitsubrepos', True, b'commit') |
|
|
2049 | 2049 | |
|
|
2050 | 2050 | cmdutil.checkunfinished(repo, commit=True) |
|
|
2051 | 2051 | |
|
|
2052 | 2052 | branch = repo[None].branch() |
|
|
2053 | 2053 | bheads = repo.branchheads(branch) |
|
|
2054 | 2054 | tip = repo.changelog.tip() |
|
|
2055 | 2055 | |
|
|
2056 | 2056 | extra = {} |
|
|
2057 | 2057 | if opts.get(b'close_branch') or opts.get(b'force_close_branch'): |
|
|
2058 | 2058 | extra[b'close'] = b'1' |
|
|
2059 | 2059 | |
|
|
2060 | 2060 | if repo[b'.'].closesbranch(): |
|
|
2061 | 2061 | raise error.InputError( |
|
|
2062 | 2062 | _(b'current revision is already a branch closing head') |
|
|
2063 | 2063 | ) |
|
|
2064 | 2064 | elif not bheads: |
|
|
2065 | 2065 | raise error.InputError( |
|
|
2066 | 2066 | _(b'branch "%s" has no heads to close') % branch |
|
|
2067 | 2067 | ) |
|
|
2068 | 2068 | elif ( |
|
|
2069 | 2069 | branch == repo[b'.'].branch() |
|
|
2070 | 2070 | and repo[b'.'].node() not in bheads |
|
|
2071 | 2071 | and not opts.get(b'force_close_branch') |
|
|
2072 | 2072 | ): |
|
|
2073 | 2073 | hint = _( |
|
|
2074 | 2074 | b'use --force-close-branch to close branch from a non-head' |
|
|
2075 | 2075 | b' changeset' |
|
|
2076 | 2076 | ) |
|
|
2077 | 2077 | raise error.InputError(_(b'can only close branch heads'), hint=hint) |
|
|
2078 | 2078 | elif opts.get(b'amend'): |
|
|
2079 | 2079 | if ( |
|
|
2080 | 2080 | repo[b'.'].p1().branch() != branch |
|
|
2081 | 2081 | and repo[b'.'].p2().branch() != branch |
|
|
2082 | 2082 | ): |
|
|
2083 | 2083 | raise error.InputError(_(b'can only close branch heads')) |
|
|
2084 | 2084 | |
|
|
2085 | 2085 | if opts.get(b'amend'): |
|
|
2086 | 2086 | if ui.configbool(b'ui', b'commitsubrepos'): |
|
|
2087 | 2087 | raise error.InputError( |
|
|
2088 | 2088 | _(b'cannot amend with ui.commitsubrepos enabled') |
|
|
2089 | 2089 | ) |
|
|
2090 | 2090 | |
|
|
2091 | 2091 | old = repo[b'.'] |
|
|
2092 | 2092 | rewriteutil.precheck(repo, [old.rev()], b'amend') |
|
|
2093 | 2093 | |
|
|
2094 | 2094 | # Currently histedit gets confused if an amend happens while histedit |
|
|
2095 | 2095 | # is in progress. Since we have a checkunfinished command, we are |
|
|
2096 | 2096 | # temporarily honoring it. |
|
|
2097 | 2097 | # |
|
|
2098 | 2098 | # Note: eventually this guard will be removed. Please do not expect |
|
|
2099 | 2099 | # this behavior to remain. |
|
|
2100 | 2100 | if not obsolete.isenabled(repo, obsolete.createmarkersopt): |
|
|
2101 | 2101 | cmdutil.checkunfinished(repo) |
|
|
2102 | 2102 | |
|
|
2103 | 2103 | node = cmdutil.amend(ui, repo, old, extra, pats, opts) |
|
|
2104 | 2104 | if node == old.node(): |
|
|
2105 | 2105 | ui.status(_(b"nothing changed\n")) |
|
|
2106 | 2106 | return 1 |
|
|
2107 | 2107 | else: |
|
|
2108 | 2108 | |
|
|
2109 | 2109 | def commitfunc(ui, repo, message, match, opts): |
|
|
2110 | 2110 | overrides = {} |
|
|
2111 | 2111 | if opts.get(b'secret'): |
|
|
2112 | 2112 | overrides[(b'phases', b'new-commit')] = b'secret' |
|
|
2113 | 2113 | |
|
|
2114 | 2114 | baseui = repo.baseui |
|
|
2115 | 2115 | with baseui.configoverride(overrides, b'commit'): |
|
|
2116 | 2116 | with ui.configoverride(overrides, b'commit'): |
|
|
2117 | 2117 | editform = cmdutil.mergeeditform( |
|
|
2118 | 2118 | repo[None], b'commit.normal' |
|
|
2119 | 2119 | ) |
|
|
2120 | 2120 | editor = cmdutil.getcommiteditor( |
|
|
2121 | 2121 | editform=editform, **pycompat.strkwargs(opts) |
|
|
2122 | 2122 | ) |
|
|
2123 | 2123 | return repo.commit( |
|
|
2124 | 2124 | message, |
|
|
2125 | 2125 | opts.get(b'user'), |
|
|
2126 | 2126 | opts.get(b'date'), |
|
|
2127 | 2127 | match, |
|
|
2128 | 2128 | editor=editor, |
|
|
2129 | 2129 | extra=extra, |
|
|
2130 | 2130 | ) |
|
|
2131 | 2131 | |
|
|
2132 | 2132 | node = cmdutil.commit(ui, repo, commitfunc, pats, opts) |
|
|
2133 | 2133 | |
|
|
2134 | 2134 | if not node: |
|
|
2135 | 2135 | stat = cmdutil.postcommitstatus(repo, pats, opts) |
|
|
2136 | 2136 | if stat.deleted: |
|
|
2137 | 2137 | ui.status( |
|
|
2138 | 2138 | _( |
|
|
2139 | 2139 | b"nothing changed (%d missing files, see " |
|
|
2140 | 2140 | b"'hg status')\n" |
|
|
2141 | 2141 | ) |
|
|
2142 | 2142 | % len(stat.deleted) |
|
|
2143 | 2143 | ) |
|
|
2144 | 2144 | else: |
|
|
2145 | 2145 | ui.status(_(b"nothing changed\n")) |
|
|
2146 | 2146 | return 1 |
|
|
2147 | 2147 | |
|
|
2148 | 2148 | cmdutil.commitstatus(repo, node, branch, bheads, tip, opts) |
|
|
2149 | 2149 | |
|
|
2150 | 2150 | if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'): |
|
|
2151 | 2151 | status( |
|
|
2152 | 2152 | ui, |
|
|
2153 | 2153 | repo, |
|
|
2154 | 2154 | modified=True, |
|
|
2155 | 2155 | added=True, |
|
|
2156 | 2156 | removed=True, |
|
|
2157 | 2157 | deleted=True, |
|
|
2158 | 2158 | unknown=True, |
|
|
2159 | 2159 | subrepos=opts.get(b'subrepos'), |
|
|
2160 | 2160 | ) |
|
|
2161 | 2161 | |
|
|
2162 | 2162 | |
|
|
2163 | 2163 | @command( |
|
|
2164 | 2164 | b'config|showconfig|debugconfig', |
|
|
2165 | 2165 | [ |
|
|
2166 | 2166 | (b'u', b'untrusted', None, _(b'show untrusted configuration options')), |
|
|
2167 | 2167 | (b'e', b'edit', None, _(b'edit user config')), |
|
|
2168 | 2168 | (b'l', b'local', None, _(b'edit repository config')), |
|
|
2169 | 2169 | ( |
|
|
2170 | 2170 | b'', |
|
|
2171 | 2171 | b'shared', |
|
|
2172 | 2172 | None, |
|
|
2173 | 2173 | _(b'edit shared source repository config (EXPERIMENTAL)'), |
|
|
2174 | 2174 | ), |
|
|
2175 | 2175 | (b'', b'non-shared', None, _(b'edit non shared config (EXPERIMENTAL)')), |
|
|
2176 | 2176 | (b'g', b'global', None, _(b'edit global config')), |
|
|
2177 | 2177 | ] |
|
|
2178 | 2178 | + formatteropts, |
|
|
2179 | 2179 | _(b'[-u] [NAME]...'), |
|
|
2180 | 2180 | helpcategory=command.CATEGORY_HELP, |
|
|
2181 | 2181 | optionalrepo=True, |
|
|
2182 | 2182 | intents={INTENT_READONLY}, |
|
|
2183 | 2183 | ) |
|
|
2184 | 2184 | def config(ui, repo, *values, **opts): |
|
|
2185 | 2185 | """show combined config settings from all hgrc files |
|
|
2186 | 2186 | |
|
|
2187 | 2187 | With no arguments, print names and values of all config items. |
|
|
2188 | 2188 | |
|
|
2189 | 2189 | With one argument of the form section.name, print just the value |
|
|
2190 | 2190 | of that config item. |
|
|
2191 | 2191 | |
|
|
2192 | 2192 | With multiple arguments, print names and values of all config |
|
|
2193 | 2193 | items with matching section names or section.names. |
|
|
2194 | 2194 | |
|
|
2195 | 2195 | With --edit, start an editor on the user-level config file. With |
|
|
2196 | 2196 | --global, edit the system-wide config file. With --local, edit the |
|
|
2197 | 2197 | repository-level config file. |
|
|
2198 | 2198 | |
|
|
2199 | 2199 | With --debug, the source (filename and line number) is printed |
|
|
2200 | 2200 | for each config item. |
|
|
2201 | 2201 | |
|
|
2202 | 2202 | See :hg:`help config` for more information about config files. |
|
|
2203 | 2203 | |
|
|
2204 | 2204 | .. container:: verbose |
|
|
2205 | 2205 | |
|
|
2206 | 2206 | --non-shared flag is used to edit `.hg/hgrc-not-shared` config file. |
|
|
2207 | 2207 | This file is not shared across shares when in share-safe mode. |
|
|
2208 | 2208 | |
|
|
2209 | 2209 | Template: |
|
|
2210 | 2210 | |
|
|
2211 | 2211 | The following keywords are supported. See also :hg:`help templates`. |
|
|
2212 | 2212 | |
|
|
2213 | 2213 | :name: String. Config name. |
|
|
2214 | 2214 | :source: String. Filename and line number where the item is defined. |
|
|
2215 | 2215 | :value: String. Config value. |
|
|
2216 | 2216 | |
|
|
2217 | 2217 | The --shared flag can be used to edit the config file of shared source |
|
|
2218 | 2218 | repository. It only works when you have shared using the experimental |
|
|
2219 | 2219 | share safe feature. |
|
|
2220 | 2220 | |
|
|
2221 | 2221 | Returns 0 on success, 1 if NAME does not exist. |
|
|
2222 | 2222 | |
|
|
2223 | 2223 | """ |
|
|
2224 | 2224 | |
|
|
2225 | 2225 | opts = pycompat.byteskwargs(opts) |
|
|
2226 | 2226 | editopts = (b'edit', b'local', b'global', b'shared', b'non_shared') |
|
|
2227 | 2227 | if any(opts.get(o) for o in editopts): |
|
|
2228 | 2228 | cmdutil.check_at_most_one_arg(opts, *editopts[1:]) |
|
|
2229 | 2229 | if opts.get(b'local'): |
|
|
2230 | 2230 | if not repo: |
|
|
2231 | 2231 | raise error.InputError( |
|
|
2232 | 2232 | _(b"can't use --local outside a repository") |
|
|
2233 | 2233 | ) |
|
|
2234 | 2234 | paths = [repo.vfs.join(b'hgrc')] |
|
|
2235 | 2235 | elif opts.get(b'global'): |
|
|
2236 | 2236 | paths = rcutil.systemrcpath() |
|
|
2237 | 2237 | elif opts.get(b'shared'): |
|
|
2238 | 2238 | if not repo.shared(): |
|
|
2239 | 2239 | raise error.InputError( |
|
|
2240 | 2240 | _(b"repository is not shared; can't use --shared") |
|
|
2241 | 2241 | ) |
|
|
2242 | 2242 | if requirements.SHARESAFE_REQUIREMENT not in repo.requirements: |
|
|
2243 | 2243 | raise error.InputError( |
|
|
2244 | 2244 | _( |
|
|
2245 | 2245 | b"share safe feature not enabled; " |
|
|
2246 | 2246 | b"unable to edit shared source repository config" |
|
|
2247 | 2247 | ) |
|
|
2248 | 2248 | ) |
|
|
2249 | 2249 | paths = [vfsmod.vfs(repo.sharedpath).join(b'hgrc')] |
|
|
2250 | 2250 | elif opts.get(b'non_shared'): |
|
|
2251 | 2251 | paths = [repo.vfs.join(b'hgrc-not-shared')] |
|
|
2252 | 2252 | else: |
|
|
2253 | 2253 | paths = rcutil.userrcpath() |
|
|
2254 | 2254 | |
|
|
2255 | 2255 | for f in paths: |
|
|
2256 | 2256 | if os.path.exists(f): |
|
|
2257 | 2257 | break |
|
|
2258 | 2258 | else: |
|
|
2259 | 2259 | if opts.get(b'global'): |
|
|
2260 | 2260 | samplehgrc = uimod.samplehgrcs[b'global'] |
|
|
2261 | 2261 | elif opts.get(b'local'): |
|
|
2262 | 2262 | samplehgrc = uimod.samplehgrcs[b'local'] |
|
|
2263 | 2263 | else: |
|
|
2264 | 2264 | samplehgrc = uimod.samplehgrcs[b'user'] |
|
|
2265 | 2265 | |
|
|
2266 | 2266 | f = paths[0] |
|
|
2267 | 2267 | fp = open(f, b"wb") |
|
|
2268 | 2268 | fp.write(util.tonativeeol(samplehgrc)) |
|
|
2269 | 2269 | fp.close() |
|
|
2270 | 2270 | |
|
|
2271 | 2271 | editor = ui.geteditor() |
|
|
2272 | 2272 | ui.system( |
|
|
2273 | 2273 | b"%s \"%s\"" % (editor, f), |
|
|
2274 | 2274 | onerr=error.InputError, |
|
|
2275 | 2275 | errprefix=_(b"edit failed"), |
|
|
2276 | 2276 | blockedtag=b'config_edit', |
|
|
2277 | 2277 | ) |
|
|
2278 | 2278 | return |
|
|
2279 | 2279 | ui.pager(b'config') |
|
|
2280 | 2280 | fm = ui.formatter(b'config', opts) |
|
|
2281 | 2281 | for t, f in rcutil.rccomponents(): |
|
|
2282 | 2282 | if t == b'path': |
|
|
2283 | 2283 | ui.debug(b'read config from: %s\n' % f) |
|
|
2284 | 2284 | elif t == b'resource': |
|
|
2285 | 2285 | ui.debug(b'read config from: resource:%s.%s\n' % (f[0], f[1])) |
|
|
2286 | 2286 | elif t == b'items': |
|
|
2287 | 2287 | # Don't print anything for 'items'. |
|
|
2288 | 2288 | pass |
|
|
2289 | 2289 | else: |
|
|
2290 | 2290 | raise error.ProgrammingError(b'unknown rctype: %s' % t) |
|
|
2291 | 2291 | untrusted = bool(opts.get(b'untrusted')) |
|
|
2292 | 2292 | |
|
|
2293 | 2293 | selsections = selentries = [] |
|
|
2294 | 2294 | if values: |
|
|
2295 | 2295 | selsections = [v for v in values if b'.' not in v] |
|
|
2296 | 2296 | selentries = [v for v in values if b'.' in v] |
|
|
2297 | 2297 | uniquesel = len(selentries) == 1 and not selsections |
|
|
2298 | 2298 | selsections = set(selsections) |
|
|
2299 | 2299 | selentries = set(selentries) |
|
|
2300 | 2300 | |
|
|
2301 | 2301 | matched = False |
|
|
2302 | 2302 | for section, name, value in ui.walkconfig(untrusted=untrusted): |
|
|
2303 | 2303 | source = ui.configsource(section, name, untrusted) |
|
|
2304 | 2304 | value = pycompat.bytestr(value) |
|
|
2305 | 2305 | defaultvalue = ui.configdefault(section, name) |
|
|
2306 | 2306 | if fm.isplain(): |
|
|
2307 | 2307 | source = source or b'none' |
|
|
2308 | 2308 | value = value.replace(b'\n', b'\\n') |
|
|
2309 | 2309 | entryname = section + b'.' + name |
|
|
2310 | 2310 | if values and not (section in selsections or entryname in selentries): |
|
|
2311 | 2311 | continue |
|
|
2312 | 2312 | fm.startitem() |
|
|
2313 | 2313 | fm.condwrite(ui.debugflag, b'source', b'%s: ', source) |
|
|
2314 | 2314 | if uniquesel: |
|
|
2315 | 2315 | fm.data(name=entryname) |
|
|
2316 | 2316 | fm.write(b'value', b'%s\n', value) |
|
|
2317 | 2317 | else: |
|
|
2318 | 2318 | fm.write(b'name value', b'%s=%s\n', entryname, value) |
|
|
2319 | 2319 | if formatter.isprintable(defaultvalue): |
|
|
2320 | 2320 | fm.data(defaultvalue=defaultvalue) |
|
|
2321 | 2321 | elif isinstance(defaultvalue, list) and all( |
|
|
2322 | 2322 | formatter.isprintable(e) for e in defaultvalue |
|
|
2323 | 2323 | ): |
|
|
2324 | 2324 | fm.data(defaultvalue=fm.formatlist(defaultvalue, name=b'value')) |
|
|
2325 | 2325 | # TODO: no idea how to process unsupported defaultvalue types |
|
|
2326 | 2326 | matched = True |
|
|
2327 | 2327 | fm.end() |
|
|
2328 | 2328 | if matched: |
|
|
2329 | 2329 | return 0 |
|
|
2330 | 2330 | return 1 |
|
|
2331 | 2331 | |
|
|
2332 | 2332 | |
|
|
2333 | 2333 | @command( |
|
|
2334 | 2334 | b'continue', |
|
|
2335 | 2335 | dryrunopts, |
|
|
2336 | 2336 | helpcategory=command.CATEGORY_CHANGE_MANAGEMENT, |
|
|
2337 | 2337 | helpbasic=True, |
|
|
2338 | 2338 | ) |
|
|
2339 | 2339 | def continuecmd(ui, repo, **opts): |
|
|
2340 | 2340 | """resumes an interrupted operation (EXPERIMENTAL) |
|
|
2341 | 2341 | |
|
|
2342 | 2342 | Finishes a multistep operation like graft, histedit, rebase, merge, |
|
|
2343 | 2343 | and unshelve if they are in an interrupted state. |
|
|
2344 | 2344 | |
|
|
2345 | 2345 | use --dry-run/-n to dry run the command. |
|
|
2346 | 2346 | """ |
|
|
2347 | 2347 | dryrun = opts.get('dry_run') |
|
|
2348 | 2348 | contstate = cmdutil.getunfinishedstate(repo) |
|
|
2349 | 2349 | if not contstate: |
|
|
2350 | 2350 | raise error.StateError(_(b'no operation in progress')) |
|
|
2351 | 2351 | if not contstate.continuefunc: |
|
|
2352 | 2352 | raise error.StateError( |
|
|
2353 | 2353 | ( |
|
|
2354 | 2354 | _(b"%s in progress but does not support 'hg continue'") |
|
|
2355 | 2355 | % (contstate._opname) |
|
|
2356 | 2356 | ), |
|
|
2357 | 2357 | hint=contstate.continuemsg(), |
|
|
2358 | 2358 | ) |
|
|
2359 | 2359 | if dryrun: |
|
|
2360 | 2360 | ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname)) |
|
|
2361 | 2361 | return |
|
|
2362 | 2362 | return contstate.continuefunc(ui, repo) |
|
|
2363 | 2363 | |
|
|
2364 | 2364 | |
|
|
2365 | 2365 | @command( |
|
|
2366 | 2366 | b'copy|cp', |
|
|
2367 | 2367 | [ |
|
|
2368 | 2368 | (b'', b'forget', None, _(b'unmark a destination file as copied')), |
|
|
2369 | 2369 | (b'A', b'after', None, _(b'record a copy that has already occurred')), |
|
|
2370 | 2370 | ( |
|
|
2371 | 2371 | b'', |
|
|
2372 | 2372 | b'at-rev', |
|
|
2373 | 2373 | b'', |
|
|
2374 | 2374 | _(b'(un)mark copies in the given revision (EXPERIMENTAL)'), |
|
|
2375 | 2375 | _(b'REV'), |
|
|
2376 | 2376 | ), |
|
|
2377 | 2377 | ( |
|
|
2378 | 2378 | b'f', |
|
|
2379 | 2379 | b'force', |
|
|
2380 | 2380 | None, |
|
|
2381 | 2381 | _(b'forcibly copy over an existing managed file'), |
|
|
2382 | 2382 | ), |
|
|
2383 | 2383 | ] |
|
|
2384 | 2384 | + walkopts |
|
|
2385 | 2385 | + dryrunopts, |
|
|
2386 | 2386 | _(b'[OPTION]... (SOURCE... DEST | --forget DEST...)'), |
|
|
2387 | 2387 | helpcategory=command.CATEGORY_FILE_CONTENTS, |
|
|
2388 | 2388 | ) |
|
|
2389 | 2389 | def copy(ui, repo, *pats, **opts): |
|
|
2390 | 2390 | """mark files as copied for the next commit |
|
|
2391 | 2391 | |
|
|
2392 | 2392 | Mark dest as having copies of source files. If dest is a |
|
|
2393 | 2393 | directory, copies are put in that directory. If dest is a file, |
|
|
2394 | 2394 | the source must be a single file. |
|
|
2395 | 2395 | |
|
|
2396 | 2396 | By default, this command copies the contents of files as they |
|
|
2397 | 2397 | exist in the working directory. If invoked with -A/--after, the |
|
|
2398 | 2398 | operation is recorded, but no copying is performed. |
|
|
2399 | 2399 | |
|
|
2400 | 2400 | To undo marking a destination file as copied, use --forget. With that |
|
|
2401 | 2401 | option, all given (positional) arguments are unmarked as copies. The |
|
|
2402 | 2402 | destination file(s) will be left in place (still tracked). |
|
|
2403 | 2403 | |
|
|
2404 | 2404 | This command takes effect with the next commit by default. |
|
|
2405 | 2405 | |
|
|
2406 | 2406 | Returns 0 on success, 1 if errors are encountered. |
|
|
2407 | 2407 | """ |
|
|
2408 | 2408 | opts = pycompat.byteskwargs(opts) |
|
|
2409 | 2409 | with repo.wlock(): |
|
|
2410 | 2410 | return cmdutil.copy(ui, repo, pats, opts) |
|
|
2411 | 2411 | |
|
|
2412 | 2412 | |
|
|
2413 | 2413 | @command( |
|
|
2414 | 2414 | b'debugcommands', |
|
|
2415 | 2415 | [], |
|
|
2416 | 2416 | _(b'[COMMAND]'), |
|
|
2417 | 2417 | helpcategory=command.CATEGORY_HELP, |
|
|
2418 | 2418 | norepo=True, |
|
|
2419 | 2419 | ) |
|
|
2420 | 2420 | def debugcommands(ui, cmd=b'', *args): |
|
|
2421 | 2421 | """list all available commands and options""" |
|
|
2422 | 2422 | for cmd, vals in sorted(pycompat.iteritems(table)): |
|
|
2423 | 2423 | cmd = cmd.split(b'|')[0] |
|
|
2424 | 2424 | opts = b', '.join([i[1] for i in vals[1]]) |
|
|
2425 | 2425 | ui.write(b'%s: %s\n' % (cmd, opts)) |
|
|
2426 | 2426 | |
|
|
2427 | 2427 | |
|
|
2428 | 2428 | @command( |
|
|
2429 | 2429 | b'debugcomplete', |
|
|
2430 | 2430 | [(b'o', b'options', None, _(b'show the command options'))], |
|
|
2431 | 2431 | _(b'[-o] CMD'), |
|
|
2432 | 2432 | helpcategory=command.CATEGORY_HELP, |
|
|
2433 | 2433 | norepo=True, |
|
|
2434 | 2434 | ) |
|
|
2435 | 2435 | def debugcomplete(ui, cmd=b'', **opts): |
|
|
2436 | 2436 | """returns the completion list associated with the given command""" |
|
|
2437 | 2437 | |
|
|
2438 | 2438 | if opts.get('options'): |
|
|
2439 | 2439 | options = [] |
|
|
2440 | 2440 | otables = [globalopts] |
|
|
2441 | 2441 | if cmd: |
|
|
2442 | 2442 | aliases, entry = cmdutil.findcmd(cmd, table, False) |
|
|
2443 | 2443 | otables.append(entry[1]) |
|
|
2444 | 2444 | for t in otables: |
|
|
2445 | 2445 | for o in t: |
|
|
2446 | 2446 | if b"(DEPRECATED)" in o[3]: |
|
|
2447 | 2447 | continue |
|
|
2448 | 2448 | if o[0]: |
|
|
2449 | 2449 | options.append(b'-%s' % o[0]) |
|
|
2450 | 2450 | options.append(b'--%s' % o[1]) |
|
|
2451 | 2451 | ui.write(b"%s\n" % b"\n".join(options)) |
|
|
2452 | 2452 | return |
|
|
2453 | 2453 | |
|
|
2454 | 2454 | cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table) |
|
|
2455 | 2455 | if ui.verbose: |
|
|
2456 | 2456 | cmdlist = [b' '.join(c[0]) for c in cmdlist.values()] |
|
|
2457 | 2457 | ui.write(b"%s\n" % b"\n".join(sorted(cmdlist))) |
|
|
2458 | 2458 | |
|
|
2459 | 2459 | |
|
|
2460 | 2460 | @command( |
|
|
2461 | 2461 | b'diff', |
|
|
2462 | 2462 | [ |
|
|
2463 | 2463 | (b'r', b'rev', [], _(b'revision (DEPRECATED)'), _(b'REV')), |
|
|
2464 | 2464 | (b'', b'from', b'', _(b'revision to diff from'), _(b'REV1')), |
|
|
2465 | 2465 | (b'', b'to', b'', _(b'revision to diff to'), _(b'REV2')), |
|
|
2466 | 2466 | (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')), |
|
|
2467 | 2467 | ] |
|
|
2468 | 2468 | + diffopts |
|
|
2469 | 2469 | + diffopts2 |
|
|
2470 | 2470 | + walkopts |
|
|
2471 | 2471 | + subrepoopts, |
|
|
2472 | 2472 | _(b'[OPTION]... ([-c REV] | [--from REV1] [--to REV2]) [FILE]...'), |
|
|
2473 | 2473 | helpcategory=command.CATEGORY_FILE_CONTENTS, |
|
|
2474 | 2474 | helpbasic=True, |
|
|
2475 | 2475 | inferrepo=True, |
|
|
2476 | 2476 | intents={INTENT_READONLY}, |
|
|
2477 | 2477 | ) |
|
|
2478 | 2478 | def diff(ui, repo, *pats, **opts): |
|
|
2479 | 2479 | """diff repository (or selected files) |
|
|
2480 | 2480 | |
|
|
2481 | 2481 | Show differences between revisions for the specified files. |
|
|
2482 | 2482 | |
|
|
2483 | 2483 | Differences between files are shown using the unified diff format. |
|
|
2484 | 2484 | |
|
|
2485 | 2485 | .. note:: |
|
|
2486 | 2486 | |
|
|
2487 | 2487 | :hg:`diff` may generate unexpected results for merges, as it will |
|
|
2488 | 2488 | default to comparing against the working directory's first |
|
|
2489 | 2489 | parent changeset if no revisions are specified. |
|
|
2490 | 2490 | |
|
|
2491 | 2491 | By default, the working directory files are compared to its first parent. To |
|
|
2492 | 2492 | see the differences from another revision, use --from. To see the difference |
|
|
2493 | 2493 | to another revision, use --to. For example, :hg:`diff --from .^` will show |
|
|
2494 | 2494 | the differences from the working copy's grandparent to the working copy, |
|
|
2495 | 2495 | :hg:`diff --to .` will show the diff from the working copy to its parent |
|
|
2496 | 2496 | (i.e. the reverse of the default), and :hg:`diff --from 1.0 --to 1.2` will |
|
|
2497 | 2497 | show the diff between those two revisions. |
|
|
2498 | 2498 | |
|
|
2499 | 2499 | Alternatively you can specify -c/--change with a revision to see the changes |
|
|
2500 | 2500 | in that changeset relative to its first parent (i.e. :hg:`diff -c 42` is |
|
|
2501 | 2501 | equivalent to :hg:`diff --from 42^ --to 42`) |
|
|
2502 | 2502 | |
|
|
2503 | 2503 | Without the -a/--text option, diff will avoid generating diffs of |
|
|
2504 | 2504 | files it detects as binary. With -a, diff will generate a diff |
|
|
2505 | 2505 | anyway, probably with undesirable results. |
|
|
2506 | 2506 | |
|
|
2507 | 2507 | Use the -g/--git option to generate diffs in the git extended diff |
|
|
2508 | 2508 | format. For more information, read :hg:`help diffs`. |
|
|
2509 | 2509 | |
|
|
2510 | 2510 | .. container:: verbose |
|
|
2511 | 2511 | |
|
|
2512 | 2512 | Examples: |
|
|
2513 | 2513 | |
|
|
2514 | 2514 | - compare a file in the current working directory to its parent:: |
|
|
2515 | 2515 | |
|
|
2516 | 2516 | hg diff foo.c |
|
|
2517 | 2517 | |
|
|
2518 | 2518 | - compare two historical versions of a directory, with rename info:: |
|
|
2519 | 2519 | |
|
|
2520 | 2520 | hg diff --git --from 1.0 --to 1.2 lib/ |
|
|
2521 | 2521 | |
|
|
2522 | 2522 | - get change stats relative to the last change on some date:: |
|
|
2523 | 2523 | |
|
|
2524 | 2524 | hg diff --stat --from "date('may 2')" |
|
|
2525 | 2525 | |
|
|
2526 | 2526 | - diff all newly-added files that contain a keyword:: |
|
|
2527 | 2527 | |
|
|
2528 | 2528 | hg diff "set:added() and grep(GNU)" |
|
|
2529 | 2529 | |
|
|
2530 | 2530 | - compare a revision and its parents:: |
|
|
2531 | 2531 | |
|
|
2532 | 2532 | hg diff -c 9353 # compare against first parent |
|
|
2533 | 2533 | hg diff --from 9353^ --to 9353 # same using revset syntax |
|
|
2534 | 2534 | hg diff --from 9353^2 --to 9353 # compare against the second parent |
|
|
2535 | 2535 | |
|
|
2536 | 2536 | Returns 0 on success. |
|
|
2537 | 2537 | """ |
|
|
2538 | 2538 | |
|
|
2539 | 2539 | cmdutil.check_at_most_one_arg(opts, 'rev', 'change') |
|
|
2540 | 2540 | opts = pycompat.byteskwargs(opts) |
|
|
2541 | 2541 | revs = opts.get(b'rev') |
|
|
2542 | 2542 | change = opts.get(b'change') |
|
|
2543 | 2543 | from_rev = opts.get(b'from') |
|
|
2544 | 2544 | to_rev = opts.get(b'to') |
|
|
2545 | 2545 | stat = opts.get(b'stat') |
|
|
2546 | 2546 | reverse = opts.get(b'reverse') |
|
|
2547 | 2547 | |
|
|
2548 | 2548 | cmdutil.check_incompatible_arguments(opts, b'from', [b'rev', b'change']) |
|
|
2549 | 2549 | cmdutil.check_incompatible_arguments(opts, b'to', [b'rev', b'change']) |
|
|
2550 | 2550 | if change: |
|
|
2551 | 2551 | repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn') |
|
|
2552 | 2552 | ctx2 = scmutil.revsingle(repo, change, None) |
|
|
2553 | 2553 | ctx1 = ctx2.p1() |
|
|
2554 | 2554 | elif from_rev or to_rev: |
|
|
2555 | 2555 | repo = scmutil.unhidehashlikerevs( |
|
|
2556 | 2556 | repo, [from_rev] + [to_rev], b'nowarn' |
|
|
2557 | 2557 | ) |
|
|
2558 | 2558 | ctx1 = scmutil.revsingle(repo, from_rev, None) |
|
|
2559 | 2559 | ctx2 = scmutil.revsingle(repo, to_rev, None) |
|
|
2560 | 2560 | else: |
|
|
2561 | 2561 | repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn') |
|
|
2562 | 2562 | ctx1, ctx2 = scmutil.revpair(repo, revs) |
|
|
2563 | 2563 | |
|
|
2564 | 2564 | if reverse: |
|
|
2565 | 2565 | ctxleft = ctx2 |
|
|
2566 | 2566 | ctxright = ctx1 |
|
|
2567 | 2567 | else: |
|
|
2568 | 2568 | ctxleft = ctx1 |
|
|
2569 | 2569 | ctxright = ctx2 |
|
|
2570 | 2570 | |
|
|
2571 | 2571 | diffopts = patch.diffallopts(ui, opts) |
|
|
2572 | 2572 | m = scmutil.match(ctx2, pats, opts) |
|
|
2573 | 2573 | m = repo.narrowmatch(m) |
|
|
2574 | 2574 | ui.pager(b'diff') |
|
|
2575 | 2575 | logcmdutil.diffordiffstat( |
|
|
2576 | 2576 | ui, |
|
|
2577 | 2577 | repo, |
|
|
2578 | 2578 | diffopts, |
|
|
2579 | 2579 | ctxleft, |
|
|
2580 | 2580 | ctxright, |
|
|
2581 | 2581 | m, |
|
|
2582 | 2582 | stat=stat, |
|
|
2583 | 2583 | listsubrepos=opts.get(b'subrepos'), |
|
|
2584 | 2584 | root=opts.get(b'root'), |
|
|
2585 | 2585 | ) |
|
|
2586 | 2586 | |
|
|
2587 | 2587 | |
|
|
2588 | 2588 | @command( |
|
|
2589 | 2589 | b'export', |
|
|
2590 | 2590 | [ |
|
|
2591 | 2591 | ( |
|
|
2592 | 2592 | b'B', |
|
|
2593 | 2593 | b'bookmark', |
|
|
2594 | 2594 | b'', |
|
|
2595 | 2595 | _(b'export changes only reachable by given bookmark'), |
|
|
2596 | 2596 | _(b'BOOKMARK'), |
|
|
2597 | 2597 | ), |
|
|
2598 | 2598 | ( |
|
|
2599 | 2599 | b'o', |
|
|
2600 | 2600 | b'output', |
|
|
2601 | 2601 | b'', |
|
|
2602 | 2602 | _(b'print output to file with formatted name'), |
|
|
2603 | 2603 | _(b'FORMAT'), |
|
|
2604 | 2604 | ), |
|
|
2605 | 2605 | (b'', b'switch-parent', None, _(b'diff against the second parent')), |
|
|
2606 | 2606 | (b'r', b'rev', [], _(b'revisions to export'), _(b'REV')), |
|
|
2607 | 2607 | ] |
|
|
2608 | 2608 | + diffopts |
|
|
2609 | 2609 | + formatteropts, |
|
|
2610 | 2610 | _(b'[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'), |
|
|
2611 | 2611 | helpcategory=command.CATEGORY_IMPORT_EXPORT, |
|
|
2612 | 2612 | helpbasic=True, |
|
|
2613 | 2613 | intents={INTENT_READONLY}, |
|
|
2614 | 2614 | ) |
|
|
2615 | 2615 | def export(ui, repo, *changesets, **opts): |
|
|
2616 | 2616 | """dump the header and diffs for one or more changesets |
|
|
2617 | 2617 | |
|
|
2618 | 2618 | Print the changeset header and diffs for one or more revisions. |
|
|
2619 | 2619 | If no revision is given, the parent of the working directory is used. |
|
|
2620 | 2620 | |
|
|
2621 | 2621 | The information shown in the changeset header is: author, date, |
|
|
2622 | 2622 | branch name (if non-default), changeset hash, parent(s) and commit |
|
|
2623 | 2623 | comment. |
|
|
2624 | 2624 | |
|
|
2625 | 2625 | .. note:: |
|
|
2626 | 2626 | |
|
|
2627 | 2627 | :hg:`export` may generate unexpected diff output for merge |
|
|
2628 | 2628 | changesets, as it will compare the merge changeset against its |
|
|
2629 | 2629 | first parent only. |
|
|
2630 | 2630 | |
|
|
2631 | 2631 | Output may be to a file, in which case the name of the file is |
|
|
2632 | 2632 | given using a template string. See :hg:`help templates`. In addition |
|
|
2633 | 2633 | to the common template keywords, the following formatting rules are |
|
|
2634 | 2634 | supported: |
|
|
2635 | 2635 | |
|
|
2636 | 2636 | :``%%``: literal "%" character |
|
|
2637 | 2637 | :``%H``: changeset hash (40 hexadecimal digits) |
|
|
2638 | 2638 | :``%N``: number of patches being generated |
|
|
2639 | 2639 | :``%R``: changeset revision number |
|
|
2640 | 2640 | :``%b``: basename of the exporting repository |
|
|
2641 | 2641 | :``%h``: short-form changeset hash (12 hexadecimal digits) |
|
|
2642 | 2642 | :``%m``: first line of the commit message (only alphanumeric characters) |
|
|
2643 | 2643 | :``%n``: zero-padded sequence number, starting at 1 |
|
|
2644 | 2644 | :``%r``: zero-padded changeset revision number |
|
|
2645 | 2645 | :``\\``: literal "\\" character |
|
|
2646 | 2646 | |
|
|
2647 | 2647 | Without the -a/--text option, export will avoid generating diffs |
|
|
2648 | 2648 | of files it detects as binary. With -a, export will generate a |
|
|
2649 | 2649 | diff anyway, probably with undesirable results. |
|
|
2650 | 2650 | |
|
|
2651 | 2651 | With -B/--bookmark changesets reachable by the given bookmark are |
|
|
2652 | 2652 | selected. |
|
|
2653 | 2653 | |
|
|
2654 | 2654 | Use the -g/--git option to generate diffs in the git extended diff |
|
|
2655 | 2655 | format. See :hg:`help diffs` for more information. |
|
|
2656 | 2656 | |
|
|
2657 | 2657 | With the --switch-parent option, the diff will be against the |
|
|
2658 | 2658 | second parent. It can be useful to review a merge. |
|
|
2659 | 2659 | |
|
|
2660 | 2660 | .. container:: verbose |
|
|
2661 | 2661 | |
|
|
2662 | 2662 | Template: |
|
|
2663 | 2663 | |
|
|
2664 | 2664 | The following keywords are supported in addition to the common template |
|
|
2665 | 2665 | keywords and functions. See also :hg:`help templates`. |
|
|
2666 | 2666 | |
|
|
2667 | 2667 | :diff: String. Diff content. |
|
|
2668 | 2668 | :parents: List of strings. Parent nodes of the changeset. |
|
|
2669 | 2669 | |
|
|
2670 | 2670 | Examples: |
|
|
2671 | 2671 | |
|
|
2672 | 2672 | - use export and import to transplant a bugfix to the current |
|
|
2673 | 2673 | branch:: |
|
|
2674 | 2674 | |
|
|
2675 | 2675 | hg export -r 9353 | hg import - |
|
|
2676 | 2676 | |
|
|
2677 | 2677 | - export all the changesets between two revisions to a file with |
|
|
2678 | 2678 | rename information:: |
|
|
2679 | 2679 | |
|
|
2680 | 2680 | hg export --git -r 123:150 > changes.txt |
|
|
2681 | 2681 | |
|
|
2682 | 2682 | - split outgoing changes into a series of patches with |
|
|
2683 | 2683 | descriptive names:: |
|
|
2684 | 2684 | |
|
|
2685 | 2685 | hg export -r "outgoing()" -o "%n-%m.patch" |
|
|
2686 | 2686 | |
|
|
2687 | 2687 | Returns 0 on success. |
|
|
2688 | 2688 | """ |
|
|
2689 | 2689 | opts = pycompat.byteskwargs(opts) |
|
|
2690 | 2690 | bookmark = opts.get(b'bookmark') |
|
|
2691 | 2691 | changesets += tuple(opts.get(b'rev', [])) |
|
|
2692 | 2692 | |
|
|
2693 | 2693 | cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark') |
|
|
2694 | 2694 | |
|
|
2695 | 2695 | if bookmark: |
|
|
2696 | 2696 | if bookmark not in repo._bookmarks: |
|
|
2697 | 2697 | raise error.InputError(_(b"bookmark '%s' not found") % bookmark) |
|
|
2698 | 2698 | |
|
|
2699 | 2699 | revs = scmutil.bookmarkrevs(repo, bookmark) |
|
|
2700 | 2700 | else: |
|
|
2701 | 2701 | if not changesets: |
|
|
2702 | 2702 | changesets = [b'.'] |
|
|
2703 | 2703 | |
|
|
2704 | 2704 | repo = scmutil.unhidehashlikerevs(repo, changesets, b'nowarn') |
|
|
2705 | 2705 | revs = scmutil.revrange(repo, changesets) |
|
|
2706 | 2706 | |
|
|
2707 | 2707 | if not revs: |
|
|
2708 | 2708 | raise error.InputError(_(b"export requires at least one changeset")) |
|
|
2709 | 2709 | if len(revs) > 1: |
|
|
2710 | 2710 | ui.note(_(b'exporting patches:\n')) |
|
|
2711 | 2711 | else: |
|
|
2712 | 2712 | ui.note(_(b'exporting patch:\n')) |
|
|
2713 | 2713 | |
|
|
2714 | 2714 | fntemplate = opts.get(b'output') |
|
|
2715 | 2715 | if cmdutil.isstdiofilename(fntemplate): |
|
|
2716 | 2716 | fntemplate = b'' |
|
|
2717 | 2717 | |
|
|
2718 | 2718 | if fntemplate: |
|
|
2719 | 2719 | fm = formatter.nullformatter(ui, b'export', opts) |
|
|
2720 | 2720 | else: |
|
|
2721 | 2721 | ui.pager(b'export') |
|
|
2722 | 2722 | fm = ui.formatter(b'export', opts) |
|
|
2723 | 2723 | with fm: |
|
|
2724 | 2724 | cmdutil.export( |
|
|
2725 | 2725 | repo, |
|
|
2726 | 2726 | revs, |
|
|
2727 | 2727 | fm, |
|
|
2728 | 2728 | fntemplate=fntemplate, |
|
|
2729 | 2729 | switch_parent=opts.get(b'switch_parent'), |
|
|
2730 | 2730 | opts=patch.diffallopts(ui, opts), |
|
|
2731 | 2731 | ) |
|
|
2732 | 2732 | |
|
|
2733 | 2733 | |
|
|
2734 | 2734 | @command( |
|
|
2735 | 2735 | b'files', |
|
|
2736 | 2736 | [ |
|
|
2737 | 2737 | ( |
|
|
2738 | 2738 | b'r', |
|
|
2739 | 2739 | b'rev', |
|
|
2740 | 2740 | b'', |
|
|
2741 | 2741 | _(b'search the repository as it is in REV'), |
|
|
2742 | 2742 | _(b'REV'), |
|
|
2743 | 2743 | ), |
|
|
2744 | 2744 | ( |
|
|
2745 | 2745 | b'0', |
|
|
2746 | 2746 | b'print0', |
|
|
2747 | 2747 | None, |
|
|
2748 | 2748 | _(b'end filenames with NUL, for use with xargs'), |
|
|
2749 | 2749 | ), |
|
|
2750 | 2750 | ] |
|
|
2751 | 2751 | + walkopts |
|
|
2752 | 2752 | + formatteropts |
|
|
2753 | 2753 | + subrepoopts, |
|
|
2754 | 2754 | _(b'[OPTION]... [FILE]...'), |
|
|
2755 | 2755 | helpcategory=command.CATEGORY_WORKING_DIRECTORY, |
|
|
2756 | 2756 | intents={INTENT_READONLY}, |
|
|
2757 | 2757 | ) |
|
|
2758 | 2758 | def files(ui, repo, *pats, **opts): |
|
|
2759 | 2759 | """list tracked files |
|
|
2760 | 2760 | |
|
|
2761 | 2761 | Print files under Mercurial control in the working directory or |
|
|
2762 | 2762 | specified revision for given files (excluding removed files). |
|
|
2763 | 2763 | Files can be specified as filenames or filesets. |
|
|
2764 | 2764 | |
|
|
2765 | 2765 | If no files are given to match, this command prints the names |
|
|
2766 | 2766 | of all files under Mercurial control. |
|
|
2767 | 2767 | |
|
|
2768 | 2768 | .. container:: verbose |
|
|
2769 | 2769 | |
|
|
2770 | 2770 | Template: |
|
|
2771 | 2771 | |
|
|
2772 | 2772 | The following keywords are supported in addition to the common template |
|
|
2773 | 2773 | keywords and functions. See also :hg:`help templates`. |
|
|
2774 | 2774 | |
|
|
2775 | 2775 | :flags: String. Character denoting file's symlink and executable bits. |
|
|
2776 | 2776 | :path: String. Repository-absolute path of the file. |
|
|
2777 | 2777 | :size: Integer. Size of the file in bytes. |
|
|
2778 | 2778 | |
|
|
2779 | 2779 | Examples: |
|
|
2780 | 2780 | |
|
|
2781 | 2781 | - list all files under the current directory:: |
|
|
2782 | 2782 | |
|
|
2783 | 2783 | hg files . |
|
|
2784 | 2784 | |
|
|
2785 | 2785 | - shows sizes and flags for current revision:: |
|
|
2786 | 2786 | |
|
|
2787 | 2787 | hg files -vr . |
|
|
2788 | 2788 | |
|
|
2789 | 2789 | - list all files named README:: |
|
|
2790 | 2790 | |
|
|
2791 | 2791 | hg files -I "**/README" |
|
|
2792 | 2792 | |
|
|
2793 | 2793 | - list all binary files:: |
|
|
2794 | 2794 | |
|
|
2795 | 2795 | hg files "set:binary()" |
|
|
2796 | 2796 | |
|
|
2797 | 2797 | - find files containing a regular expression:: |
|
|
2798 | 2798 | |
|
|
2799 | 2799 | hg files "set:grep('bob')" |
|
|
2800 | 2800 | |
|
|
2801 | 2801 | - search tracked file contents with xargs and grep:: |
|
|
2802 | 2802 | |
|
|
2803 | 2803 | hg files -0 | xargs -0 grep foo |
|
|
2804 | 2804 | |
|
|
2805 | 2805 | See :hg:`help patterns` and :hg:`help filesets` for more information |
|
|
2806 | 2806 | on specifying file patterns. |
|
|
2807 | 2807 | |
|
|
2808 | 2808 | Returns 0 if a match is found, 1 otherwise. |
|
|
2809 | 2809 | |
|
|
2810 | 2810 | """ |
|
|
2811 | 2811 | |
|
|
2812 | 2812 | opts = pycompat.byteskwargs(opts) |
|
|
2813 | 2813 | rev = opts.get(b'rev') |
|
|
2814 | 2814 | if rev: |
|
|
2815 | 2815 | repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn') |
|
|
2816 | 2816 | ctx = scmutil.revsingle(repo, rev, None) |
|
|
2817 | 2817 | |
|
|
2818 | 2818 | end = b'\n' |
|
|
2819 | 2819 | if opts.get(b'print0'): |
|
|
2820 | 2820 | end = b'\0' |
|
|
2821 | 2821 | fmt = b'%s' + end |
|
|
2822 | 2822 | |
|
|
2823 | 2823 | m = scmutil.match(ctx, pats, opts) |
|
|
2824 | 2824 | ui.pager(b'files') |
|
|
2825 | 2825 | uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True) |
|
|
2826 | 2826 | with ui.formatter(b'files', opts) as fm: |
|
|
2827 | 2827 | return cmdutil.files( |
|
|
2828 | 2828 | ui, ctx, m, uipathfn, fm, fmt, opts.get(b'subrepos') |
|
|
2829 | 2829 | ) |
|
|
2830 | 2830 | |
|
|
2831 | 2831 | |
|
|
2832 | 2832 | @command( |
|
|
2833 | 2833 | b'forget', |
|
|
2834 | 2834 | [ |
|
|
2835 | 2835 | (b'i', b'interactive', None, _(b'use interactive mode')), |
|
|
2836 | 2836 | ] |
|
|
2837 | 2837 | + walkopts |
|
|
2838 | 2838 | + dryrunopts, |
|
|
2839 | 2839 | _(b'[OPTION]... FILE...'), |
|
|
2840 | 2840 | helpcategory=command.CATEGORY_WORKING_DIRECTORY, |
|
|
2841 | 2841 | helpbasic=True, |
|
|
2842 | 2842 | inferrepo=True, |
|
|
2843 | 2843 | ) |
|
|
2844 | 2844 | def forget(ui, repo, *pats, **opts): |
|
|
2845 | 2845 | """forget the specified files on the next commit |
|
|
2846 | 2846 | |
|
|
2847 | 2847 | Mark the specified files so they will no longer be tracked |
|
|
2848 | 2848 | after the next commit. |
|
|
2849 | 2849 | |
|
|
2850 | 2850 | This only removes files from the current branch, not from the |
|
|
2851 | 2851 | entire project history, and it does not delete them from the |
|
|
2852 | 2852 | working directory. |
|
|
2853 | 2853 | |
|
|
2854 | 2854 | To delete the file from the working directory, see :hg:`remove`. |
|
|
2855 | 2855 | |
|
|
2856 | 2856 | To undo a forget before the next commit, see :hg:`add`. |
|
|
2857 | 2857 | |
|
|
2858 | 2858 | .. container:: verbose |
|
|
2859 | 2859 | |
|
|
2860 | 2860 | Examples: |
|
|
2861 | 2861 | |
|
|
2862 | 2862 | - forget newly-added binary files:: |
|
|
2863 | 2863 | |
|
|
2864 | 2864 | hg forget "set:added() and binary()" |
|
|
2865 | 2865 | |
|
|
2866 | 2866 | - forget files that would be excluded by .hgignore:: |
|
|
2867 | 2867 | |
|
|
2868 | 2868 | hg forget "set:hgignore()" |
|
|
2869 | 2869 | |
|
|
2870 | 2870 | Returns 0 on success. |
|
|
2871 | 2871 | """ |
|
|
2872 | 2872 | |
|
|
2873 | 2873 | opts = pycompat.byteskwargs(opts) |
|
|
2874 | 2874 | if not pats: |
|
|
2875 | 2875 | raise error.InputError(_(b'no files specified')) |
|
|
2876 | 2876 | |
|
|
2877 | 2877 | m = scmutil.match(repo[None], pats, opts) |
|
|
2878 | 2878 | dryrun, interactive = opts.get(b'dry_run'), opts.get(b'interactive') |
|
|
2879 | 2879 | uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True) |
|
|
2880 | 2880 | rejected = cmdutil.forget( |
|
|
2881 | 2881 | ui, |
|
|
2882 | 2882 | repo, |
|
|
2883 | 2883 | m, |
|
|
2884 | 2884 | prefix=b"", |
|
|
2885 | 2885 | uipathfn=uipathfn, |
|
|
2886 | 2886 | explicitonly=False, |
|
|
2887 | 2887 | dryrun=dryrun, |
|
|
2888 | 2888 | interactive=interactive, |
|
|
2889 | 2889 | )[0] |
|
|
2890 | 2890 | return rejected and 1 or 0 |
|
|
2891 | 2891 | |
|
|
2892 | 2892 | |
|
|
2893 | 2893 | @command( |
|
|
2894 | 2894 | b'graft', |
|
|
2895 | 2895 | [ |
|
|
2896 | 2896 | (b'r', b'rev', [], _(b'revisions to graft'), _(b'REV')), |
|
|
2897 | 2897 | ( |
|
|
2898 | 2898 | b'', |
|
|
2899 | 2899 | b'base', |
|
|
2900 | 2900 | b'', |
|
|
2901 | 2901 | _(b'base revision when doing the graft merge (ADVANCED)'), |
|
|
2902 | 2902 | _(b'REV'), |
|
|
2903 | 2903 | ), |
|
|
2904 | 2904 | (b'c', b'continue', False, _(b'resume interrupted graft')), |
|
|
2905 | 2905 | (b'', b'stop', False, _(b'stop interrupted graft')), |
|
|
2906 | 2906 | (b'', b'abort', False, _(b'abort interrupted graft')), |
|
|
2907 | 2907 | (b'e', b'edit', False, _(b'invoke editor on commit messages')), |
|
|
2908 | 2908 | (b'', b'log', None, _(b'append graft info to log message')), |
|
|
2909 | 2909 | ( |
|
|
2910 | 2910 | b'', |
|
|
2911 | 2911 | b'no-commit', |
|
|
2912 | 2912 | None, |
|
|
2913 | 2913 | _(b"don't commit, just apply the changes in working directory"), |
|
|
2914 | 2914 | ), |
|
|
2915 | 2915 | (b'f', b'force', False, _(b'force graft')), |
|
|
2916 | 2916 | ( |
|
|
2917 | 2917 | b'D', |
|
|
2918 | 2918 | b'currentdate', |
|
|
2919 | 2919 | False, |
|
|
2920 | 2920 | _(b'record the current date as commit date'), |
|
|
2921 | 2921 | ), |
|
|
2922 | 2922 | ( |
|
|
2923 | 2923 | b'U', |
|
|
2924 | 2924 | b'currentuser', |
|
|
2925 | 2925 | False, |
|
|
2926 | 2926 | _(b'record the current user as committer'), |
|
|
2927 | 2927 | ), |
|
|
2928 | 2928 | ] |
|
|
2929 | 2929 | + commitopts2 |
|
|
2930 | 2930 | + mergetoolopts |
|
|
2931 | 2931 | + dryrunopts, |
|
|
2932 | 2932 | _(b'[OPTION]... [-r REV]... REV...'), |
|
|
2933 | 2933 | helpcategory=command.CATEGORY_CHANGE_MANAGEMENT, |
|
|
2934 | 2934 | ) |
|
|
2935 | 2935 | def graft(ui, repo, *revs, **opts): |
|
|
2936 | 2936 | """copy changes from other branches onto the current branch |
|
|
2937 | 2937 | |
|
|
2938 | 2938 | This command uses Mercurial's merge logic to copy individual |
|
|
2939 | 2939 | changes from other branches without merging branches in the |
|
|
2940 | 2940 | history graph. This is sometimes known as 'backporting' or |
|
|
2941 | 2941 | 'cherry-picking'. By default, graft will copy user, date, and |
|
|
2942 | 2942 | description from the source changesets. |
|
|
2943 | 2943 | |
|
|
2944 | 2944 | Changesets that are ancestors of the current revision, that have |
|
|
2945 | 2945 | already been grafted, or that are merges will be skipped. |
|
|
2946 | 2946 | |
|
|
2947 | 2947 | If --log is specified, log messages will have a comment appended |
|
|
2948 | 2948 | of the form:: |
|
|
2949 | 2949 | |
|
|
2950 | 2950 | (grafted from CHANGESETHASH) |
|
|
2951 | 2951 | |
|
|
2952 | 2952 | If --force is specified, revisions will be grafted even if they |
|
|
2953 | 2953 | are already ancestors of, or have been grafted to, the destination. |
|
|
2954 | 2954 | This is useful when the revisions have since been backed out. |
|
|
2955 | 2955 | |
|
|
2956 | 2956 | If a graft merge results in conflicts, the graft process is |
|
|
2957 | 2957 | interrupted so that the current merge can be manually resolved. |
|
|
2958 | 2958 | Once all conflicts are addressed, the graft process can be |
|
|
2959 | 2959 | continued with the -c/--continue option. |
|
|
2960 | 2960 | |
|
|
2961 | 2961 | The -c/--continue option reapplies all the earlier options. |
|
|
2962 | 2962 | |
|
|
2963 | 2963 | .. container:: verbose |
|
|
2964 | 2964 | |
|
|
2965 | 2965 | The --base option exposes more of how graft internally uses merge with a |
|
|
2966 | 2966 | custom base revision. --base can be used to specify another ancestor than |
|
|
2967 | 2967 | the first and only parent. |
|
|
2968 | 2968 | |
|
|
2969 | 2969 | The command:: |
|
|
2970 | 2970 | |
|
|
2971 | 2971 | hg graft -r 345 --base 234 |
|
|
2972 | 2972 | |
|
|
2973 | 2973 | is thus pretty much the same as:: |
|
|
2974 | 2974 | |
|
|
2975 | 2975 | hg diff --from 234 --to 345 | hg import |
|
|
2976 | 2976 | |
|
|
2977 | 2977 | but using merge to resolve conflicts and track moved files. |
|
|
2978 | 2978 | |
|
|
2979 | 2979 | The result of a merge can thus be backported as a single commit by |
|
|
2980 | 2980 | specifying one of the merge parents as base, and thus effectively |
|
|
2981 | 2981 | grafting the changes from the other side. |
|
|
2982 | 2982 | |
|
|
2983 | 2983 | It is also possible to collapse multiple changesets and clean up history |
|
|
2984 | 2984 | by specifying another ancestor as base, much like rebase --collapse |
|
|
2985 | 2985 | --keep. |
|
|
2986 | 2986 | |
|
|
2987 | 2987 | The commit message can be tweaked after the fact using commit --amend . |
|
|
2988 | 2988 | |
|
|
2989 | 2989 | For using non-ancestors as the base to backout changes, see the backout |
|
|
2990 | 2990 | command and the hidden --parent option. |
|
|
2991 | 2991 | |
|
|
2992 | 2992 | .. container:: verbose |
|
|
2993 | 2993 | |
|
|
2994 | 2994 | Examples: |
|
|
2995 | 2995 | |
|
|
2996 | 2996 | - copy a single change to the stable branch and edit its description:: |
|
|
2997 | 2997 | |
|
|
2998 | 2998 | hg update stable |
|
|
2999 | 2999 | hg graft --edit 9393 |
|
|
3000 | 3000 | |
|
|
3001 | 3001 | - graft a range of changesets with one exception, updating dates:: |
|
|
3002 | 3002 | |
|
|
3003 | 3003 | hg graft -D "2085::2093 and not 2091" |
|
|
3004 | 3004 | |
|
|
3005 | 3005 | - continue a graft after resolving conflicts:: |
|
|
3006 | 3006 | |
|
|
3007 | 3007 | hg graft -c |
|
|
3008 | 3008 | |
|
|
3009 | 3009 | - show the source of a grafted changeset:: |
|
|
3010 | 3010 | |
|
|
3011 | 3011 | hg log --debug -r . |
|
|
3012 | 3012 | |
|
|
3013 | 3013 | - show revisions sorted by date:: |
|
|
3014 | 3014 | |
|
|
3015 | 3015 | hg log -r "sort(all(), date)" |
|
|
3016 | 3016 | |
|
|
3017 | 3017 | - backport the result of a merge as a single commit:: |
|
|
3018 | 3018 | |
|
|
3019 | 3019 | hg graft -r 123 --base 123^ |
|
|
3020 | 3020 | |
|
|
3021 | 3021 | - land a feature branch as one changeset:: |
|
|
3022 | 3022 | |
|
|
3023 | 3023 | hg up -cr default |
|
|
3024 | 3024 | hg graft -r featureX --base "ancestor('featureX', 'default')" |
|
|
3025 | 3025 | |
|
|
3026 | 3026 | See :hg:`help revisions` for more about specifying revisions. |
|
|
3027 | 3027 | |
|
|
3028 | 3028 | Returns 0 on successful completion, 1 if there are unresolved files. |
|
|
3029 | 3029 | """ |
|
|
3030 | 3030 | with repo.wlock(): |
|
|
3031 | 3031 | return _dograft(ui, repo, *revs, **opts) |
|
|
3032 | 3032 | |
|
|
3033 | 3033 | |
|
|
3034 | 3034 | def _dograft(ui, repo, *revs, **opts): |
|
|
3035 | 3035 | opts = pycompat.byteskwargs(opts) |
|
|
3036 | 3036 | if revs and opts.get(b'rev'): |
|
|
3037 | 3037 | ui.warn( |
|
|
3038 | 3038 | _( |
|
|
3039 | 3039 | b'warning: inconsistent use of --rev might give unexpected ' |
|
|
3040 | 3040 | b'revision ordering!\n' |
|
|
3041 | 3041 | ) |
|
|
3042 | 3042 | ) |
|
|
3043 | 3043 | |
|
|
3044 | 3044 | revs = list(revs) |
|
|
3045 | 3045 | revs.extend(opts.get(b'rev')) |
|
|
3046 | 3046 | # a dict of data to be stored in state file |
|
|
3047 | 3047 | statedata = {} |
|
|
3048 | 3048 | # list of new nodes created by ongoing graft |
|
|
3049 | 3049 | statedata[b'newnodes'] = [] |
|
|
3050 | 3050 | |
|
|
3051 | 3051 | cmdutil.resolvecommitoptions(ui, opts) |
|
|
3052 | 3052 | |
|
|
3053 | 3053 | editor = cmdutil.getcommiteditor( |
|
|
3054 | 3054 | editform=b'graft', **pycompat.strkwargs(opts) |
|
|
3055 | 3055 | ) |
|
|
3056 | 3056 | |
|
|
3057 | 3057 | cmdutil.check_at_most_one_arg(opts, b'abort', b'stop', b'continue') |
|
|
3058 | 3058 | |
|
|
3059 | 3059 | cont = False |
|
|
3060 | 3060 | if opts.get(b'no_commit'): |
|
|
3061 | 3061 | cmdutil.check_incompatible_arguments( |
|
|
3062 | 3062 | opts, |
|
|
3063 | 3063 | b'no_commit', |
|
|
3064 | 3064 | [b'edit', b'currentuser', b'currentdate', b'log'], |
|
|
3065 | 3065 | ) |
|
|
3066 | 3066 | |
|
|
3067 | 3067 | graftstate = statemod.cmdstate(repo, b'graftstate') |
|
|
3068 | 3068 | |
|
|
3069 | 3069 | if opts.get(b'stop'): |
|
|
3070 | 3070 | cmdutil.check_incompatible_arguments( |
|
|
3071 | 3071 | opts, |
|
|
3072 | 3072 | b'stop', |
|
|
3073 | 3073 | [ |
|
|
3074 | 3074 | b'edit', |
|
|
3075 | 3075 | b'log', |
|
|
3076 | 3076 | b'user', |
|
|
3077 | 3077 | b'date', |
|
|
3078 | 3078 | b'currentdate', |
|
|
3079 | 3079 | b'currentuser', |
|
|
3080 | 3080 | b'rev', |
|
|
3081 | 3081 | ], |
|
|
3082 | 3082 | ) |
|
|
3083 | 3083 | return _stopgraft(ui, repo, graftstate) |
|
|
3084 | 3084 | elif opts.get(b'abort'): |
|
|
3085 | 3085 | cmdutil.check_incompatible_arguments( |
|
|
3086 | 3086 | opts, |
|
|
3087 | 3087 | b'abort', |
|
|
3088 | 3088 | [ |
|
|
3089 | 3089 | b'edit', |
|
|
3090 | 3090 | b'log', |
|
|
3091 | 3091 | b'user', |
|
|
3092 | 3092 | b'date', |
|
|
3093 | 3093 | b'currentdate', |
|
|
3094 | 3094 | b'currentuser', |
|
|
3095 | 3095 | b'rev', |
|
|
3096 | 3096 | ], |
|
|
3097 | 3097 | ) |
|
|
3098 | 3098 | return cmdutil.abortgraft(ui, repo, graftstate) |
|
|
3099 | 3099 | elif opts.get(b'continue'): |
|
|
3100 | 3100 | cont = True |
|
|
3101 | 3101 | if revs: |
|
|
3102 | 3102 | raise error.InputError(_(b"can't specify --continue and revisions")) |
|
|
3103 | 3103 | # read in unfinished revisions |
|
|
3104 | 3104 | if graftstate.exists(): |
|
|
3105 | 3105 | statedata = cmdutil.readgraftstate(repo, graftstate) |
|
|
3106 | 3106 | if statedata.get(b'date'): |
|
|
3107 | 3107 | opts[b'date'] = statedata[b'date'] |
|
|
3108 | 3108 | if statedata.get(b'user'): |
|
|
3109 | 3109 | opts[b'user'] = statedata[b'user'] |
|
|
3110 | 3110 | if statedata.get(b'log'): |
|
|
3111 | 3111 | opts[b'log'] = True |
|
|
3112 | 3112 | if statedata.get(b'no_commit'): |
|
|
3113 | 3113 | opts[b'no_commit'] = statedata.get(b'no_commit') |
|
|
3114 | 3114 | if statedata.get(b'base'): |
|
|
3115 | 3115 | opts[b'base'] = statedata.get(b'base') |
|
|
3116 | 3116 | nodes = statedata[b'nodes'] |
|
|
3117 | 3117 | revs = [repo[node].rev() for node in nodes] |
|
|
3118 | 3118 | else: |
|
|
3119 | 3119 | cmdutil.wrongtooltocontinue(repo, _(b'graft')) |
|
|
3120 | 3120 | else: |
|
|
3121 | 3121 | if not revs: |
|
|
3122 | 3122 | raise error.InputError(_(b'no revisions specified')) |
|
|
3123 | 3123 | cmdutil.checkunfinished(repo) |
|
|
3124 | 3124 | cmdutil.bailifchanged(repo) |
|
|
3125 | 3125 | revs = scmutil.revrange(repo, revs) |
|
|
3126 | 3126 | |
|
|
3127 | 3127 | skipped = set() |
|
|
3128 | 3128 | basectx = None |
|
|
3129 | 3129 | if opts.get(b'base'): |
|
|
3130 | 3130 | basectx = scmutil.revsingle(repo, opts[b'base'], None) |
|
|
3131 | 3131 | if basectx is None: |
|
|
3132 | 3132 | # check for merges |
|
|
3133 | 3133 | for rev in repo.revs(b'%ld and merge()', revs): |
|
|
3134 | 3134 | ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev) |
|
|
3135 | 3135 | skipped.add(rev) |
|
|
3136 | 3136 | revs = [r for r in revs if r not in skipped] |
|
|
3137 | 3137 | if not revs: |
|
|
3138 | 3138 | return -1 |
|
|
3139 | 3139 | if basectx is not None and len(revs) != 1: |
|
|
3140 | 3140 | raise error.InputError(_(b'only one revision allowed with --base ')) |
|
|
3141 | 3141 | |
|
|
3142 | 3142 | # Don't check in the --continue case, in effect retaining --force across |
|
|
3143 | 3143 | # --continues. That's because without --force, any revisions we decided to |
|
|
3144 | 3144 | # skip would have been filtered out here, so they wouldn't have made their |
|
|
3145 | 3145 | # way to the graftstate. With --force, any revisions we would have otherwise |
|
|
3146 | 3146 | # skipped would not have been filtered out, and if they hadn't been applied |
|
|
3147 | 3147 | # already, they'd have been in the graftstate. |
|
|
3148 | 3148 | if not (cont or opts.get(b'force')) and basectx is None: |
|
|
3149 | 3149 | # check for ancestors of dest branch |
|
|
3150 | 3150 | ancestors = repo.revs(b'%ld & (::.)', revs) |
|
|
3151 | 3151 | for rev in ancestors: |
|
|
3152 | 3152 | ui.warn(_(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev])) |
|
|
3153 | 3153 | |
|
|
3154 | 3154 | revs = [r for r in revs if r not in ancestors] |
|
|
3155 | 3155 | |
|
|
3156 | 3156 | if not revs: |
|
|
3157 | 3157 | return -1 |
|
|
3158 | 3158 | |
|
|
3159 | 3159 | # analyze revs for earlier grafts |
|
|
3160 | 3160 | ids = {} |
|
|
3161 | 3161 | for ctx in repo.set(b"%ld", revs): |
|
|
3162 | 3162 | ids[ctx.hex()] = ctx.rev() |
|
|
3163 | 3163 | n = ctx.extra().get(b'source') |
|
|
3164 | 3164 | if n: |
|
|
3165 | 3165 | ids[n] = ctx.rev() |
|
|
3166 | 3166 | |
|
|
3167 | 3167 | # check ancestors for earlier grafts |
|
|
3168 | 3168 | ui.debug(b'scanning for duplicate grafts\n') |
|
|
3169 | 3169 | |
|
|
3170 | 3170 | # The only changesets we can be sure doesn't contain grafts of any |
|
|
3171 | 3171 | # revs, are the ones that are common ancestors of *all* revs: |
|
|
3172 | 3172 | for rev in repo.revs(b'only(%d,ancestor(%ld))', repo[b'.'].rev(), revs): |
|
|
3173 | 3173 | ctx = repo[rev] |
|
|
3174 | 3174 | n = ctx.extra().get(b'source') |
|
|
3175 | 3175 | if n in ids: |
|
|
3176 | 3176 | try: |
|
|
3177 | 3177 | r = repo[n].rev() |
|
|
3178 | 3178 | except error.RepoLookupError: |
|
|
3179 | 3179 | r = None |
|
|
3180 | 3180 | if r in revs: |
|
|
3181 | 3181 | ui.warn( |
|
|
3182 | 3182 | _( |
|
|
3183 | 3183 | b'skipping revision %d:%s ' |
|
|
3184 | 3184 | b'(already grafted to %d:%s)\n' |
|
|
3185 | 3185 | ) |
|
|
3186 | 3186 | % (r, repo[r], rev, ctx) |
|
|
3187 | 3187 | ) |
|
|
3188 | 3188 | revs.remove(r) |
|
|
3189 | 3189 | elif ids[n] in revs: |
|
|
3190 | 3190 | if r is None: |
|
|
3191 | 3191 | ui.warn( |
|
|
3192 | 3192 | _( |
|
|
3193 | 3193 | b'skipping already grafted revision %d:%s ' |
|
|
3194 | 3194 | b'(%d:%s also has unknown origin %s)\n' |
|
|
3195 | 3195 | ) |
|
|
3196 | 3196 | % (ids[n], repo[ids[n]], rev, ctx, n[:12]) |
|
|
3197 | 3197 | ) |
|
|
3198 | 3198 | else: |
|
|
3199 | 3199 | ui.warn( |
|
|
3200 | 3200 | _( |
|
|
3201 | 3201 | b'skipping already grafted revision %d:%s ' |
|
|
3202 | 3202 | b'(%d:%s also has origin %d:%s)\n' |
|
|
3203 | 3203 | ) |
|
|
3204 | 3204 | % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]) |
|
|
3205 | 3205 | ) |
|
|
3206 | 3206 | revs.remove(ids[n]) |
|
|
3207 | 3207 | elif ctx.hex() in ids: |
|
|
3208 | 3208 | r = ids[ctx.hex()] |
|
|
3209 | 3209 | if r in revs: |
|
|
3210 | 3210 | ui.warn( |
|
|
3211 | 3211 | _( |
|
|
3212 | 3212 | b'skipping already grafted revision %d:%s ' |
|
|
3213 | 3213 | b'(was grafted from %d:%s)\n' |
|
|
3214 | 3214 | ) |
|
|
3215 | 3215 | % (r, repo[r], rev, ctx) |
|
|
3216 | 3216 | ) |
|
|
3217 | 3217 | revs.remove(r) |
|
|
3218 | 3218 | if not revs: |
|
|
3219 | 3219 | return -1 |
|
|
3220 | 3220 | |
|
|
3221 | 3221 | if opts.get(b'no_commit'): |
|
|
3222 | 3222 | statedata[b'no_commit'] = True |
|
|
3223 | 3223 | if opts.get(b'base'): |
|
|
3224 | 3224 | statedata[b'base'] = opts[b'base'] |
|
|
3225 | 3225 | for pos, ctx in enumerate(repo.set(b"%ld", revs)): |
|
|
3226 | 3226 | desc = b'%d:%s "%s"' % ( |
|
|
3227 | 3227 | ctx.rev(), |
|
|
3228 | 3228 | ctx, |
|
|
3229 | 3229 | ctx.description().split(b'\n', 1)[0], |
|
|
3230 | 3230 | ) |
|
|
3231 | 3231 | names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node()) |
|
|
3232 | 3232 | if names: |
|
|
3233 | 3233 | desc += b' (%s)' % b' '.join(names) |
|
|
3234 | 3234 | ui.status(_(b'grafting %s\n') % desc) |
|
|
3235 | 3235 | if opts.get(b'dry_run'): |
|
|
3236 | 3236 | continue |
|
|
3237 | 3237 | |
|
|
3238 | 3238 | source = ctx.extra().get(b'source') |
|
|
3239 | 3239 | extra = {} |
|
|
3240 | 3240 | if source: |
|
|
3241 | 3241 | extra[b'source'] = source |
|
|
3242 | 3242 | extra[b'intermediate-source'] = ctx.hex() |
|
|
3243 | 3243 | else: |
|
|
3244 | 3244 | extra[b'source'] = ctx.hex() |
|
|
3245 | 3245 | user = ctx.user() |
|
|
3246 | 3246 | if opts.get(b'user'): |
|
|
3247 | 3247 | user = opts[b'user'] |
|
|
3248 | 3248 | statedata[b'user'] = user |
|
|
3249 | 3249 | date = ctx.date() |
|
|
3250 | 3250 | if opts.get(b'date'): |
|
|
3251 | 3251 | date = opts[b'date'] |
|
|
3252 | 3252 | statedata[b'date'] = date |
|
|
3253 | 3253 | message = ctx.description() |
|
|
3254 | 3254 | if opts.get(b'log'): |
|
|
3255 | 3255 | message += b'\n(grafted from %s)' % ctx.hex() |
|
|
3256 | 3256 | statedata[b'log'] = True |
|
|
3257 | 3257 | |
|
|
3258 | 3258 | # we don't merge the first commit when continuing |
|
|
3259 | 3259 | if not cont: |
|
|
3260 | 3260 | # perform the graft merge with p1(rev) as 'ancestor' |
|
|
3261 | 3261 | overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')} |
|
|
3262 | 3262 | base = ctx.p1() if basectx is None else basectx |
|
|
3263 | 3263 | with ui.configoverride(overrides, b'graft'): |
|
|
3264 | 3264 | stats = mergemod.graft(repo, ctx, base, [b'local', b'graft']) |
|
|
3265 | 3265 | # report any conflicts |
|
|
3266 | 3266 | if stats.unresolvedcount > 0: |
|
|
3267 | 3267 | # write out state for --continue |
|
|
3268 | 3268 | nodes = [repo[rev].hex() for rev in revs[pos:]] |
|
|
3269 | 3269 | statedata[b'nodes'] = nodes |
|
|
3270 | 3270 | stateversion = 1 |
|
|
3271 | 3271 | graftstate.save(stateversion, statedata) |
|
|
3272 | 3272 | ui.error(_(b"abort: unresolved conflicts, can't continue\n")) |
|
|
3273 | 3273 | ui.error(_(b"(use 'hg resolve' and 'hg graft --continue')\n")) |
|
|
3274 | 3274 | return 1 |
|
|
3275 | 3275 | else: |
|
|
3276 | 3276 | cont = False |
|
|
3277 | 3277 | |
|
|
3278 | 3278 | # commit if --no-commit is false |
|
|
3279 | 3279 | if not opts.get(b'no_commit'): |
|
|
3280 | 3280 | node = repo.commit( |
|
|
3281 | 3281 | text=message, user=user, date=date, extra=extra, editor=editor |
|
|
3282 | 3282 | ) |
|
|
3283 | 3283 | if node is None: |
|
|
3284 | 3284 | ui.warn( |
|
|
3285 | 3285 | _(b'note: graft of %d:%s created no changes to commit\n') |
|
|
3286 | 3286 | % (ctx.rev(), ctx) |
|
|
3287 | 3287 | ) |
|
|
3288 | 3288 | # checking that newnodes exist because old state files won't have it |
|
|
3289 | 3289 | elif statedata.get(b'newnodes') is not None: |
|
|
3290 | 3290 | statedata[b'newnodes'].append(node) |
|
|
3291 | 3291 | |
|
|
3292 | 3292 | # remove state when we complete successfully |
|
|
3293 | 3293 | if not opts.get(b'dry_run'): |
|
|
3294 | 3294 | graftstate.delete() |
|
|
3295 | 3295 | |
|
|
3296 | 3296 | return 0 |
|
|
3297 | 3297 | |
|
|
3298 | 3298 | |
|
|
3299 | 3299 | def _stopgraft(ui, repo, graftstate): |
|
|
3300 | 3300 | """stop the interrupted graft""" |
|
|
3301 | 3301 | if not graftstate.exists(): |
|
|
3302 | 3302 | raise error.StateError(_(b"no interrupted graft found")) |
|
|
3303 | 3303 | pctx = repo[b'.'] |
|
|
3304 | 3304 | mergemod.clean_update(pctx) |
|
|
3305 | 3305 | graftstate.delete() |
|
|
3306 | 3306 | ui.status(_(b"stopped the interrupted graft\n")) |
|
|
3307 | 3307 | ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12]) |
|
|
3308 | 3308 | return 0 |
|
|
3309 | 3309 | |
|
|
3310 | 3310 | |
|
|
3311 | 3311 | statemod.addunfinished( |
|
|
3312 | 3312 | b'graft', |
|
|
3313 | 3313 | fname=b'graftstate', |
|
|
3314 | 3314 | clearable=True, |
|
|
3315 | 3315 | stopflag=True, |
|
|
3316 | 3316 | continueflag=True, |
|
|
3317 | 3317 | abortfunc=cmdutil.hgabortgraft, |
|
|
3318 | 3318 | cmdhint=_(b"use 'hg graft --continue' or 'hg graft --stop' to stop"), |
|
|
3319 | 3319 | ) |
|
|
3320 | 3320 | |
|
|
3321 | 3321 | |
|
|
3322 | 3322 | @command( |
|
|
3323 | 3323 | b'grep', |
|
|
3324 | 3324 | [ |
|
|
3325 | 3325 | (b'0', b'print0', None, _(b'end fields with NUL')), |
|
|
3326 | 3326 | (b'', b'all', None, _(b'an alias to --diff (DEPRECATED)')), |
|
|
3327 | 3327 | ( |
|
|
3328 | 3328 | b'', |
|
|
3329 | 3329 | b'diff', |
|
|
3330 | 3330 | None, |
|
|
3331 | 3331 | _( |
|
|
3332 | 3332 | b'search revision differences for when the pattern was added ' |
|
|
3333 | 3333 | b'or removed' |
|
|
3334 | 3334 | ), |
|
|
3335 | 3335 | ), |
|
|
3336 | 3336 | (b'a', b'text', None, _(b'treat all files as text')), |
|
|
3337 | 3337 | ( |
|
|
3338 | 3338 | b'f', |
|
|
3339 | 3339 | b'follow', |
|
|
3340 | 3340 | None, |
|
|
3341 | 3341 | _( |
|
|
3342 | 3342 | b'follow changeset history,' |
|
|
3343 | 3343 | b' or file history across copies and renames' |
|
|
3344 | 3344 | ), |
|
|
3345 | 3345 | ), |
|
|
3346 | 3346 | (b'i', b'ignore-case', None, _(b'ignore case when matching')), |
|
|
3347 | 3347 | ( |
|
|
3348 | 3348 | b'l', |
|
|
3349 | 3349 | b'files-with-matches', |
|
|
3350 | 3350 | None, |
|
|
3351 | 3351 | _(b'print only filenames and revisions that match'), |
|
|
3352 | 3352 | ), |
|
|
3353 | 3353 | (b'n', b'line-number', None, _(b'print matching line numbers')), |
|
|
3354 | 3354 | ( |
|
|
3355 | 3355 | b'r', |
|
|
3356 | 3356 | b'rev', |
|
|
3357 | 3357 | [], |
|
|
3358 | 3358 | _(b'search files changed within revision range'), |
|
|
3359 | 3359 | _(b'REV'), |
|
|
3360 | 3360 | ), |
|
|
3361 | 3361 | ( |
|
|
3362 | 3362 | b'', |
|
|
3363 | 3363 | b'all-files', |
|
|
3364 | 3364 | None, |
|
|
3365 | 3365 | _( |
|
|
3366 | 3366 | b'include all files in the changeset while grepping (DEPRECATED)' |
|
|
3367 | 3367 | ), |
|
|
3368 | 3368 | ), |
|
|
3369 | 3369 | (b'u', b'user', None, _(b'list the author (long with -v)')), |
|
|
3370 | 3370 | (b'd', b'date', None, _(b'list the date (short with -q)')), |
|
|
3371 | 3371 | ] |
|
|
3372 | 3372 | + formatteropts |
|
|
3373 | 3373 | + walkopts, |
|
|
3374 | 3374 | _(b'[--diff] [OPTION]... PATTERN [FILE]...'), |
|
|
3375 | 3375 | helpcategory=command.CATEGORY_FILE_CONTENTS, |
|
|
3376 | 3376 | inferrepo=True, |
|
|
3377 | 3377 | intents={INTENT_READONLY}, |
|
|
3378 | 3378 | ) |
|
|
3379 | 3379 | def grep(ui, repo, pattern, *pats, **opts): |
|
|
3380 | 3380 | """search for a pattern in specified files |
|
|
3381 | 3381 | |
|
|
3382 | 3382 | Search the working directory or revision history for a regular |
|
|
3383 | 3383 | expression in the specified files for the entire repository. |
|
|
3384 | 3384 | |
|
|
3385 | 3385 | By default, grep searches the repository files in the working |
|
|
3386 | 3386 | directory and prints the files where it finds a match. To specify |
|
|
3387 | 3387 | historical revisions instead of the working directory, use the |
|
|
3388 | 3388 | --rev flag. |
|
|
3389 | 3389 | |
|
|
3390 | 3390 | To search instead historical revision differences that contains a |
|
|
3391 | 3391 | change in match status ("-" for a match that becomes a non-match, |
|
|
3392 | 3392 | or "+" for a non-match that becomes a match), use the --diff flag. |
|
|
3393 | 3393 | |
|
|
3394 | 3394 | PATTERN can be any Python (roughly Perl-compatible) regular |
|
|
3395 | 3395 | expression. |
|
|
3396 | 3396 | |
|
|
3397 | 3397 | If no FILEs are specified and the --rev flag isn't supplied, all |
|
|
3398 | 3398 | files in the working directory are searched. When using the --rev |
|
|
3399 | 3399 | flag and specifying FILEs, use the --follow argument to also |
|
|
3400 | 3400 | follow the specified FILEs across renames and copies. |
|
|
3401 | 3401 | |
|
|
3402 | 3402 | .. container:: verbose |
|
|
3403 | 3403 | |
|
|
3404 | 3404 | Template: |
|
|
3405 | 3405 | |
|
|
3406 | 3406 | The following keywords are supported in addition to the common template |
|
|
3407 | 3407 | keywords and functions. See also :hg:`help templates`. |
|
|
3408 | 3408 | |
|
|
3409 | 3409 | :change: String. Character denoting insertion ``+`` or removal ``-``. |
|
|
3410 | 3410 | Available if ``--diff`` is specified. |
|
|
3411 | 3411 | :lineno: Integer. Line number of the match. |
|
|
3412 | 3412 | :path: String. Repository-absolute path of the file. |
|
|
3413 | 3413 | :texts: List of text chunks. |
|
|
3414 | 3414 | |
|
|
3415 | 3415 | And each entry of ``{texts}`` provides the following sub-keywords. |
|
|
3416 | 3416 | |
|
|
3417 | 3417 | :matched: Boolean. True if the chunk matches the specified pattern. |
|
|
3418 | 3418 | :text: String. Chunk content. |
|
|
3419 | 3419 | |
|
|
3420 | 3420 | See :hg:`help templates.operators` for the list expansion syntax. |
|
|
3421 | 3421 | |
|
|
3422 | 3422 | Returns 0 if a match is found, 1 otherwise. |
|
|
3423 | 3423 | |
|
|
3424 | 3424 | """ |
|
|
3425 | 3425 | cmdutil.check_incompatible_arguments(opts, 'all_files', ['all', 'diff']) |
|
|
3426 | 3426 | opts = pycompat.byteskwargs(opts) |
|
|
3427 | 3427 | diff = opts.get(b'all') or opts.get(b'diff') |
|
|
3428 | 3428 | follow = opts.get(b'follow') |
|
|
3429 | 3429 | if opts.get(b'all_files') is None and not diff: |
|
|
3430 | 3430 | opts[b'all_files'] = True |
|
|
3431 | 3431 | plaingrep = ( |
|
|
3432 | 3432 | opts.get(b'all_files') |
|
|
3433 | 3433 | and not opts.get(b'rev') |
|
|
3434 | 3434 | and not opts.get(b'follow') |
|
|
3435 | 3435 | ) |
|
|
3436 | 3436 | all_files = opts.get(b'all_files') |
|
|
3437 | 3437 | if plaingrep: |
|
|
3438 | 3438 | opts[b'rev'] = [b'wdir()'] |
|
|
3439 | 3439 | |
|
|
3440 | 3440 | reflags = re.M |
|
|
3441 | 3441 | if opts.get(b'ignore_case'): |
|
|
3442 | 3442 | reflags |= re.I |
|
|
3443 | 3443 | try: |
|
|
3444 | 3444 | regexp = util.re.compile(pattern, reflags) |
|
|
3445 | 3445 | except re.error as inst: |
|
|
3446 | 3446 | ui.warn( |
|
|
3447 | 3447 | _(b"grep: invalid match pattern: %s\n") % pycompat.bytestr(inst) |
|
|
3448 | 3448 | ) |
|
|
3449 | 3449 | return 1 |
|
|
3450 | 3450 | sep, eol = b':', b'\n' |
|
|
3451 | 3451 | if opts.get(b'print0'): |
|
|
3452 | 3452 | sep = eol = b'\0' |
|
|
3453 | 3453 | |
|
|
3454 | 3454 | searcher = grepmod.grepsearcher( |
|
|
3455 | 3455 | ui, repo, regexp, all_files=all_files, diff=diff, follow=follow |
|
|
3456 | 3456 | ) |
|
|
3457 | 3457 | |
|
|
3458 | 3458 | getfile = searcher._getfile |
|
|
3459 | 3459 | |
|
|
3460 | 3460 | uipathfn = scmutil.getuipathfn(repo) |
|
|
3461 | 3461 | |
|
|
3462 | 3462 | def display(fm, fn, ctx, pstates, states): |
|
|
3463 | 3463 | rev = scmutil.intrev(ctx) |
|
|
3464 | 3464 | if fm.isplain(): |
|
|
3465 | 3465 | formatuser = ui.shortuser |
|
|
3466 | 3466 | else: |
|
|
3467 | 3467 | formatuser = pycompat.bytestr |
|
|
3468 | 3468 | if ui.quiet: |
|
|
3469 | 3469 | datefmt = b'%Y-%m-%d' |
|
|
3470 | 3470 | else: |
|
|
3471 | 3471 | datefmt = b'%a %b %d %H:%M:%S %Y %1%2' |
|
|
3472 | 3472 | found = False |
|
|
3473 | 3473 | |
|
|
3474 | 3474 | @util.cachefunc |
|
|
3475 | 3475 | def binary(): |
|
|
3476 | 3476 | flog = getfile(fn) |
|
|
3477 | 3477 | try: |
|
|
3478 | 3478 | return stringutil.binary(flog.read(ctx.filenode(fn))) |
|
|
3479 | 3479 | except error.WdirUnsupported: |
|
|
3480 | 3480 | return ctx[fn].isbinary() |
|
|
3481 | 3481 | |
|
|
3482 | 3482 | fieldnamemap = {b'linenumber': b'lineno'} |
|
|
3483 | 3483 | if diff: |
|
|
3484 | 3484 | iter = grepmod.difflinestates(pstates, states) |
|
|
3485 | 3485 | else: |
|
|
3486 | 3486 | iter = [(b'', l) for l in states] |
|
|
3487 | 3487 | for change, l in iter: |
|
|
3488 | 3488 | fm.startitem() |
|
|
3489 | 3489 | fm.context(ctx=ctx) |
|
|
3490 | 3490 | fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn) |
|
|
3491 | 3491 | fm.plain(uipathfn(fn), label=b'grep.filename') |
|
|
3492 | 3492 | |
|
|
3493 | 3493 | cols = [ |
|
|
3494 | 3494 | (b'rev', b'%d', rev, not plaingrep, b''), |
|
|
3495 | 3495 | ( |
|
|
3496 | 3496 | b'linenumber', |
|
|
3497 | 3497 | b'%d', |
|
|
3498 | 3498 | l.linenum, |
|
|
3499 | 3499 | opts.get(b'line_number'), |
|
|
3500 | 3500 | b'', |
|
|
3501 | 3501 | ), |
|
|
3502 | 3502 | ] |
|
|
3503 | 3503 | if diff: |
|
|
3504 | 3504 | cols.append( |
|
|
3505 | 3505 | ( |
|
|
3506 | 3506 | b'change', |
|
|
3507 | 3507 | b'%s', |
|
|
3508 | 3508 | change, |
|
|
3509 | 3509 | True, |
|
|
3510 | 3510 | b'grep.inserted ' |
|
|
3511 | 3511 | if change == b'+' |
|
|
3512 | 3512 | else b'grep.deleted ', |
|
|
3513 | 3513 | ) |
|
|
3514 | 3514 | ) |
|
|
3515 | 3515 | cols.extend( |
|
|
3516 | 3516 | [ |
|
|
3517 | 3517 | ( |
|
|
3518 | 3518 | b'user', |
|
|
3519 | 3519 | b'%s', |
|
|
3520 | 3520 | formatuser(ctx.user()), |
|
|
3521 | 3521 | opts.get(b'user'), |
|
|
3522 | 3522 | b'', |
|
|
3523 | 3523 | ), |
|
|
3524 | 3524 | ( |
|
|
3525 | 3525 | b'date', |
|
|
3526 | 3526 | b'%s', |
|
|
3527 | 3527 | fm.formatdate(ctx.date(), datefmt), |
|
|
3528 | 3528 | opts.get(b'date'), |
|
|
3529 | 3529 | b'', |
|
|
3530 | 3530 | ), |
|
|
3531 | 3531 | ] |
|
|
3532 | 3532 | ) |
|
|
3533 | 3533 | for name, fmt, data, cond, extra_label in cols: |
|
|
3534 | 3534 | if cond: |
|
|
3535 | 3535 | fm.plain(sep, label=b'grep.sep') |
|
|
3536 | 3536 | field = fieldnamemap.get(name, name) |
|
|
3537 | 3537 | label = extra_label + (b'grep.%s' % name) |
|
|
3538 | 3538 | fm.condwrite(cond, field, fmt, data, label=label) |
|
|
3539 | 3539 | if not opts.get(b'files_with_matches'): |
|
|
3540 | 3540 | fm.plain(sep, label=b'grep.sep') |
|
|
3541 | 3541 | if not opts.get(b'text') and binary(): |
|
|
3542 | 3542 | fm.plain(_(b" Binary file matches")) |
|
|
3543 | 3543 | else: |
|
|
3544 | 3544 | displaymatches(fm.nested(b'texts', tmpl=b'{text}'), l) |
|
|
3545 | 3545 | fm.plain(eol) |
|
|
3546 | 3546 | found = True |
|
|
3547 | 3547 | if opts.get(b'files_with_matches'): |
|
|
3548 | 3548 | break |
|
|
3549 | 3549 | return found |
|
|
3550 | 3550 | |
|
|
3551 | 3551 | def displaymatches(fm, l): |
|
|
3552 | 3552 | p = 0 |
|
|
3553 | 3553 | for s, e in l.findpos(regexp): |
|
|
3554 | 3554 | if p < s: |
|
|
3555 | 3555 | fm.startitem() |
|
|
3556 | 3556 | fm.write(b'text', b'%s', l.line[p:s]) |
|
|
3557 | 3557 | fm.data(matched=False) |
|
|
3558 | 3558 | fm.startitem() |
|
|
3559 | 3559 | fm.write(b'text', b'%s', l.line[s:e], label=b'grep.match') |
|
|
3560 | 3560 | fm.data(matched=True) |
|
|
3561 | 3561 | p = e |
|
|
3562 | 3562 | if p < len(l.line): |
|
|
3563 | 3563 | fm.startitem() |
|
|
3564 | 3564 | fm.write(b'text', b'%s', l.line[p:]) |
|
|
3565 | 3565 | fm.data(matched=False) |
|
|
3566 | 3566 | fm.end() |
|
|
3567 | 3567 | |
|
|
3568 | 3568 | found = False |
|
|
3569 | 3569 | |
|
|
3570 | 3570 | wopts = logcmdutil.walkopts( |
|
|
3571 | 3571 | pats=pats, |
|
|
3572 | 3572 | opts=opts, |
|
|
3573 | 3573 | revspec=opts[b'rev'], |
|
|
3574 | 3574 | include_pats=opts[b'include'], |
|
|
3575 | 3575 | exclude_pats=opts[b'exclude'], |
|
|
3576 | 3576 | follow=follow, |
|
|
3577 | 3577 | force_changelog_traversal=all_files, |
|
|
3578 | 3578 | filter_revisions_by_pats=not all_files, |
|
|
3579 | 3579 | ) |
|
|
3580 | 3580 | revs, makefilematcher = logcmdutil.makewalker(repo, wopts) |
|
|
3581 | 3581 | |
|
|
3582 | 3582 | ui.pager(b'grep') |
|
|
3583 | 3583 | fm = ui.formatter(b'grep', opts) |
|
|
3584 | 3584 | for fn, ctx, pstates, states in searcher.searchfiles(revs, makefilematcher): |
|
|
3585 | 3585 | r = display(fm, fn, ctx, pstates, states) |
|
|
3586 | 3586 | found = found or r |
|
|
3587 | 3587 | if r and not diff and not all_files: |
|
|
3588 | 3588 | searcher.skipfile(fn, ctx.rev()) |
|
|
3589 | 3589 | fm.end() |
|
|
3590 | 3590 | |
|
|
3591 | 3591 | return not found |
|
|
3592 | 3592 | |
|
|
3593 | 3593 | |
|
|
3594 | 3594 | @command( |
|
|
3595 | 3595 | b'heads', |
|
|
3596 | 3596 | [ |
|
|
3597 | 3597 | ( |
|
|
3598 | 3598 | b'r', |
|
|
3599 | 3599 | b'rev', |
|
|
3600 | 3600 | b'', |
|
|
3601 | 3601 | _(b'show only heads which are descendants of STARTREV'), |
|
|
3602 | 3602 | _(b'STARTREV'), |
|
|
3603 | 3603 | ), |
|
|
3604 | 3604 | (b't', b'topo', False, _(b'show topological heads only')), |
|
|
3605 | 3605 | ( |
|
|
3606 | 3606 | b'a', |
|
|
3607 | 3607 | b'active', |
|
|
3608 | 3608 | False, |
|
|
3609 | 3609 | _(b'show active branchheads only (DEPRECATED)'), |
|
|
3610 | 3610 | ), |
|
|
3611 | 3611 | (b'c', b'closed', False, _(b'show normal and closed branch heads')), |
|
|
3612 | 3612 | ] |
|
|
3613 | 3613 | + templateopts, |
|
|
3614 | 3614 | _(b'[-ct] [-r STARTREV] [REV]...'), |
|
|
3615 | 3615 | helpcategory=command.CATEGORY_CHANGE_NAVIGATION, |
|
|
3616 | 3616 | intents={INTENT_READONLY}, |
|
|
3617 | 3617 | ) |
|
|
3618 | 3618 | def heads(ui, repo, *branchrevs, **opts): |
|
|
3619 | 3619 | """show branch heads |
|
|
3620 | 3620 | |
|
|
3621 | 3621 | With no arguments, show all open branch heads in the repository. |
|
|
3622 | 3622 | Branch heads are changesets that have no descendants on the |
|
|
3623 | 3623 | same branch. They are where development generally takes place and |
|
|
3624 | 3624 | are the usual targets for update and merge operations. |
|
|
3625 | 3625 | |
|
|
3626 | 3626 | If one or more REVs are given, only open branch heads on the |
|
|
3627 | 3627 | branches associated with the specified changesets are shown. This |
|
|
3628 | 3628 | means that you can use :hg:`heads .` to see the heads on the |
|
|
3629 | 3629 | currently checked-out branch. |
|
|
3630 | 3630 | |
|
|
3631 | 3631 | If -c/--closed is specified, also show branch heads marked closed |
|
|
3632 | 3632 | (see :hg:`commit --close-branch`). |
|
|
3633 | 3633 | |
|
|
3634 | 3634 | If STARTREV is specified, only those heads that are descendants of |
|
|
3635 | 3635 | STARTREV will be displayed. |
|
|
3636 | 3636 | |
|
|
3637 | 3637 | If -t/--topo is specified, named branch mechanics will be ignored and only |
|
|
3638 | 3638 | topological heads (changesets with no children) will be shown. |
|
|
3639 | 3639 | |
|
|
3640 | 3640 | Returns 0 if matching heads are found, 1 if not. |
|
|
3641 | 3641 | """ |
|
|
3642 | 3642 | |
|
|
3643 | 3643 | opts = pycompat.byteskwargs(opts) |
|
|
3644 | 3644 | start = None |
|
|
3645 | 3645 | rev = opts.get(b'rev') |
|
|
3646 | 3646 | if rev: |
|
|
3647 | 3647 | repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn') |
|
|
3648 | 3648 | start = scmutil.revsingle(repo, rev, None).node() |
|
|
3649 | 3649 | |
|
|
3650 | 3650 | if opts.get(b'topo'): |
|
|
3651 | 3651 | heads = [repo[h] for h in repo.heads(start)] |
|
|
3652 | 3652 | else: |
|
|
3653 | 3653 | heads = [] |
|
|
3654 | 3654 | for branch in repo.branchmap(): |
|
|
3655 | 3655 | heads += repo.branchheads(branch, start, opts.get(b'closed')) |
|
|
3656 | 3656 | heads = [repo[h] for h in heads] |
|
|
3657 | 3657 | |
|
|
3658 | 3658 | if branchrevs: |
|
|
3659 | 3659 | branches = { |
|
|
3660 | 3660 | repo[r].branch() for r in scmutil.revrange(repo, branchrevs) |
|
|
3661 | 3661 | } |
|
|
3662 | 3662 | heads = [h for h in heads if h.branch() in branches] |
|
|
3663 | 3663 | |
|
|
3664 | 3664 | if opts.get(b'active') and branchrevs: |
|
|
3665 | 3665 | dagheads = repo.heads(start) |
|
|
3666 | 3666 | heads = [h for h in heads if h.node() in dagheads] |
|
|
3667 | 3667 | |
|
|
3668 | 3668 | if branchrevs: |
|
|
3669 | 3669 | haveheads = {h.branch() for h in heads} |
|
|
3670 | 3670 | if branches - haveheads: |
|
|
3671 | 3671 | headless = b', '.join(b for b in branches - haveheads) |
|
|
3672 | 3672 | msg = _(b'no open branch heads found on branches %s') |
|
|
3673 | 3673 | if opts.get(b'rev'): |
|
|
3674 | 3674 | msg += _(b' (started at %s)') % opts[b'rev'] |
|
|
3675 | 3675 | ui.warn((msg + b'\n') % headless) |
|
|
3676 | 3676 | |
|
|
3677 | 3677 | if not heads: |
|
|
3678 | 3678 | return 1 |
|
|
3679 | 3679 | |
|
|
3680 | 3680 | ui.pager(b'heads') |
|
|
3681 | 3681 | heads = sorted(heads, key=lambda x: -(x.rev())) |
|
|
3682 | 3682 | displayer = logcmdutil.changesetdisplayer(ui, repo, opts) |
|
|
3683 | 3683 | for ctx in heads: |
|
|
3684 | 3684 | displayer.show(ctx) |
|
|
3685 | 3685 | displayer.close() |
|
|
3686 | 3686 | |
|
|
3687 | 3687 | |
|
|
3688 | 3688 | @command( |
|
|
3689 | 3689 | b'help', |
|
|
3690 | 3690 | [ |
|
|
3691 | 3691 | (b'e', b'extension', None, _(b'show only help for extensions')), |
|
|
3692 | 3692 | (b'c', b'command', None, _(b'show only help for commands')), |
|
|
3693 | 3693 | (b'k', b'keyword', None, _(b'show topics matching keyword')), |
|
|
3694 | 3694 | ( |
|
|
3695 | 3695 | b's', |
|
|
3696 | 3696 | b'system', |
|
|
3697 | 3697 | [], |
|
|
3698 | 3698 | _(b'show help for specific platform(s)'), |
|
|
3699 | 3699 | _(b'PLATFORM'), |
|
|
3700 | 3700 | ), |
|
|
3701 | 3701 | ], |
|
|
3702 | 3702 | _(b'[-eck] [-s PLATFORM] [TOPIC]'), |
|
|
3703 | 3703 | helpcategory=command.CATEGORY_HELP, |
|
|
3704 | 3704 | norepo=True, |
|
|
3705 | 3705 | intents={INTENT_READONLY}, |
|
|
3706 | 3706 | ) |
|
|
3707 | 3707 | def help_(ui, name=None, **opts): |
|
|
3708 | 3708 | """show help for a given topic or a help overview |
|
|
3709 | 3709 | |
|
|
3710 | 3710 | With no arguments, print a list of commands with short help messages. |
|
|
3711 | 3711 | |
|
|
3712 | 3712 | Given a topic, extension, or command name, print help for that |
|
|
3713 | 3713 | topic. |
|
|
3714 | 3714 | |
|
|
3715 | 3715 | Returns 0 if successful. |
|
|
3716 | 3716 | """ |
|
|
3717 | 3717 | |
|
|
3718 | 3718 | keep = opts.get('system') or [] |
|
|
3719 | 3719 | if len(keep) == 0: |
|
|
3720 | 3720 | if pycompat.sysplatform.startswith(b'win'): |
|
|
3721 | 3721 | keep.append(b'windows') |
|
|
3722 | 3722 | elif pycompat.sysplatform == b'OpenVMS': |
|
|
3723 | 3723 | keep.append(b'vms') |
|
|
3724 | 3724 | elif pycompat.sysplatform == b'plan9': |
|
|
3725 | 3725 | keep.append(b'plan9') |
|
|
3726 | 3726 | else: |
|
|
3727 | 3727 | keep.append(b'unix') |
|
|
3728 | 3728 | keep.append(pycompat.sysplatform.lower()) |
|
|
3729 | 3729 | if ui.verbose: |
|
|
3730 | 3730 | keep.append(b'verbose') |
|
|
3731 | 3731 | |
|
|
3732 | 3732 | commands = sys.modules[__name__] |
|
|
3733 | 3733 | formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts) |
|
|
3734 | 3734 | ui.pager(b'help') |
|
|
3735 | 3735 | ui.write(formatted) |
|
|
3736 | 3736 | |
|
|
3737 | 3737 | |
|
|
3738 | 3738 | @command( |
|
|
3739 | 3739 | b'identify|id', |
|
|
3740 | 3740 | [ |
|
|
3741 | 3741 | (b'r', b'rev', b'', _(b'identify the specified revision'), _(b'REV')), |
|
|
3742 | 3742 | (b'n', b'num', None, _(b'show local revision number')), |
|
|
3743 | 3743 | (b'i', b'id', None, _(b'show global revision id')), |
|
|
3744 | 3744 | (b'b', b'branch', None, _(b'show branch')), |
|
|
3745 | 3745 | (b't', b'tags', None, _(b'show tags')), |
|
|
3746 | 3746 | (b'B', b'bookmarks', None, _(b'show bookmarks')), |
|
|
3747 | 3747 | ] |
|
|
3748 | 3748 | + remoteopts |
|
|
3749 | 3749 | + formatteropts, |
|
|
3750 | 3750 | _(b'[-nibtB] [-r REV] [SOURCE]'), |
|
|
3751 | 3751 | helpcategory=command.CATEGORY_CHANGE_NAVIGATION, |
|
|
3752 | 3752 | optionalrepo=True, |
|
|
3753 | 3753 | intents={INTENT_READONLY}, |
|
|
3754 | 3754 | ) |
|
|
3755 | 3755 | def identify( |
|
|
3756 | 3756 | ui, |
|
|
3757 | 3757 | repo, |
|
|
3758 | 3758 | source=None, |
|
|
3759 | 3759 | rev=None, |
|
|
3760 | 3760 | num=None, |
|
|
3761 | 3761 | id=None, |
|
|
3762 | 3762 | branch=None, |
|
|
3763 | 3763 | tags=None, |
|
|
3764 | 3764 | bookmarks=None, |
|
|
3765 | 3765 | **opts |
|
|
3766 | 3766 | ): |
|
|
3767 | 3767 | """identify the working directory or specified revision |
|
|
3768 | 3768 | |
|
|
3769 | 3769 | Print a summary identifying the repository state at REV using one or |
|
|
3770 | 3770 | two parent hash identifiers, followed by a "+" if the working |
|
|
3771 | 3771 | directory has uncommitted changes, the branch name (if not default), |
|
|
3772 | 3772 | a list of tags, and a list of bookmarks. |
|
|
3773 | 3773 | |
|
|
3774 | 3774 | When REV is not given, print a summary of the current state of the |
|
|
3775 | 3775 | repository including the working directory. Specify -r. to get information |
|
|
3776 | 3776 | of the working directory parent without scanning uncommitted changes. |
|
|
3777 | 3777 | |
|
|
3778 | 3778 | Specifying a path to a repository root or Mercurial bundle will |
|
|
3779 | 3779 | cause lookup to operate on that repository/bundle. |
|
|
3780 | 3780 | |
|
|
3781 | 3781 | .. container:: verbose |
|
|
3782 | 3782 | |
|
|
3783 | 3783 | Template: |
|
|
3784 | 3784 | |
|
|
3785 | 3785 | The following keywords are supported in addition to the common template |
|
|
3786 | 3786 | keywords and functions. See also :hg:`help templates`. |
|
|
3787 | 3787 | |
|
|
3788 | 3788 | :dirty: String. Character ``+`` denoting if the working directory has |
|
|
3789 | 3789 | uncommitted changes. |
|
|
3790 | 3790 | :id: String. One or two nodes, optionally followed by ``+``. |
|
|
3791 | 3791 | :parents: List of strings. Parent nodes of the changeset. |
|
|
3792 | 3792 | |
|
|
3793 | 3793 | Examples: |
|
|
3794 | 3794 | |
|
|
3795 | 3795 | - generate a build identifier for the working directory:: |
|
|
3796 | 3796 | |
|
|
3797 | 3797 | hg id --id > build-id.dat |
|
|
3798 | 3798 | |
|
|
3799 | 3799 | - find the revision corresponding to a tag:: |
|
|
3800 | 3800 | |
|
|
3801 | 3801 | hg id -n -r 1.3 |
|
|
3802 | 3802 | |
|
|
3803 | 3803 | - check the most recent revision of a remote repository:: |
|
|
3804 | 3804 | |
|
|
3805 | 3805 | hg id -r tip https://www.mercurial-scm.org/repo/hg/ |
|
|
3806 | 3806 | |
|
|
3807 | 3807 | See :hg:`log` for generating more information about specific revisions, |
|
|
3808 | 3808 | including full hash identifiers. |
|
|
3809 | 3809 | |
|
|
3810 | 3810 | Returns 0 if successful. |
|
|
3811 | 3811 | """ |
|
|
3812 | 3812 | |
|
|
3813 | 3813 | opts = pycompat.byteskwargs(opts) |
|
|
3814 | 3814 | if not repo and not source: |
|
|
3815 | 3815 | raise error.InputError( |
|
|
3816 | 3816 | _(b"there is no Mercurial repository here (.hg not found)") |
|
|
3817 | 3817 | ) |
|
|
3818 | 3818 | |
|
|
3819 | 3819 | default = not (num or id or branch or tags or bookmarks) |
|
|
3820 | 3820 | output = [] |
|
|
3821 | 3821 | revs = [] |
|
|
3822 | 3822 | |
|
|
3823 | 3823 | if source: |
|
|
3824 | 3824 | source, branches = hg.parseurl(ui.expandpath(source)) |
|
|
3825 | 3825 | peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo |
|
|
3826 | 3826 | repo = peer.local() |
|
|
3827 | 3827 | revs, checkout = hg.addbranchrevs(repo, peer, branches, None) |
|
|
3828 | 3828 | |
|
|
3829 | 3829 | fm = ui.formatter(b'identify', opts) |
|
|
3830 | 3830 | fm.startitem() |
|
|
3831 | 3831 | |
|
|
3832 | 3832 | if not repo: |
|
|
3833 | 3833 | if num or branch or tags: |
|
|
3834 | 3834 | raise error.InputError( |
|
|
3835 | 3835 | _(b"can't query remote revision number, branch, or tags") |
|
|
3836 | 3836 | ) |
|
|
3837 | 3837 | if not rev and revs: |
|
|
3838 | 3838 | rev = revs[0] |
|
|
3839 | 3839 | if not rev: |
|
|
3840 | 3840 | rev = b"tip" |
|
|
3841 | 3841 | |
|
|
3842 | 3842 | remoterev = peer.lookup(rev) |
|
|
3843 | 3843 | hexrev = fm.hexfunc(remoterev) |
|
|
3844 | 3844 | if default or id: |
|
|
3845 | 3845 | output = [hexrev] |
|
|
3846 | 3846 | fm.data(id=hexrev) |
|
|
3847 | 3847 | |
|
|
3848 | 3848 | @util.cachefunc |
|
|
3849 | 3849 | def getbms(): |
|
|
3850 | 3850 | bms = [] |
|
|
3851 | 3851 | |
|
|
3852 | 3852 | if b'bookmarks' in peer.listkeys(b'namespaces'): |
|
|
3853 | 3853 | hexremoterev = hex(remoterev) |
|
|
3854 | 3854 | bms = [ |
|
|
3855 | 3855 | bm |
|
|
3856 | 3856 | for bm, bmr in pycompat.iteritems( |
|
|
3857 | 3857 | peer.listkeys(b'bookmarks') |
|
|
3858 | 3858 | ) |
|
|
3859 | 3859 | if bmr == hexremoterev |
|
|
3860 | 3860 | ] |
|
|
3861 | 3861 | |
|
|
3862 | 3862 | return sorted(bms) |
|
|
3863 | 3863 | |
|
|
3864 | 3864 | if fm.isplain(): |
|
|
3865 | 3865 | if bookmarks: |
|
|
3866 | 3866 | output.extend(getbms()) |
|
|
3867 | 3867 | elif default and not ui.quiet: |
|
|
3868 | 3868 | # multiple bookmarks for a single parent separated by '/' |
|
|
3869 | 3869 | bm = b'/'.join(getbms()) |
|
|
3870 | 3870 | if bm: |
|
|
3871 | 3871 | output.append(bm) |
|
|
3872 | 3872 | else: |
|
|
3873 | 3873 | fm.data(node=hex(remoterev)) |
|
|
3874 | 3874 | if bookmarks or b'bookmarks' in fm.datahint(): |
|
|
3875 | 3875 | fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark')) |
|
|
3876 | 3876 | else: |
|
|
3877 | 3877 | if rev: |
|
|
3878 | 3878 | repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn') |
|
|
3879 | 3879 | ctx = scmutil.revsingle(repo, rev, None) |
|
|
3880 | 3880 | |
|
|
3881 | 3881 | if ctx.rev() is None: |
|
|
3882 | 3882 | ctx = repo[None] |
|
|
3883 | 3883 | parents = ctx.parents() |
|
|
3884 | 3884 | taglist = [] |
|
|
3885 | 3885 | for p in parents: |
|
|
3886 | 3886 | taglist.extend(p.tags()) |
|
|
3887 | 3887 | |
|
|
3888 | 3888 | dirty = b"" |
|
|
3889 | 3889 | if ctx.dirty(missing=True, merge=False, branch=False): |
|
|
3890 | 3890 | dirty = b'+' |
|
|
3891 | 3891 | fm.data(dirty=dirty) |
|
|
3892 | 3892 | |
|
|
3893 | 3893 | hexoutput = [fm.hexfunc(p.node()) for p in parents] |
|
|
3894 | 3894 | if default or id: |
|
|
3895 | 3895 | output = [b"%s%s" % (b'+'.join(hexoutput), dirty)] |
|
|
3896 | 3896 | fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty)) |
|
|
3897 | 3897 | |
|
|
3898 | 3898 | if num: |
|
|
3899 | 3899 | numoutput = [b"%d" % p.rev() for p in parents] |
|
|
3900 | 3900 | output.append(b"%s%s" % (b'+'.join(numoutput), dirty)) |
|
|
3901 | 3901 | |
|
|
3902 | 3902 | fm.data( |
|
|
3903 | 3903 | parents=fm.formatlist( |
|
|
3904 | 3904 | [fm.hexfunc(p.node()) for p in parents], name=b'node' |
|
|
3905 | 3905 | ) |
|
|
3906 | 3906 | ) |
|
|
3907 | 3907 | else: |
|
|
3908 | 3908 | hexoutput = fm.hexfunc(ctx.node()) |
|
|
3909 | 3909 | if default or id: |
|
|
3910 | 3910 | output = [hexoutput] |
|
|
3911 | 3911 | fm.data(id=hexoutput) |
|
|
3912 | 3912 | |
|
|
3913 | 3913 | if num: |
|
|
3914 | 3914 | output.append(pycompat.bytestr(ctx.rev())) |
|
|
3915 | 3915 | taglist = ctx.tags() |
|
|
3916 | 3916 | |
|
|
3917 | 3917 | if default and not ui.quiet: |
|
|
3918 | 3918 | b = ctx.branch() |
|
|
3919 | 3919 | if b != b'default': |
|
|
3920 | 3920 | output.append(b"(%s)" % b) |
|
|
3921 | 3921 | |
|
|
3922 | 3922 | # multiple tags for a single parent separated by '/' |
|
|
3923 | 3923 | t = b'/'.join(taglist) |
|
|
3924 | 3924 | if t: |
|
|
3925 | 3925 | output.append(t) |
|
|
3926 | 3926 | |
|
|
3927 | 3927 | # multiple bookmarks for a single parent separated by '/' |
|
|
3928 | 3928 | bm = b'/'.join(ctx.bookmarks()) |
|
|
3929 | 3929 | if bm: |
|
|
3930 | 3930 | output.append(bm) |
|
|
3931 | 3931 | else: |
|
|
3932 | 3932 | if branch: |
|
|
3933 | 3933 | output.append(ctx.branch()) |
|
|
3934 | 3934 | |
|
|
3935 | 3935 | if tags: |
|
|
3936 | 3936 | output.extend(taglist) |
|
|
3937 | 3937 | |
|
|
3938 | 3938 | if bookmarks: |
|
|
3939 | 3939 | output.extend(ctx.bookmarks()) |
|
|
3940 | 3940 | |
|
|
3941 | 3941 | fm.data(node=ctx.hex()) |
|
|
3942 | 3942 | fm.data(branch=ctx.branch()) |
|
|
3943 | 3943 | fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':')) |
|
|
3944 | 3944 | fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark')) |
|
|
3945 | 3945 | fm.context(ctx=ctx) |
|
|
3946 | 3946 | |
|
|
3947 | 3947 | fm.plain(b"%s\n" % b' '.join(output)) |
|
|
3948 | 3948 | fm.end() |
|
|
3949 | 3949 | |
|
|
3950 | 3950 | |
|
|
3951 | 3951 | @command( |
|
|
3952 | 3952 | b'import|patch', |
|
|
3953 | 3953 | [ |
|
|
3954 | 3954 | ( |
|
|
3955 | 3955 | b'p', |
|
|
3956 | 3956 | b'strip', |
|
|
3957 | 3957 | 1, |
|
|
3958 | 3958 | _( |
|
|
3959 | 3959 | b'directory strip option for patch. This has the same ' |
|
|
3960 | 3960 | b'meaning as the corresponding patch option' |
|
|
3961 | 3961 | ), |
|
|
3962 | 3962 | _(b'NUM'), |
|
|
3963 | 3963 | ), |
|
|
3964 | 3964 | (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')), |
|
|
3965 | 3965 | (b'', b'secret', None, _(b'use the secret phase for committing')), |
|
|
3966 | 3966 | (b'e', b'edit', False, _(b'invoke editor on commit messages')), |
|
|
3967 | 3967 | ( |
|
|
3968 | 3968 | b'f', |
|
|
3969 | 3969 | b'force', |
|
|
3970 | 3970 | None, |
|
|
3971 | 3971 | _(b'skip check for outstanding uncommitted changes (DEPRECATED)'), |
|
|
3972 | 3972 | ), |
|
|
3973 | 3973 | ( |
|
|
3974 | 3974 | b'', |
|
|
3975 | 3975 | b'no-commit', |
|
|
3976 | 3976 | None, |
|
|
3977 | 3977 | _(b"don't commit, just update the working directory"), |
|
|
3978 | 3978 | ), |
|
|
3979 | 3979 | ( |
|
|
3980 | 3980 | b'', |
|
|
3981 | 3981 | b'bypass', |
|
|
3982 | 3982 | None, |
|
|
3983 | 3983 | _(b"apply patch without touching the working directory"), |
|
|
3984 | 3984 | ), |
|
|
3985 | 3985 | (b'', b'partial', None, _(b'commit even if some hunks fail')), |
|
|
3986 | 3986 | (b'', b'exact', None, _(b'abort if patch would apply lossily')), |
|
|
3987 | 3987 | (b'', b'prefix', b'', _(b'apply patch to subdirectory'), _(b'DIR')), |
|
|
3988 | 3988 | ( |
|
|
3989 | 3989 | b'', |
|
|
3990 | 3990 | b'import-branch', |
|
|
3991 | 3991 | None, |
|
|
3992 | 3992 | _(b'use any branch information in patch (implied by --exact)'), |
|
|
3993 | 3993 | ), |
|
|
3994 | 3994 | ] |
|
|
3995 | 3995 | + commitopts |
|
|
3996 | 3996 | + commitopts2 |
|
|
3997 | 3997 | + similarityopts, |
|
|
3998 | 3998 | _(b'[OPTION]... PATCH...'), |
|
|
3999 | 3999 | helpcategory=command.CATEGORY_IMPORT_EXPORT, |
|
|
4000 | 4000 | ) |
|
|
4001 | 4001 | def import_(ui, repo, patch1=None, *patches, **opts): |
|
|
4002 | 4002 | """import an ordered set of patches |
|
|
4003 | 4003 | |
|
|
4004 | 4004 | Import a list of patches and commit them individually (unless |
|
|
4005 | 4005 | --no-commit is specified). |
|
|
4006 | 4006 | |
|
|
4007 | 4007 | To read a patch from standard input (stdin), use "-" as the patch |
|
|
4008 | 4008 | name. If a URL is specified, the patch will be downloaded from |
|
|
4009 | 4009 | there. |
|
|
4010 | 4010 | |
|
|
4011 | 4011 | Import first applies changes to the working directory (unless |
|
|
4012 | 4012 | --bypass is specified), import will abort if there are outstanding |
|
|
4013 | 4013 | changes. |
|
|
4014 | 4014 | |
|
|
4015 | 4015 | Use --bypass to apply and commit patches directly to the |
|
|
4016 | 4016 | repository, without affecting the working directory. Without |
|
|
4017 | 4017 | --exact, patches will be applied on top of the working directory |
|
|
4018 | 4018 | parent revision. |
|
|
4019 | 4019 | |
|
|
4020 | 4020 | You can import a patch straight from a mail message. Even patches |
|
|
4021 | 4021 | as attachments work (to use the body part, it must have type |
|
|
4022 | 4022 | text/plain or text/x-patch). From and Subject headers of email |
|
|
4023 | 4023 | message are used as default committer and commit message. All |
|
|
4024 | 4024 | text/plain body parts before first diff are added to the commit |
|
|
4025 | 4025 | message. |
|
|
4026 | 4026 | |
|
|
4027 | 4027 | If the imported patch was generated by :hg:`export`, user and |
|
|
4028 | 4028 | description from patch override values from message headers and |
|
|
4029 | 4029 | body. Values given on command line with -m/--message and -u/--user |
|
|
4030 | 4030 | override these. |
|
|
4031 | 4031 | |
|
|
4032 | 4032 | If --exact is specified, import will set the working directory to |
|
|
4033 | 4033 | the parent of each patch before applying it, and will abort if the |
|
|
4034 | 4034 | resulting changeset has a different ID than the one recorded in |
|
|
4035 | 4035 | the patch. This will guard against various ways that portable |
|
|
4036 | 4036 | patch formats and mail systems might fail to transfer Mercurial |
|
|
4037 | 4037 | data or metadata. See :hg:`bundle` for lossless transmission. |
|
|
4038 | 4038 | |
|
|
4039 | 4039 | Use --partial to ensure a changeset will be created from the patch |
|
|
4040 | 4040 | even if some hunks fail to apply. Hunks that fail to apply will be |
|
|
4041 | 4041 | written to a <target-file>.rej file. Conflicts can then be resolved |
|
|
4042 | 4042 | by hand before :hg:`commit --amend` is run to update the created |
|
|
4043 | 4043 | changeset. This flag exists to let people import patches that |
|
|
4044 | 4044 | partially apply without losing the associated metadata (author, |
|
|
4045 | 4045 | date, description, ...). |
|
|
4046 | 4046 | |
|
|
4047 | 4047 | .. note:: |
|
|
4048 | 4048 | |
|
|
4049 | 4049 | When no hunks apply cleanly, :hg:`import --partial` will create |
|
|
4050 | 4050 | an empty changeset, importing only the patch metadata. |
|
|
4051 | 4051 | |
|
|
4052 | 4052 | With -s/--similarity, hg will attempt to discover renames and |
|
|
4053 | 4053 | copies in the patch in the same way as :hg:`addremove`. |
|
|
4054 | 4054 | |
|
|
4055 | 4055 | It is possible to use external patch programs to perform the patch |
|
|
4056 | 4056 | by setting the ``ui.patch`` configuration option. For the default |
|
|
4057 | 4057 | internal tool, the fuzz can also be configured via ``patch.fuzz``. |
|
|
4058 | 4058 | See :hg:`help config` for more information about configuration |
|
|
4059 | 4059 | files and how to use these options. |
|
|
4060 | 4060 | |
|
|
4061 | 4061 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
|
4062 | 4062 | |
|
|
4063 | 4063 | .. container:: verbose |
|
|
4064 | 4064 | |
|
|
4065 | 4065 | Examples: |
|
|
4066 | 4066 | |
|
|
4067 | 4067 | - import a traditional patch from a website and detect renames:: |
|
|
4068 | 4068 | |
|
|
4069 | 4069 | hg import -s 80 http://example.com/bugfix.patch |
|
|
4070 | 4070 | |
|
|
4071 | 4071 | - import a changeset from an hgweb server:: |
|
|
4072 | 4072 | |
|
|
4073 | 4073 | hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa |
|
|
4074 | 4074 | |
|
|
4075 | 4075 | - import all the patches in an Unix-style mbox:: |
|
|
4076 | 4076 | |
|
|
4077 | 4077 | hg import incoming-patches.mbox |
|
|
4078 | 4078 | |
|
|
4079 | 4079 | - import patches from stdin:: |
|
|
4080 | 4080 | |
|
|
4081 | 4081 | hg import - |
|
|
4082 | 4082 | |
|
|
4083 | 4083 | - attempt to exactly restore an exported changeset (not always |
|
|
4084 | 4084 | possible):: |
|
|
4085 | 4085 | |
|
|
4086 | 4086 | hg import --exact proposed-fix.patch |
|
|
4087 | 4087 | |
|
|
4088 | 4088 | - use an external tool to apply a patch which is too fuzzy for |
|
|
4089 | 4089 | the default internal tool. |
|
|
4090 | 4090 | |
|
|
4091 | 4091 | hg import --config ui.patch="patch --merge" fuzzy.patch |
|
|
4092 | 4092 | |
|
|
4093 | 4093 | - change the default fuzzing from 2 to a less strict 7 |
|
|
4094 | 4094 | |
|
|
4095 | 4095 | hg import --config ui.fuzz=7 fuzz.patch |
|
|
4096 | 4096 | |
|
|
4097 | 4097 | Returns 0 on success, 1 on partial success (see --partial). |
|
|
4098 | 4098 | """ |
|
|
4099 | 4099 | |
|
|
4100 | 4100 | cmdutil.check_incompatible_arguments( |
|
|
4101 | 4101 | opts, 'no_commit', ['bypass', 'secret'] |
|
|
4102 | 4102 | ) |
|
|
4103 | 4103 | cmdutil.check_incompatible_arguments(opts, 'exact', ['edit', 'prefix']) |
|
|
4104 | 4104 | opts = pycompat.byteskwargs(opts) |
|
|
4105 | 4105 | if not patch1: |
|
|
4106 | 4106 | raise error.InputError(_(b'need at least one patch to import')) |
|
|
4107 | 4107 | |
|
|
4108 | 4108 | patches = (patch1,) + patches |
|
|
4109 | 4109 | |
|
|
4110 | 4110 | date = opts.get(b'date') |
|
|
4111 | 4111 | if date: |
|
|
4112 | 4112 | opts[b'date'] = dateutil.parsedate(date) |
|
|
4113 | 4113 | |
|
|
4114 | 4114 | exact = opts.get(b'exact') |
|
|
4115 | 4115 | update = not opts.get(b'bypass') |
|
|
4116 | 4116 | try: |
|
|
4117 | 4117 | sim = float(opts.get(b'similarity') or 0) |
|
|
4118 | 4118 | except ValueError: |
|
|
4119 | 4119 | raise error.InputError(_(b'similarity must be a number')) |
|
|
4120 | 4120 | if sim < 0 or sim > 100: |
|
|
4121 | 4121 | raise error.InputError(_(b'similarity must be between 0 and 100')) |
|
|
4122 | 4122 | if sim and not update: |
|
|
4123 | 4123 | raise error.InputError(_(b'cannot use --similarity with --bypass')) |
|
|
4124 | 4124 | |
|
|
4125 | 4125 | base = opts[b"base"] |
|
|
4126 | 4126 | msgs = [] |
|
|
4127 | 4127 | ret = 0 |
|
|
4128 | 4128 | |
|
|
4129 | 4129 | with repo.wlock(): |
|
|
4130 | 4130 | if update: |
|
|
4131 | 4131 | cmdutil.checkunfinished(repo) |
|
|
4132 | 4132 | if exact or not opts.get(b'force'): |
|
|
4133 | 4133 | cmdutil.bailifchanged(repo) |
|
|
4134 | 4134 | |
|
|
4135 | 4135 | if not opts.get(b'no_commit'): |
|
|
4136 | 4136 | lock = repo.lock |
|
|
4137 | 4137 | tr = lambda: repo.transaction(b'import') |
|
|
4138 | 4138 | dsguard = util.nullcontextmanager |
|
|
4139 | 4139 | else: |
|
|
4140 | 4140 | lock = util.nullcontextmanager |
|
|
4141 | 4141 | tr = util.nullcontextmanager |
|
|
4142 | 4142 | dsguard = lambda: dirstateguard.dirstateguard(repo, b'import') |
|
|
4143 | 4143 | with lock(), tr(), dsguard(): |
|
|
4144 | 4144 | parents = repo[None].parents() |
|
|
4145 | 4145 | for patchurl in patches: |
|
|
4146 | 4146 | if patchurl == b'-': |
|
|
4147 | 4147 | ui.status(_(b'applying patch from stdin\n')) |
|
|
4148 | 4148 | patchfile = ui.fin |
|
|
4149 | 4149 | patchurl = b'stdin' # for error message |
|
|
4150 | 4150 | else: |
|
|
4151 | 4151 | patchurl = os.path.join(base, patchurl) |
|
|
4152 | 4152 | ui.status(_(b'applying %s\n') % patchurl) |
|
|
4153 | 4153 | patchfile = hg.openpath(ui, patchurl, sendaccept=False) |
|
|
4154 | 4154 | |
|
|
4155 | 4155 | haspatch = False |
|
|
4156 | 4156 | for hunk in patch.split(patchfile): |
|
|
4157 | 4157 | with patch.extract(ui, hunk) as patchdata: |
|
|
4158 | 4158 | msg, node, rej = cmdutil.tryimportone( |
|
|
4159 | 4159 | ui, repo, patchdata, parents, opts, msgs, hg.clean |
|
|
4160 | 4160 | ) |
|
|
4161 | 4161 | if msg: |
|
|
4162 | 4162 | haspatch = True |
|
|
4163 | 4163 | ui.note(msg + b'\n') |
|
|
4164 | 4164 | if update or exact: |
|
|
4165 | 4165 | parents = repo[None].parents() |
|
|
4166 | 4166 | else: |
|
|
4167 | 4167 | parents = [repo[node]] |
|
|
4168 | 4168 | if rej: |
|
|
4169 | 4169 | ui.write_err(_(b"patch applied partially\n")) |
|
|
4170 | 4170 | ui.write_err( |
|
|
4171 | 4171 | _( |
|
|
4172 | 4172 | b"(fix the .rej files and run " |
|
|
4173 | 4173 | b"`hg commit --amend`)\n" |
|
|
4174 | 4174 | ) |
|
|
4175 | 4175 | ) |
|
|
4176 | 4176 | ret = 1 |
|
|
4177 | 4177 | break |
|
|
4178 | 4178 | |
|
|
4179 | 4179 | if not haspatch: |
|
|
4180 | 4180 | raise error.InputError(_(b'%s: no diffs found') % patchurl) |
|
|
4181 | 4181 | |
|
|
4182 | 4182 | if msgs: |
|
|
4183 | 4183 | repo.savecommitmessage(b'\n* * *\n'.join(msgs)) |
|
|
4184 | 4184 | return ret |
|
|
4185 | 4185 | |
|
|
4186 | 4186 | |
|
|
4187 | 4187 | @command( |
|
|
4188 | 4188 | b'incoming|in', |
|
|
4189 | 4189 | [ |
|
|
4190 | 4190 | ( |
|
|
4191 | 4191 | b'f', |
|
|
4192 | 4192 | b'force', |
|
|
4193 | 4193 | None, |
|
|
4194 | 4194 | _(b'run even if remote repository is unrelated'), |
|
|
4195 | 4195 | ), |
|
|
4196 | 4196 | (b'n', b'newest-first', None, _(b'show newest record first')), |
|
|
4197 | 4197 | (b'', b'bundle', b'', _(b'file to store the bundles into'), _(b'FILE')), |
|
|
4198 | 4198 | ( |
|
|
4199 | 4199 | b'r', |
|
|
4200 | 4200 | b'rev', |
|
|
4201 | 4201 | [], |
|
|
4202 | 4202 | _(b'a remote changeset intended to be added'), |
|
|
4203 | 4203 | _(b'REV'), |
|
|
4204 | 4204 | ), |
|
|
4205 | 4205 | (b'B', b'bookmarks', False, _(b"compare bookmarks")), |
|
|
4206 | 4206 | ( |
|
|
4207 | 4207 | b'b', |
|
|
4208 | 4208 | b'branch', |
|
|
4209 | 4209 | [], |
|
|
4210 | 4210 | _(b'a specific branch you would like to pull'), |
|
|
4211 | 4211 | _(b'BRANCH'), |
|
|
4212 | 4212 | ), |
|
|
4213 | 4213 | ] |
|
|
4214 | 4214 | + logopts |
|
|
4215 | 4215 | + remoteopts |
|
|
4216 | 4216 | + subrepoopts, |
|
|
4217 | 4217 | _(b'[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'), |
|
|
4218 | 4218 | helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT, |
|
|
4219 | 4219 | ) |
|
|
4220 | 4220 | def incoming(ui, repo, source=b"default", **opts): |
|
|
4221 | 4221 | """show new changesets found in source |
|
|
4222 | 4222 | |
|
|
4223 | 4223 | Show new changesets found in the specified path/URL or the default |
|
|
4224 | 4224 | pull location. These are the changesets that would have been pulled |
|
|
4225 | 4225 | by :hg:`pull` at the time you issued this command. |
|
|
4226 | 4226 | |
|
|
4227 | 4227 | See pull for valid source format details. |
|
|
4228 | 4228 | |
|
|
4229 | 4229 | .. container:: verbose |
|
|
4230 | 4230 | |
|
|
4231 | 4231 | With -B/--bookmarks, the result of bookmark comparison between |
|
|
4232 | 4232 | local and remote repositories is displayed. With -v/--verbose, |
|
|
4233 | 4233 | status is also displayed for each bookmark like below:: |
|
|
4234 | 4234 | |
|
|
4235 | 4235 | BM1 01234567890a added |
|
|
4236 | 4236 | BM2 1234567890ab advanced |
|
|
4237 | 4237 | BM3 234567890abc diverged |
|
|
4238 | 4238 | BM4 34567890abcd changed |
|
|
4239 | 4239 | |
|
|
4240 | 4240 | The action taken locally when pulling depends on the |
|
|
4241 | 4241 | status of each bookmark: |
|
|
4242 | 4242 | |
|
|
4243 | 4243 | :``added``: pull will create it |
|
|
4244 | 4244 | :``advanced``: pull will update it |
|
|
4245 | 4245 | :``diverged``: pull will create a divergent bookmark |
|
|
4246 | 4246 | :``changed``: result depends on remote changesets |
|
|
4247 | 4247 | |
|
|
4248 | 4248 | From the point of view of pulling behavior, bookmark |
|
|
4249 | 4249 | existing only in the remote repository are treated as ``added``, |
|
|
4250 | 4250 | even if it is in fact locally deleted. |
|
|
4251 | 4251 | |
|
|
4252 | 4252 | .. container:: verbose |
|
|
4253 | 4253 | |
|
|
4254 | 4254 | For remote repository, using --bundle avoids downloading the |
|
|
4255 | 4255 | changesets twice if the incoming is followed by a pull. |
|
|
4256 | 4256 | |
|
|
4257 | 4257 | Examples: |
|
|
4258 | 4258 | |
|
|
4259 | 4259 | - show incoming changes with patches and full description:: |
|
|
4260 | 4260 | |
|
|
4261 | 4261 | hg incoming -vp |
|
|
4262 | 4262 | |
|
|
4263 | 4263 | - show incoming changes excluding merges, store a bundle:: |
|
|
4264 | 4264 | |
|
|
4265 | 4265 | hg in -vpM --bundle incoming.hg |
|
|
4266 | 4266 | hg pull incoming.hg |
|
|
4267 | 4267 | |
|
|
4268 | 4268 | - briefly list changes inside a bundle:: |
|
|
4269 | 4269 | |
|
|
4270 | 4270 | hg in changes.hg -T "{desc|firstline}\\n" |
|
|
4271 | 4271 | |
|
|
4272 | 4272 | Returns 0 if there are incoming changes, 1 otherwise. |
|
|
4273 | 4273 | """ |
|
|
4274 | 4274 | opts = pycompat.byteskwargs(opts) |
|
|
4275 | 4275 | if opts.get(b'graph'): |
|
|
4276 | 4276 | logcmdutil.checkunsupportedgraphflags([], opts) |
|
|
4277 | 4277 | |
|
|
4278 | 4278 | def display(other, chlist, displayer): |
|
|
4279 | 4279 | revdag = logcmdutil.graphrevs(other, chlist, opts) |
|
|
4280 | 4280 | logcmdutil.displaygraph( |
|
|
4281 | 4281 | ui, repo, revdag, displayer, graphmod.asciiedges |
|
|
4282 | 4282 | ) |
|
|
4283 | 4283 | |
|
|
4284 | 4284 | hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True) |
|
|
4285 | 4285 | return 0 |
|
|
4286 | 4286 | |
|
|
4287 | 4287 | cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'bundle']) |
|
|
4288 | 4288 | |
|
|
4289 | 4289 | if opts.get(b'bookmarks'): |
|
|
4290 | 4290 | source, branches = hg.parseurl( |
|
|
4291 | 4291 | ui.expandpath(source), opts.get(b'branch') |
|
|
4292 | 4292 | ) |
|
|
4293 | 4293 | other = hg.peer(repo, opts, source) |
|
|
4294 | 4294 | if b'bookmarks' not in other.listkeys(b'namespaces'): |
|
|
4295 | 4295 | ui.warn(_(b"remote doesn't support bookmarks\n")) |
|
|
4296 | 4296 | return 0 |
|
|
4297 | 4297 | ui.pager(b'incoming') |
|
|
4298 | 4298 | ui.status(_(b'comparing with %s\n') % util.hidepassword(source)) |
|
|
4299 | 4299 | return bookmarks.incoming(ui, repo, other) |
|
|
4300 | 4300 | |
|
|
4301 | 4301 | repo._subtoppath = ui.expandpath(source) |
|
|
4302 | 4302 | try: |
|
|
4303 | 4303 | return hg.incoming(ui, repo, source, opts) |
|
|
4304 | 4304 | finally: |
|
|
4305 | 4305 | del repo._subtoppath |
|
|
4306 | 4306 | |
|
|
4307 | 4307 | |
|
|
4308 | 4308 | @command( |
|
|
4309 | 4309 | b'init', |
|
|
4310 | 4310 | remoteopts, |
|
|
4311 | 4311 | _(b'[-e CMD] [--remotecmd CMD] [DEST]'), |
|
|
4312 | 4312 | helpcategory=command.CATEGORY_REPO_CREATION, |
|
|
4313 | 4313 | helpbasic=True, |
|
|
4314 | 4314 | norepo=True, |
|
|
4315 | 4315 | ) |
|
|
4316 | 4316 | def init(ui, dest=b".", **opts): |
|
|
4317 | 4317 | """create a new repository in the given directory |
|
|
4318 | 4318 | |
|
|
4319 | 4319 | Initialize a new repository in the given directory. If the given |
|
|
4320 | 4320 | directory does not exist, it will be created. |
|
|
4321 | 4321 | |
|
|
4322 | 4322 | If no directory is given, the current directory is used. |
|
|
4323 | 4323 | |
|
|
4324 | 4324 | It is possible to specify an ``ssh://`` URL as the destination. |
|
|
4325 | 4325 | See :hg:`help urls` for more information. |
|
|
4326 | 4326 | |
|
|
4327 | 4327 | Returns 0 on success. |
|
|
4328 | 4328 | """ |
|
|
4329 | 4329 | opts = pycompat.byteskwargs(opts) |
|
|
4330 | 4330 | hg.peer(ui, opts, ui.expandpath(dest), create=True) |
|
|
4331 | 4331 | |
|
|
4332 | 4332 | |
|
|
4333 | 4333 | @command( |
|
|
4334 | 4334 | b'locate', |
|
|
4335 | 4335 | [ |
|
|
4336 | 4336 | ( |
|
|
4337 | 4337 | b'r', |
|
|
4338 | 4338 | b'rev', |
|
|
4339 | 4339 | b'', |
|
|
4340 | 4340 | _(b'search the repository as it is in REV'), |
|
|
4341 | 4341 | _(b'REV'), |
|
|
4342 | 4342 | ), |
|
|
4343 | 4343 | ( |
|
|
4344 | 4344 | b'0', |
|
|
4345 | 4345 | b'print0', |
|
|
4346 | 4346 | None, |
|
|
4347 | 4347 | _(b'end filenames with NUL, for use with xargs'), |
|
|
4348 | 4348 | ), |
|
|
4349 | 4349 | ( |
|
|
4350 | 4350 | b'f', |
|
|
4351 | 4351 | b'fullpath', |
|
|
4352 | 4352 | None, |
|
|
4353 | 4353 | _(b'print complete paths from the filesystem root'), |
|
|
4354 | 4354 | ), |
|
|
4355 | 4355 | ] |
|
|
4356 | 4356 | + walkopts, |
|
|
4357 | 4357 | _(b'[OPTION]... [PATTERN]...'), |
|
|
4358 | 4358 | helpcategory=command.CATEGORY_WORKING_DIRECTORY, |
|
|
4359 | 4359 | ) |
|
|
4360 | 4360 | def locate(ui, repo, *pats, **opts): |
|
|
4361 | 4361 | """locate files matching specific patterns (DEPRECATED) |
|
|
4362 | 4362 | |
|
|
4363 | 4363 | Print files under Mercurial control in the working directory whose |
|
|
4364 | 4364 | names match the given patterns. |
|
|
4365 | 4365 | |
|
|
4366 | 4366 | By default, this command searches all directories in the working |
|
|
4367 | 4367 | directory. To search just the current directory and its |
|
|
4368 | 4368 | subdirectories, use "--include .". |
|
|
4369 | 4369 | |
|
|
4370 | 4370 | If no patterns are given to match, this command prints the names |
|
|
4371 | 4371 | of all files under Mercurial control in the working directory. |
|
|
4372 | 4372 | |
|
|
4373 | 4373 | If you want to feed the output of this command into the "xargs" |
|
|
4374 | 4374 | command, use the -0 option to both this command and "xargs". This |
|
|
4375 | 4375 | will avoid the problem of "xargs" treating single filenames that |
|
|
4376 | 4376 | contain whitespace as multiple filenames. |
|
|
4377 | 4377 | |
|
|
4378 | 4378 | See :hg:`help files` for a more versatile command. |
|
|
4379 | 4379 | |
|
|
4380 | 4380 | Returns 0 if a match is found, 1 otherwise. |
|
|
4381 | 4381 | """ |
|
|
4382 | 4382 | opts = pycompat.byteskwargs(opts) |
|
|
4383 | 4383 | if opts.get(b'print0'): |
|
|
4384 | 4384 | end = b'\0' |
|
|
4385 | 4385 | else: |
|
|
4386 | 4386 | end = b'\n' |
|
|
4387 | 4387 | ctx = scmutil.revsingle(repo, opts.get(b'rev'), None) |
|
|
4388 | 4388 | |
|
|
4389 | 4389 | ret = 1 |
|
|
4390 | 4390 | m = scmutil.match( |
|
|
4391 | 4391 | ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False |
|
|
4392 | 4392 | ) |
|
|
4393 | 4393 | |
|
|
4394 | 4394 | ui.pager(b'locate') |
|
|
4395 | 4395 | if ctx.rev() is None: |
|
|
4396 | 4396 | # When run on the working copy, "locate" includes removed files, so |
|
|
4397 | 4397 | # we get the list of files from the dirstate. |
|
|
4398 | 4398 | filesgen = sorted(repo.dirstate.matches(m)) |
|
|
4399 | 4399 | else: |
|
|
4400 | 4400 | filesgen = ctx.matches(m) |
|
|
4401 | 4401 | uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats)) |
|
|
4402 | 4402 | for abs in filesgen: |
|
|
4403 | 4403 | if opts.get(b'fullpath'): |
|
|
4404 | 4404 | ui.write(repo.wjoin(abs), end) |
|
|
4405 | 4405 | else: |
|
|
4406 | 4406 | ui.write(uipathfn(abs), end) |
|
|
4407 | 4407 | ret = 0 |
|
|
4408 | 4408 | |
|
|
4409 | 4409 | return ret |
|
|
4410 | 4410 | |
|
|
4411 | 4411 | |
|
|
4412 | 4412 | @command( |
|
|
4413 | 4413 | b'log|history', |
|
|
4414 | 4414 | [ |
|
|
4415 | 4415 | ( |
|
|
4416 | 4416 | b'f', |
|
|
4417 | 4417 | b'follow', |
|
|
4418 | 4418 | None, |
|
|
4419 | 4419 | _( |
|
|
4420 | 4420 | b'follow changeset history, or file history across copies and renames' |
|
|
4421 | 4421 | ), |
|
|
4422 | 4422 | ), |
|
|
4423 | 4423 | ( |
|
|
4424 | 4424 | b'', |
|
|
4425 | 4425 | b'follow-first', |
|
|
4426 | 4426 | None, |
|
|
4427 | 4427 | _(b'only follow the first parent of merge changesets (DEPRECATED)'), |
|
|
4428 | 4428 | ), |
|
|
4429 | 4429 | ( |
|
|
4430 | 4430 | b'd', |
|
|
4431 | 4431 | b'date', |
|
|
4432 | 4432 | b'', |
|
|
4433 | 4433 | _(b'show revisions matching date spec'), |
|
|
4434 | 4434 | _(b'DATE'), |
|
|
4435 | 4435 | ), |
|
|
4436 | 4436 | (b'C', b'copies', None, _(b'show copied files')), |
|
|
4437 | 4437 | ( |
|
|
4438 | 4438 | b'k', |
|
|
4439 | 4439 | b'keyword', |
|
|
4440 | 4440 | [], |
|
|
4441 | 4441 | _(b'do case-insensitive search for a given text'), |
|
|
4442 | 4442 | _(b'TEXT'), |
|
|
4443 | 4443 | ), |
|
|
4444 | 4444 | ( |
|
|
4445 | 4445 | b'r', |
|
|
4446 | 4446 | b'rev', |
|
|
4447 | 4447 | [], |
|
|
4448 | 4448 | _(b'revisions to select or follow from'), |
|
|
4449 | 4449 | _(b'REV'), |
|
|
4450 | 4450 | ), |
|
|
4451 | 4451 | ( |
|
|
4452 | 4452 | b'L', |
|
|
4453 | 4453 | b'line-range', |
|
|
4454 | 4454 | [], |
|
|
4455 | 4455 | _(b'follow line range of specified file (EXPERIMENTAL)'), |
|
|
4456 | 4456 | _(b'FILE,RANGE'), |
|
|
4457 | 4457 | ), |
|
|
4458 | 4458 | ( |
|
|
4459 | 4459 | b'', |
|
|
4460 | 4460 | b'removed', |
|
|
4461 | 4461 | None, |
|
|
4462 | 4462 | _(b'include revisions where files were removed'), |
|
|
4463 | 4463 | ), |
|
|
4464 | 4464 | ( |
|
|
4465 | 4465 | b'm', |
|
|
4466 | 4466 | b'only-merges', |
|
|
4467 | 4467 | None, |
|
|
4468 | 4468 | _(b'show only merges (DEPRECATED) (use -r "merge()" instead)'), |
|
|
4469 | 4469 | ), |
|
|
4470 | 4470 | (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')), |
|
|
4471 | 4471 | ( |
|
|
4472 | 4472 | b'', |
|
|
4473 | 4473 | b'only-branch', |
|
|
4474 | 4474 | [], |
|
|
4475 | 4475 | _( |
|
|
4476 | 4476 | b'show only changesets within the given named branch (DEPRECATED)' |
|
|
4477 | 4477 | ), |
|
|
4478 | 4478 | _(b'BRANCH'), |
|
|
4479 | 4479 | ), |
|
|
4480 | 4480 | ( |
|
|
4481 | 4481 | b'b', |
|
|
4482 | 4482 | b'branch', |
|
|
4483 | 4483 | [], |
|
|
4484 | 4484 | _(b'show changesets within the given named branch'), |
|
|
4485 | 4485 | _(b'BRANCH'), |
|
|
4486 | 4486 | ), |
|
|
4487 | 4487 | ( |
|
|
4488 | 4488 | b'B', |
|
|
4489 | 4489 | b'bookmark', |
|
|
4490 | 4490 | [], |
|
|
4491 | 4491 | _(b"show changesets within the given bookmark"), |
|
|
4492 | 4492 | _(b'BOOKMARK'), |
|
|
4493 | 4493 | ), |
|
|
4494 | 4494 | ( |
|
|
4495 | 4495 | b'P', |
|
|
4496 | 4496 | b'prune', |
|
|
4497 | 4497 | [], |
|
|
4498 | 4498 | _(b'do not display revision or any of its ancestors'), |
|
|
4499 | 4499 | _(b'REV'), |
|
|
4500 | 4500 | ), |
|
|
4501 | 4501 | ] |
|
|
4502 | 4502 | + logopts |
|
|
4503 | 4503 | + walkopts, |
|
|
4504 | 4504 | _(b'[OPTION]... [FILE]'), |
|
|
4505 | 4505 | helpcategory=command.CATEGORY_CHANGE_NAVIGATION, |
|
|
4506 | 4506 | helpbasic=True, |
|
|
4507 | 4507 | inferrepo=True, |
|
|
4508 | 4508 | intents={INTENT_READONLY}, |
|
|
4509 | 4509 | ) |
|
|
4510 | 4510 | def log(ui, repo, *pats, **opts): |
|
|
4511 | 4511 | """show revision history of entire repository or files |
|
|
4512 | 4512 | |
|
|
4513 | 4513 | Print the revision history of the specified files or the entire |
|
|
4514 | 4514 | project. |
|
|
4515 | 4515 | |
|
|
4516 | 4516 | If no revision range is specified, the default is ``tip:0`` unless |
|
|
4517 | 4517 | --follow is set. |
|
|
4518 | 4518 | |
|
|
4519 | 4519 | File history is shown without following rename or copy history of |
|
|
4520 | 4520 | files. Use -f/--follow with a filename to follow history across |
|
|
4521 | 4521 | renames and copies. --follow without a filename will only show |
|
|
4522 | 4522 | ancestors of the starting revisions. The starting revisions can be |
|
|
4523 | 4523 | specified by -r/--rev, which default to the working directory parent. |
|
|
4524 | 4524 | |
|
|
4525 | 4525 | By default this command prints revision number and changeset id, |
|
|
4526 | 4526 | tags, non-trivial parents, user, date and time, and a summary for |
|
|
4527 | 4527 | each commit. When the -v/--verbose switch is used, the list of |
|
|
4528 | 4528 | changed files and full commit message are shown. |
|
|
4529 | 4529 | |
|
|
4530 | 4530 | With --graph the revisions are shown as an ASCII art DAG with the most |
|
|
4531 | 4531 | recent changeset at the top. |
|
|
4532 | 4532 | 'o' is a changeset, '@' is a working directory parent, '%' is a changeset |
|
|
4533 | 4533 | involved in an unresolved merge conflict, '_' closes a branch, |
|
|
4534 | 4534 | 'x' is obsolete, '*' is unstable, and '+' represents a fork where the |
|
|
4535 | 4535 | changeset from the lines below is a parent of the 'o' merge on the same |
|
|
4536 | 4536 | line. |
|
|
4537 | 4537 | Paths in the DAG are represented with '|', '/' and so forth. ':' in place |
|
|
4538 | 4538 | of a '|' indicates one or more revisions in a path are omitted. |
|
|
4539 | 4539 | |
|
|
4540 | 4540 | .. container:: verbose |
|
|
4541 | 4541 | |
|
|
4542 | 4542 | Use -L/--line-range FILE,M:N options to follow the history of lines |
|
|
4543 | 4543 | from M to N in FILE. With -p/--patch only diff hunks affecting |
|
|
4544 | 4544 | specified line range will be shown. This option requires --follow; |
|
|
4545 | 4545 | it can be specified multiple times. Currently, this option is not |
|
|
4546 | 4546 | compatible with --graph. This option is experimental. |
|
|
4547 | 4547 | |
|
|
4548 | 4548 | .. note:: |
|
|
4549 | 4549 | |
|
|
4550 | 4550 | :hg:`log --patch` may generate unexpected diff output for merge |
|
|
4551 | 4551 | changesets, as it will only compare the merge changeset against |
|
|
4552 | 4552 | its first parent. Also, only files different from BOTH parents |
|
|
4553 | 4553 | will appear in files:. |
|
|
4554 | 4554 | |
|
|
4555 | 4555 | .. note:: |
|
|
4556 | 4556 | |
|
|
4557 | 4557 | For performance reasons, :hg:`log FILE` may omit duplicate changes |
|
|
4558 | 4558 | made on branches and will not show removals or mode changes. To |
|
|
4559 | 4559 | see all such changes, use the --removed switch. |
|
|
4560 | 4560 | |
|
|
4561 | 4561 | .. container:: verbose |
|
|
4562 | 4562 | |
|
|
4563 | 4563 | .. note:: |
|
|
4564 | 4564 | |
|
|
4565 | 4565 | The history resulting from -L/--line-range options depends on diff |
|
|
4566 | 4566 | options; for instance if white-spaces are ignored, respective changes |
|
|
4567 | 4567 | with only white-spaces in specified line range will not be listed. |
|
|
4568 | 4568 | |
|
|
4569 | 4569 | .. container:: verbose |
|
|
4570 | 4570 | |
|
|
4571 | 4571 | Some examples: |
|
|
4572 | 4572 | |
|
|
4573 | 4573 | - changesets with full descriptions and file lists:: |
|
|
4574 | 4574 | |
|
|
4575 | 4575 | hg log -v |
|
|
4576 | 4576 | |
|
|
4577 | 4577 | - changesets ancestral to the working directory:: |
|
|
4578 | 4578 | |
|
|
4579 | 4579 | hg log -f |
|
|
4580 | 4580 | |
|
|
4581 | 4581 | - last 10 commits on the current branch:: |
|
|
4582 | 4582 | |
|
|
4583 | 4583 | hg log -l 10 -b . |
|
|
4584 | 4584 | |
|
|
4585 | 4585 | - changesets showing all modifications of a file, including removals:: |
|
|
4586 | 4586 | |
|
|
4587 | 4587 | hg log --removed file.c |
|
|
4588 | 4588 | |
|
|
4589 | 4589 | - all changesets that touch a directory, with diffs, excluding merges:: |
|
|
4590 | 4590 | |
|
|
4591 | 4591 | hg log -Mp lib/ |
|
|
4592 | 4592 | |
|
|
4593 | 4593 | - all revision numbers that match a keyword:: |
|
|
4594 | 4594 | |
|
|
4595 | 4595 | hg log -k bug --template "{rev}\\n" |
|
|
4596 | 4596 | |
|
|
4597 | 4597 | - the full hash identifier of the working directory parent:: |
|
|
4598 | 4598 | |
|
|
4599 | 4599 | hg log -r . --template "{node}\\n" |
|
|
4600 | 4600 | |
|
|
4601 | 4601 | - list available log templates:: |
|
|
4602 | 4602 | |
|
|
4603 | 4603 | hg log -T list |
|
|
4604 | 4604 | |
|
|
4605 | 4605 | - check if a given changeset is included in a tagged release:: |
|
|
4606 | 4606 | |
|
|
4607 | 4607 | hg log -r "a21ccf and ancestor(1.9)" |
|
|
4608 | 4608 | |
|
|
4609 | 4609 | - find all changesets by some user in a date range:: |
|
|
4610 | 4610 | |
|
|
4611 | 4611 | hg log -k alice -d "may 2008 to jul 2008" |
|
|
4612 | 4612 | |
|
|
4613 | 4613 | - summary of all changesets after the last tag:: |
|
|
4614 | 4614 | |
|
|
4615 | 4615 | hg log -r "last(tagged())::" --template "{desc|firstline}\\n" |
|
|
4616 | 4616 | |
|
|
4617 | 4617 | - changesets touching lines 13 to 23 for file.c:: |
|
|
4618 | 4618 | |
|
|
4619 | 4619 | hg log -L file.c,13:23 |
|
|
4620 | 4620 | |
|
|
4621 | 4621 | - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of |
|
|
4622 | 4622 | main.c with patch:: |
|
|
4623 | 4623 | |
|
|
4624 | 4624 | hg log -L file.c,13:23 -L main.c,2:6 -p |
|
|
4625 | 4625 | |
|
|
4626 | 4626 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
|
4627 | 4627 | |
|
|
4628 | 4628 | See :hg:`help revisions` for more about specifying and ordering |
|
|
4629 | 4629 | revisions. |
|
|
4630 | 4630 | |
|
|
4631 | 4631 | See :hg:`help templates` for more about pre-packaged styles and |
|
|
4632 | 4632 | specifying custom templates. The default template used by the log |
|
|
4633 | 4633 | command can be customized via the ``command-templates.log`` configuration |
|
|
4634 | 4634 | setting. |
|
|
4635 | 4635 | |
|
|
4636 | 4636 | Returns 0 on success. |
|
|
4637 | 4637 | |
|
|
4638 | 4638 | """ |
|
|
4639 | 4639 | opts = pycompat.byteskwargs(opts) |
|
|
4640 | 4640 | linerange = opts.get(b'line_range') |
|
|
4641 | 4641 | |
|
|
4642 | 4642 | if linerange and not opts.get(b'follow'): |
|
|
4643 | 4643 | raise error.InputError(_(b'--line-range requires --follow')) |
|
|
4644 | 4644 | |
|
|
4645 | 4645 | if linerange and pats: |
|
|
4646 | 4646 | # TODO: take pats as patterns with no line-range filter |
|
|
4647 | 4647 | raise error.InputError( |
|
|
4648 | 4648 | _(b'FILE arguments are not compatible with --line-range option') |
|
|
4649 | 4649 | ) |
|
|
4650 | 4650 | |
|
|
4651 | 4651 | repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn') |
|
|
4652 | 4652 | walk_opts = logcmdutil.parseopts(ui, pats, opts) |
|
|
4653 | 4653 | revs, differ = logcmdutil.getrevs(repo, walk_opts) |
|
|
4654 | 4654 | if linerange: |
|
|
4655 | 4655 | # TODO: should follow file history from logcmdutil._initialrevs(), |
|
|
4656 | 4656 | # then filter the result by logcmdutil._makerevset() and --limit |
|
|
4657 | 4657 | revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts) |
|
|
4658 | 4658 | |
|
|
4659 | 4659 | getcopies = None |
|
|
4660 | 4660 | if opts.get(b'copies'): |
|
|
4661 | 4661 | endrev = None |
|
|
4662 | 4662 | if revs: |
|
|
4663 | 4663 | endrev = revs.max() + 1 |
|
|
4664 | 4664 | getcopies = scmutil.getcopiesfn(repo, endrev=endrev) |
|
|
4665 | 4665 | |
|
|
4666 | 4666 | ui.pager(b'log') |
|
|
4667 | 4667 | displayer = logcmdutil.changesetdisplayer( |
|
|
4668 | 4668 | ui, repo, opts, differ, buffered=True |
|
|
4669 | 4669 | ) |
|
|
4670 | 4670 | if opts.get(b'graph'): |
|
|
4671 | 4671 | displayfn = logcmdutil.displaygraphrevs |
|
|
4672 | 4672 | else: |
|
|
4673 | 4673 | displayfn = logcmdutil.displayrevs |
|
|
4674 | 4674 | displayfn(ui, repo, revs, displayer, getcopies) |
|
|
4675 | 4675 | |
|
|
4676 | 4676 | |
|
|
4677 | 4677 | @command( |
|
|
4678 | 4678 | b'manifest', |
|
|
4679 | 4679 | [ |
|
|
4680 | 4680 | (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')), |
|
|
4681 | 4681 | (b'', b'all', False, _(b"list files from all revisions")), |
|
|
4682 | 4682 | ] |
|
|
4683 | 4683 | + formatteropts, |
|
|
4684 | 4684 | _(b'[-r REV]'), |
|
|
4685 | 4685 | helpcategory=command.CATEGORY_MAINTENANCE, |
|
|
4686 | 4686 | intents={INTENT_READONLY}, |
|
|
4687 | 4687 | ) |
|
|
4688 | 4688 | def manifest(ui, repo, node=None, rev=None, **opts): |
|
|
4689 | 4689 | """output the current or given revision of the project manifest |
|
|
4690 | 4690 | |
|
|
4691 | 4691 | Print a list of version controlled files for the given revision. |
|
|
4692 | 4692 | If no revision is given, the first parent of the working directory |
|
|
4693 | 4693 | is used, or the null revision if no revision is checked out. |
|
|
4694 | 4694 | |
|
|
4695 | 4695 | With -v, print file permissions, symlink and executable bits. |
|
|
4696 | 4696 | With --debug, print file revision hashes. |
|
|
4697 | 4697 | |
|
|
4698 | 4698 | If option --all is specified, the list of all files from all revisions |
|
|
4699 | 4699 | is printed. This includes deleted and renamed files. |
|
|
4700 | 4700 | |
|
|
4701 | 4701 | Returns 0 on success. |
|
|
4702 | 4702 | """ |
|
|
4703 | 4703 | opts = pycompat.byteskwargs(opts) |
|
|
4704 | 4704 | fm = ui.formatter(b'manifest', opts) |
|
|
4705 | 4705 | |
|
|
4706 | 4706 | if opts.get(b'all'): |
|
|
4707 | 4707 | if rev or node: |
|
|
4708 | 4708 | raise error.InputError(_(b"can't specify a revision with --all")) |
|
|
4709 | 4709 | |
|
|
4710 | 4710 | res = set() |
|
|
4711 | 4711 | for rev in repo: |
|
|
4712 | 4712 | ctx = repo[rev] |
|
|
4713 | 4713 | res |= set(ctx.files()) |
|
|
4714 | 4714 | |
|
|
4715 | 4715 | ui.pager(b'manifest') |
|
|
4716 | 4716 | for f in sorted(res): |
|
|
4717 | 4717 | fm.startitem() |
|
|
4718 | 4718 | fm.write(b"path", b'%s\n', f) |
|
|
4719 | 4719 | fm.end() |
|
|
4720 | 4720 | return |
|
|
4721 | 4721 | |
|
|
4722 | 4722 | if rev and node: |
|
|
4723 | 4723 | raise error.InputError(_(b"please specify just one revision")) |
|
|
4724 | 4724 | |
|
|
4725 | 4725 | if not node: |
|
|
4726 | 4726 | node = rev |
|
|
4727 | 4727 | |
|
|
4728 | 4728 | char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'} |
|
|
4729 | 4729 | mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'} |
|
|
4730 | 4730 | if node: |
|
|
4731 | 4731 | repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn') |
|
|
4732 | 4732 | ctx = scmutil.revsingle(repo, node) |
|
|
4733 | 4733 | mf = ctx.manifest() |
|
|
4734 | 4734 | ui.pager(b'manifest') |
|
|
4735 | 4735 | for f in ctx: |
|
|
4736 | 4736 | fm.startitem() |
|
|
4737 | 4737 | fm.context(ctx=ctx) |
|
|
4738 | 4738 | fl = ctx[f].flags() |
|
|
4739 | 4739 | fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f])) |
|
|
4740 | 4740 | fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl]) |
|
|
4741 | 4741 | fm.write(b'path', b'%s\n', f) |
|
|
4742 | 4742 | fm.end() |
|
|
4743 | 4743 | |
|
|
4744 | 4744 | |
|
|
4745 | 4745 | @command( |
|
|
4746 | 4746 | b'merge', |
|
|
4747 | 4747 | [ |
|
|
4748 | 4748 | ( |
|
|
4749 | 4749 | b'f', |
|
|
4750 | 4750 | b'force', |
|
|
4751 | 4751 | None, |
|
|
4752 | 4752 | _(b'force a merge including outstanding changes (DEPRECATED)'), |
|
|
4753 | 4753 | ), |
|
|
4754 | 4754 | (b'r', b'rev', b'', _(b'revision to merge'), _(b'REV')), |
|
|
4755 | 4755 | ( |
|
|
4756 | 4756 | b'P', |
|
|
4757 | 4757 | b'preview', |
|
|
4758 | 4758 | None, |
|
|
4759 | 4759 | _(b'review revisions to merge (no merge is performed)'), |
|
|
4760 | 4760 | ), |
|
|
4761 | 4761 | (b'', b'abort', None, _(b'abort the ongoing merge')), |
|
|
4762 | 4762 | ] |
|
|
4763 | 4763 | + mergetoolopts, |
|
|
4764 | 4764 | _(b'[-P] [[-r] REV]'), |
|
|
4765 | 4765 | helpcategory=command.CATEGORY_CHANGE_MANAGEMENT, |
|
|
4766 | 4766 | helpbasic=True, |
|
|
4767 | 4767 | ) |
|
|
4768 | 4768 | def merge(ui, repo, node=None, **opts): |
|
|
4769 | 4769 | """merge another revision into working directory |
|
|
4770 | 4770 | |
|
|
4771 | 4771 | The current working directory is updated with all changes made in |
|
|
4772 | 4772 | the requested revision since the last common predecessor revision. |
|
|
4773 | 4773 | |
|
|
4774 | 4774 | Files that changed between either parent are marked as changed for |
|
|
4775 | 4775 | the next commit and a commit must be performed before any further |
|
|
4776 | 4776 | updates to the repository are allowed. The next commit will have |
|
|
4777 | 4777 | two parents. |
|
|
4778 | 4778 | |
|
|
4779 | 4779 | ``--tool`` can be used to specify the merge tool used for file |
|
|
4780 | 4780 | merges. It overrides the HGMERGE environment variable and your |
|
|
4781 | 4781 | configuration files. See :hg:`help merge-tools` for options. |
|
|
4782 | 4782 | |
|
|
4783 | 4783 | If no revision is specified, the working directory's parent is a |
|
|
4784 | 4784 | head revision, and the current branch contains exactly one other |
|
|
4785 | 4785 | head, the other head is merged with by default. Otherwise, an |
|
|
4786 | 4786 | explicit revision with which to merge must be provided. |
|
|
4787 | 4787 | |
|
|
4788 | 4788 | See :hg:`help resolve` for information on handling file conflicts. |
|
|
4789 | 4789 | |
|
|
4790 | 4790 | To undo an uncommitted merge, use :hg:`merge --abort` which |
|
|
4791 | 4791 | will check out a clean copy of the original merge parent, losing |
|
|
4792 | 4792 | all changes. |
|
|
4793 | 4793 | |
|
|
4794 | 4794 | Returns 0 on success, 1 if there are unresolved files. |
|
|
4795 | 4795 | """ |
|
|
4796 | 4796 | |
|
|
4797 | 4797 | opts = pycompat.byteskwargs(opts) |
|
|
4798 | 4798 | abort = opts.get(b'abort') |
|
|
4799 | 4799 | if abort and repo.dirstate.p2() == nullid: |
|
|
4800 | 4800 | cmdutil.wrongtooltocontinue(repo, _(b'merge')) |
|
|
4801 | 4801 | cmdutil.check_incompatible_arguments(opts, b'abort', [b'rev', b'preview']) |
|
|
4802 | 4802 | if abort: |
|
|
4803 | 4803 | state = cmdutil.getunfinishedstate(repo) |
|
|
4804 | 4804 | if state and state._opname != b'merge': |
|
|
4805 | 4805 | raise error.StateError( |
|
|
4806 | 4806 | _(b'cannot abort merge with %s in progress') % (state._opname), |
|
|
4807 | 4807 | hint=state.hint(), |
|
|
4808 | 4808 | ) |
|
|
4809 | 4809 | if node: |
|
|
4810 | 4810 | raise error.InputError(_(b"cannot specify a node with --abort")) |
|
|
4811 | 4811 | return hg.abortmerge(repo.ui, repo) |
|
|
4812 | 4812 | |
|
|
4813 | 4813 | if opts.get(b'rev') and node: |
|
|
4814 | 4814 | raise error.InputError(_(b"please specify just one revision")) |
|
|
4815 | 4815 | if not node: |
|
|
4816 | 4816 | node = opts.get(b'rev') |
|
|
4817 | 4817 | |
|
|
4818 | 4818 | if node: |
|
|
4819 | 4819 | ctx = scmutil.revsingle(repo, node) |
|
|
4820 | 4820 | else: |
|
|
4821 | 4821 | if ui.configbool(b'commands', b'merge.require-rev'): |
|
|
4822 | 4822 | raise error.InputError( |
|
|
4823 | 4823 | _( |
|
|
4824 | 4824 | b'configuration requires specifying revision to merge ' |
|
|
4825 | 4825 | b'with' |
|
|
4826 | 4826 | ) |
|
|
4827 | 4827 | ) |
|
|
4828 | 4828 | ctx = repo[destutil.destmerge(repo)] |
|
|
4829 | 4829 | |
|
|
4830 | 4830 | if ctx.node() is None: |
|
|
4831 | 4831 | raise error.InputError( |
|
|
4832 | 4832 | _(b'merging with the working copy has no effect') |
|
|
4833 | 4833 | ) |
|
|
4834 | 4834 | |
|
|
4835 | 4835 | if opts.get(b'preview'): |
|
|
4836 | 4836 | # find nodes that are ancestors of p2 but not of p1 |
|
|
4837 | 4837 | p1 = repo[b'.'].node() |
|
|
4838 | 4838 | p2 = ctx.node() |
|
|
4839 | 4839 | nodes = repo.changelog.findmissing(common=[p1], heads=[p2]) |
|
|
4840 | 4840 | |
|
|
4841 | 4841 | displayer = logcmdutil.changesetdisplayer(ui, repo, opts) |
|
|
4842 | 4842 | for node in nodes: |
|
|
4843 | 4843 | displayer.show(repo[node]) |
|
|
4844 | 4844 | displayer.close() |
|
|
4845 | 4845 | return 0 |
|
|
4846 | 4846 | |
|
|
4847 | 4847 | # ui.forcemerge is an internal variable, do not document |
|
|
4848 | 4848 | overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')} |
|
|
4849 | 4849 | with ui.configoverride(overrides, b'merge'): |
|
|
4850 | 4850 | force = opts.get(b'force') |
|
|
4851 | 4851 | labels = [b'working copy', b'merge rev'] |
|
|
4852 | 4852 | return hg.merge(ctx, force=force, labels=labels) |
|
|
4853 | 4853 | |
|
|
4854 | 4854 | |
|
|
4855 | 4855 | statemod.addunfinished( |
|
|
4856 | 4856 | b'merge', |
|
|
4857 | 4857 | fname=None, |
|
|
4858 | 4858 | clearable=True, |
|
|
4859 | 4859 | allowcommit=True, |
|
|
4860 | 4860 | cmdmsg=_(b'outstanding uncommitted merge'), |
|
|
4861 | 4861 | abortfunc=hg.abortmerge, |
|
|
4862 | 4862 | statushint=_( |
|
|
4863 | 4863 | b'To continue: hg commit\nTo abort: hg merge --abort' |
|
|
4864 | 4864 | ), |
|
|
4865 | 4865 | cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"), |
|
|
4866 | 4866 | ) |
|
|
4867 | 4867 | |
|
|
4868 | 4868 | |
|
|
4869 | 4869 | @command( |
|
|
4870 | 4870 | b'outgoing|out', |
|
|
4871 | 4871 | [ |
|
|
4872 | 4872 | ( |
|
|
4873 | 4873 | b'f', |
|
|
4874 | 4874 | b'force', |
|
|
4875 | 4875 | None, |
|
|
4876 | 4876 | _(b'run even when the destination is unrelated'), |
|
|
4877 | 4877 | ), |
|
|
4878 | 4878 | ( |
|
|
4879 | 4879 | b'r', |
|
|
4880 | 4880 | b'rev', |
|
|
4881 | 4881 | [], |
|
|
4882 | 4882 | _(b'a changeset intended to be included in the destination'), |
|
|
4883 | 4883 | _(b'REV'), |
|
|
4884 | 4884 | ), |
|
|
4885 | 4885 | (b'n', b'newest-first', None, _(b'show newest record first')), |
|
|
4886 | 4886 | (b'B', b'bookmarks', False, _(b'compare bookmarks')), |
|
|
4887 | 4887 | ( |
|
|
4888 | 4888 | b'b', |
|
|
4889 | 4889 | b'branch', |
|
|
4890 | 4890 | [], |
|
|
4891 | 4891 | _(b'a specific branch you would like to push'), |
|
|
4892 | 4892 | _(b'BRANCH'), |
|
|
4893 | 4893 | ), |
|
|
4894 | 4894 | ] |
|
|
4895 | 4895 | + logopts |
|
|
4896 | 4896 | + remoteopts |
|
|
4897 | 4897 | + subrepoopts, |
|
|
4898 | 4898 | _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]'), |
|
|
4899 | 4899 | helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT, |
|
|
4900 | 4900 | ) |
|
|
4901 | 4901 | def outgoing(ui, repo, dest=None, **opts): |
|
|
4902 | 4902 | """show changesets not found in the destination |
|
|
4903 | 4903 | |
|
|
4904 | 4904 | Show changesets not found in the specified destination repository |
|
|
4905 | 4905 | or the default push location. These are the changesets that would |
|
|
4906 | 4906 | be pushed if a push was requested. |
|
|
4907 | 4907 | |
|
|
4908 | 4908 | See pull for details of valid destination formats. |
|
|
4909 | 4909 | |
|
|
4910 | 4910 | .. container:: verbose |
|
|
4911 | 4911 | |
|
|
4912 | 4912 | With -B/--bookmarks, the result of bookmark comparison between |
|
|
4913 | 4913 | local and remote repositories is displayed. With -v/--verbose, |
|
|
4914 | 4914 | status is also displayed for each bookmark like below:: |
|
|
4915 | 4915 | |
|
|
4916 | 4916 | BM1 01234567890a added |
|
|
4917 | 4917 | BM2 deleted |
|
|
4918 | 4918 | BM3 234567890abc advanced |
|
|
4919 | 4919 | BM4 34567890abcd diverged |
|
|
4920 | 4920 | BM5 4567890abcde changed |
|
|
4921 | 4921 | |
|
|
4922 | 4922 | The action taken when pushing depends on the |
|
|
4923 | 4923 | status of each bookmark: |
|
|
4924 | 4924 | |
|
|
4925 | 4925 | :``added``: push with ``-B`` will create it |
|
|
4926 | 4926 | :``deleted``: push with ``-B`` will delete it |
|
|
4927 | 4927 | :``advanced``: push will update it |
|
|
4928 | 4928 | :``diverged``: push with ``-B`` will update it |
|
|
4929 | 4929 | :``changed``: push with ``-B`` will update it |
|
|
4930 | 4930 | |
|
|
4931 | 4931 | From the point of view of pushing behavior, bookmarks |
|
|
4932 | 4932 | existing only in the remote repository are treated as |
|
|
4933 | 4933 | ``deleted``, even if it is in fact added remotely. |
|
|
4934 | 4934 | |
|
|
4935 | 4935 | Returns 0 if there are outgoing changes, 1 otherwise. |
|
|
4936 | 4936 | """ |
|
|
4937 | 4937 | # hg._outgoing() needs to re-resolve the path in order to handle #branch |
|
|
4938 | 4938 | # style URLs, so don't overwrite dest. |
|
|
4939 | 4939 | path = ui.paths.getpath(dest, default=(b'default-push', b'default')) |
|
|
4940 | 4940 | if not path: |
|
|
4941 | 4941 | raise error.ConfigError( |
|
|
4942 | 4942 | _(b'default repository not configured!'), |
|
|
4943 | 4943 | hint=_(b"see 'hg help config.paths'"), |
|
|
4944 | 4944 | ) |
|
|
4945 | 4945 | |
|
|
4946 | 4946 | opts = pycompat.byteskwargs(opts) |
|
|
4947 | 4947 | if opts.get(b'graph'): |
|
|
4948 | 4948 | logcmdutil.checkunsupportedgraphflags([], opts) |
|
|
4949 | 4949 | o, other = hg._outgoing(ui, repo, dest, opts) |
|
|
4950 | 4950 | if not o: |
|
|
4951 | 4951 | cmdutil.outgoinghooks(ui, repo, other, opts, o) |
|
|
4952 | 4952 | return |
|
|
4953 | 4953 | |
|
|
4954 | 4954 | revdag = logcmdutil.graphrevs(repo, o, opts) |
|
|
4955 | 4955 | ui.pager(b'outgoing') |
|
|
4956 | 4956 | displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True) |
|
|
4957 | 4957 | logcmdutil.displaygraph( |
|
|
4958 | 4958 | ui, repo, revdag, displayer, graphmod.asciiedges |
|
|
4959 | 4959 | ) |
|
|
4960 | 4960 | cmdutil.outgoinghooks(ui, repo, other, opts, o) |
|
|
4961 | 4961 | return 0 |
|
|
4962 | 4962 | |
|
|
4963 | 4963 | if opts.get(b'bookmarks'): |
|
|
4964 | 4964 | dest = path.pushloc or path.loc |
|
|
4965 | 4965 | other = hg.peer(repo, opts, dest) |
|
|
4966 | 4966 | if b'bookmarks' not in other.listkeys(b'namespaces'): |
|
|
4967 | 4967 | ui.warn(_(b"remote doesn't support bookmarks\n")) |
|
|
4968 | 4968 | return 0 |
|
|
4969 | 4969 | ui.status(_(b'comparing with %s\n') % util.hidepassword(dest)) |
|
|
4970 | 4970 | ui.pager(b'outgoing') |
|
|
4971 | 4971 | return bookmarks.outgoing(ui, repo, other) |
|
|
4972 | 4972 | |
|
|
4973 | 4973 | repo._subtoppath = path.pushloc or path.loc |
|
|
4974 | 4974 | try: |
|
|
4975 | 4975 | return hg.outgoing(ui, repo, dest, opts) |
|
|
4976 | 4976 | finally: |
|
|
4977 | 4977 | del repo._subtoppath |
|
|
4978 | 4978 | |
|
|
4979 | 4979 | |
|
|
4980 | 4980 | @command( |
|
|
4981 | 4981 | b'parents', |
|
|
4982 | 4982 | [ |
|
|
4983 | 4983 | ( |
|
|
4984 | 4984 | b'r', |
|
|
4985 | 4985 | b'rev', |
|
|
4986 | 4986 | b'', |
|
|
4987 | 4987 | _(b'show parents of the specified revision'), |
|
|
4988 | 4988 | _(b'REV'), |
|
|
4989 | 4989 | ), |
|
|
4990 | 4990 | ] |
|
|
4991 | 4991 | + templateopts, |
|
|
4992 | 4992 | _(b'[-r REV] [FILE]'), |
|
|
4993 | 4993 | helpcategory=command.CATEGORY_CHANGE_NAVIGATION, |
|
|
4994 | 4994 | inferrepo=True, |
|
|
4995 | 4995 | ) |
|
|
4996 | 4996 | def parents(ui, repo, file_=None, **opts): |
|
|
4997 | 4997 | """show the parents of the working directory or revision (DEPRECATED) |
|
|
4998 | 4998 | |
|
|
4999 | 4999 | Print the working directory's parent revisions. If a revision is |
|
|
5000 | 5000 | given via -r/--rev, the parent of that revision will be printed. |
|
|
5001 | 5001 | If a file argument is given, the revision in which the file was |
|
|
5002 | 5002 | last changed (before the working directory revision or the |
|
|
5003 | 5003 | argument to --rev if given) is printed. |
|
|
5004 | 5004 | |
|
|
5005 | 5005 | This command is equivalent to:: |
|
|
5006 | 5006 | |
|
|
5007 | 5007 | hg log -r "p1()+p2()" or |
|
|
5008 | 5008 | hg log -r "p1(REV)+p2(REV)" or |
|
|
5009 | 5009 | hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or |
|
|
5010 | 5010 | hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))" |
|
|
5011 | 5011 | |
|
|
5012 | 5012 | See :hg:`summary` and :hg:`help revsets` for related information. |
|
|
5013 | 5013 | |
|
|
5014 | 5014 | Returns 0 on success. |
|
|
5015 | 5015 | """ |
|
|
5016 | 5016 | |
|
|
5017 | 5017 | opts = pycompat.byteskwargs(opts) |
|
|
5018 | 5018 | rev = opts.get(b'rev') |
|
|
5019 | 5019 | if rev: |
|
|
5020 | 5020 | repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn') |
|
|
5021 | 5021 | ctx = scmutil.revsingle(repo, rev, None) |
|
|
5022 | 5022 | |
|
|
5023 | 5023 | if file_: |
|
|
5024 | 5024 | m = scmutil.match(ctx, (file_,), opts) |
|
|
5025 | 5025 | if m.anypats() or len(m.files()) != 1: |
|
|
5026 | 5026 | raise error.InputError(_(b'can only specify an explicit filename')) |
|
|
5027 | 5027 | file_ = m.files()[0] |
|
|
5028 | 5028 | filenodes = [] |
|
|
5029 | 5029 | for cp in ctx.parents(): |
|
|
5030 | 5030 | if not cp: |
|
|
5031 | 5031 | continue |
|
|
5032 | 5032 | try: |
|
|
5033 | 5033 | filenodes.append(cp.filenode(file_)) |
|
|
5034 | 5034 | except error.LookupError: |
|
|
5035 | 5035 | pass |
|
|
5036 | 5036 | if not filenodes: |
|
|
5037 | 5037 | raise error.InputError(_(b"'%s' not found in manifest") % file_) |
|
|
5038 | 5038 | p = [] |
|
|
5039 | 5039 | for fn in filenodes: |
|
|
5040 | 5040 | fctx = repo.filectx(file_, fileid=fn) |
|
|
5041 | 5041 | p.append(fctx.node()) |
|
|
5042 | 5042 | else: |
|
|
5043 | 5043 | p = [cp.node() for cp in ctx.parents()] |
|
|
5044 | 5044 | |
|
|
5045 | 5045 | displayer = logcmdutil.changesetdisplayer(ui, repo, opts) |
|
|
5046 | 5046 | for n in p: |
|
|
5047 | 5047 | if n != nullid: |
|
|
5048 | 5048 | displayer.show(repo[n]) |
|
|
5049 | 5049 | displayer.close() |
|
|
5050 | 5050 | |
|
|
5051 | 5051 | |
|
|
5052 | 5052 | @command( |
|
|
5053 | 5053 | b'paths', |
|
|
5054 | 5054 | formatteropts, |
|
|
5055 | 5055 | _(b'[NAME]'), |
|
|
5056 | 5056 | helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT, |
|
|
5057 | 5057 | optionalrepo=True, |
|
|
5058 | 5058 | intents={INTENT_READONLY}, |
|
|
5059 | 5059 | ) |
|
|
5060 | 5060 | def paths(ui, repo, search=None, **opts): |
|
|
5061 | 5061 | """show aliases for remote repositories |
|
|
5062 | 5062 | |
|
|
5063 | 5063 | Show definition of symbolic path name NAME. If no name is given, |
|
|
5064 | 5064 | show definition of all available names. |
|
|
5065 | 5065 | |
|
|
5066 | 5066 | Option -q/--quiet suppresses all output when searching for NAME |
|
|
5067 | 5067 | and shows only the path names when listing all definitions. |
|
|
5068 | 5068 | |
|
|
5069 | 5069 | Path names are defined in the [paths] section of your |
|
|
5070 | 5070 | configuration file and in ``/etc/mercurial/hgrc``. If run inside a |
|
|
5071 | 5071 | repository, ``.hg/hgrc`` is used, too. |
|
|
5072 | 5072 | |
|
|
5073 | 5073 | The path names ``default`` and ``default-push`` have a special |
|
|
5074 | 5074 | meaning. When performing a push or pull operation, they are used |
|
|
5075 | 5075 | as fallbacks if no location is specified on the command-line. |
|
|
5076 | 5076 | When ``default-push`` is set, it will be used for push and |
|
|
5077 | 5077 | ``default`` will be used for pull; otherwise ``default`` is used |
|
|
5078 | 5078 | as the fallback for both. When cloning a repository, the clone |
|
|
5079 | 5079 | source is written as ``default`` in ``.hg/hgrc``. |
|
|
5080 | 5080 | |
|
|
5081 | 5081 | .. note:: |
|
|
5082 | 5082 | |
|
|
5083 | 5083 | ``default`` and ``default-push`` apply to all inbound (e.g. |
|
|
5084 | 5084 | :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` |
|
|
5085 | 5085 | and :hg:`bundle`) operations. |
|
|
5086 | 5086 | |
|
|
5087 | 5087 | See :hg:`help urls` for more information. |
|
|
5088 | 5088 | |
|
|
5089 | 5089 | .. container:: verbose |
|
|
5090 | 5090 | |
|
|
5091 | 5091 | Template: |
|
|
5092 | 5092 | |
|
|
5093 | 5093 | The following keywords are supported. See also :hg:`help templates`. |
|
|
5094 | 5094 | |
|
|
5095 | 5095 | :name: String. Symbolic name of the path alias. |
|
|
5096 | 5096 | :pushurl: String. URL for push operations. |
|
|
5097 | 5097 | :url: String. URL or directory path for the other operations. |
|
|
5098 | 5098 | |
|
|
5099 | 5099 | Returns 0 on success. |
|
|
5100 | 5100 | """ |
|
|
5101 | 5101 | |
|
|
5102 | 5102 | opts = pycompat.byteskwargs(opts) |
|
|
5103 | 5103 | ui.pager(b'paths') |
|
|
5104 | 5104 | if search: |
|
|
5105 | 5105 | pathitems = [ |
|
|
5106 | 5106 | (name, path) |
|
|
5107 | 5107 | for name, path in pycompat.iteritems(ui.paths) |
|
|
5108 | 5108 | if name == search |
|
|
5109 | 5109 | ] |
|
|
5110 | 5110 | else: |
|
|
5111 | 5111 | pathitems = sorted(pycompat.iteritems(ui.paths)) |
|
|
5112 | 5112 | |
|
|
5113 | 5113 | fm = ui.formatter(b'paths', opts) |
|
|
5114 | 5114 | if fm.isplain(): |
|
|
5115 | 5115 | hidepassword = util.hidepassword |
|
|
5116 | 5116 | else: |
|
|
5117 | 5117 | hidepassword = bytes |
|
|
5118 | 5118 | if ui.quiet: |
|
|
5119 | 5119 | namefmt = b'%s\n' |
|
|
5120 | 5120 | else: |
|
|
5121 | 5121 | namefmt = b'%s = ' |
|
|
5122 | 5122 | showsubopts = not search and not ui.quiet |
|
|
5123 | 5123 | |
|
|
5124 | 5124 | for name, path in pathitems: |
|
|
5125 | 5125 | fm.startitem() |
|
|
5126 | 5126 | fm.condwrite(not search, b'name', namefmt, name) |
|
|
5127 | 5127 | fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc)) |
|
|
5128 | 5128 | for subopt, value in sorted(path.suboptions.items()): |
|
|
5129 | 5129 | assert subopt not in (b'name', b'url') |
|
|
5130 | 5130 | if showsubopts: |
|
|
5131 | 5131 | fm.plain(b'%s:%s = ' % (name, subopt)) |
|
|
5132 | 5132 | fm.condwrite(showsubopts, subopt, b'%s\n', value) |
|
|
5133 | 5133 | |
|
|
5134 | 5134 | fm.end() |
|
|
5135 | 5135 | |
|
|
5136 | 5136 | if search and not pathitems: |
|
|
5137 | 5137 | if not ui.quiet: |
|
|
5138 | 5138 | ui.warn(_(b"not found!\n")) |
|
|
5139 | 5139 | return 1 |
|
|
5140 | 5140 | else: |
|
|
5141 | 5141 | return 0 |
|
|
5142 | 5142 | |
|
|
5143 | 5143 | |
|
|
5144 | 5144 | @command( |
|
|
5145 | 5145 | b'phase', |
|
|
5146 | 5146 | [ |
|
|
5147 | 5147 | (b'p', b'public', False, _(b'set changeset phase to public')), |
|
|
5148 | 5148 | (b'd', b'draft', False, _(b'set changeset phase to draft')), |
|
|
5149 | 5149 | (b's', b'secret', False, _(b'set changeset phase to secret')), |
|
|
5150 | 5150 | (b'f', b'force', False, _(b'allow to move boundary backward')), |
|
|
5151 | 5151 | (b'r', b'rev', [], _(b'target revision'), _(b'REV')), |
|
|
5152 | 5152 | ], |
|
|
5153 | 5153 | _(b'[-p|-d|-s] [-f] [-r] [REV...]'), |
|
|
5154 | 5154 | helpcategory=command.CATEGORY_CHANGE_ORGANIZATION, |
|
|
5155 | 5155 | ) |
|
|
5156 | 5156 | def phase(ui, repo, *revs, **opts): |
|
|
5157 | 5157 | """set or show the current phase name |
|
|
5158 | 5158 | |
|
|
5159 | 5159 | With no argument, show the phase name of the current revision(s). |
|
|
5160 | 5160 | |
|
|
5161 | 5161 | With one of -p/--public, -d/--draft or -s/--secret, change the |
|
|
5162 | 5162 | phase value of the specified revisions. |
|
|
5163 | 5163 | |
|
|
5164 | 5164 | Unless -f/--force is specified, :hg:`phase` won't move changesets from a |
|
|
5165 | 5165 | lower phase to a higher phase. Phases are ordered as follows:: |
|
|
5166 | 5166 | |
|
|
5167 | 5167 | public < draft < secret |
|
|
5168 | 5168 | |
|
|
5169 | 5169 | Returns 0 on success, 1 if some phases could not be changed. |
|
|
5170 | 5170 | |
|
|
5171 | 5171 | (For more information about the phases concept, see :hg:`help phases`.) |
|
|
5172 | 5172 | """ |
|
|
5173 | 5173 | opts = pycompat.byteskwargs(opts) |
|
|
5174 | 5174 | # search for a unique phase argument |
|
|
5175 | 5175 | targetphase = None |
|
|
5176 | 5176 | for idx, name in enumerate(phases.cmdphasenames): |
|
|
5177 | 5177 | if opts[name]: |
|
|
5178 | 5178 | if targetphase is not None: |
|
|
5179 | 5179 | raise error.InputError(_(b'only one phase can be specified')) |
|
|
5180 | 5180 | targetphase = idx |
|
|
5181 | 5181 | |
|
|
5182 | 5182 | # look for specified revision |
|
|
5183 | 5183 | revs = list(revs) |
|
|
5184 | 5184 | revs.extend(opts[b'rev']) |
|
|
5185 | 5185 | if not revs: |
|
|
5186 | 5186 | # display both parents as the second parent phase can influence |
|
|
5187 | 5187 | # the phase of a merge commit |
|
|
5188 | 5188 | revs = [c.rev() for c in repo[None].parents()] |
|
|
5189 | 5189 | |
|
|
5190 | 5190 | revs = scmutil.revrange(repo, revs) |
|
|
5191 | 5191 | |
|
|
5192 | 5192 | ret = 0 |
|
|
5193 | 5193 | if targetphase is None: |
|
|
5194 | 5194 | # display |
|
|
5195 | 5195 | for r in revs: |
|
|
5196 | 5196 | ctx = repo[r] |
|
|
5197 | 5197 | ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr())) |
|
|
5198 | 5198 | else: |
|
|
5199 | 5199 | with repo.lock(), repo.transaction(b"phase") as tr: |
|
|
5200 | 5200 | # set phase |
|
|
5201 | 5201 | if not revs: |
|
|
5202 | 5202 | raise error.InputError(_(b'empty revision set')) |
|
|
5203 | 5203 | nodes = [repo[r].node() for r in revs] |
|
|
5204 | 5204 | # moving revision from public to draft may hide them |
|
|
5205 | 5205 | # We have to check result on an unfiltered repository |
|
|
5206 | 5206 | unfi = repo.unfiltered() |
|
|
5207 | 5207 | getphase = unfi._phasecache.phase |
|
|
5208 | 5208 | olddata = [getphase(unfi, r) for r in unfi] |
|
|
5209 | 5209 | phases.advanceboundary(repo, tr, targetphase, nodes) |
|
|
5210 | 5210 | if opts[b'force']: |
|
|
5211 | 5211 | phases.retractboundary(repo, tr, targetphase, nodes) |
|
|
5212 | 5212 | getphase = unfi._phasecache.phase |
|
|
5213 | 5213 | newdata = [getphase(unfi, r) for r in unfi] |
|
|
5214 | 5214 | changes = sum(newdata[r] != olddata[r] for r in unfi) |
|
|
5215 | 5215 | cl = unfi.changelog |
|
|
5216 | 5216 | rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase] |
|
|
5217 | 5217 | if rejected: |
|
|
5218 | 5218 | ui.warn( |
|
|
5219 | 5219 | _( |
|
|
5220 | 5220 | b'cannot move %i changesets to a higher ' |
|
|
5221 | 5221 | b'phase, use --force\n' |
|
|
5222 | 5222 | ) |
|
|
5223 | 5223 | % len(rejected) |
|
|
5224 | 5224 | ) |
|
|
5225 | 5225 | ret = 1 |
|
|
5226 | 5226 | if changes: |
|
|
5227 | 5227 | msg = _(b'phase changed for %i changesets\n') % changes |
|
|
5228 | 5228 | if ret: |
|
|
5229 | 5229 | ui.status(msg) |
|
|
5230 | 5230 | else: |
|
|
5231 | 5231 | ui.note(msg) |
|
|
5232 | 5232 | else: |
|
|
5233 | 5233 | ui.warn(_(b'no phases changed\n')) |
|
|
5234 | 5234 | return ret |
|
|
5235 | 5235 | |
|
|
5236 | 5236 | |
|
|
5237 | 5237 | def postincoming(ui, repo, modheads, optupdate, checkout, brev): |
|
|
5238 | 5238 | """Run after a changegroup has been added via pull/unbundle |
|
|
5239 | 5239 | |
|
|
5240 | 5240 | This takes arguments below: |
|
|
5241 | 5241 | |
|
|
5242 | 5242 | :modheads: change of heads by pull/unbundle |
|
|
5243 | 5243 | :optupdate: updating working directory is needed or not |
|
|
5244 | 5244 | :checkout: update destination revision (or None to default destination) |
|
|
5245 | 5245 | :brev: a name, which might be a bookmark to be activated after updating |
|
|
5246 | 5246 | """ |
|
|
5247 | 5247 | if modheads == 0: |
|
|
5248 | 5248 | return |
|
|
5249 | 5249 | if optupdate: |
|
|
5250 | 5250 | try: |
|
|
5251 | 5251 | return hg.updatetotally(ui, repo, checkout, brev) |
|
|
5252 | 5252 | except error.UpdateAbort as inst: |
|
|
5253 | 5253 | msg = _(b"not updating: %s") % stringutil.forcebytestr(inst) |
|
|
5254 | 5254 | hint = inst.hint |
|
|
5255 | 5255 | raise error.UpdateAbort(msg, hint=hint) |
|
|
5256 | 5256 | if modheads is not None and modheads > 1: |
|
|
5257 | 5257 | currentbranchheads = len(repo.branchheads()) |
|
|
5258 | 5258 | if currentbranchheads == modheads: |
|
|
5259 | 5259 | ui.status( |
|
|
5260 | 5260 | _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n") |
|
|
5261 | 5261 | ) |
|
|
5262 | 5262 | elif currentbranchheads > 1: |
|
|
5263 | 5263 | ui.status( |
|
|
5264 | 5264 | _(b"(run 'hg heads .' to see heads, 'hg merge' to merge)\n") |
|
|
5265 | 5265 | ) |
|
|
5266 | 5266 | else: |
|
|
5267 | 5267 | ui.status(_(b"(run 'hg heads' to see heads)\n")) |
|
|
5268 | 5268 | elif not ui.configbool(b'commands', b'update.requiredest'): |
|
|
5269 | 5269 | ui.status(_(b"(run 'hg update' to get a working copy)\n")) |
|
|
5270 | 5270 | |
|
|
5271 | 5271 | |
|
|
5272 | 5272 | @command( |
|
|
5273 | 5273 | b'pull', |
|
|
5274 | 5274 | [ |
|
|
5275 | 5275 | ( |
|
|
5276 | 5276 | b'u', |
|
|
5277 | 5277 | b'update', |
|
|
5278 | 5278 | None, |
|
|
5279 | 5279 | _(b'update to new branch head if new descendants were pulled'), |
|
|
5280 | 5280 | ), |
|
|
5281 | 5281 | ( |
|
|
5282 | 5282 | b'f', |
|
|
5283 | 5283 | b'force', |
|
|
5284 | 5284 | None, |
|
|
5285 | 5285 | _(b'run even when remote repository is unrelated'), |
|
|
5286 | 5286 | ), |
|
|
5287 | 5287 | ( |
|
|
5288 | 5288 | b'', |
|
|
5289 | 5289 | b'confirm', |
|
|
5290 | 5290 | None, |
|
|
5291 | 5291 | _(b'confirm pull before applying changes'), |
|
|
5292 | 5292 | ), |
|
|
5293 | 5293 | ( |
|
|
5294 | 5294 | b'r', |
|
|
5295 | 5295 | b'rev', |
|
|
5296 | 5296 | [], |
|
|
5297 | 5297 | _(b'a remote changeset intended to be added'), |
|
|
5298 | 5298 | _(b'REV'), |
|
|
5299 | 5299 | ), |
|
|
5300 | 5300 | (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')), |
|
|
5301 | 5301 | ( |
|
|
5302 | 5302 | b'b', |
|
|
5303 | 5303 | b'branch', |
|
|
5304 | 5304 | [], |
|
|
5305 | 5305 | _(b'a specific branch you would like to pull'), |
|
|
5306 | 5306 | _(b'BRANCH'), |
|
|
5307 | 5307 | ), |
|
|
5308 | 5308 | ] |
|
|
5309 | 5309 | + remoteopts, |
|
|
5310 | 5310 | _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'), |
|
|
5311 | 5311 | helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT, |
|
|
5312 | 5312 | helpbasic=True, |
|
|
5313 | 5313 | ) |
|
|
5314 | 5314 | def pull(ui, repo, source=b"default", **opts): |
|
|
5315 | 5315 | """pull changes from the specified source |
|
|
5316 | 5316 | |
|
|
5317 | 5317 | Pull changes from a remote repository to a local one. |
|
|
5318 | 5318 | |
|
|
5319 | 5319 | This finds all changes from the repository at the specified path |
|
|
5320 | 5320 | or URL and adds them to a local repository (the current one unless |
|
|
5321 | 5321 | -R is specified). By default, this does not update the copy of the |
|
|
5322 | 5322 | project in the working directory. |
|
|
5323 | 5323 | |
|
|
5324 | 5324 | When cloning from servers that support it, Mercurial may fetch |
|
|
5325 | 5325 | pre-generated data. When this is done, hooks operating on incoming |
|
|
5326 | 5326 | changesets and changegroups may fire more than once, once for each |
|
|
5327 | 5327 | pre-generated bundle and as well as for any additional remaining |
|
|
5328 | 5328 | data. See :hg:`help -e clonebundles` for more. |
|
|
5329 | 5329 | |
|
|
5330 | 5330 | Use :hg:`incoming` if you want to see what would have been added |
|
|
5331 | 5331 | by a pull at the time you issued this command. If you then decide |
|
|
5332 | 5332 | to add those changes to the repository, you should use :hg:`pull |
|
|
5333 | 5333 | -r X` where ``X`` is the last changeset listed by :hg:`incoming`. |
|
|
5334 | 5334 | |
|
|
5335 | 5335 | If SOURCE is omitted, the 'default' path will be used. |
|
|
5336 | 5336 | See :hg:`help urls` for more information. |
|
|
5337 | 5337 | |
|
|
5338 | 5338 | Specifying bookmark as ``.`` is equivalent to specifying the active |
|
|
5339 | 5339 | bookmark's name. |
|
|
5340 | 5340 | |
|
|
5341 | 5341 | Returns 0 on success, 1 if an update had unresolved files. |
|
|
5342 | 5342 | """ |
|
|
5343 | 5343 | |
|
|
5344 | 5344 | opts = pycompat.byteskwargs(opts) |
|
|
5345 | 5345 | if ui.configbool(b'commands', b'update.requiredest') and opts.get( |
|
|
5346 | 5346 | b'update' |
|
|
5347 | 5347 | ): |
|
|
5348 | 5348 | msg = _(b'update destination required by configuration') |
|
|
5349 | 5349 | hint = _(b'use hg pull followed by hg update DEST') |
|
|
5350 | 5350 | raise error.InputError(msg, hint=hint) |
|
|
5351 | 5351 | |
|
|
5352 | 5352 | source, branches = hg.parseurl(ui.expandpath(source), opts.get(b'branch')) |
|
|
5353 | 5353 | ui.status(_(b'pulling from %s\n') % util.hidepassword(source)) |
|
|
5354 | 5354 | ui.flush() |
|
|
5355 | 5355 | other = hg.peer(repo, opts, source) |
|
|
5356 | 5356 | try: |
|
|
5357 | 5357 | revs, checkout = hg.addbranchrevs( |
|
|
5358 | 5358 | repo, other, branches, opts.get(b'rev') |
|
|
5359 | 5359 | ) |
|
|
5360 | 5360 | |
|
|
5361 | 5361 | pullopargs = {} |
|
|
5362 | 5362 | |
|
|
5363 | 5363 | nodes = None |
|
|
5364 | 5364 | if opts.get(b'bookmark') or revs: |
|
|
5365 | 5365 | # The list of bookmark used here is the same used to actually update |
|
|
5366 | 5366 | # the bookmark names, to avoid the race from issue 4689 and we do |
|
|
5367 | 5367 | # all lookup and bookmark queries in one go so they see the same |
|
|
5368 | 5368 | # version of the server state (issue 4700). |
|
|
5369 | 5369 | nodes = [] |
|
|
5370 | 5370 | fnodes = [] |
|
|
5371 | 5371 | revs = revs or [] |
|
|
5372 | 5372 | if revs and not other.capable(b'lookup'): |
|
|
5373 | 5373 | err = _( |
|
|
5374 | 5374 | b"other repository doesn't support revision lookup, " |
|
|
5375 | 5375 | b"so a rev cannot be specified." |
|
|
5376 | 5376 | ) |
|
|
5377 | 5377 | raise error.Abort(err) |
|
|
5378 | 5378 | with other.commandexecutor() as e: |
|
|
5379 | 5379 | fremotebookmarks = e.callcommand( |
|
|
5380 | 5380 | b'listkeys', {b'namespace': b'bookmarks'} |
|
|
5381 | 5381 | ) |
|
|
5382 | 5382 | for r in revs: |
|
|
5383 | 5383 | fnodes.append(e.callcommand(b'lookup', {b'key': r})) |
|
|
5384 | 5384 | remotebookmarks = fremotebookmarks.result() |
|
|
5385 | 5385 | remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks) |
|
|
5386 | 5386 | pullopargs[b'remotebookmarks'] = remotebookmarks |
|
|
5387 | 5387 | for b in opts.get(b'bookmark', []): |
|
|
5388 | 5388 | b = repo._bookmarks.expandname(b) |
|
|
5389 | 5389 | if b not in remotebookmarks: |
|
|
5390 | 5390 | raise error.InputError( |
|
|
5391 | 5391 | _(b'remote bookmark %s not found!') % b |
|
|
5392 | 5392 | ) |
|
|
5393 | 5393 | nodes.append(remotebookmarks[b]) |
|
|
5394 | 5394 | for i, rev in enumerate(revs): |
|
|
5395 | 5395 | node = fnodes[i].result() |
|
|
5396 | 5396 | nodes.append(node) |
|
|
5397 | 5397 | if rev == checkout: |
|
|
5398 | 5398 | checkout = node |
|
|
5399 | 5399 | |
|
|
5400 | 5400 | wlock = util.nullcontextmanager() |
|
|
5401 | 5401 | if opts.get(b'update'): |
|
|
5402 | 5402 | wlock = repo.wlock() |
|
|
5403 | 5403 | with wlock: |
|
|
5404 | 5404 | pullopargs.update(opts.get(b'opargs', {})) |
|
|
5405 | 5405 | modheads = exchange.pull( |
|
|
5406 | 5406 | repo, |
|
|
5407 | 5407 | other, |
|
|
5408 | 5408 | heads=nodes, |
|
|
5409 | 5409 | force=opts.get(b'force'), |
|
|
5410 | 5410 | bookmarks=opts.get(b'bookmark', ()), |
|
|
5411 | 5411 | opargs=pullopargs, |
|
|
5412 | 5412 | confirm=opts.get(b'confirm'), |
|
|
5413 | 5413 | ).cgresult |
|
|
5414 | 5414 | |
|
|
5415 | 5415 | # brev is a name, which might be a bookmark to be activated at |
|
|
5416 | 5416 | # the end of the update. In other words, it is an explicit |
|
|
5417 | 5417 | # destination of the update |
|
|
5418 | 5418 | brev = None |
|
|
5419 | 5419 | |
|
|
5420 | 5420 | if checkout: |
|
|
5421 | 5421 | checkout = repo.unfiltered().changelog.rev(checkout) |
|
|
5422 | 5422 | |
|
|
5423 | 5423 | # order below depends on implementation of |
|
|
5424 | 5424 | # hg.addbranchrevs(). opts['bookmark'] is ignored, |
|
|
5425 | 5425 | # because 'checkout' is determined without it. |
|
|
5426 | 5426 | if opts.get(b'rev'): |
|
|
5427 | 5427 | brev = opts[b'rev'][0] |
|
|
5428 | 5428 | elif opts.get(b'branch'): |
|
|
5429 | 5429 | brev = opts[b'branch'][0] |
|
|
5430 | 5430 | else: |
|
|
5431 | 5431 | brev = branches[0] |
|
|
5432 | 5432 | repo._subtoppath = source |
|
|
5433 | 5433 | try: |
|
|
5434 | 5434 | ret = postincoming( |
|
|
5435 | 5435 | ui, repo, modheads, opts.get(b'update'), checkout, brev |
|
|
5436 | 5436 | ) |
|
|
5437 | 5437 | except error.FilteredRepoLookupError as exc: |
|
|
5438 | 5438 | msg = _(b'cannot update to target: %s') % exc.args[0] |
|
|
5439 | 5439 | exc.args = (msg,) + exc.args[1:] |
|
|
5440 | 5440 | raise |
|
|
5441 | 5441 | finally: |
|
|
5442 | 5442 | del repo._subtoppath |
|
|
5443 | 5443 | |
|
|
5444 | 5444 | finally: |
|
|
5445 | 5445 | other.close() |
|
|
5446 | 5446 | return ret |
|
|
5447 | 5447 | |
|
|
5448 | 5448 | |
|
|
5449 | 5449 | @command( |
|
|
5450 | 5450 | b'push', |
|
|
5451 | 5451 | [ |
|
|
5452 | 5452 | (b'f', b'force', None, _(b'force push')), |
|
|
5453 | 5453 | ( |
|
|
5454 | 5454 | b'r', |
|
|
5455 | 5455 | b'rev', |
|
|
5456 | 5456 | [], |
|
|
5457 | 5457 | _(b'a changeset intended to be included in the destination'), |
|
|
5458 | 5458 | _(b'REV'), |
|
|
5459 | 5459 | ), |
|
|
5460 | 5460 | (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')), |
|
|
5461 | 5461 | (b'', b'all-bookmarks', None, _(b"push all bookmarks (EXPERIMENTAL)")), |
|
|
5462 | 5462 | ( |
|
|
5463 | 5463 | b'b', |
|
|
5464 | 5464 | b'branch', |
|
|
5465 | 5465 | [], |
|
|
5466 | 5466 | _(b'a specific branch you would like to push'), |
|
|
5467 | 5467 | _(b'BRANCH'), |
|
|
5468 | 5468 | ), |
|
|
5469 | 5469 | (b'', b'new-branch', False, _(b'allow pushing a new branch')), |
|
|
5470 | 5470 | ( |
|
|
5471 | 5471 | b'', |
|
|
5472 | 5472 | b'pushvars', |
|
|
5473 | 5473 | [], |
|
|
5474 | 5474 | _(b'variables that can be sent to server (ADVANCED)'), |
|
|
5475 | 5475 | ), |
|
|
5476 | 5476 | ( |
|
|
5477 | 5477 | b'', |
|
|
5478 | 5478 | b'publish', |
|
|
5479 | 5479 | False, |
|
|
5480 | 5480 | _(b'push the changeset as public (EXPERIMENTAL)'), |
|
|
5481 | 5481 | ), |
|
|
5482 | 5482 | ] |
|
|
5483 | 5483 | + remoteopts, |
|
|
5484 | 5484 | _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'), |
|
|
5485 | 5485 | helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT, |
|
|
5486 | 5486 | helpbasic=True, |
|
|
5487 | 5487 | ) |
|
|
5488 | 5488 | def push(ui, repo, dest=None, **opts): |
|
|
5489 | 5489 | """push changes to the specified destination |
|
|
5490 | 5490 | |
|
|
5491 | 5491 | Push changesets from the local repository to the specified |
|
|
5492 | 5492 | destination. |
|
|
5493 | 5493 | |
|
|
5494 | 5494 | This operation is symmetrical to pull: it is identical to a pull |
|
|
5495 | 5495 | in the destination repository from the current one. |
|
|
5496 | 5496 | |
|
|
5497 | 5497 | By default, push will not allow creation of new heads at the |
|
|
5498 | 5498 | destination, since multiple heads would make it unclear which head |
|
|
5499 | 5499 | to use. In this situation, it is recommended to pull and merge |
|
|
5500 | 5500 | before pushing. |
|
|
5501 | 5501 | |
|
|
5502 | 5502 | Use --new-branch if you want to allow push to create a new named |
|
|
5503 | 5503 | branch that is not present at the destination. This allows you to |
|
|
5504 | 5504 | only create a new branch without forcing other changes. |
|
|
5505 | 5505 | |
|
|
5506 | 5506 | .. note:: |
|
|
5507 | 5507 | |
|
|
5508 | 5508 | Extra care should be taken with the -f/--force option, |
|
|
5509 | 5509 | which will push all new heads on all branches, an action which will |
|
|
5510 | 5510 | almost always cause confusion for collaborators. |
|
|
5511 | 5511 | |
|
|
5512 | 5512 | If -r/--rev is used, the specified revision and all its ancestors |
|
|
5513 | 5513 | will be pushed to the remote repository. |
|
|
5514 | 5514 | |
|
|
5515 | 5515 | If -B/--bookmark is used, the specified bookmarked revision, its |
|
|
5516 | 5516 | ancestors, and the bookmark will be pushed to the remote |
|
|
5517 | 5517 | repository. Specifying ``.`` is equivalent to specifying the active |
|
|
5518 | 5518 | bookmark's name. Use the --all-bookmarks option for pushing all |
|
|
5519 | 5519 | current bookmarks. |
|
|
5520 | 5520 | |
|
|
5521 | 5521 | Please see :hg:`help urls` for important details about ``ssh://`` |
|
|
5522 | 5522 | URLs. If DESTINATION is omitted, a default path will be used. |
|
|
5523 | 5523 | |
|
|
5524 | 5524 | .. container:: verbose |
|
|
5525 | 5525 | |
|
|
5526 | 5526 | The --pushvars option sends strings to the server that become |
|
|
5527 | 5527 | environment variables prepended with ``HG_USERVAR_``. For example, |
|
|
5528 | 5528 | ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with |
|
|
5529 | 5529 | ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment. |
|
|
5530 | 5530 | |
|
|
5531 | 5531 | pushvars can provide for user-overridable hooks as well as set debug |
|
|
5532 | 5532 | levels. One example is having a hook that blocks commits containing |
|
|
5533 | 5533 | conflict markers, but enables the user to override the hook if the file |
|
|
5534 | 5534 | is using conflict markers for testing purposes or the file format has |
|
|
5535 | 5535 | strings that look like conflict markers. |
|
|
5536 | 5536 | |
|
|
5537 | 5537 | By default, servers will ignore `--pushvars`. To enable it add the |
|
|
5538 | 5538 | following to your configuration file:: |
|
|
5539 | 5539 | |
|
|
5540 | 5540 | [push] |
|
|
5541 | 5541 | pushvars.server = true |
|
|
5542 | 5542 | |
|
|
5543 | 5543 | Returns 0 if push was successful, 1 if nothing to push. |
|
|
5544 | 5544 | """ |
|
|
5545 | 5545 | |
|
|
5546 | 5546 | opts = pycompat.byteskwargs(opts) |
|
|
5547 | 5547 | |
|
|
5548 | 5548 | if opts.get(b'all_bookmarks'): |
|
|
5549 | 5549 | cmdutil.check_incompatible_arguments( |
|
|
5550 | 5550 | opts, |
|
|
5551 | 5551 | b'all_bookmarks', |
|
|
5552 | 5552 | [b'bookmark', b'rev'], |
|
|
5553 | 5553 | ) |
|
|
5554 | 5554 | opts[b'bookmark'] = list(repo._bookmarks) |
|
|
5555 | 5555 | |
|
|
5556 | 5556 | if opts.get(b'bookmark'): |
|
|
5557 | 5557 | ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push') |
|
|
5558 | 5558 | for b in opts[b'bookmark']: |
|
|
5559 | 5559 | # translate -B options to -r so changesets get pushed |
|
|
5560 | 5560 | b = repo._bookmarks.expandname(b) |
|
|
5561 | 5561 | if b in repo._bookmarks: |
|
|
5562 | 5562 | opts.setdefault(b'rev', []).append(b) |
|
|
5563 | 5563 | else: |
|
|
5564 | 5564 | # if we try to push a deleted bookmark, translate it to null |
|
|
5565 | 5565 | # this lets simultaneous -r, -b options continue working |
|
|
5566 | 5566 | opts.setdefault(b'rev', []).append(b"null") |
|
|
5567 | 5567 | |
|
|
5568 | 5568 | path = ui.paths.getpath(dest, default=(b'default-push', b'default')) |
|
|
5569 | 5569 | if not path: |
|
|
5570 | 5570 | raise error.ConfigError( |
|
|
5571 | 5571 | _(b'default repository not configured!'), |
|
|
5572 | 5572 | hint=_(b"see 'hg help config.paths'"), |
|
|
5573 | 5573 | ) |
|
|
5574 | 5574 | dest = path.pushloc or path.loc |
|
|
5575 | 5575 | branches = (path.branch, opts.get(b'branch') or []) |
|
|
5576 | 5576 | ui.status(_(b'pushing to %s\n') % util.hidepassword(dest)) |
|
|
5577 | 5577 | revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get(b'rev')) |
|
|
5578 | 5578 | other = hg.peer(repo, opts, dest) |
|
|
5579 | 5579 | |
|
|
5580 | 5580 | if revs: |
|
|
5581 | 5581 | revs = [repo[r].node() for r in scmutil.revrange(repo, revs)] |
|
|
5582 | 5582 | if not revs: |
|
|
5583 | 5583 | raise error.InputError( |
|
|
5584 | 5584 | _(b"specified revisions evaluate to an empty set"), |
|
|
5585 | 5585 | hint=_(b"use different revision arguments"), |
|
|
5586 | 5586 | ) |
|
|
5587 | 5587 | elif path.pushrev: |
|
|
5588 | 5588 | # It doesn't make any sense to specify ancestor revisions. So limit |
|
|
5589 | 5589 | # to DAG heads to make discovery simpler. |
|
|
5590 | 5590 | expr = revsetlang.formatspec(b'heads(%r)', path.pushrev) |
|
|
5591 | 5591 | revs = scmutil.revrange(repo, [expr]) |
|
|
5592 | 5592 | revs = [repo[rev].node() for rev in revs] |
|
|
5593 | 5593 | if not revs: |
|
|
5594 | 5594 | raise error.InputError( |
|
|
5595 | 5595 | _(b'default push revset for path evaluates to an empty set') |
|
|
5596 | 5596 | ) |
|
|
5597 | 5597 | elif ui.configbool(b'commands', b'push.require-revs'): |
|
|
5598 | 5598 | raise error.InputError( |
|
|
5599 | 5599 | _(b'no revisions specified to push'), |
|
|
5600 | 5600 | hint=_(b'did you mean "hg push -r ."?'), |
|
|
5601 | 5601 | ) |
|
|
5602 | 5602 | |
|
|
5603 | 5603 | repo._subtoppath = dest |
|
|
5604 | 5604 | try: |
|
|
5605 | 5605 | # push subrepos depth-first for coherent ordering |
|
|
5606 | 5606 | c = repo[b'.'] |
|
|
5607 | 5607 | subs = c.substate # only repos that are committed |
|
|
5608 | 5608 | for s in sorted(subs): |
|
|
5609 | 5609 | result = c.sub(s).push(opts) |
|
|
5610 | 5610 | if result == 0: |
|
|
5611 | 5611 | return not result |
|
|
5612 | 5612 | finally: |
|
|
5613 | 5613 | del repo._subtoppath |
|
|
5614 | 5614 | |
|
|
5615 | 5615 | opargs = dict(opts.get(b'opargs', {})) # copy opargs since we may mutate it |
|
|
5616 | 5616 | opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', [])) |
|
|
5617 | 5617 | |
|
|
5618 | 5618 | pushop = exchange.push( |
|
|
5619 | 5619 | repo, |
|
|
5620 | 5620 | other, |
|
|
5621 | 5621 | opts.get(b'force'), |
|
|
5622 | 5622 | revs=revs, |
|
|
5623 | 5623 | newbranch=opts.get(b'new_branch'), |
|
|
5624 | 5624 | bookmarks=opts.get(b'bookmark', ()), |
|
|
5625 | 5625 | publish=opts.get(b'publish'), |
|
|
5626 | 5626 | opargs=opargs, |
|
|
5627 | 5627 | ) |
|
|
5628 | 5628 | |
|
|
5629 | 5629 | result = not pushop.cgresult |
|
|
5630 | 5630 | |
|
|
5631 | 5631 | if pushop.bkresult is not None: |
|
|
5632 | 5632 | if pushop.bkresult == 2: |
|
|
5633 | 5633 | result = 2 |
|
|
5634 | 5634 | elif not result and pushop.bkresult: |
|
|
5635 | 5635 | result = 2 |
|
|
5636 | 5636 | |
|
|
5637 | 5637 | return result |
|
|
5638 | 5638 | |
|
|
5639 | 5639 | |
|
|
5640 | 5640 | @command( |
|
|
5641 | 5641 | b'recover', |
|
|
5642 | 5642 | [ |
|
|
5643 | 5643 | (b'', b'verify', False, b"run `hg verify` after successful recover"), |
|
|
5644 | 5644 | ], |
|
|
5645 | 5645 | helpcategory=command.CATEGORY_MAINTENANCE, |
|
|
5646 | 5646 | ) |
|
|
5647 | 5647 | def recover(ui, repo, **opts): |
|
|
5648 | 5648 | """roll back an interrupted transaction |
|
|
5649 | 5649 | |
|
|
5650 | 5650 | Recover from an interrupted commit or pull. |
|
|
5651 | 5651 | |
|
|
5652 | 5652 | This command tries to fix the repository status after an |
|
|
5653 | 5653 | interrupted operation. It should only be necessary when Mercurial |
|
|
5654 | 5654 | suggests it. |
|
|
5655 | 5655 | |
|
|
5656 | 5656 | Returns 0 if successful, 1 if nothing to recover or verify fails. |
|
|
5657 | 5657 | """ |
|
|
5658 | 5658 | ret = repo.recover() |
|
|
5659 | 5659 | if ret: |
|
|
5660 | 5660 | if opts['verify']: |
|
|
5661 | 5661 | return hg.verify(repo) |
|
|
5662 | 5662 | else: |
|
|
5663 | 5663 | msg = _( |
|
|
5664 | 5664 | b"(verify step skipped, run `hg verify` to check your " |
|
|
5665 | 5665 | b"repository content)\n" |
|
|
5666 | 5666 | ) |
|
|
5667 | 5667 | ui.warn(msg) |
|
|
5668 | 5668 | return 0 |
|
|
5669 | 5669 | return 1 |
|
|
5670 | 5670 | |
|
|
5671 | 5671 | |
|
|
5672 | 5672 | @command( |
|
|
5673 | 5673 | b'remove|rm', |
|
|
5674 | 5674 | [ |
|
|
5675 | 5675 | (b'A', b'after', None, _(b'record delete for missing files')), |
|
|
5676 | 5676 | (b'f', b'force', None, _(b'forget added files, delete modified files')), |
|
|
5677 | 5677 | ] |
|
|
5678 | 5678 | + subrepoopts |
|
|
5679 | 5679 | + walkopts |
|
|
5680 | 5680 | + dryrunopts, |
|
|
5681 | 5681 | _(b'[OPTION]... FILE...'), |
|
|
5682 | 5682 | helpcategory=command.CATEGORY_WORKING_DIRECTORY, |
|
|
5683 | 5683 | helpbasic=True, |
|
|
5684 | 5684 | inferrepo=True, |
|
|
5685 | 5685 | ) |
|
|
5686 | 5686 | def remove(ui, repo, *pats, **opts): |
|
|
5687 | 5687 | """remove the specified files on the next commit |
|
|
5688 | 5688 | |
|
|
5689 | 5689 | Schedule the indicated files for removal from the current branch. |
|
|
5690 | 5690 | |
|
|
5691 | 5691 | This command schedules the files to be removed at the next commit. |
|
|
5692 | 5692 | To undo a remove before that, see :hg:`revert`. To undo added |
|
|
5693 | 5693 | files, see :hg:`forget`. |
|
|
5694 | 5694 | |
|
|
5695 | 5695 | .. container:: verbose |
|
|
5696 | 5696 | |
|
|
5697 | 5697 | -A/--after can be used to remove only files that have already |
|
|
5698 | 5698 | been deleted, -f/--force can be used to force deletion, and -Af |
|
|
5699 | 5699 | can be used to remove files from the next revision without |
|
|
5700 | 5700 | deleting them from the working directory. |
|
|
5701 | 5701 | |
|
|
5702 | 5702 | The following table details the behavior of remove for different |
|
|
5703 | 5703 | file states (columns) and option combinations (rows). The file |
|
|
5704 | 5704 | states are Added [A], Clean [C], Modified [M] and Missing [!] |
|
|
5705 | 5705 | (as reported by :hg:`status`). The actions are Warn, Remove |
|
|
5706 | 5706 | (from branch) and Delete (from disk): |
|
|
5707 | 5707 | |
|
|
5708 | 5708 | ========= == == == == |
|
|
5709 | 5709 | opt/state A C M ! |
|
|
5710 | 5710 | ========= == == == == |
|
|
5711 | 5711 | none W RD W R |
|
|
5712 | 5712 | -f R RD RD R |
|
|
5713 | 5713 | -A W W W R |
|
|
5714 | 5714 | -Af R R R R |
|
|
5715 | 5715 | ========= == == == == |
|
|
5716 | 5716 | |
|
|
5717 | 5717 | .. note:: |
|
|
5718 | 5718 | |
|
|
5719 | 5719 | :hg:`remove` never deletes files in Added [A] state from the |
|
|
5720 | 5720 | working directory, not even if ``--force`` is specified. |
|
|
5721 | 5721 | |
|
|
5722 | 5722 | Returns 0 on success, 1 if any warnings encountered. |
|
|
5723 | 5723 | """ |
|
|
5724 | 5724 | |
|
|
5725 | 5725 | opts = pycompat.byteskwargs(opts) |
|
|
5726 | 5726 | after, force = opts.get(b'after'), opts.get(b'force') |
|
|
5727 | 5727 | dryrun = opts.get(b'dry_run') |
|
|
5728 | 5728 | if not pats and not after: |
|
|
5729 | 5729 | raise error.InputError(_(b'no files specified')) |
|
|
5730 | 5730 | |
|
|
5731 | 5731 | m = scmutil.match(repo[None], pats, opts) |
|
|
5732 | 5732 | subrepos = opts.get(b'subrepos') |
|
|
5733 | 5733 | uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True) |
|
|
5734 | 5734 | return cmdutil.remove( |
|
|
5735 | 5735 | ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun |
|
|
5736 | 5736 | ) |
|
|
5737 | 5737 | |
|
|
5738 | 5738 | |
|
|
5739 | 5739 | @command( |
|
|
5740 | 5740 | b'rename|move|mv', |
|
|
5741 | 5741 | [ |
|
|
5742 | 5742 | (b'A', b'after', None, _(b'record a rename that has already occurred')), |
|
|
5743 | 5743 | ( |
|
|
5744 | 5744 | b'', |
|
|
5745 | 5745 | b'at-rev', |
|
|
5746 | 5746 | b'', |
|
|
5747 | 5747 | _(b'(un)mark renames in the given revision (EXPERIMENTAL)'), |
|
|
5748 | 5748 | _(b'REV'), |
|
|
5749 | 5749 | ), |
|
|
5750 | 5750 | ( |
|
|
5751 | 5751 | b'f', |
|
|
5752 | 5752 | b'force', |
|
|
5753 | 5753 | None, |
|
|
5754 | 5754 | _(b'forcibly move over an existing managed file'), |
|
|
5755 | 5755 | ), |
|
|
5756 | 5756 | ] |
|
|
5757 | 5757 | + walkopts |
|
|
5758 | 5758 | + dryrunopts, |
|
|
5759 | 5759 | _(b'[OPTION]... SOURCE... DEST'), |
|
|
5760 | 5760 | helpcategory=command.CATEGORY_WORKING_DIRECTORY, |
|
|
5761 | 5761 | ) |
|
|
5762 | 5762 | def rename(ui, repo, *pats, **opts): |
|
|
5763 | 5763 | """rename files; equivalent of copy + remove |
|
|
5764 | 5764 | |
|
|
5765 | 5765 | Mark dest as copies of sources; mark sources for deletion. If dest |
|
|
5766 | 5766 | is a directory, copies are put in that directory. If dest is a |
|
|
5767 | 5767 | file, there can only be one source. |
|
|
5768 | 5768 | |
|
|
5769 | 5769 | By default, this command copies the contents of files as they |
|
|
5770 | 5770 | exist in the working directory. If invoked with -A/--after, the |
|
|
5771 | 5771 | operation is recorded, but no copying is performed. |
|
|
5772 | 5772 | |
|
|
5773 | 5773 | This command takes effect at the next commit. To undo a rename |
|
|
5774 | 5774 | before that, see :hg:`revert`. |
|
|
5775 | 5775 | |
|
|
5776 | 5776 | Returns 0 on success, 1 if errors are encountered. |
|
|
5777 | 5777 | """ |
|
|
5778 | 5778 | opts = pycompat.byteskwargs(opts) |
|
|
5779 | 5779 | with repo.wlock(): |
|
|
5780 | 5780 | return cmdutil.copy(ui, repo, pats, opts, rename=True) |
|
|
5781 | 5781 | |
|
|
5782 | 5782 | |
|
|
5783 | 5783 | @command( |
|
|
5784 | 5784 | b'resolve', |
|
|
5785 | 5785 | [ |
|
|
5786 | 5786 | (b'a', b'all', None, _(b'select all unresolved files')), |
|
|
5787 | 5787 | (b'l', b'list', None, _(b'list state of files needing merge')), |
|
|
5788 | 5788 | (b'm', b'mark', None, _(b'mark files as resolved')), |
|
|
5789 | 5789 | (b'u', b'unmark', None, _(b'mark files as unresolved')), |
|
|
5790 | 5790 | (b'n', b'no-status', None, _(b'hide status prefix')), |
|
|
5791 | 5791 | (b'', b're-merge', None, _(b're-merge files')), |
|
|
5792 | 5792 | ] |
|
|
5793 | 5793 | + mergetoolopts |
|
|
5794 | 5794 | + walkopts |
|
|
5795 | 5795 | + formatteropts, |
|
|
5796 | 5796 | _(b'[OPTION]... [FILE]...'), |
|
|
5797 | 5797 | helpcategory=command.CATEGORY_WORKING_DIRECTORY, |
|
|
5798 | 5798 | inferrepo=True, |
|
|
5799 | 5799 | ) |
|
|
5800 | 5800 | def resolve(ui, repo, *pats, **opts): |
|
|
5801 | 5801 | """redo merges or set/view the merge status of files |
|
|
5802 | 5802 | |
|
|
5803 | 5803 | Merges with unresolved conflicts are often the result of |
|
|
5804 | 5804 | non-interactive merging using the ``internal:merge`` configuration |
|
|
5805 | 5805 | setting, or a command-line merge tool like ``diff3``. The resolve |
|
|
5806 | 5806 | command is used to manage the files involved in a merge, after |
|
|
5807 | 5807 | :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the |
|
|
5808 | 5808 | working directory must have two parents). See :hg:`help |
|
|
5809 | 5809 | merge-tools` for information on configuring merge tools. |
|
|
5810 | 5810 | |
|
|
5811 | 5811 | The resolve command can be used in the following ways: |
|
|
5812 | 5812 | |
|
|
5813 | 5813 | - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge |
|
|
5814 | 5814 | the specified files, discarding any previous merge attempts. Re-merging |
|
|
5815 | 5815 | is not performed for files already marked as resolved. Use ``--all/-a`` |
|
|
5816 | 5816 | to select all unresolved files. ``--tool`` can be used to specify |
|
|
5817 | 5817 | the merge tool used for the given files. It overrides the HGMERGE |
|
|
5818 | 5818 | environment variable and your configuration files. Previous file |
|
|
5819 | 5819 | contents are saved with a ``.orig`` suffix. |
|
|
5820 | 5820 | |
|
|
5821 | 5821 | - :hg:`resolve -m [FILE]`: mark a file as having been resolved |
|
|
5822 | 5822 | (e.g. after having manually fixed-up the files). The default is |
|
|
5823 | 5823 | to mark all unresolved files. |
|
|
5824 | 5824 | |
|
|
5825 | 5825 | - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The |
|
|
5826 | 5826 | default is to mark all resolved files. |
|
|
5827 | 5827 | |
|
|
5828 | 5828 | - :hg:`resolve -l`: list files which had or still have conflicts. |
|
|
5829 | 5829 | In the printed list, ``U`` = unresolved and ``R`` = resolved. |
|
|
5830 | 5830 | You can use ``set:unresolved()`` or ``set:resolved()`` to filter |
|
|
5831 | 5831 | the list. See :hg:`help filesets` for details. |
|
|
5832 | 5832 | |
|
|
5833 | 5833 | .. note:: |
|
|
5834 | 5834 | |
|
|
5835 | 5835 | Mercurial will not let you commit files with unresolved merge |
|
|
5836 | 5836 | conflicts. You must use :hg:`resolve -m ...` before you can |
|
|
5837 | 5837 | commit after a conflicting merge. |
|
|
5838 | 5838 | |
|
|
5839 | 5839 | .. container:: verbose |
|
|
5840 | 5840 | |
|
|
5841 | 5841 | Template: |
|
|
5842 | 5842 | |
|
|
5843 | 5843 | The following keywords are supported in addition to the common template |
|
|
5844 | 5844 | keywords and functions. See also :hg:`help templates`. |
|
|
5845 | 5845 | |
|
|
5846 | 5846 | :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``. |
|
|
5847 | 5847 | :path: String. Repository-absolute path of the file. |
|
|
5848 | 5848 | |
|
|
5849 | 5849 | Returns 0 on success, 1 if any files fail a resolve attempt. |
|
|
5850 | 5850 | """ |
|
|
5851 | 5851 | |
|
|
5852 | 5852 | opts = pycompat.byteskwargs(opts) |
|
|
5853 | 5853 | confirm = ui.configbool(b'commands', b'resolve.confirm') |
|
|
5854 | 5854 | flaglist = b'all mark unmark list no_status re_merge'.split() |
|
|
5855 | 5855 | all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist] |
|
|
5856 | 5856 | |
|
|
5857 | 5857 | actioncount = len(list(filter(None, [show, mark, unmark, remerge]))) |
|
|
5858 | 5858 | if actioncount > 1: |
|
|
5859 | 5859 | raise error.InputError(_(b"too many actions specified")) |
|
|
5860 | 5860 | elif actioncount == 0 and ui.configbool( |
|
|
5861 | 5861 | b'commands', b'resolve.explicit-re-merge' |
|
|
5862 | 5862 | ): |
|
|
5863 | 5863 | hint = _(b'use --mark, --unmark, --list or --re-merge') |
|
|
5864 | 5864 | raise error.InputError(_(b'no action specified'), hint=hint) |
|
|
5865 | 5865 | if pats and all: |
|
|
5866 | 5866 | raise error.InputError(_(b"can't specify --all and patterns")) |
|
|
5867 | 5867 | if not (all or pats or show or mark or unmark): |
|
|
5868 | 5868 | raise error.InputError( |
|
|
5869 | 5869 | _(b'no files or directories specified'), |
|
|
5870 | 5870 | hint=b'use --all to re-merge all unresolved files', |
|
|
5871 | 5871 | ) |
|
|
5872 | 5872 | |
|
|
5873 | 5873 | if confirm: |
|
|
5874 | 5874 | if all: |
|
|
5875 | 5875 | if ui.promptchoice( |
|
|
5876 | 5876 | _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No') |
|
|
5877 | 5877 | ): |
|
|
5878 | 5878 | raise error.CanceledError(_(b'user quit')) |
|
|
5879 | 5879 | if mark and not pats: |
|
|
5880 | 5880 | if ui.promptchoice( |
|
|
5881 | 5881 | _( |
|
|
5882 | 5882 | b'mark all unresolved files as resolved (yn)?' |
|
|
5883 | 5883 | b'$$ &Yes $$ &No' |
|
|
5884 | 5884 | ) |
|
|
5885 | 5885 | ): |
|
|
5886 | 5886 | raise error.CanceledError(_(b'user quit')) |
|
|
5887 | 5887 | if unmark and not pats: |
|
|
5888 | 5888 | if ui.promptchoice( |
|
|
5889 | 5889 | _( |
|
|
5890 | 5890 | b'mark all resolved files as unresolved (yn)?' |
|
|
5891 | 5891 | b'$$ &Yes $$ &No' |
|
|
5892 | 5892 | ) |
|
|
5893 | 5893 | ): |
|
|
5894 | 5894 | raise error.CanceledError(_(b'user quit')) |
|
|
5895 | 5895 | |
|
|
5896 | 5896 | uipathfn = scmutil.getuipathfn(repo) |
|
|
5897 | 5897 | |
|
|
5898 | 5898 | if show: |
|
|
5899 | 5899 | ui.pager(b'resolve') |
|
|
5900 | 5900 | fm = ui.formatter(b'resolve', opts) |
|
|
5901 | 5901 | ms = mergestatemod.mergestate.read(repo) |
|
|
5902 | 5902 | wctx = repo[None] |
|
|
5903 | 5903 | m = scmutil.match(wctx, pats, opts) |
|
|
5904 | 5904 | |
|
|
5905 | 5905 | # Labels and keys based on merge state. Unresolved path conflicts show |
|
|
5906 | 5906 | # as 'P'. Resolved path conflicts show as 'R', the same as normal |
|
|
5907 | 5907 | # resolved conflicts. |
|
|
5908 | 5908 | mergestateinfo = { |
|
|
5909 | 5909 | mergestatemod.MERGE_RECORD_UNRESOLVED: ( |
|
|
5910 | 5910 | b'resolve.unresolved', |
|
|
5911 | 5911 | b'U', |
|
|
5912 | 5912 | ), |
|
|
5913 | 5913 | mergestatemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'), |
|
|
5914 | 5914 | mergestatemod.MERGE_RECORD_UNRESOLVED_PATH: ( |
|
|
5915 | 5915 | b'resolve.unresolved', |
|
|
5916 | 5916 | b'P', |
|
|
5917 | 5917 | ), |
|
|
5918 | 5918 | mergestatemod.MERGE_RECORD_RESOLVED_PATH: ( |
|
|
5919 | 5919 | b'resolve.resolved', |
|
|
5920 | 5920 | b'R', |
|
|
5921 | 5921 | ), |
|
|
5922 | 5922 | } |
|
|
5923 | 5923 | |
|
|
5924 | 5924 | for f in ms: |
|
|
5925 | 5925 | if not m(f): |
|
|
5926 | 5926 | continue |
|
|
5927 | 5927 | |
|
|
5928 | 5928 | label, key = mergestateinfo[ms[f]] |
|
|
5929 | 5929 | fm.startitem() |
|
|
5930 | 5930 | fm.context(ctx=wctx) |
|
|
5931 | 5931 | fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label) |
|
|
5932 | 5932 | fm.data(path=f) |
|
|
5933 | 5933 | fm.plain(b'%s\n' % uipathfn(f), label=label) |
|
|
5934 | 5934 | fm.end() |
|
|
5935 | 5935 | return 0 |
|
|
5936 | 5936 | |
|
|
5937 | 5937 | with repo.wlock(): |
|
|
5938 | 5938 | ms = mergestatemod.mergestate.read(repo) |
|
|
5939 | 5939 | |
|
|
5940 | 5940 | if not (ms.active() or repo.dirstate.p2() != nullid): |
|
|
5941 | 5941 | raise error.StateError( |
|
|
5942 | 5942 | _(b'resolve command not applicable when not merging') |
|
|
5943 | 5943 | ) |
|
|
5944 | 5944 | |
|
|
5945 | 5945 | wctx = repo[None] |
|
|
5946 | 5946 | m = scmutil.match(wctx, pats, opts) |
|
|
5947 | 5947 | ret = 0 |
|
|
5948 | 5948 | didwork = False |
|
|
5949 | 5949 | |
|
|
5950 | 5950 | tocomplete = [] |
|
|
5951 | 5951 | hasconflictmarkers = [] |
|
|
5952 | 5952 | if mark: |
|
|
5953 | 5953 | markcheck = ui.config(b'commands', b'resolve.mark-check') |
|
|
5954 | 5954 | if markcheck not in [b'warn', b'abort']: |
|
|
5955 | 5955 | # Treat all invalid / unrecognized values as 'none'. |
|
|
5956 | 5956 | markcheck = False |
|
|
5957 | 5957 | for f in ms: |
|
|
5958 | 5958 | if not m(f): |
|
|
5959 | 5959 | continue |
|
|
5960 | 5960 | |
|
|
5961 | 5961 | didwork = True |
|
|
5962 | 5962 | |
|
|
5963 | 5963 | # path conflicts must be resolved manually |
|
|
5964 | 5964 | if ms[f] in ( |
|
|
5965 | 5965 | mergestatemod.MERGE_RECORD_UNRESOLVED_PATH, |
|
|
5966 | 5966 | mergestatemod.MERGE_RECORD_RESOLVED_PATH, |
|
|
5967 | 5967 | ): |
|
|
5968 | 5968 | if mark: |
|
|
5969 | 5969 | ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED_PATH) |
|
|
5970 | 5970 | elif unmark: |
|
|
5971 | 5971 | ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED_PATH) |
|
|
5972 | 5972 | elif ms[f] == mergestatemod.MERGE_RECORD_UNRESOLVED_PATH: |
|
|
5973 | 5973 | ui.warn( |
|
|
5974 | 5974 | _(b'%s: path conflict must be resolved manually\n') |
|
|
5975 | 5975 | % uipathfn(f) |
|
|
5976 | 5976 | ) |
|
|
5977 | 5977 | continue |
|
|
5978 | 5978 | |
|
|
5979 | 5979 | if mark: |
|
|
5980 | 5980 | if markcheck: |
|
|
5981 | 5981 | fdata = repo.wvfs.tryread(f) |
|
|
5982 | 5982 | if ( |
|
|
5983 | 5983 | filemerge.hasconflictmarkers(fdata) |
|
|
5984 | 5984 | and ms[f] != mergestatemod.MERGE_RECORD_RESOLVED |
|
|
5985 | 5985 | ): |
|
|
5986 | 5986 | hasconflictmarkers.append(f) |
|
|
5987 | 5987 | ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED) |
|
|
5988 | 5988 | elif unmark: |
|
|
5989 | 5989 | ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED) |
|
|
5990 | 5990 | else: |
|
|
5991 | 5991 | # backup pre-resolve (merge uses .orig for its own purposes) |
|
|
5992 | 5992 | a = repo.wjoin(f) |
|
|
5993 | 5993 | try: |
|
|
5994 | 5994 | util.copyfile(a, a + b".resolve") |
|
|
5995 | 5995 | except (IOError, OSError) as inst: |
|
|
5996 | 5996 | if inst.errno != errno.ENOENT: |
|
|
5997 | 5997 | raise |
|
|
5998 | 5998 | |
|
|
5999 | 5999 | try: |
|
|
6000 | 6000 | # preresolve file |
|
|
6001 | 6001 | overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')} |
|
|
6002 | 6002 | with ui.configoverride(overrides, b'resolve'): |
|
|
6003 | 6003 | complete, r = ms.preresolve(f, wctx) |
|
|
6004 | 6004 | if not complete: |
|
|
6005 | 6005 | tocomplete.append(f) |
|
|
6006 | 6006 | elif r: |
|
|
6007 | 6007 | ret = 1 |
|
|
6008 | 6008 | finally: |
|
|
6009 | 6009 | ms.commit() |
|
|
6010 | 6010 | |
|
|
6011 | 6011 | # replace filemerge's .orig file with our resolve file, but only |
|
|
6012 | 6012 | # for merges that are complete |
|
|
6013 | 6013 | if complete: |
|
|
6014 | 6014 | try: |
|
|
6015 | 6015 | util.rename( |
|
|
6016 | 6016 | a + b".resolve", scmutil.backuppath(ui, repo, f) |
|
|
6017 | 6017 | ) |
|
|
6018 | 6018 | except OSError as inst: |
|
|
6019 | 6019 | if inst.errno != errno.ENOENT: |
|
|
6020 | 6020 | raise |
|
|
6021 | 6021 | |
|
|
6022 | 6022 | if hasconflictmarkers: |
|
|
6023 | 6023 | ui.warn( |
|
|
6024 | 6024 | _( |
|
|
6025 | 6025 | b'warning: the following files still have conflict ' |
|
|
6026 | 6026 | b'markers:\n' |
|
|
6027 | 6027 | ) |
|
|
6028 | 6028 | + b''.join( |
|
|
6029 | 6029 | b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers |
|
|
6030 | 6030 | ) |
|
|
6031 | 6031 | ) |
|
|
6032 | 6032 | if markcheck == b'abort' and not all and not pats: |
|
|
6033 | 6033 | raise error.StateError( |
|
|
6034 | 6034 | _(b'conflict markers detected'), |
|
|
6035 | 6035 | hint=_(b'use --all to mark anyway'), |
|
|
6036 | 6036 | ) |
|
|
6037 | 6037 | |
|
|
6038 | 6038 | for f in tocomplete: |
|
|
6039 | 6039 | try: |
|
|
6040 | 6040 | # resolve file |
|
|
6041 | 6041 | overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')} |
|
|
6042 | 6042 | with ui.configoverride(overrides, b'resolve'): |
|
|
6043 | 6043 | r = ms.resolve(f, wctx) |
|
|
6044 | 6044 | if r: |
|
|
6045 | 6045 | ret = 1 |
|
|
6046 | 6046 | finally: |
|
|
6047 | 6047 | ms.commit() |
|
|
6048 | 6048 | |
|
|
6049 | 6049 | # replace filemerge's .orig file with our resolve file |
|
|
6050 | 6050 | a = repo.wjoin(f) |
|
|
6051 | 6051 | try: |
|
|
6052 | 6052 | util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f)) |
|
|
6053 | 6053 | except OSError as inst: |
|
|
6054 | 6054 | if inst.errno != errno.ENOENT: |
|
|
6055 | 6055 | raise |
|
|
6056 | 6056 | |
|
|
6057 | 6057 | ms.commit() |
|
|
6058 | 6058 | branchmerge = repo.dirstate.p2() != nullid |
|
|
6059 | 6059 | mergestatemod.recordupdates(repo, ms.actions(), branchmerge, None) |
|
|
6060 | 6060 | |
|
|
6061 | 6061 | if not didwork and pats: |
|
|
6062 | 6062 | hint = None |
|
|
6063 | 6063 | if not any([p for p in pats if p.find(b':') >= 0]): |
|
|
6064 | 6064 | pats = [b'path:%s' % p for p in pats] |
|
|
6065 | 6065 | m = scmutil.match(wctx, pats, opts) |
|
|
6066 | 6066 | for f in ms: |
|
|
6067 | 6067 | if not m(f): |
|
|
6068 | 6068 | continue |
|
|
6069 | 6069 | |
|
|
6070 | 6070 | def flag(o): |
|
|
6071 | 6071 | if o == b're_merge': |
|
|
6072 | 6072 | return b'--re-merge ' |
|
|
6073 | 6073 | return b'-%s ' % o[0:1] |
|
|
6074 | 6074 | |
|
|
6075 | 6075 | flags = b''.join([flag(o) for o in flaglist if opts.get(o)]) |
|
|
6076 | 6076 | hint = _(b"(try: hg resolve %s%s)\n") % ( |
|
|
6077 | 6077 | flags, |
|
|
6078 | 6078 | b' '.join(pats), |
|
|
6079 | 6079 | ) |
|
|
6080 | 6080 | break |
|
|
6081 | 6081 | ui.warn(_(b"arguments do not match paths that need resolving\n")) |
|
|
6082 | 6082 | if hint: |
|
|
6083 | 6083 | ui.warn(hint) |
|
|
6084 | 6084 | |
|
|
6085 | 6085 | unresolvedf = list(ms.unresolved()) |
|
|
6086 | 6086 | if not unresolvedf: |
|
|
6087 | 6087 | ui.status(_(b'(no more unresolved files)\n')) |
|
|
6088 | 6088 | cmdutil.checkafterresolved(repo) |
|
|
6089 | 6089 | |
|
|
6090 | 6090 | return ret |
|
|
6091 | 6091 | |
|
|
6092 | 6092 | |
|
|
6093 | 6093 | @command( |
|
|
6094 | 6094 | b'revert', |
|
|
6095 | 6095 | [ |
|
|
6096 | 6096 | (b'a', b'all', None, _(b'revert all changes when no arguments given')), |
|
|
6097 | 6097 | (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')), |
|
|
6098 | 6098 | (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')), |
|
|
6099 | 6099 | (b'C', b'no-backup', None, _(b'do not save backup copies of files')), |
|
|
6100 | 6100 | (b'i', b'interactive', None, _(b'interactively select the changes')), |
|
|
6101 | 6101 | ] |
|
|
6102 | 6102 | + walkopts |
|
|
6103 | 6103 | + dryrunopts, |
|
|
6104 | 6104 | _(b'[OPTION]... [-r REV] [NAME]...'), |
|
|
6105 | 6105 | helpcategory=command.CATEGORY_WORKING_DIRECTORY, |
|
|
6106 | 6106 | ) |
|
|
6107 | 6107 | def revert(ui, repo, *pats, **opts): |
|
|
6108 | 6108 | """restore files to their checkout state |
|
|
6109 | 6109 | |
|
|
6110 | 6110 | .. note:: |
|
|
6111 | 6111 | |
|
|
6112 | 6112 | To check out earlier revisions, you should use :hg:`update REV`. |
|
|
6113 | 6113 | To cancel an uncommitted merge (and lose your changes), |
|
|
6114 | 6114 | use :hg:`merge --abort`. |
|
|
6115 | 6115 | |
|
|
6116 | 6116 | With no revision specified, revert the specified files or directories |
|
|
6117 | 6117 | to the contents they had in the parent of the working directory. |
|
|
6118 | 6118 | This restores the contents of files to an unmodified |
|
|
6119 | 6119 | state and unschedules adds, removes, copies, and renames. If the |
|
|
6120 | 6120 | working directory has two parents, you must explicitly specify a |
|
|
6121 | 6121 | revision. |
|
|
6122 | 6122 | |
|
|
6123 | 6123 | Using the -r/--rev or -d/--date options, revert the given files or |
|
|
6124 | 6124 | directories to their states as of a specific revision. Because |
|
|
6125 | 6125 | revert does not change the working directory parents, this will |
|
|
6126 | 6126 | cause these files to appear modified. This can be helpful to "back |
|
|
6127 | 6127 | out" some or all of an earlier change. See :hg:`backout` for a |
|
|
6128 | 6128 | related method. |
|
|
6129 | 6129 | |
|
|
6130 | 6130 | Modified files are saved with a .orig suffix before reverting. |
|
|
6131 | 6131 | To disable these backups, use --no-backup. It is possible to store |
|
|
6132 | 6132 | the backup files in a custom directory relative to the root of the |
|
|
6133 | 6133 | repository by setting the ``ui.origbackuppath`` configuration |
|
|
6134 | 6134 | option. |
|
|
6135 | 6135 | |
|
|
6136 | 6136 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
|
6137 | 6137 | |
|
|
6138 | 6138 | See :hg:`help backout` for a way to reverse the effect of an |
|
|
6139 | 6139 | earlier changeset. |
|
|
6140 | 6140 | |
|
|
6141 | 6141 | Returns 0 on success. |
|
|
6142 | 6142 | """ |
|
|
6143 | 6143 | |
|
|
6144 | 6144 | opts = pycompat.byteskwargs(opts) |
|
|
6145 | 6145 | if opts.get(b"date"): |
|
|
6146 | 6146 | cmdutil.check_incompatible_arguments(opts, b'date', [b'rev']) |
|
|
6147 | 6147 | opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"]) |
|
|
6148 | 6148 | |
|
|
6149 | 6149 | parent, p2 = repo.dirstate.parents() |
|
|
6150 | 6150 | if not opts.get(b'rev') and p2 != nullid: |
|
|
6151 | 6151 | # revert after merge is a trap for new users (issue2915) |
|
|
6152 | 6152 | raise error.InputError( |
|
|
6153 | 6153 | _(b'uncommitted merge with no revision specified'), |
|
|
6154 | 6154 | hint=_(b"use 'hg update' or see 'hg help revert'"), |
|
|
6155 | 6155 | ) |
|
|
6156 | 6156 | |
|
|
6157 | 6157 | rev = opts.get(b'rev') |
|
|
6158 | 6158 | if rev: |
|
|
6159 | 6159 | repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn') |
|
|
6160 | 6160 | ctx = scmutil.revsingle(repo, rev) |
|
|
6161 | 6161 | |
|
|
6162 | 6162 | if not ( |
|
|
6163 | 6163 | pats |
|
|
6164 | 6164 | or opts.get(b'include') |
|
|
6165 | 6165 | or opts.get(b'exclude') |
|
|
6166 | 6166 | or opts.get(b'all') |
|
|
6167 | 6167 | or opts.get(b'interactive') |
|
|
6168 | 6168 | ): |
|
|
6169 | 6169 | msg = _(b"no files or directories specified") |
|
|
6170 | 6170 | if p2 != nullid: |
|
|
6171 | 6171 | hint = _( |
|
|
6172 | 6172 | b"uncommitted merge, use --all to discard all changes," |
|
|
6173 | 6173 | b" or 'hg update -C .' to abort the merge" |
|
|
6174 | 6174 | ) |
|
|
6175 | 6175 | raise error.InputError(msg, hint=hint) |
|
|
6176 | 6176 | dirty = any(repo.status()) |
|
|
6177 | 6177 | node = ctx.node() |
|
|
6178 | 6178 | if node != parent: |
|
|
6179 | 6179 | if dirty: |
|
|
6180 | 6180 | hint = ( |
|
|
6181 | 6181 | _( |
|
|
6182 | 6182 | b"uncommitted changes, use --all to discard all" |
|
|
6183 | 6183 | b" changes, or 'hg update %d' to update" |
|
|
6184 | 6184 | ) |
|
|
6185 | 6185 | % ctx.rev() |
|
|
6186 | 6186 | ) |
|
|
6187 | 6187 | else: |
|
|
6188 | 6188 | hint = ( |
|
|
6189 | 6189 | _( |
|
|
6190 | 6190 | b"use --all to revert all files," |
|
|
6191 | 6191 | b" or 'hg update %d' to update" |
|
|
6192 | 6192 | ) |
|
|
6193 | 6193 | % ctx.rev() |
|
|
6194 | 6194 | ) |
|
|
6195 | 6195 | elif dirty: |
|
|
6196 | 6196 | hint = _(b"uncommitted changes, use --all to discard all changes") |
|
|
6197 | 6197 | else: |
|
|
6198 | 6198 | hint = _(b"use --all to revert all files") |
|
|
6199 | 6199 | raise error.InputError(msg, hint=hint) |
|
|
6200 | 6200 | |
|
|
6201 | 6201 | return cmdutil.revert(ui, repo, ctx, *pats, **pycompat.strkwargs(opts)) |
|
|
6202 | 6202 | |
|
|
6203 | 6203 | |
|
|
6204 | 6204 | @command( |
|
|
6205 | 6205 | b'rollback', |
|
|
6206 | 6206 | dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))], |
|
|
6207 | 6207 | helpcategory=command.CATEGORY_MAINTENANCE, |
|
|
6208 | 6208 | ) |
|
|
6209 | 6209 | def rollback(ui, repo, **opts): |
|
|
6210 | 6210 | """roll back the last transaction (DANGEROUS) (DEPRECATED) |
|
|
6211 | 6211 | |
|
|
6212 | 6212 | Please use :hg:`commit --amend` instead of rollback to correct |
|
|
6213 | 6213 | mistakes in the last commit. |
|
|
6214 | 6214 | |
|
|
6215 | 6215 | This command should be used with care. There is only one level of |
|
|
6216 | 6216 | rollback, and there is no way to undo a rollback. It will also |
|
|
6217 | 6217 | restore the dirstate at the time of the last transaction, losing |
|
|
6218 | 6218 | any dirstate changes since that time. This command does not alter |
|
|
6219 | 6219 | the working directory. |
|
|
6220 | 6220 | |
|
|
6221 | 6221 | Transactions are used to encapsulate the effects of all commands |
|
|
6222 | 6222 | that create new changesets or propagate existing changesets into a |
|
|
6223 | 6223 | repository. |
|
|
6224 | 6224 | |
|
|
6225 | 6225 | .. container:: verbose |
|
|
6226 | 6226 | |
|
|
6227 | 6227 | For example, the following commands are transactional, and their |
|
|
6228 | 6228 | effects can be rolled back: |
|
|
6229 | 6229 | |
|
|
6230 | 6230 | - commit |
|
|
6231 | 6231 | - import |
|
|
6232 | 6232 | - pull |
|
|
6233 | 6233 | - push (with this repository as the destination) |
|
|
6234 | 6234 | - unbundle |
|
|
6235 | 6235 | |
|
|
6236 | 6236 | To avoid permanent data loss, rollback will refuse to rollback a |
|
|
6237 | 6237 | commit transaction if it isn't checked out. Use --force to |
|
|
6238 | 6238 | override this protection. |
|
|
6239 | 6239 | |
|
|
6240 | 6240 | The rollback command can be entirely disabled by setting the |
|
|
6241 | 6241 | ``ui.rollback`` configuration setting to false. If you're here |
|
|
6242 | 6242 | because you want to use rollback and it's disabled, you can |
|
|
6243 | 6243 | re-enable the command by setting ``ui.rollback`` to true. |
|
|
6244 | 6244 | |
|
|
6245 | 6245 | This command is not intended for use on public repositories. Once |
|
|
6246 | 6246 | changes are visible for pull by other users, rolling a transaction |
|
|
6247 | 6247 | back locally is ineffective (someone else may already have pulled |
|
|
6248 | 6248 | the changes). Furthermore, a race is possible with readers of the |
|
|
6249 | 6249 | repository; for example an in-progress pull from the repository |
|
|
6250 | 6250 | may fail if a rollback is performed. |
|
|
6251 | 6251 | |
|
|
6252 | 6252 | Returns 0 on success, 1 if no rollback data is available. |
|
|
6253 | 6253 | """ |
|
|
6254 | 6254 | if not ui.configbool(b'ui', b'rollback'): |
|
|
6255 | 6255 | raise error.Abort( |
|
|
6256 | 6256 | _(b'rollback is disabled because it is unsafe'), |
|
|
6257 | 6257 | hint=b'see `hg help -v rollback` for information', |
|
|
6258 | 6258 | ) |
|
|
6259 | 6259 | return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force')) |
|
|
6260 | 6260 | |
|
|
6261 | 6261 | |
|
|
6262 | 6262 | @command( |
|
|
6263 | 6263 | b'root', |
|
|
6264 | 6264 | [] + formatteropts, |
|
|
6265 | 6265 | intents={INTENT_READONLY}, |
|
|
6266 | 6266 | helpcategory=command.CATEGORY_WORKING_DIRECTORY, |
|
|
6267 | 6267 | ) |
|
|
6268 | 6268 | def root(ui, repo, **opts): |
|
|
6269 | 6269 | """print the root (top) of the current working directory |
|
|
6270 | 6270 | |
|
|
6271 | 6271 | Print the root directory of the current repository. |
|
|
6272 | 6272 | |
|
|
6273 | 6273 | .. container:: verbose |
|
|
6274 | 6274 | |
|
|
6275 | 6275 | Template: |
|
|
6276 | 6276 | |
|
|
6277 | 6277 | The following keywords are supported in addition to the common template |
|
|
6278 | 6278 | keywords and functions. See also :hg:`help templates`. |
|
|
6279 | 6279 | |
|
|
6280 | 6280 | :hgpath: String. Path to the .hg directory. |
|
|
6281 | 6281 | :storepath: String. Path to the directory holding versioned data. |
|
|
6282 | 6282 | |
|
|
6283 | 6283 | Returns 0 on success. |
|
|
6284 | 6284 | """ |
|
|
6285 | 6285 | opts = pycompat.byteskwargs(opts) |
|
|
6286 | 6286 | with ui.formatter(b'root', opts) as fm: |
|
|
6287 | 6287 | fm.startitem() |
|
|
6288 | 6288 | fm.write(b'reporoot', b'%s\n', repo.root) |
|
|
6289 | 6289 | fm.data(hgpath=repo.path, storepath=repo.spath) |
|
|
6290 | 6290 | |
|
|
6291 | 6291 | |
|
|
6292 | 6292 | @command( |
|
|
6293 | 6293 | b'serve', |
|
|
6294 | 6294 | [ |
|
|
6295 | 6295 | ( |
|
|
6296 | 6296 | b'A', |
|
|
6297 | 6297 | b'accesslog', |
|
|
6298 | 6298 | b'', |
|
|
6299 | 6299 | _(b'name of access log file to write to'), |
|
|
6300 | 6300 | _(b'FILE'), |
|
|
6301 | 6301 | ), |
|
|
6302 | 6302 | (b'd', b'daemon', None, _(b'run server in background')), |
|
|
6303 | 6303 | (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')), |
|
|
6304 | 6304 | ( |
|
|
6305 | 6305 | b'E', |
|
|
6306 | 6306 | b'errorlog', |
|
|
6307 | 6307 | b'', |
|
|
6308 | 6308 | _(b'name of error log file to write to'), |
|
|
6309 | 6309 | _(b'FILE'), |
|
|
6310 | 6310 | ), |
|
|
6311 | 6311 | # use string type, then we can check if something was passed |
|
|
6312 | 6312 | ( |
|
|
6313 | 6313 | b'p', |
|
|
6314 | 6314 | b'port', |
|
|
6315 | 6315 | b'', |
|
|
6316 | 6316 | _(b'port to listen on (default: 8000)'), |
|
|
6317 | 6317 | _(b'PORT'), |
|
|
6318 | 6318 | ), |
|
|
6319 | 6319 | ( |
|
|
6320 | 6320 | b'a', |
|
|
6321 | 6321 | b'address', |
|
|
6322 | 6322 | b'', |
|
|
6323 | 6323 | _(b'address to listen on (default: all interfaces)'), |
|
|
6324 | 6324 | _(b'ADDR'), |
|
|
6325 | 6325 | ), |
|
|
6326 | 6326 | ( |
|
|
6327 | 6327 | b'', |
|
|
6328 | 6328 | b'prefix', |
|
|
6329 | 6329 | b'', |
|
|
6330 | 6330 | _(b'prefix path to serve from (default: server root)'), |
|
|
6331 | 6331 | _(b'PREFIX'), |
|
|
6332 | 6332 | ), |
|
|
6333 | 6333 | ( |
|
|
6334 | 6334 | b'n', |
|
|
6335 | 6335 | b'name', |
|
|
6336 | 6336 | b'', |
|
|
6337 | 6337 | _(b'name to show in web pages (default: working directory)'), |
|
|
6338 | 6338 | _(b'NAME'), |
|
|
6339 | 6339 | ), |
|
|
6340 | 6340 | ( |
|
|
6341 | 6341 | b'', |
|
|
6342 | 6342 | b'web-conf', |
|
|
6343 | 6343 | b'', |
|
|
6344 | 6344 | _(b"name of the hgweb config file (see 'hg help hgweb')"), |
|
|
6345 | 6345 | _(b'FILE'), |
|
|
6346 | 6346 | ), |
|
|
6347 | 6347 | ( |
|
|
6348 | 6348 | b'', |
|
|
6349 | 6349 | b'webdir-conf', |
|
|
6350 | 6350 | b'', |
|
|
6351 | 6351 | _(b'name of the hgweb config file (DEPRECATED)'), |
|
|
6352 | 6352 | _(b'FILE'), |
|
|
6353 | 6353 | ), |
|
|
6354 | 6354 | ( |
|
|
6355 | 6355 | b'', |
|
|
6356 | 6356 | b'pid-file', |
|
|
6357 | 6357 | b'', |
|
|
6358 | 6358 | _(b'name of file to write process ID to'), |
|
|
6359 | 6359 | _(b'FILE'), |
|
|
6360 | 6360 | ), |
|
|
6361 | 6361 | (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')), |
|
|
6362 | 6362 | ( |
|
|
6363 | 6363 | b'', |
|
|
6364 | 6364 | b'cmdserver', |
|
|
6365 | 6365 | b'', |
|
|
6366 | 6366 | _(b'for remote clients (ADVANCED)'), |
|
|
6367 | 6367 | _(b'MODE'), |
|
|
6368 | 6368 | ), |
|
|
6369 | 6369 | (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')), |
|
|
6370 | 6370 | (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')), |
|
|
6371 | 6371 | (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')), |
|
|
6372 | 6372 | (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')), |
|
|
6373 | 6373 | (b'', b'print-url', None, _(b'start and print only the URL')), |
|
|
6374 | 6374 | ] |
|
|
6375 | 6375 | + subrepoopts, |
|
|
6376 | 6376 | _(b'[OPTION]...'), |
|
|
6377 | 6377 | helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT, |
|
|
6378 | 6378 | helpbasic=True, |
|
|
6379 | 6379 | optionalrepo=True, |
|
|
6380 | 6380 | ) |
|
|
6381 | 6381 | def serve(ui, repo, **opts): |
|
|
6382 | 6382 | """start stand-alone webserver |
|
|
6383 | 6383 | |
|
|
6384 | 6384 | Start a local HTTP repository browser and pull server. You can use |
|
|
6385 | 6385 | this for ad-hoc sharing and browsing of repositories. It is |
|
|
6386 | 6386 | recommended to use a real web server to serve a repository for |
|
|
6387 | 6387 | longer periods of time. |
|
|
6388 | 6388 | |
|
|
6389 | 6389 | Please note that the server does not implement access control. |
|
|
6390 | 6390 | This means that, by default, anybody can read from the server and |
|
|
6391 | 6391 | nobody can write to it by default. Set the ``web.allow-push`` |
|
|
6392 | 6392 | option to ``*`` to allow everybody to push to the server. You |
|
|
6393 | 6393 | should use a real web server if you need to authenticate users. |
|
|
6394 | 6394 | |
|
|
6395 | 6395 | By default, the server logs accesses to stdout and errors to |
|
|
6396 | 6396 | stderr. Use the -A/--accesslog and -E/--errorlog options to log to |
|
|
6397 | 6397 | files. |
|
|
6398 | 6398 | |
|
|
6399 | 6399 | To have the server choose a free port number to listen on, specify |
|
|
6400 | 6400 | a port number of 0; in this case, the server will print the port |
|
|
6401 | 6401 | number it uses. |
|
|
6402 | 6402 | |
|
|
6403 | 6403 | Returns 0 on success. |
|
|
6404 | 6404 | """ |
|
|
6405 | 6405 | |
|
|
6406 | 6406 | cmdutil.check_incompatible_arguments(opts, 'stdio', ['cmdserver']) |
|
|
6407 | 6407 | opts = pycompat.byteskwargs(opts) |
|
|
6408 | 6408 | if opts[b"print_url"] and ui.verbose: |
|
|
6409 | 6409 | raise error.InputError(_(b"cannot use --print-url with --verbose")) |
|
|
6410 | 6410 | |
|
|
6411 | 6411 | if opts[b"stdio"]: |
|
|
6412 | 6412 | if repo is None: |
|
|
6413 | 6413 | raise error.RepoError( |
|
|
6414 | 6414 | _(b"there is no Mercurial repository here (.hg not found)") |
|
|
6415 | 6415 | ) |
|
|
6416 | 6416 | s = wireprotoserver.sshserver(ui, repo) |
|
|
6417 | 6417 | s.serve_forever() |
|
|
6418 | 6418 | return |
|
|
6419 | 6419 | |
|
|
6420 | 6420 | service = server.createservice(ui, repo, opts) |
|
|
6421 | 6421 | return server.runservice(opts, initfn=service.init, runfn=service.run) |
|
|
6422 | 6422 | |
|
|
6423 | 6423 | |
|
|
6424 | 6424 | @command( |
|
|
6425 | 6425 | b'shelve', |
|
|
6426 | 6426 | [ |
|
|
6427 | 6427 | ( |
|
|
6428 | 6428 | b'A', |
|
|
6429 | 6429 | b'addremove', |
|
|
6430 | 6430 | None, |
|
|
6431 | 6431 | _(b'mark new/missing files as added/removed before shelving'), |
|
|
6432 | 6432 | ), |
|
|
6433 | 6433 | (b'u', b'unknown', None, _(b'store unknown files in the shelve')), |
|
|
6434 | 6434 | (b'', b'cleanup', None, _(b'delete all shelved changes')), |
|
|
6435 | 6435 | ( |
|
|
6436 | 6436 | b'', |
|
|
6437 | 6437 | b'date', |
|
|
6438 | 6438 | b'', |
|
|
6439 | 6439 | _(b'shelve with the specified commit date'), |
|
|
6440 | 6440 | _(b'DATE'), |
|
|
6441 | 6441 | ), |
|
|
6442 | 6442 | (b'd', b'delete', None, _(b'delete the named shelved change(s)')), |
|
|
6443 | 6443 | (b'e', b'edit', False, _(b'invoke editor on commit messages')), |
|
|
6444 | 6444 | ( |
|
|
6445 | 6445 | b'k', |
|
|
6446 | 6446 | b'keep', |
|
|
6447 | 6447 | False, |
|
|
6448 | 6448 | _(b'shelve, but keep changes in the working directory'), |
|
|
6449 | 6449 | ), |
|
|
6450 | 6450 | (b'l', b'list', None, _(b'list current shelves')), |
|
|
6451 | 6451 | (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')), |
|
|
6452 | 6452 | ( |
|
|
6453 | 6453 | b'n', |
|
|
6454 | 6454 | b'name', |
|
|
6455 | 6455 | b'', |
|
|
6456 | 6456 | _(b'use the given name for the shelved commit'), |
|
|
6457 | 6457 | _(b'NAME'), |
|
|
6458 | 6458 | ), |
|
|
6459 | 6459 | ( |
|
|
6460 | 6460 | b'p', |
|
|
6461 | 6461 | b'patch', |
|
|
6462 | 6462 | None, |
|
|
6463 | 6463 | _( |
|
|
6464 | 6464 | b'output patches for changes (provide the names of the shelved ' |
|
|
6465 | 6465 | b'changes as positional arguments)' |
|
|
6466 | 6466 | ), |
|
|
6467 | 6467 | ), |
|
|
6468 | 6468 | (b'i', b'interactive', None, _(b'interactive mode')), |
|
|
6469 | 6469 | ( |
|
|
6470 | 6470 | b'', |
|
|
6471 | 6471 | b'stat', |
|
|
6472 | 6472 | None, |
|
|
6473 | 6473 | _( |
|
|
6474 | 6474 | b'output diffstat-style summary of changes (provide the names of ' |
|
|
6475 | 6475 | b'the shelved changes as positional arguments)' |
|
|
6476 | 6476 | ), |
|
|
6477 | 6477 | ), |
|
|
6478 | 6478 | ] |
|
|
6479 | 6479 | + cmdutil.walkopts, |
|
|
6480 | 6480 | _(b'hg shelve [OPTION]... [FILE]...'), |
|
|
6481 | 6481 | helpcategory=command.CATEGORY_WORKING_DIRECTORY, |
|
|
6482 | 6482 | ) |
|
|
6483 | 6483 | def shelve(ui, repo, *pats, **opts): |
|
|
6484 | 6484 | """save and set aside changes from the working directory |
|
|
6485 | 6485 | |
|
|
6486 | 6486 | Shelving takes files that "hg status" reports as not clean, saves |
|
|
6487 | 6487 | the modifications to a bundle (a shelved change), and reverts the |
|
|
6488 | 6488 | files so that their state in the working directory becomes clean. |
|
|
6489 | 6489 | |
|
|
6490 | 6490 | To restore these changes to the working directory, using "hg |
|
|
6491 | 6491 | unshelve"; this will work even if you switch to a different |
|
|
6492 | 6492 | commit. |
|
|
6493 | 6493 | |
|
|
6494 | 6494 | When no files are specified, "hg shelve" saves all not-clean |
|
|
6495 | 6495 | files. If specific files or directories are named, only changes to |
|
|
6496 | 6496 | those files are shelved. |
|
|
6497 | 6497 | |
|
|
6498 | 6498 | In bare shelve (when no files are specified, without interactive, |
|
|
6499 | 6499 | include and exclude option), shelving remembers information if the |
|
|
6500 | 6500 | working directory was on newly created branch, in other words working |
|
|
6501 | 6501 | directory was on different branch than its first parent. In this |
|
|
6502 | 6502 | situation unshelving restores branch information to the working directory. |
|
|
6503 | 6503 | |
|
|
6504 | 6504 | Each shelved change has a name that makes it easier to find later. |
|
|
6505 | 6505 | The name of a shelved change defaults to being based on the active |
|
|
6506 | 6506 | bookmark, or if there is no active bookmark, the current named |
|
|
6507 | 6507 | branch. To specify a different name, use ``--name``. |
|
|
6508 | 6508 | |
|
|
6509 | 6509 | To see a list of existing shelved changes, use the ``--list`` |
|
|
6510 | 6510 | option. For each shelved change, this will print its name, age, |
|
|
6511 | 6511 | and description; use ``--patch`` or ``--stat`` for more details. |
|
|
6512 | 6512 | |
|
|
6513 | 6513 | To delete specific shelved changes, use ``--delete``. To delete |
|
|
6514 | 6514 | all shelved changes, use ``--cleanup``. |
|
|
6515 | 6515 | """ |
|
|
6516 | 6516 | opts = pycompat.byteskwargs(opts) |
|
|
6517 | 6517 | allowables = [ |
|
|
6518 | 6518 | (b'addremove', {b'create'}), # 'create' is pseudo action |
|
|
6519 | 6519 | (b'unknown', {b'create'}), |
|
|
6520 | 6520 | (b'cleanup', {b'cleanup'}), |
|
|
6521 | 6521 | # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests |
|
|
6522 | 6522 | (b'delete', {b'delete'}), |
|
|
6523 | 6523 | (b'edit', {b'create'}), |
|
|
6524 | 6524 | (b'keep', {b'create'}), |
|
|
6525 | 6525 | (b'list', {b'list'}), |
|
|
6526 | 6526 | (b'message', {b'create'}), |
|
|
6527 | 6527 | (b'name', {b'create'}), |
|
|
6528 | 6528 | (b'patch', {b'patch', b'list'}), |
|
|
6529 | 6529 | (b'stat', {b'stat', b'list'}), |
|
|
6530 | 6530 | ] |
|
|
6531 | 6531 | |
|
|
6532 | 6532 | def checkopt(opt): |
|
|
6533 | 6533 | if opts.get(opt): |
|
|
6534 | 6534 | for i, allowable in allowables: |
|
|
6535 | 6535 | if opts[i] and opt not in allowable: |
|
|
6536 | 6536 | raise error.InputError( |
|
|
6537 | 6537 | _( |
|
|
6538 | 6538 | b"options '--%s' and '--%s' may not be " |
|
|
6539 | 6539 | b"used together" |
|
|
6540 | 6540 | ) |
|
|
6541 | 6541 | % (opt, i) |
|
|
6542 | 6542 | ) |
|
|
6543 | 6543 | return True |
|
|
6544 | 6544 | |
|
|
6545 | 6545 | if checkopt(b'cleanup'): |
|
|
6546 | 6546 | if pats: |
|
|
6547 | 6547 | raise error.InputError( |
|
|
6548 | 6548 | _(b"cannot specify names when using '--cleanup'") |
|
|
6549 | 6549 | ) |
|
|
6550 | 6550 | return shelvemod.cleanupcmd(ui, repo) |
|
|
6551 | 6551 | elif checkopt(b'delete'): |
|
|
6552 | 6552 | return shelvemod.deletecmd(ui, repo, pats) |
|
|
6553 | 6553 | elif checkopt(b'list'): |
|
|
6554 | 6554 | return shelvemod.listcmd(ui, repo, pats, opts) |
|
|
6555 | 6555 | elif checkopt(b'patch') or checkopt(b'stat'): |
|
|
6556 | 6556 | return shelvemod.patchcmds(ui, repo, pats, opts) |
|
|
6557 | 6557 | else: |
|
|
6558 | 6558 | return shelvemod.createcmd(ui, repo, pats, opts) |
|
|
6559 | 6559 | |
|
|
6560 | 6560 | |
|
|
6561 | 6561 | _NOTTERSE = b'nothing' |
|
|
6562 | 6562 | |
|
|
6563 | 6563 | |
|
|
6564 | 6564 | @command( |
|
|
6565 | 6565 | b'status|st', |
|
|
6566 | 6566 | [ |
|
|
6567 | 6567 | (b'A', b'all', None, _(b'show status of all files')), |
|
|
6568 | 6568 | (b'm', b'modified', None, _(b'show only modified files')), |
|
|
6569 | 6569 | (b'a', b'added', None, _(b'show only added files')), |
|
|
6570 | 6570 | (b'r', b'removed', None, _(b'show only removed files')), |
|
|
6571 | 6571 | (b'd', b'deleted', None, _(b'show only missing files')), |
|
|
6572 | 6572 | (b'c', b'clean', None, _(b'show only files without changes')), |
|
|
6573 | 6573 | (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')), |
|
|
6574 | 6574 | (b'i', b'ignored', None, _(b'show only ignored files')), |
|
|
6575 | 6575 | (b'n', b'no-status', None, _(b'hide status prefix')), |
|
|
6576 | 6576 | (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')), |
|
|
6577 | 6577 | ( |
|
|
6578 | 6578 | b'C', |
|
|
6579 | 6579 | b'copies', |
|
|
6580 | 6580 | None, |
|
|
6581 | 6581 | _(b'show source of copied files (DEFAULT: ui.statuscopies)'), |
|
|
6582 | 6582 | ), |
|
|
6583 | 6583 | ( |
|
|
6584 | 6584 | b'0', |
|
|
6585 | 6585 | b'print0', |
|
|
6586 | 6586 | None, |
|
|
6587 | 6587 | _(b'end filenames with NUL, for use with xargs'), |
|
|
6588 | 6588 | ), |
|
|
6589 | 6589 | (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')), |
|
|
6590 | 6590 | ( |
|
|
6591 | 6591 | b'', |
|
|
6592 | 6592 | b'change', |
|
|
6593 | 6593 | b'', |
|
|
6594 | 6594 | _(b'list the changed files of a revision'), |
|
|
6595 | 6595 | _(b'REV'), |
|
|
6596 | 6596 | ), |
|
|
6597 | 6597 | ] |
|
|
6598 | 6598 | + walkopts |
|
|
6599 | 6599 | + subrepoopts |
|
|
6600 | 6600 | + formatteropts, |
|
|
6601 | 6601 | _(b'[OPTION]... [FILE]...'), |
|
|
6602 | 6602 | helpcategory=command.CATEGORY_WORKING_DIRECTORY, |
|
|
6603 | 6603 | helpbasic=True, |
|
|
6604 | 6604 | inferrepo=True, |
|
|
6605 | 6605 | intents={INTENT_READONLY}, |
|
|
6606 | 6606 | ) |
|
|
6607 | 6607 | def status(ui, repo, *pats, **opts): |
|
|
6608 | 6608 | """show changed files in the working directory |
|
|
6609 | 6609 | |
|
|
6610 | 6610 | Show status of files in the repository. If names are given, only |
|
|
6611 | 6611 | files that match are shown. Files that are clean or ignored or |
|
|
6612 | 6612 | the source of a copy/move operation, are not listed unless |
|
|
6613 | 6613 | -c/--clean, -i/--ignored, -C/--copies or -A/--all are given. |
|
|
6614 | 6614 | Unless options described with "show only ..." are given, the |
|
|
6615 | 6615 | options -mardu are used. |
|
|
6616 | 6616 | |
|
|
6617 | 6617 | Option -q/--quiet hides untracked (unknown and ignored) files |
|
|
6618 | 6618 | unless explicitly requested with -u/--unknown or -i/--ignored. |
|
|
6619 | 6619 | |
|
|
6620 | 6620 | .. note:: |
|
|
6621 | 6621 | |
|
|
6622 | 6622 | :hg:`status` may appear to disagree with diff if permissions have |
|
|
6623 | 6623 | changed or a merge has occurred. The standard diff format does |
|
|
6624 | 6624 | not report permission changes and diff only reports changes |
|
|
6625 | 6625 | relative to one merge parent. |
|
|
6626 | 6626 | |
|
|
6627 | 6627 | If one revision is given, it is used as the base revision. |
|
|
6628 | 6628 | If two revisions are given, the differences between them are |
|
|
6629 | 6629 | shown. The --change option can also be used as a shortcut to list |
|
|
6630 | 6630 | the changed files of a revision from its first parent. |
|
|
6631 | 6631 | |
|
|
6632 | 6632 | The codes used to show the status of files are:: |
|
|
6633 | 6633 | |
|
|
6634 | 6634 | M = modified |
|
|
6635 | 6635 | A = added |
|
|
6636 | 6636 | R = removed |
|
|
6637 | 6637 | C = clean |
|
|
6638 | 6638 | ! = missing (deleted by non-hg command, but still tracked) |
|
|
6639 | 6639 | ? = not tracked |
|
|
6640 | 6640 | I = ignored |
|
|
6641 | 6641 | = origin of the previous file (with --copies) |
|
|
6642 | 6642 | |
|
|
6643 | 6643 | .. container:: verbose |
|
|
6644 | 6644 | |
|
|
6645 | 6645 | The -t/--terse option abbreviates the output by showing only the directory |
|
|
6646 | 6646 | name if all the files in it share the same status. The option takes an |
|
|
6647 | 6647 | argument indicating the statuses to abbreviate: 'm' for 'modified', 'a' |
|
|
6648 | 6648 | for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i' |
|
|
6649 | 6649 | for 'ignored' and 'c' for clean. |
|
|
6650 | 6650 | |
|
|
6651 | 6651 | It abbreviates only those statuses which are passed. Note that clean and |
|
|
6652 | 6652 | ignored files are not displayed with '--terse ic' unless the -c/--clean |
|
|
6653 | 6653 | and -i/--ignored options are also used. |
|
|
6654 | 6654 | |
|
|
6655 | 6655 | The -v/--verbose option shows information when the repository is in an |
|
|
6656 | 6656 | unfinished merge, shelve, rebase state etc. You can have this behavior |
|
|
6657 | 6657 | turned on by default by enabling the ``commands.status.verbose`` option. |
|
|
6658 | 6658 | |
|
|
6659 | 6659 | You can skip displaying some of these states by setting |
|
|
6660 | 6660 | ``commands.status.skipstates`` to one or more of: 'bisect', 'graft', |
|
|
6661 | 6661 | 'histedit', 'merge', 'rebase', or 'unshelve'. |
|
|
6662 | 6662 | |
|
|
6663 | 6663 | Template: |
|
|
6664 | 6664 | |
|
|
6665 | 6665 | The following keywords are supported in addition to the common template |
|
|
6666 | 6666 | keywords and functions. See also :hg:`help templates`. |
|
|
6667 | 6667 | |
|
|
6668 | 6668 | :path: String. Repository-absolute path of the file. |
|
|
6669 | 6669 | :source: String. Repository-absolute path of the file originated from. |
|
|
6670 | 6670 | Available if ``--copies`` is specified. |
|
|
6671 | 6671 | :status: String. Character denoting file's status. |
|
|
6672 | 6672 | |
|
|
6673 | 6673 | Examples: |
|
|
6674 | 6674 | |
|
|
6675 | 6675 | - show changes in the working directory relative to a |
|
|
6676 | 6676 | changeset:: |
|
|
6677 | 6677 | |
|
|
6678 | 6678 | hg status --rev 9353 |
|
|
6679 | 6679 | |
|
|
6680 | 6680 | - show changes in the working directory relative to the |
|
|
6681 | 6681 | current directory (see :hg:`help patterns` for more information):: |
|
|
6682 | 6682 | |
|
|
6683 | 6683 | hg status re: |
|
|
6684 | 6684 | |
|
|
6685 | 6685 | - show all changes including copies in an existing changeset:: |
|
|
6686 | 6686 | |
|
|
6687 | 6687 | hg status --copies --change 9353 |
|
|
6688 | 6688 | |
|
|
6689 | 6689 | - get a NUL separated list of added files, suitable for xargs:: |
|
|
6690 | 6690 | |
|
|
6691 | 6691 | hg status -an0 |
|
|
6692 | 6692 | |
|
|
6693 | 6693 | - show more information about the repository status, abbreviating |
|
|
6694 | 6694 | added, removed, modified, deleted, and untracked paths:: |
|
|
6695 | 6695 | |
|
|
6696 | 6696 | hg status -v -t mardu |
|
|
6697 | 6697 | |
|
|
6698 | 6698 | Returns 0 on success. |
|
|
6699 | 6699 | |
|
|
6700 | 6700 | """ |
|
|
6701 | 6701 | |
|
|
6702 | 6702 | cmdutil.check_at_most_one_arg(opts, 'rev', 'change') |
|
|
6703 | 6703 | opts = pycompat.byteskwargs(opts) |
|
|
6704 | 6704 | revs = opts.get(b'rev') |
|
|
6705 | 6705 | change = opts.get(b'change') |
|
|
6706 | 6706 | terse = opts.get(b'terse') |
|
|
6707 | 6707 | if terse is _NOTTERSE: |
|
|
6708 | 6708 | if revs: |
|
|
6709 | 6709 | terse = b'' |
|
|
6710 | 6710 | else: |
|
|
6711 | 6711 | terse = ui.config(b'commands', b'status.terse') |
|
|
6712 | 6712 | |
|
|
6713 | 6713 | if revs and terse: |
|
|
6714 | 6714 | msg = _(b'cannot use --terse with --rev') |
|
|
6715 | 6715 | raise error.InputError(msg) |
|
|
6716 | 6716 | elif change: |
|
|
6717 | 6717 | repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn') |
|
|
6718 | 6718 | ctx2 = scmutil.revsingle(repo, change, None) |
|
|
6719 | 6719 | ctx1 = ctx2.p1() |
|
|
6720 | 6720 | else: |
|
|
6721 | 6721 | repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn') |
|
|
6722 | 6722 | ctx1, ctx2 = scmutil.revpair(repo, revs) |
|
|
6723 | 6723 | |
|
|
6724 | 6724 | forcerelativevalue = None |
|
|
6725 | 6725 | if ui.hasconfig(b'commands', b'status.relative'): |
|
|
6726 | 6726 | forcerelativevalue = ui.configbool(b'commands', b'status.relative') |
|
|
6727 | 6727 | uipathfn = scmutil.getuipathfn( |
|
|
6728 | 6728 | repo, |
|
|
6729 | 6729 | legacyrelativevalue=bool(pats), |
|
|
6730 | 6730 | forcerelativevalue=forcerelativevalue, |
|
|
6731 | 6731 | ) |
|
|
6732 | 6732 | |
|
|
6733 | 6733 | if opts.get(b'print0'): |
|
|
6734 | 6734 | end = b'\0' |
|
|
6735 | 6735 | else: |
|
|
6736 | 6736 | end = b'\n' |
|
|
6737 | 6737 | states = b'modified added removed deleted unknown ignored clean'.split() |
|
|
6738 | 6738 | show = [k for k in states if opts.get(k)] |
|
|
6739 | 6739 | if opts.get(b'all'): |
|
|
6740 | 6740 | show += ui.quiet and (states[:4] + [b'clean']) or states |
|
|
6741 | 6741 | |
|
|
6742 | 6742 | if not show: |
|
|
6743 | 6743 | if ui.quiet: |
|
|
6744 | 6744 | show = states[:4] |
|
|
6745 | 6745 | else: |
|
|
6746 | 6746 | show = states[:5] |
|
|
6747 | 6747 | |
|
|
6748 | 6748 | m = scmutil.match(ctx2, pats, opts) |
|
|
6749 | 6749 | if terse: |
|
|
6750 | 6750 | # we need to compute clean and unknown to terse |
|
|
6751 | 6751 | stat = repo.status( |
|
|
6752 | 6752 | ctx1.node(), |
|
|
6753 | 6753 | ctx2.node(), |
|
|
6754 | 6754 | m, |
|
|
6755 | 6755 | b'ignored' in show or b'i' in terse, |
|
|
6756 | 6756 | clean=True, |
|
|
6757 | 6757 | unknown=True, |
|
|
6758 | 6758 | listsubrepos=opts.get(b'subrepos'), |
|
|
6759 | 6759 | ) |
|
|
6760 | 6760 | |
|
|
6761 | 6761 | stat = cmdutil.tersedir(stat, terse) |
|
|
6762 | 6762 | else: |
|
|
6763 | 6763 | stat = repo.status( |
|
|
6764 | 6764 | ctx1.node(), |
|
|
6765 | 6765 | ctx2.node(), |
|
|
6766 | 6766 | m, |
|
|
6767 | 6767 | b'ignored' in show, |
|
|
6768 | 6768 | b'clean' in show, |
|
|
6769 | 6769 | b'unknown' in show, |
|
|
6770 | 6770 | opts.get(b'subrepos'), |
|
|
6771 | 6771 | ) |
|
|
6772 | 6772 | |
|
|
6773 | 6773 | changestates = zip( |
|
|
6774 | 6774 | states, |
|
|
6775 | 6775 | pycompat.iterbytestr(b'MAR!?IC'), |
|
|
6776 | 6776 | [getattr(stat, s.decode('utf8')) for s in states], |
|
|
6777 | 6777 | ) |
|
|
6778 | 6778 | |
|
|
6779 | 6779 | copy = {} |
|
|
6780 | 6780 | if ( |
|
|
6781 | 6781 | opts.get(b'all') |
|
|
6782 | 6782 | or opts.get(b'copies') |
|
|
6783 | 6783 | or ui.configbool(b'ui', b'statuscopies') |
|
|
6784 | 6784 | ) and not opts.get(b'no_status'): |
|
|
6785 | 6785 | copy = copies.pathcopies(ctx1, ctx2, m) |
|
|
6786 | 6786 | |
|
|
6787 | 6787 | morestatus = None |
|
|
6788 | 6788 | if ( |
|
|
6789 | 6789 | (ui.verbose or ui.configbool(b'commands', b'status.verbose')) |
|
|
6790 | 6790 | and not ui.plain() |
|
|
6791 | 6791 | and not opts.get(b'print0') |
|
|
6792 | 6792 | ): |
|
|
6793 | 6793 | morestatus = cmdutil.readmorestatus(repo) |
|
|
6794 | 6794 | |
|
|
6795 | 6795 | ui.pager(b'status') |
|
|
6796 | 6796 | fm = ui.formatter(b'status', opts) |
|
|
6797 | 6797 | fmt = b'%s' + end |
|
|
6798 | 6798 | showchar = not opts.get(b'no_status') |
|
|
6799 | 6799 | |
|
|
6800 | 6800 | for state, char, files in changestates: |
|
|
6801 | 6801 | if state in show: |
|
|
6802 | 6802 | label = b'status.' + state |
|
|
6803 | 6803 | for f in files: |
|
|
6804 | 6804 | fm.startitem() |
|
|
6805 | 6805 | fm.context(ctx=ctx2) |
|
|
6806 | 6806 | fm.data(itemtype=b'file', path=f) |
|
|
6807 | 6807 | fm.condwrite(showchar, b'status', b'%s ', char, label=label) |
|
|
6808 | 6808 | fm.plain(fmt % uipathfn(f), label=label) |
|
|
6809 | 6809 | if f in copy: |
|
|
6810 | 6810 | fm.data(source=copy[f]) |
|
|
6811 | 6811 | fm.plain( |
|
|
6812 | 6812 | (b' %s' + end) % uipathfn(copy[f]), |
|
|
6813 | 6813 | label=b'status.copied', |
|
|
6814 | 6814 | ) |
|
|
6815 | 6815 | if morestatus: |
|
|
6816 | 6816 | morestatus.formatfile(f, fm) |
|
|
6817 | 6817 | |
|
|
6818 | 6818 | if morestatus: |
|
|
6819 | 6819 | morestatus.formatfooter(fm) |
|
|
6820 | 6820 | fm.end() |
|
|
6821 | 6821 | |
|
|
6822 | 6822 | |
|
|
6823 | 6823 | @command( |
|
|
6824 | 6824 | b'summary|sum', |
|
|
6825 | 6825 | [(b'', b'remote', None, _(b'check for push and pull'))], |
|
|
6826 | 6826 | b'[--remote]', |
|
|
6827 | 6827 | helpcategory=command.CATEGORY_WORKING_DIRECTORY, |
|
|
6828 | 6828 | helpbasic=True, |
|
|
6829 | 6829 | intents={INTENT_READONLY}, |
|
|
6830 | 6830 | ) |
|
|
6831 | 6831 | def summary(ui, repo, **opts): |
|
|
6832 | 6832 | """summarize working directory state |
|
|
6833 | 6833 | |
|
|
6834 | 6834 | This generates a brief summary of the working directory state, |
|
|
6835 | 6835 | including parents, branch, commit status, phase and available updates. |
|
|
6836 | 6836 | |
|
|
6837 | 6837 | With the --remote option, this will check the default paths for |
|
|
6838 | 6838 | incoming and outgoing changes. This can be time-consuming. |
|
|
6839 | 6839 | |
|
|
6840 | 6840 | Returns 0 on success. |
|
|
6841 | 6841 | """ |
|
|
6842 | 6842 | |
|
|
6843 | 6843 | opts = pycompat.byteskwargs(opts) |
|
|
6844 | 6844 | ui.pager(b'summary') |
|
|
6845 | 6845 | ctx = repo[None] |
|
|
6846 | 6846 | parents = ctx.parents() |
|
|
6847 | 6847 | pnode = parents[0].node() |
|
|
6848 | 6848 | marks = [] |
|
|
6849 | 6849 | |
|
|
6850 | 6850 | try: |
|
|
6851 | 6851 | ms = mergestatemod.mergestate.read(repo) |
|
|
6852 | 6852 | except error.UnsupportedMergeRecords as e: |
|
|
6853 | 6853 | s = b' '.join(e.recordtypes) |
|
|
6854 | 6854 | ui.warn( |
|
|
6855 | 6855 | _(b'warning: merge state has unsupported record types: %s\n') % s |
|
|
6856 | 6856 | ) |
|
|
6857 | 6857 | unresolved = [] |
|
|
6858 | 6858 | else: |
|
|
6859 | 6859 | unresolved = list(ms.unresolved()) |
|
|
6860 | 6860 | |
|
|
6861 | 6861 | for p in parents: |
|
|
6862 | 6862 | # label with log.changeset (instead of log.parent) since this |
|
|
6863 | 6863 | # shows a working directory parent *changeset*: |
|
|
6864 | 6864 | # i18n: column positioning for "hg summary" |
|
|
6865 | 6865 | ui.write( |
|
|
6866 | 6866 | _(b'parent: %d:%s ') % (p.rev(), p), |
|
|
6867 | 6867 | label=logcmdutil.changesetlabels(p), |
|
|
6868 | 6868 | ) |
|
|
6869 | 6869 | ui.write(b' '.join(p.tags()), label=b'log.tag') |
|
|
6870 | 6870 | if p.bookmarks(): |
|
|
6871 | 6871 | marks.extend(p.bookmarks()) |
|
|
6872 | 6872 | if p.rev() == -1: |
|
|
6873 | 6873 | if not len(repo): |
|
|
6874 | 6874 | ui.write(_(b' (empty repository)')) |
|
|
6875 | 6875 | else: |
|
|
6876 | 6876 | ui.write(_(b' (no revision checked out)')) |
|
|
6877 | 6877 | if p.obsolete(): |
|
|
6878 | 6878 | ui.write(_(b' (obsolete)')) |
|
|
6879 | 6879 | if p.isunstable(): |
|
|
6880 | 6880 | instabilities = ( |
|
|
6881 | 6881 | ui.label(instability, b'trouble.%s' % instability) |
|
|
6882 | 6882 | for instability in p.instabilities() |
|
|
6883 | 6883 | ) |
|
|
6884 | 6884 | ui.write(b' (' + b', '.join(instabilities) + b')') |
|
|
6885 | 6885 | ui.write(b'\n') |
|
|
6886 | 6886 | if p.description(): |
|
|
6887 | 6887 | ui.status( |
|
|
6888 | 6888 | b' ' + p.description().splitlines()[0].strip() + b'\n', |
|
|
6889 | 6889 | label=b'log.summary', |
|
|
6890 | 6890 | ) |
|
|
6891 | 6891 | |
|
|
6892 | 6892 | branch = ctx.branch() |
|
|
6893 | 6893 | bheads = repo.branchheads(branch) |
|
|
6894 | 6894 | # i18n: column positioning for "hg summary" |
|
|
6895 | 6895 | m = _(b'branch: %s\n') % branch |
|
|
6896 | 6896 | if branch != b'default': |
|
|
6897 | 6897 | ui.write(m, label=b'log.branch') |
|
|
6898 | 6898 | else: |
|
|
6899 | 6899 | ui.status(m, label=b'log.branch') |
|
|
6900 | 6900 | |
|
|
6901 | 6901 | if marks: |
|
|
6902 | 6902 | active = repo._activebookmark |
|
|
6903 | 6903 | # i18n: column positioning for "hg summary" |
|
|
6904 | 6904 | ui.write(_(b'bookmarks:'), label=b'log.bookmark') |
|
|
6905 | 6905 | if active is not None: |
|
|
6906 | 6906 | if active in marks: |
|
|
6907 | 6907 | ui.write(b' *' + active, label=bookmarks.activebookmarklabel) |
|
|
6908 | 6908 | marks.remove(active) |
|
|
6909 | 6909 | else: |
|
|
6910 | 6910 | ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel) |
|
|
6911 | 6911 | for m in marks: |
|
|
6912 | 6912 | ui.write(b' ' + m, label=b'log.bookmark') |
|
|
6913 | 6913 | ui.write(b'\n', label=b'log.bookmark') |
|
|
6914 | 6914 | |
|
|
6915 | 6915 | status = repo.status(unknown=True) |
|
|
6916 | 6916 | |
|
|
6917 | 6917 | c = repo.dirstate.copies() |
|
|
6918 | 6918 | copied, renamed = [], [] |
|
|
6919 | 6919 | for d, s in pycompat.iteritems(c): |
|
|
6920 | 6920 | if s in status.removed: |
|
|
6921 | 6921 | status.removed.remove(s) |
|
|
6922 | 6922 | renamed.append(d) |
|
|
6923 | 6923 | else: |
|
|
6924 | 6924 | copied.append(d) |
|
|
6925 | 6925 | if d in status.added: |
|
|
6926 | 6926 | status.added.remove(d) |
|
|
6927 | 6927 | |
|
|
6928 | 6928 | subs = [s for s in ctx.substate if ctx.sub(s).dirty()] |
|
|
6929 | 6929 | |
|
|
6930 | 6930 | labels = [ |
|
|
6931 | 6931 | (ui.label(_(b'%d modified'), b'status.modified'), status.modified), |
|
|
6932 | 6932 | (ui.label(_(b'%d added'), b'status.added'), status.added), |
|
|
6933 | 6933 | (ui.label(_(b'%d removed'), b'status.removed'), status.removed), |
|
|
6934 | 6934 | (ui.label(_(b'%d renamed'), b'status.copied'), renamed), |
|
|
6935 | 6935 | (ui.label(_(b'%d copied'), b'status.copied'), copied), |
|
|
6936 | 6936 | (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted), |
|
|
6937 | 6937 | (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown), |
|
|
6938 | 6938 | (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved), |
|
|
6939 | 6939 | (ui.label(_(b'%d subrepos'), b'status.modified'), subs), |
|
|
6940 | 6940 | ] |
|
|
6941 | 6941 | t = [] |
|
|
6942 | 6942 | for l, s in labels: |
|
|
6943 | 6943 | if s: |
|
|
6944 | 6944 | t.append(l % len(s)) |
|
|
6945 | 6945 | |
|
|
6946 | 6946 | t = b', '.join(t) |
|
|
6947 | 6947 | cleanworkdir = False |
|
|
6948 | 6948 | |
|
|
6949 | 6949 | if repo.vfs.exists(b'graftstate'): |
|
|
6950 | 6950 | t += _(b' (graft in progress)') |
|
|
6951 | 6951 | if repo.vfs.exists(b'updatestate'): |
|
|
6952 | 6952 | t += _(b' (interrupted update)') |
|
|
6953 | 6953 | elif len(parents) > 1: |
|
|
6954 | 6954 | t += _(b' (merge)') |
|
|
6955 | 6955 | elif branch != parents[0].branch(): |
|
|
6956 | 6956 | t += _(b' (new branch)') |
|
|
6957 | 6957 | elif parents[0].closesbranch() and pnode in repo.branchheads( |
|
|
6958 | 6958 | branch, closed=True |
|
|
6959 | 6959 | ): |
|
|
6960 | 6960 | t += _(b' (head closed)') |
|
|
6961 | 6961 | elif not ( |
|
|
6962 | 6962 | status.modified |
|
|
6963 | 6963 | or status.added |
|
|
6964 | 6964 | or status.removed |
|
|
6965 | 6965 | or renamed |
|
|
6966 | 6966 | or copied |
|
|
6967 | 6967 | or subs |
|
|
6968 | 6968 | ): |
|
|
6969 | 6969 | t += _(b' (clean)') |
|
|
6970 | 6970 | cleanworkdir = True |
|
|
6971 | 6971 | elif pnode not in bheads: |
|
|
6972 | 6972 | t += _(b' (new branch head)') |
|
|
6973 | 6973 | |
|
|
6974 | 6974 | if parents: |
|
|
6975 | 6975 | pendingphase = max(p.phase() for p in parents) |
|
|
6976 | 6976 | else: |
|
|
6977 | 6977 | pendingphase = phases.public |
|
|
6978 | 6978 | |
|
|
6979 | 6979 | if pendingphase > phases.newcommitphase(ui): |
|
|
6980 | 6980 | t += b' (%s)' % phases.phasenames[pendingphase] |
|
|
6981 | 6981 | |
|
|
6982 | 6982 | if cleanworkdir: |
|
|
6983 | 6983 | # i18n: column positioning for "hg summary" |
|
|
6984 | 6984 | ui.status(_(b'commit: %s\n') % t.strip()) |
|
|
6985 | 6985 | else: |
|
|
6986 | 6986 | # i18n: column positioning for "hg summary" |
|
|
6987 | 6987 | ui.write(_(b'commit: %s\n') % t.strip()) |
|
|
6988 | 6988 | |
|
|
6989 | 6989 | # all ancestors of branch heads - all ancestors of parent = new csets |
|
|
6990 | 6990 | new = len( |
|
|
6991 | 6991 | repo.changelog.findmissing([pctx.node() for pctx in parents], bheads) |
|
|
6992 | 6992 | ) |
|
|
6993 | 6993 | |
|
|
6994 | 6994 | if new == 0: |
|
|
6995 | 6995 | # i18n: column positioning for "hg summary" |
|
|
6996 | 6996 | ui.status(_(b'update: (current)\n')) |
|
|
6997 | 6997 | elif pnode not in bheads: |
|
|
6998 | 6998 | # i18n: column positioning for "hg summary" |
|
|
6999 | 6999 | ui.write(_(b'update: %d new changesets (update)\n') % new) |
|
|
7000 | 7000 | else: |
|
|
7001 | 7001 | # i18n: column positioning for "hg summary" |
|
|
7002 | 7002 | ui.write( |
|
|
7003 | 7003 | _(b'update: %d new changesets, %d branch heads (merge)\n') |
|
|
7004 | 7004 | % (new, len(bheads)) |
|
|
7005 | 7005 | ) |
|
|
7006 | 7006 | |
|
|
7007 | 7007 | t = [] |
|
|
7008 | 7008 | draft = len(repo.revs(b'draft()')) |
|
|
7009 | 7009 | if draft: |
|
|
7010 | 7010 | t.append(_(b'%d draft') % draft) |
|
|
7011 | 7011 | secret = len(repo.revs(b'secret()')) |
|
|
7012 | 7012 | if secret: |
|
|
7013 | 7013 | t.append(_(b'%d secret') % secret) |
|
|
7014 | 7014 | |
|
|
7015 | 7015 | if draft or secret: |
|
|
7016 | 7016 | ui.status(_(b'phases: %s\n') % b', '.join(t)) |
|
|
7017 | 7017 | |
|
|
7018 | 7018 | if obsolete.isenabled(repo, obsolete.createmarkersopt): |
|
|
7019 | 7019 | for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"): |
|
|
7020 | 7020 | numtrouble = len(repo.revs(trouble + b"()")) |
|
|
7021 | 7021 | # We write all the possibilities to ease translation |
|
|
7022 | 7022 | troublemsg = { |
|
|
7023 | 7023 | b"orphan": _(b"orphan: %d changesets"), |
|
|
7024 | 7024 | b"contentdivergent": _(b"content-divergent: %d changesets"), |
|
|
7025 | 7025 | b"phasedivergent": _(b"phase-divergent: %d changesets"), |
|
|
7026 | 7026 | } |
|
|
7027 | 7027 | if numtrouble > 0: |
|
|
7028 | 7028 | ui.status(troublemsg[trouble] % numtrouble + b"\n") |
|
|
7029 | 7029 | |
|
|
7030 | 7030 | cmdutil.summaryhooks(ui, repo) |
|
|
7031 | 7031 | |
|
|
7032 | 7032 | if opts.get(b'remote'): |
|
|
7033 | 7033 | needsincoming, needsoutgoing = True, True |
|
|
7034 | 7034 | else: |
|
|
7035 | 7035 | needsincoming, needsoutgoing = False, False |
|
|
7036 | 7036 | for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None): |
|
|
7037 | 7037 | if i: |
|
|
7038 | 7038 | needsincoming = True |
|
|
7039 | 7039 | if o: |
|
|
7040 | 7040 | needsoutgoing = True |
|
|
7041 | 7041 | if not needsincoming and not needsoutgoing: |
|
|
7042 | 7042 | return |
|
|
7043 | 7043 | |
|
|
7044 | 7044 | def getincoming(): |
|
|
7045 | 7045 | source, branches = hg.parseurl(ui.expandpath(b'default')) |
|
|
7046 | 7046 | sbranch = branches[0] |
|
|
7047 | 7047 | try: |
|
|
7048 | 7048 | other = hg.peer(repo, {}, source) |
|
|
7049 | 7049 | except error.RepoError: |
|
|
7050 | 7050 | if opts.get(b'remote'): |
|
|
7051 | 7051 | raise |
|
|
7052 | 7052 | return source, sbranch, None, None, None |
|
|
7053 | 7053 | revs, checkout = hg.addbranchrevs(repo, other, branches, None) |
|
|
7054 | 7054 | if revs: |
|
|
7055 | 7055 | revs = [other.lookup(rev) for rev in revs] |
|
|
7056 | 7056 | ui.debug(b'comparing with %s\n' % util.hidepassword(source)) |
|
|
7057 | 7057 | repo.ui.pushbuffer() |
|
|
7058 | 7058 | commoninc = discovery.findcommonincoming(repo, other, heads=revs) |
|
|
7059 | 7059 | repo.ui.popbuffer() |
|
|
7060 | 7060 | return source, sbranch, other, commoninc, commoninc[1] |
|
|
7061 | 7061 | |
|
|
7062 | 7062 | if needsincoming: |
|
|
7063 | 7063 | source, sbranch, sother, commoninc, incoming = getincoming() |
|
|
7064 | 7064 | else: |
|
|
7065 | 7065 | source = sbranch = sother = commoninc = incoming = None |
|
|
7066 | 7066 | |
|
|
7067 | 7067 | def getoutgoing(): |
|
|
7068 | 7068 | dest, branches = hg.parseurl(ui.expandpath(b'default-push', b'default')) |
|
|
7069 | 7069 | dbranch = branches[0] |
|
|
7070 | 7070 | revs, checkout = hg.addbranchrevs(repo, repo, branches, None) |
|
|
7071 | 7071 | if source != dest: |
|
|
7072 | 7072 | try: |
|
|
7073 | 7073 | dother = hg.peer(repo, {}, dest) |
|
|
7074 | 7074 | except error.RepoError: |
|
|
7075 | 7075 | if opts.get(b'remote'): |
|
|
7076 | 7076 | raise |
|
|
7077 | 7077 | return dest, dbranch, None, None |
|
|
7078 | 7078 | ui.debug(b'comparing with %s\n' % util.hidepassword(dest)) |
|
|
7079 | 7079 | elif sother is None: |
|
|
7080 | 7080 | # there is no explicit destination peer, but source one is invalid |
|
|
7081 | 7081 | return dest, dbranch, None, None |
|
|
7082 | 7082 | else: |
|
|
7083 | 7083 | dother = sother |
|
|
7084 | 7084 | if source != dest or (sbranch is not None and sbranch != dbranch): |
|
|
7085 | 7085 | common = None |
|
|
7086 | 7086 | else: |
|
|
7087 | 7087 | common = commoninc |
|
|
7088 | 7088 | if revs: |
|
|
7089 | 7089 | revs = [repo.lookup(rev) for rev in revs] |
|
|
7090 | 7090 | repo.ui.pushbuffer() |
|
|
7091 | 7091 | outgoing = discovery.findcommonoutgoing( |
|
|
7092 | 7092 | repo, dother, onlyheads=revs, commoninc=common |
|
|
7093 | 7093 | ) |
|
|
7094 | 7094 | repo.ui.popbuffer() |
|
|
7095 | 7095 | return dest, dbranch, dother, outgoing |
|
|
7096 | 7096 | |
|
|
7097 | 7097 | if needsoutgoing: |
|
|
7098 | 7098 | dest, dbranch, dother, outgoing = getoutgoing() |
|
|
7099 | 7099 | else: |
|
|
7100 | 7100 | dest = dbranch = dother = outgoing = None |
|
|
7101 | 7101 | |
|
|
7102 | 7102 | if opts.get(b'remote'): |
|
|
7103 | 7103 | t = [] |
|
|
7104 | 7104 | if incoming: |
|
|
7105 | 7105 | t.append(_(b'1 or more incoming')) |
|
|
7106 | 7106 | o = outgoing.missing |
|
|
7107 | 7107 | if o: |
|
|
7108 | 7108 | t.append(_(b'%d outgoing') % len(o)) |
|
|
7109 | 7109 | other = dother or sother |
|
|
7110 | 7110 | if b'bookmarks' in other.listkeys(b'namespaces'): |
|
|
7111 | 7111 | counts = bookmarks.summary(repo, other) |
|
|
7112 | 7112 | if counts[0] > 0: |
|
|
7113 | 7113 | t.append(_(b'%d incoming bookmarks') % counts[0]) |
|
|
7114 | 7114 | if counts[1] > 0: |
|
|
7115 | 7115 | t.append(_(b'%d outgoing bookmarks') % counts[1]) |
|
|
7116 | 7116 | |
|
|
7117 | 7117 | if t: |
|
|
7118 | 7118 | # i18n: column positioning for "hg summary" |
|
|
7119 | 7119 | ui.write(_(b'remote: %s\n') % (b', '.join(t))) |
|
|
7120 | 7120 | else: |
|
|
7121 | 7121 | # i18n: column positioning for "hg summary" |
|
|
7122 | 7122 | ui.status(_(b'remote: (synced)\n')) |
|
|
7123 | 7123 | |
|
|
7124 | 7124 | cmdutil.summaryremotehooks( |
|
|
7125 | 7125 | ui, |
|
|
7126 | 7126 | repo, |
|
|
7127 | 7127 | opts, |
|
|
7128 | 7128 | ( |
|
|
7129 | 7129 | (source, sbranch, sother, commoninc), |
|
|
7130 | 7130 | (dest, dbranch, dother, outgoing), |
|
|
7131 | 7131 | ), |
|
|
7132 | 7132 | ) |
|
|
7133 | 7133 | |
|
|
7134 | 7134 | |
|
|
7135 | 7135 | @command( |
|
|
7136 | 7136 | b'tag', |
|
|
7137 | 7137 | [ |
|
|
7138 | 7138 | (b'f', b'force', None, _(b'force tag')), |
|
|
7139 | 7139 | (b'l', b'local', None, _(b'make the tag local')), |
|
|
7140 | 7140 | (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')), |
|
|
7141 | 7141 | (b'', b'remove', None, _(b'remove a tag')), |
|
|
7142 | 7142 | # -l/--local is already there, commitopts cannot be used |
|
|
7143 | 7143 | (b'e', b'edit', None, _(b'invoke editor on commit messages')), |
|
|
7144 | 7144 | (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')), |
|
|
7145 | 7145 | ] |
|
|
7146 | 7146 | + commitopts2, |
|
|
7147 | 7147 | _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'), |
|
|
7148 | 7148 | helpcategory=command.CATEGORY_CHANGE_ORGANIZATION, |
|
|
7149 | 7149 | ) |
|
|
7150 | 7150 | def tag(ui, repo, name1, *names, **opts): |
|
|
7151 | 7151 | """add one or more tags for the current or given revision |
|
|
7152 | 7152 | |
|
|
7153 | 7153 | Name a particular revision using <name>. |
|
|
7154 | 7154 | |
|
|
7155 | 7155 | Tags are used to name particular revisions of the repository and are |
|
|
7156 | 7156 | very useful to compare different revisions, to go back to significant |
|
|
7157 | 7157 | earlier versions or to mark branch points as releases, etc. Changing |
|
|
7158 | 7158 | an existing tag is normally disallowed; use -f/--force to override. |
|
|
7159 | 7159 | |
|
|
7160 | 7160 | If no revision is given, the parent of the working directory is |
|
|
7161 | 7161 | used. |
|
|
7162 | 7162 | |
|
|
7163 | 7163 | To facilitate version control, distribution, and merging of tags, |
|
|
7164 | 7164 | they are stored as a file named ".hgtags" which is managed similarly |
|
|
7165 | 7165 | to other project files and can be hand-edited if necessary. This |
|
|
7166 | 7166 | also means that tagging creates a new commit. The file |
|
|
7167 | 7167 | ".hg/localtags" is used for local tags (not shared among |
|
|
7168 | 7168 | repositories). |
|
|
7169 | 7169 | |
|
|
7170 | 7170 | Tag commits are usually made at the head of a branch. If the parent |
|
|
7171 | 7171 | of the working directory is not a branch head, :hg:`tag` aborts; use |
|
|
7172 | 7172 | -f/--force to force the tag commit to be based on a non-head |
|
|
7173 | 7173 | changeset. |
|
|
7174 | 7174 | |
|
|
7175 | 7175 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
|
7176 | 7176 | |
|
|
7177 | 7177 | Since tag names have priority over branch names during revision |
|
|
7178 | 7178 | lookup, using an existing branch name as a tag name is discouraged. |
|
|
7179 | 7179 | |
|
|
7180 | 7180 | Returns 0 on success. |
|
|
7181 | 7181 | """ |
|
|
7182 | 7182 | cmdutil.check_incompatible_arguments(opts, 'remove', ['rev']) |
|
|
7183 | 7183 | opts = pycompat.byteskwargs(opts) |
|
|
7184 | 7184 | with repo.wlock(), repo.lock(): |
|
|
7185 | 7185 | rev_ = b"." |
|
|
7186 | 7186 | names = [t.strip() for t in (name1,) + names] |
|
|
7187 | 7187 | if len(names) != len(set(names)): |
|
|
7188 | 7188 | raise error.InputError(_(b'tag names must be unique')) |
|
|
7189 | 7189 | for n in names: |
|
|
7190 | 7190 | scmutil.checknewlabel(repo, n, b'tag') |
|
|
7191 | 7191 | if not n: |
|
|
7192 | 7192 | raise error.InputError( |
|
|
7193 | 7193 | _(b'tag names cannot consist entirely of whitespace') |
|
|
7194 | 7194 | ) |
|
|
7195 | 7195 | if opts.get(b'rev'): |
|
|
7196 | 7196 | rev_ = opts[b'rev'] |
|
|
7197 | 7197 | message = opts.get(b'message') |
|
|
7198 | 7198 | if opts.get(b'remove'): |
|
|
7199 | 7199 | if opts.get(b'local'): |
|
|
7200 | 7200 | expectedtype = b'local' |
|
|
7201 | 7201 | else: |
|
|
7202 | 7202 | expectedtype = b'global' |
|
|
7203 | 7203 | |
|
|
7204 | 7204 | for n in names: |
|
|
7205 | 7205 | if repo.tagtype(n) == b'global': |
|
|
7206 | 7206 | alltags = tagsmod.findglobaltags(ui, repo) |
|
|
7207 | 7207 | if alltags[n][0] == nullid: |
|
|
7208 | 7208 | raise error.InputError( |
|
|
7209 | 7209 | _(b"tag '%s' is already removed") % n |
|
|
7210 | 7210 | ) |
|
|
7211 | 7211 | if not repo.tagtype(n): |
|
|
7212 | 7212 | raise error.InputError(_(b"tag '%s' does not exist") % n) |
|
|
7213 | 7213 | if repo.tagtype(n) != expectedtype: |
|
|
7214 | 7214 | if expectedtype == b'global': |
|
|
7215 | 7215 | raise error.InputError( |
|
|
7216 | 7216 | _(b"tag '%s' is not a global tag") % n |
|
|
7217 | 7217 | ) |
|
|
7218 | 7218 | else: |
|
|
7219 | 7219 | raise error.InputError( |
|
|
7220 | 7220 | _(b"tag '%s' is not a local tag") % n |
|
|
7221 | 7221 | ) |
|
|
7222 | 7222 | rev_ = b'null' |
|
|
7223 | 7223 | if not message: |
|
|
7224 | 7224 | # we don't translate commit messages |
|
|
7225 | 7225 | message = b'Removed tag %s' % b', '.join(names) |
|
|
7226 | 7226 | elif not opts.get(b'force'): |
|
|
7227 | 7227 | for n in names: |
|
|
7228 | 7228 | if n in repo.tags(): |
|
|
7229 | 7229 | raise error.InputError( |
|
|
7230 | 7230 | _(b"tag '%s' already exists (use -f to force)") % n |
|
|
7231 | 7231 | ) |
|
|
7232 | 7232 | if not opts.get(b'local'): |
|
|
7233 | 7233 | p1, p2 = repo.dirstate.parents() |
|
|
7234 | 7234 | if p2 != nullid: |
|
|
7235 | 7235 | raise error.StateError(_(b'uncommitted merge')) |
|
|
7236 | 7236 | bheads = repo.branchheads() |
|
|
7237 | 7237 | if not opts.get(b'force') and bheads and p1 not in bheads: |
|
|
7238 | 7238 | raise error.InputError( |
|
|
7239 | 7239 | _( |
|
|
7240 | 7240 | b'working directory is not at a branch head ' |
|
|
7241 | 7241 | b'(use -f to force)' |
|
|
7242 | 7242 | ) |
|
|
7243 | 7243 | ) |
|
|
7244 | 7244 | node = scmutil.revsingle(repo, rev_).node() |
|
|
7245 | 7245 | |
|
|
7246 | 7246 | if not message: |
|
|
7247 | 7247 | # we don't translate commit messages |
|
|
7248 | 7248 | message = b'Added tag %s for changeset %s' % ( |
|
|
7249 | 7249 | b', '.join(names), |
|
|
7250 | 7250 | short(node), |
|
|
7251 | 7251 | ) |
|
|
7252 | 7252 | |
|
|
7253 | 7253 | date = opts.get(b'date') |
|
|
7254 | 7254 | if date: |
|
|
7255 | 7255 | date = dateutil.parsedate(date) |
|
|
7256 | 7256 | |
|
|
7257 | 7257 | if opts.get(b'remove'): |
|
|
7258 | 7258 | editform = b'tag.remove' |
|
|
7259 | 7259 | else: |
|
|
7260 | 7260 | editform = b'tag.add' |
|
|
7261 | 7261 | editor = cmdutil.getcommiteditor( |
|
|
7262 | 7262 | editform=editform, **pycompat.strkwargs(opts) |
|
|
7263 | 7263 | ) |
|
|
7264 | 7264 | |
|
|
7265 | 7265 | # don't allow tagging the null rev |
|
|
7266 | 7266 | if ( |
|
|
7267 | 7267 | not opts.get(b'remove') |
|
|
7268 | 7268 | and scmutil.revsingle(repo, rev_).rev() == nullrev |
|
|
7269 | 7269 | ): |
|
|
7270 | 7270 | raise error.InputError(_(b"cannot tag null revision")) |
|
|
7271 | 7271 | |
|
|
7272 | 7272 | tagsmod.tag( |
|
|
7273 | 7273 | repo, |
|
|
7274 | 7274 | names, |
|
|
7275 | 7275 | node, |
|
|
7276 | 7276 | message, |
|
|
7277 | 7277 | opts.get(b'local'), |
|
|
7278 | 7278 | opts.get(b'user'), |
|
|
7279 | 7279 | date, |
|
|
7280 | 7280 | editor=editor, |
|
|
7281 | 7281 | ) |
|
|
7282 | 7282 | |
|
|
7283 | 7283 | |
|
|
7284 | 7284 | @command( |
|
|
7285 | 7285 | b'tags', |
|
|
7286 | 7286 | formatteropts, |
|
|
7287 | 7287 | b'', |
|
|
7288 | 7288 | helpcategory=command.CATEGORY_CHANGE_ORGANIZATION, |
|
|
7289 | 7289 | intents={INTENT_READONLY}, |
|
|
7290 | 7290 | ) |
|
|
7291 | 7291 | def tags(ui, repo, **opts): |
|
|
7292 | 7292 | """list repository tags |
|
|
7293 | 7293 | |
|
|
7294 | 7294 | This lists both regular and local tags. When the -v/--verbose |
|
|
7295 | 7295 | switch is used, a third column "local" is printed for local tags. |
|
|
7296 | 7296 | When the -q/--quiet switch is used, only the tag name is printed. |
|
|
7297 | 7297 | |
|
|
7298 | 7298 | .. container:: verbose |
|
|
7299 | 7299 | |
|
|
7300 | 7300 | Template: |
|
|
7301 | 7301 | |
|
|
7302 | 7302 | The following keywords are supported in addition to the common template |
|
|
7303 | 7303 | keywords and functions such as ``{tag}``. See also |
|
|
7304 | 7304 | :hg:`help templates`. |
|
|
7305 | 7305 | |
|
|
7306 | 7306 | :type: String. ``local`` for local tags. |
|
|
7307 | 7307 | |
|
|
7308 | 7308 | Returns 0 on success. |
|
|
7309 | 7309 | """ |
|
|
7310 | 7310 | |
|
|
7311 | 7311 | opts = pycompat.byteskwargs(opts) |
|
|
7312 | 7312 | ui.pager(b'tags') |
|
|
7313 | 7313 | fm = ui.formatter(b'tags', opts) |
|
|
7314 | 7314 | hexfunc = fm.hexfunc |
|
|
7315 | 7315 | |
|
|
7316 | 7316 | for t, n in reversed(repo.tagslist()): |
|
|
7317 | 7317 | hn = hexfunc(n) |
|
|
7318 | 7318 | label = b'tags.normal' |
|
|
7319 | 7319 | tagtype = repo.tagtype(t) |
|
|
7320 | 7320 | if not tagtype or tagtype == b'global': |
|
|
7321 | 7321 | tagtype = b'' |
|
|
7322 | 7322 | else: |
|
|
7323 | 7323 | label = b'tags.' + tagtype |
|
|
7324 | 7324 | |
|
|
7325 | 7325 | fm.startitem() |
|
|
7326 | 7326 | fm.context(repo=repo) |
|
|
7327 | 7327 | fm.write(b'tag', b'%s', t, label=label) |
|
|
7328 | 7328 | fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s' |
|
|
7329 | 7329 | fm.condwrite( |
|
|
7330 | 7330 | not ui.quiet, |
|
|
7331 | 7331 | b'rev node', |
|
|
7332 | 7332 | fmt, |
|
|
7333 | 7333 | repo.changelog.rev(n), |
|
|
7334 | 7334 | hn, |
|
|
7335 | 7335 | label=label, |
|
|
7336 | 7336 | ) |
|
|
7337 | 7337 | fm.condwrite( |
|
|
7338 | 7338 | ui.verbose and tagtype, b'type', b' %s', tagtype, label=label |
|
|
7339 | 7339 | ) |
|
|
7340 | 7340 | fm.plain(b'\n') |
|
|
7341 | 7341 | fm.end() |
|
|
7342 | 7342 | |
|
|
7343 | 7343 | |
|
|
7344 | 7344 | @command( |
|
|
7345 | 7345 | b'tip', |
|
|
7346 | 7346 | [ |
|
|
7347 | 7347 | (b'p', b'patch', None, _(b'show patch')), |
|
|
7348 | 7348 | (b'g', b'git', None, _(b'use git extended diff format')), |
|
|
7349 | 7349 | ] |
|
|
7350 | 7350 | + templateopts, |
|
|
7351 | 7351 | _(b'[-p] [-g]'), |
|
|
7352 | 7352 | helpcategory=command.CATEGORY_CHANGE_NAVIGATION, |
|
|
7353 | 7353 | ) |
|
|
7354 | 7354 | def tip(ui, repo, **opts): |
|
|
7355 | 7355 | """show the tip revision (DEPRECATED) |
|
|
7356 | 7356 | |
|
|
7357 | 7357 | The tip revision (usually just called the tip) is the changeset |
|
|
7358 | 7358 | most recently added to the repository (and therefore the most |
|
|
7359 | 7359 | recently changed head). |
|
|
7360 | 7360 | |
|
|
7361 | 7361 | If you have just made a commit, that commit will be the tip. If |
|
|
7362 | 7362 | you have just pulled changes from another repository, the tip of |
|
|
7363 | 7363 | that repository becomes the current tip. The "tip" tag is special |
|
|
7364 | 7364 | and cannot be renamed or assigned to a different changeset. |
|
|
7365 | 7365 | |
|
|
7366 | 7366 | This command is deprecated, please use :hg:`heads` instead. |
|
|
7367 | 7367 | |
|
|
7368 | 7368 | Returns 0 on success. |
|
|
7369 | 7369 | """ |
|
|
7370 | 7370 | opts = pycompat.byteskwargs(opts) |
|
|
7371 | 7371 | displayer = logcmdutil.changesetdisplayer(ui, repo, opts) |
|
|
7372 | 7372 | displayer.show(repo[b'tip']) |
|
|
7373 | 7373 | displayer.close() |
|
|
7374 | 7374 | |
|
|
7375 | 7375 | |
|
|
7376 | 7376 | @command( |
|
|
7377 | 7377 | b'unbundle', |
|
|
7378 | 7378 | [ |
|
|
7379 | 7379 | ( |
|
|
7380 | 7380 | b'u', |
|
|
7381 | 7381 | b'update', |
|
|
7382 | 7382 | None, |
|
|
7383 | 7383 | _(b'update to new branch head if changesets were unbundled'), |
|
|
7384 | 7384 | ) |
|
|
7385 | 7385 | ], |
|
|
7386 | 7386 | _(b'[-u] FILE...'), |
|
|
7387 | 7387 | helpcategory=command.CATEGORY_IMPORT_EXPORT, |
|
|
7388 | 7388 | ) |
|
|
7389 | 7389 | def unbundle(ui, repo, fname1, *fnames, **opts): |
|
|
7390 | 7390 | """apply one or more bundle files |
|
|
7391 | 7391 | |
|
|
7392 | 7392 | Apply one or more bundle files generated by :hg:`bundle`. |
|
|
7393 | 7393 | |
|
|
7394 | 7394 | Returns 0 on success, 1 if an update has unresolved files. |
|
|
7395 | 7395 | """ |
|
|
7396 | 7396 | fnames = (fname1,) + fnames |
|
|
7397 | 7397 | |
|
|
7398 | 7398 | with repo.lock(): |
|
|
7399 | 7399 | for fname in fnames: |
|
|
7400 | 7400 | f = hg.openpath(ui, fname) |
|
|
7401 | 7401 | gen = exchange.readbundle(ui, f, fname) |
|
|
7402 | 7402 | if isinstance(gen, streamclone.streamcloneapplier): |
|
|
7403 | 7403 | raise error.InputError( |
|
|
7404 | 7404 | _( |
|
|
7405 | 7405 | b'packed bundles cannot be applied with ' |
|
|
7406 | 7406 | b'"hg unbundle"' |
|
|
7407 | 7407 | ), |
|
|
7408 | 7408 | hint=_(b'use "hg debugapplystreamclonebundle"'), |
|
|
7409 | 7409 | ) |
|
|
7410 | 7410 | url = b'bundle:' + fname |
|
|
7411 | 7411 | try: |
|
|
7412 | 7412 | txnname = b'unbundle' |
|
|
7413 | 7413 | if not isinstance(gen, bundle2.unbundle20): |
|
|
7414 | 7414 | txnname = b'unbundle\n%s' % util.hidepassword(url) |
|
|
7415 | 7415 | with repo.transaction(txnname) as tr: |
|
|
7416 | 7416 | op = bundle2.applybundle( |
|
|
7417 | 7417 | repo, gen, tr, source=b'unbundle', url=url |
|
|
7418 | 7418 | ) |
|
|
7419 | 7419 | except error.BundleUnknownFeatureError as exc: |
|
|
7420 | 7420 | raise error.Abort( |
|
|
7421 | 7421 | _(b'%s: unknown bundle feature, %s') % (fname, exc), |
|
|
7422 | 7422 | hint=_( |
|
|
7423 | 7423 | b"see https://mercurial-scm.org/" |
|
|
7424 | 7424 | b"wiki/BundleFeature for more " |
|
|
7425 | 7425 | b"information" |
|
|
7426 | 7426 | ), |
|
|
7427 | 7427 | ) |
|
|
7428 | 7428 | modheads = bundle2.combinechangegroupresults(op) |
|
|
7429 | 7429 | |
|
|
7430 | 7430 | return postincoming(ui, repo, modheads, opts.get('update'), None, None) |
|
|
7431 | 7431 | |
|
|
7432 | 7432 | |
|
|
7433 | 7433 | @command( |
|
|
7434 | 7434 | b'unshelve', |
|
|
7435 | 7435 | [ |
|
|
7436 | 7436 | (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')), |
|
|
7437 | 7437 | ( |
|
|
7438 | 7438 | b'c', |
|
|
7439 | 7439 | b'continue', |
|
|
7440 | 7440 | None, |
|
|
7441 | 7441 | _(b'continue an incomplete unshelve operation'), |
|
|
7442 | 7442 | ), |
|
|
7443 | 7443 | (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')), |
|
|
7444 | 7444 | (b'k', b'keep', None, _(b'keep shelve after unshelving')), |
|
|
7445 | 7445 | ( |
|
|
7446 | 7446 | b'n', |
|
|
7447 | 7447 | b'name', |
|
|
7448 | 7448 | b'', |
|
|
7449 | 7449 | _(b'restore shelved change with given name'), |
|
|
7450 | 7450 | _(b'NAME'), |
|
|
7451 | 7451 | ), |
|
|
7452 | 7452 | (b't', b'tool', b'', _(b'specify merge tool')), |
|
|
7453 | 7453 | ( |
|
|
7454 | 7454 | b'', |
|
|
7455 | 7455 | b'date', |
|
|
7456 | 7456 | b'', |
|
|
7457 | 7457 | _(b'set date for temporary commits (DEPRECATED)'), |
|
|
7458 | 7458 | _(b'DATE'), |
|
|
7459 | 7459 | ), |
|
|
7460 | 7460 | ], |
|
|
7461 | 7461 | _(b'hg unshelve [OPTION]... [[-n] SHELVED]'), |
|
|
7462 | 7462 | helpcategory=command.CATEGORY_WORKING_DIRECTORY, |
|
|
7463 | 7463 | ) |
|
|
7464 | 7464 | def unshelve(ui, repo, *shelved, **opts): |
|
|
7465 | 7465 | """restore a shelved change to the working directory |
|
|
7466 | 7466 | |
|
|
7467 | 7467 | This command accepts an optional name of a shelved change to |
|
|
7468 | 7468 | restore. If none is given, the most recent shelved change is used. |
|
|
7469 | 7469 | |
|
|
7470 | 7470 | If a shelved change is applied successfully, the bundle that |
|
|
7471 | 7471 | contains the shelved changes is moved to a backup location |
|
|
7472 | 7472 | (.hg/shelve-backup). |
|
|
7473 | 7473 | |
|
|
7474 | 7474 | Since you can restore a shelved change on top of an arbitrary |
|
|
7475 | 7475 | commit, it is possible that unshelving will result in a conflict |
|
|
7476 | 7476 | between your changes and the commits you are unshelving onto. If |
|
|
7477 | 7477 | this occurs, you must resolve the conflict, then use |
|
|
7478 | 7478 | ``--continue`` to complete the unshelve operation. (The bundle |
|
|
7479 | 7479 | will not be moved until you successfully complete the unshelve.) |
|
|
7480 | 7480 | |
|
|
7481 | 7481 | (Alternatively, you can use ``--abort`` to abandon an unshelve |
|
|
7482 | 7482 | that causes a conflict. This reverts the unshelved changes, and |
|
|
7483 | 7483 | leaves the bundle in place.) |
|
|
7484 | 7484 | |
|
|
7485 | 7485 | If bare shelved change (without interactive, include and exclude |
|
|
7486 | 7486 | option) was done on newly created branch it would restore branch |
|
|
7487 | 7487 | information to the working directory. |
|
|
7488 | 7488 | |
|
|
7489 | 7489 | After a successful unshelve, the shelved changes are stored in a |
|
|
7490 | 7490 | backup directory. Only the N most recent backups are kept. N |
|
|
7491 | 7491 | defaults to 10 but can be overridden using the ``shelve.maxbackups`` |
|
|
7492 | 7492 | configuration option. |
|
|
7493 | 7493 | |
|
|
7494 | 7494 | .. container:: verbose |
|
|
7495 | 7495 | |
|
|
7496 | 7496 | Timestamp in seconds is used to decide order of backups. More |
|
|
7497 | 7497 | than ``maxbackups`` backups are kept, if same timestamp |
|
|
7498 | 7498 | prevents from deciding exact order of them, for safety. |
|
|
7499 | 7499 | |
|
|
7500 | 7500 | Selected changes can be unshelved with ``--interactive`` flag. |
|
|
7501 | 7501 | The working directory is updated with the selected changes, and |
|
|
7502 | 7502 | only the unselected changes remain shelved. |
|
|
7503 | 7503 | Note: The whole shelve is applied to working directory first before |
|
|
7504 | 7504 | running interactively. So, this will bring up all the conflicts between |
|
|
7505 | 7505 | working directory and the shelve, irrespective of which changes will be |
|
|
7506 | 7506 | unshelved. |
|
|
7507 | 7507 | """ |
|
|
7508 | 7508 | with repo.wlock(): |
|
|
7509 | 7509 | return shelvemod.unshelvecmd(ui, repo, *shelved, **opts) |
|
|
7510 | 7510 | |
|
|
7511 | 7511 | |
|
|
7512 | 7512 | statemod.addunfinished( |
|
|
7513 | 7513 | b'unshelve', |
|
|
7514 | 7514 | fname=b'shelvedstate', |
|
|
7515 | 7515 | continueflag=True, |
|
|
7516 | 7516 | abortfunc=shelvemod.hgabortunshelve, |
|
|
7517 | 7517 | continuefunc=shelvemod.hgcontinueunshelve, |
|
|
7518 | 7518 | cmdmsg=_(b'unshelve already in progress'), |
|
|
7519 | 7519 | ) |
|
|
7520 | 7520 | |
|
|
7521 | 7521 | |
|
|
7522 | 7522 | @command( |
|
|
7523 | 7523 | b'update|up|checkout|co', |
|
|
7524 | 7524 | [ |
|
|
7525 | 7525 | (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')), |
|
|
7526 | 7526 | (b'c', b'check', None, _(b'require clean working directory')), |
|
|
7527 | 7527 | (b'm', b'merge', None, _(b'merge uncommitted changes')), |
|
|
7528 | 7528 | (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')), |
|
|
7529 | 7529 | (b'r', b'rev', b'', _(b'revision'), _(b'REV')), |
|
|
7530 | 7530 | ] |
|
|
7531 | 7531 | + mergetoolopts, |
|
|
7532 | 7532 | _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'), |
|
|
7533 | 7533 | helpcategory=command.CATEGORY_WORKING_DIRECTORY, |
|
|
7534 | 7534 | helpbasic=True, |
|
|
7535 | 7535 | ) |
|
|
7536 | 7536 | def update(ui, repo, node=None, **opts): |
|
|
7537 | 7537 | """update working directory (or switch revisions) |
|
|
7538 | 7538 | |
|
|
7539 | 7539 | Update the repository's working directory to the specified |
|
|
7540 | 7540 | changeset. If no changeset is specified, update to the tip of the |
|
|
7541 | 7541 | current named branch and move the active bookmark (see :hg:`help |
|
|
7542 | 7542 | bookmarks`). |
|
|
7543 | 7543 | |
|
|
7544 | 7544 | Update sets the working directory's parent revision to the specified |
|
|
7545 | 7545 | changeset (see :hg:`help parents`). |
|
|
7546 | 7546 | |
|
|
7547 | 7547 | If the changeset is not a descendant or ancestor of the working |
|
|
7548 | 7548 | directory's parent and there are uncommitted changes, the update is |
|
|
7549 | 7549 | aborted. With the -c/--check option, the working directory is checked |
|
|
7550 | 7550 | for uncommitted changes; if none are found, the working directory is |
|
|
7551 | 7551 | updated to the specified changeset. |
|
|
7552 | 7552 | |
|
|
7553 | 7553 | .. container:: verbose |
|
|
7554 | 7554 | |
|
|
7555 | 7555 | The -C/--clean, -c/--check, and -m/--merge options control what |
|
|
7556 | 7556 | happens if the working directory contains uncommitted changes. |
|
|
7557 | 7557 | At most of one of them can be specified. |
|
|
7558 | 7558 | |
|
|
7559 | 7559 | 1. If no option is specified, and if |
|
|
7560 | 7560 | the requested changeset is an ancestor or descendant of |
|
|
7561 | 7561 | the working directory's parent, the uncommitted changes |
|
|
7562 | 7562 | are merged into the requested changeset and the merged |
|
|
7563 | 7563 | result is left uncommitted. If the requested changeset is |
|
|
7564 | 7564 | not an ancestor or descendant (that is, it is on another |
|
|
7565 | 7565 | branch), the update is aborted and the uncommitted changes |
|
|
7566 | 7566 | are preserved. |
|
|
7567 | 7567 | |
|
|
7568 | 7568 | 2. With the -m/--merge option, the update is allowed even if the |
|
|
7569 | 7569 | requested changeset is not an ancestor or descendant of |
|
|
7570 | 7570 | the working directory's parent. |
|
|
7571 | 7571 | |
|
|
7572 | 7572 | 3. With the -c/--check option, the update is aborted and the |
|
|
7573 | 7573 | uncommitted changes are preserved. |
|
|
7574 | 7574 | |
|
|
7575 | 7575 | 4. With the -C/--clean option, uncommitted changes are discarded and |
|
|
7576 | 7576 | the working directory is updated to the requested changeset. |
|
|
7577 | 7577 | |
|
|
7578 | 7578 | To cancel an uncommitted merge (and lose your changes), use |
|
|
7579 | 7579 | :hg:`merge --abort`. |
|
|
7580 | 7580 | |
|
|
7581 | 7581 | Use null as the changeset to remove the working directory (like |
|
|
7582 | 7582 | :hg:`clone -U`). |
|
|
7583 | 7583 | |
|
|
7584 | 7584 | If you want to revert just one file to an older revision, use |
|
|
7585 | 7585 | :hg:`revert [-r REV] NAME`. |
|
|
7586 | 7586 | |
|
|
7587 | 7587 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
|
7588 | 7588 | |
|
|
7589 | 7589 | Returns 0 on success, 1 if there are unresolved files. |
|
|
7590 | 7590 | """ |
|
|
7591 | 7591 | cmdutil.check_at_most_one_arg(opts, 'clean', 'check', 'merge') |
|
|
7592 | 7592 | rev = opts.get('rev') |
|
|
7593 | 7593 | date = opts.get('date') |
|
|
7594 | 7594 | clean = opts.get('clean') |
|
|
7595 | 7595 | check = opts.get('check') |
|
|
7596 | 7596 | merge = opts.get('merge') |
|
|
7597 | 7597 | if rev and node: |
|
|
7598 | 7598 | raise error.InputError(_(b"please specify just one revision")) |
|
|
7599 | 7599 | |
|
|
7600 | 7600 | if ui.configbool(b'commands', b'update.requiredest'): |
|
|
7601 | 7601 | if not node and not rev and not date: |
|
|
7602 | 7602 | raise error.InputError( |
|
|
7603 | 7603 | _(b'you must specify a destination'), |
|
|
7604 | 7604 | hint=_(b'for example: hg update ".::"'), |
|
|
7605 | 7605 | ) |
|
|
7606 | 7606 | |
|
|
7607 | 7607 | if rev is None or rev == b'': |
|
|
7608 | 7608 | rev = node |
|
|
7609 | 7609 | |
|
|
7610 | 7610 | if date and rev is not None: |
|
|
7611 | 7611 | raise error.InputError(_(b"you can't specify a revision and a date")) |
|
|
7612 | 7612 | |
|
|
7613 | 7613 | updatecheck = None |
|
|
7614 | 7614 | if check: |
|
|
7615 | 7615 | updatecheck = b'abort' |
|
|
7616 | 7616 | elif merge: |
|
|
7617 | 7617 | updatecheck = b'none' |
|
|
7618 | 7618 | |
|
|
7619 | 7619 | with repo.wlock(): |
|
|
7620 | 7620 | cmdutil.clearunfinished(repo) |
|
|
7621 | 7621 | if date: |
|
|
7622 | 7622 | rev = cmdutil.finddate(ui, repo, date) |
|
|
7623 | 7623 | |
|
|
7624 | 7624 | # if we defined a bookmark, we have to remember the original name |
|
|
7625 | 7625 | brev = rev |
|
|
7626 | 7626 | if rev: |
|
|
7627 | 7627 | repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn') |
|
|
7628 | 7628 | ctx = scmutil.revsingle(repo, rev, default=None) |
|
|
7629 | 7629 | rev = ctx.rev() |
|
|
7630 | 7630 | hidden = ctx.hidden() |
|
|
7631 | 7631 | overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')} |
|
|
7632 | 7632 | with ui.configoverride(overrides, b'update'): |
|
|
7633 | 7633 | ret = hg.updatetotally( |
|
|
7634 | 7634 | ui, repo, rev, brev, clean=clean, updatecheck=updatecheck |
|
|
7635 | 7635 | ) |
|
|
7636 | 7636 | if hidden: |
|
|
7637 | 7637 | ctxstr = ctx.hex()[:12] |
|
|
7638 | 7638 | ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr) |
|
|
7639 | 7639 | |
|
|
7640 | 7640 | if ctx.obsolete(): |
|
|
7641 | 7641 | obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx) |
|
|
7642 | 7642 | ui.warn(b"(%s)\n" % obsfatemsg) |
|
|
7643 | 7643 | return ret |
|
|
7644 | 7644 | |
|
|
7645 | 7645 | |
|
|
7646 | 7646 | @command( |
|
|
7647 | 7647 | b'verify', |
|
|
7648 | 7648 | [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')], |
|
|
7649 | 7649 | helpcategory=command.CATEGORY_MAINTENANCE, |
|
|
7650 | 7650 | ) |
|
|
7651 | 7651 | def verify(ui, repo, **opts): |
|
|
7652 | 7652 | """verify the integrity of the repository |
|
|
7653 | 7653 | |
|
|
7654 | 7654 | Verify the integrity of the current repository. |
|
|
7655 | 7655 | |
|
|
7656 | 7656 | This will perform an extensive check of the repository's |
|
|
7657 | 7657 | integrity, validating the hashes and checksums of each entry in |
|
|
7658 | 7658 | the changelog, manifest, and tracked files, as well as the |
|
|
7659 | 7659 | integrity of their crosslinks and indices. |
|
|
7660 | 7660 | |
|
|
7661 | 7661 | Please see https://mercurial-scm.org/wiki/RepositoryCorruption |
|
|
7662 | 7662 | for more information about recovery from corruption of the |
|
|
7663 | 7663 | repository. |
|
|
7664 | 7664 | |
|
|
7665 | 7665 | Returns 0 on success, 1 if errors are encountered. |
|
|
7666 | 7666 | """ |
|
|
7667 | 7667 | opts = pycompat.byteskwargs(opts) |
|
|
7668 | 7668 | |
|
|
7669 | 7669 | level = None |
|
|
7670 | 7670 | if opts[b'full']: |
|
|
7671 | 7671 | level = verifymod.VERIFY_FULL |
|
|
7672 | 7672 | return hg.verify(repo, level) |
|
|
7673 | 7673 | |
|
|
7674 | 7674 | |
|
|
7675 | 7675 | @command( |
|
|
7676 | 7676 | b'version', |
|
|
7677 | 7677 | [] + formatteropts, |
|
|
7678 | 7678 | helpcategory=command.CATEGORY_HELP, |
|
|
7679 | 7679 | norepo=True, |
|
|
7680 | 7680 | intents={INTENT_READONLY}, |
|
|
7681 | 7681 | ) |
|
|
7682 | 7682 | def version_(ui, **opts): |
|
|
7683 | 7683 | """output version and copyright information |
|
|
7684 | 7684 | |
|
|
7685 | 7685 | .. container:: verbose |
|
|
7686 | 7686 | |
|
|
7687 | 7687 | Template: |
|
|
7688 | 7688 | |
|
|
7689 | 7689 | The following keywords are supported. See also :hg:`help templates`. |
|
|
7690 | 7690 | |
|
|
7691 | 7691 | :extensions: List of extensions. |
|
|
7692 | 7692 | :ver: String. Version number. |
|
|
7693 | 7693 | |
|
|
7694 | 7694 | And each entry of ``{extensions}`` provides the following sub-keywords |
|
|
7695 | 7695 | in addition to ``{ver}``. |
|
|
7696 | 7696 | |
|
|
7697 | 7697 | :bundled: Boolean. True if included in the release. |
|
|
7698 | 7698 | :name: String. Extension name. |
|
|
7699 | 7699 | """ |
|
|
7700 | 7700 | opts = pycompat.byteskwargs(opts) |
|
|
7701 | 7701 | if ui.verbose: |
|
|
7702 | 7702 | ui.pager(b'version') |
|
|
7703 | 7703 | fm = ui.formatter(b"version", opts) |
|
|
7704 | 7704 | fm.startitem() |
|
|
7705 | 7705 | fm.write( |
|
|
7706 | 7706 | b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version() |
|
|
7707 | 7707 | ) |
|
|
7708 | 7708 | license = _( |
|
|
7709 | 7709 | b"(see https://mercurial-scm.org for more information)\n" |
|
|
7710 |
b"\nCopyright (C) 2005-202 |
|
|
|
7710 | b"\nCopyright (C) 2005-2021 Matt Mackall and others\n" | |
|
|
7711 | 7711 | b"This is free software; see the source for copying conditions. " |
|
|
7712 | 7712 | b"There is NO\nwarranty; " |
|
|
7713 | 7713 | b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" |
|
|
7714 | 7714 | ) |
|
|
7715 | 7715 | if not ui.quiet: |
|
|
7716 | 7716 | fm.plain(license) |
|
|
7717 | 7717 | |
|
|
7718 | 7718 | if ui.verbose: |
|
|
7719 | 7719 | fm.plain(_(b"\nEnabled extensions:\n\n")) |
|
|
7720 | 7720 | # format names and versions into columns |
|
|
7721 | 7721 | names = [] |
|
|
7722 | 7722 | vers = [] |
|
|
7723 | 7723 | isinternals = [] |
|
|
7724 | 7724 | for name, module in sorted(extensions.extensions()): |
|
|
7725 | 7725 | names.append(name) |
|
|
7726 | 7726 | vers.append(extensions.moduleversion(module) or None) |
|
|
7727 | 7727 | isinternals.append(extensions.ismoduleinternal(module)) |
|
|
7728 | 7728 | fn = fm.nested(b"extensions", tmpl=b'{name}\n') |
|
|
7729 | 7729 | if names: |
|
|
7730 | 7730 | namefmt = b" %%-%ds " % max(len(n) for n in names) |
|
|
7731 | 7731 | places = [_(b"external"), _(b"internal")] |
|
|
7732 | 7732 | for n, v, p in zip(names, vers, isinternals): |
|
|
7733 | 7733 | fn.startitem() |
|
|
7734 | 7734 | fn.condwrite(ui.verbose, b"name", namefmt, n) |
|
|
7735 | 7735 | if ui.verbose: |
|
|
7736 | 7736 | fn.plain(b"%s " % places[p]) |
|
|
7737 | 7737 | fn.data(bundled=p) |
|
|
7738 | 7738 | fn.condwrite(ui.verbose and v, b"ver", b"%s", v) |
|
|
7739 | 7739 | if ui.verbose: |
|
|
7740 | 7740 | fn.plain(b"\n") |
|
|
7741 | 7741 | fn.end() |
|
|
7742 | 7742 | fm.end() |
|
|
7743 | 7743 | |
|
|
7744 | 7744 | |
|
|
7745 | 7745 | def loadcmdtable(ui, name, cmdtable): |
|
|
7746 | 7746 | """Load command functions from specified cmdtable""" |
|
|
7747 | 7747 | overrides = [cmd for cmd in cmdtable if cmd in table] |
|
|
7748 | 7748 | if overrides: |
|
|
7749 | 7749 | ui.warn( |
|
|
7750 | 7750 | _(b"extension '%s' overrides commands: %s\n") |
|
|
7751 | 7751 | % (name, b" ".join(overrides)) |
|
|
7752 | 7752 | ) |
|
|
7753 | 7753 | table.update(cmdtable) |
| @@ -1,119 +1,119 b'' | |||
|
|
1 | 1 | ==== |
|
|
2 | 2 | hg |
|
|
3 | 3 | ==== |
|
|
4 | 4 | |
|
|
5 | 5 | --------------------------------------- |
|
|
6 | 6 | Mercurial source code management system |
|
|
7 | 7 | --------------------------------------- |
|
|
8 | 8 | |
|
|
9 | 9 | :Author: Matt Mackall <mpm@selenic.com> |
|
|
10 | 10 | :Organization: Mercurial |
|
|
11 | 11 | :Manual section: 1 |
|
|
12 | 12 | :Manual group: Mercurial Manual |
|
|
13 | 13 | |
|
|
14 | 14 | .. contents:: |
|
|
15 | 15 | :backlinks: top |
|
|
16 | 16 | :class: htmlonly |
|
|
17 | 17 | :depth: 1 |
|
|
18 | 18 | |
|
|
19 | 19 | |
|
|
20 | 20 | Synopsis |
|
|
21 | 21 | """""""" |
|
|
22 | 22 | **hg** *command* [*option*]... [*argument*]... |
|
|
23 | 23 | |
|
|
24 | 24 | Description |
|
|
25 | 25 | """"""""""" |
|
|
26 | 26 | The **hg** command provides a command line interface to the Mercurial |
|
|
27 | 27 | system. |
|
|
28 | 28 | |
|
|
29 | 29 | Command Elements |
|
|
30 | 30 | """""""""""""""" |
|
|
31 | 31 | |
|
|
32 | 32 | files... |
|
|
33 | 33 | indicates one or more filename or relative path filenames; see |
|
|
34 | 34 | `File Name Patterns`_ for information on pattern matching |
|
|
35 | 35 | |
|
|
36 | 36 | path |
|
|
37 | 37 | indicates a path on the local machine |
|
|
38 | 38 | |
|
|
39 | 39 | revision |
|
|
40 | 40 | indicates a changeset which can be specified as a changeset |
|
|
41 | 41 | revision number, a tag, or a unique substring of the changeset |
|
|
42 | 42 | hash value |
|
|
43 | 43 | |
|
|
44 | 44 | repository path |
|
|
45 | 45 | either the pathname of a local repository or the URI of a remote |
|
|
46 | 46 | repository. |
|
|
47 | 47 | |
|
|
48 | 48 | .. include:: hg.1.gendoc.txt |
|
|
49 | 49 | |
|
|
50 | 50 | Files |
|
|
51 | 51 | """"" |
|
|
52 | 52 | |
|
|
53 | 53 | ``/etc/mercurial/hgrc``, ``$HOME/.hgrc``, ``.hg/hgrc`` |
|
|
54 | 54 | This file contains defaults and configuration. Values in |
|
|
55 | 55 | ``.hg/hgrc`` override those in ``$HOME/.hgrc``, and these override |
|
|
56 | 56 | settings made in the global ``/etc/mercurial/hgrc`` configuration. |
|
|
57 | 57 | See |hgrc(5)|_ for details of the contents and format of these |
|
|
58 | 58 | files. |
|
|
59 | 59 | |
|
|
60 | 60 | ``.hgignore`` |
|
|
61 | 61 | This file contains regular expressions (one per line) that |
|
|
62 | 62 | describe file names that should be ignored by **hg**. For details, |
|
|
63 | 63 | see |hgignore(5)|_. |
|
|
64 | 64 | |
|
|
65 | 65 | ``.hgsub`` |
|
|
66 | 66 | This file defines the locations of all subrepositories, and |
|
|
67 | 67 | tells where the subrepository checkouts came from. For details, see |
|
|
68 | 68 | :hg:`help subrepos`. |
|
|
69 | 69 | |
|
|
70 | 70 | ``.hgsubstate`` |
|
|
71 | 71 | This file is where Mercurial stores all nested repository states. *NB: This |
|
|
72 | 72 | file should not be edited manually.* |
|
|
73 | 73 | |
|
|
74 | 74 | ``.hgtags`` |
|
|
75 | 75 | This file contains changeset hash values and text tag names (one |
|
|
76 | 76 | of each separated by spaces) that correspond to tagged versions of |
|
|
77 | 77 | the repository contents. The file content is encoded using UTF-8. |
|
|
78 | 78 | |
|
|
79 | 79 | ``.hg/last-message.txt`` |
|
|
80 | 80 | This file is used by :hg:`commit` to store a backup of the commit message |
|
|
81 | 81 | in case the commit fails. |
|
|
82 | 82 | |
|
|
83 | 83 | ``.hg/localtags`` |
|
|
84 | 84 | This file can be used to define local tags which are not shared among |
|
|
85 | 85 | repositories. The file format is the same as for ``.hgtags``, but it is |
|
|
86 | 86 | encoded using the local system encoding. |
|
|
87 | 87 | |
|
|
88 | 88 | Some commands (e.g. revert) produce backup files ending in ``.orig``, |
|
|
89 | 89 | if the ``.orig`` file already exists and is not tracked by Mercurial, |
|
|
90 | 90 | it will be overwritten. |
|
|
91 | 91 | |
|
|
92 | 92 | Bugs |
|
|
93 | 93 | """" |
|
|
94 | 94 | Probably lots, please post them to the mailing list (see Resources_ |
|
|
95 | 95 | below) when you find them. |
|
|
96 | 96 | |
|
|
97 | 97 | See Also |
|
|
98 | 98 | """""""" |
|
|
99 | 99 | |hgignore(5)|_, |hgrc(5)|_ |
|
|
100 | 100 | |
|
|
101 | 101 | Author |
|
|
102 | 102 | """""" |
|
|
103 | 103 | Written by Matt Mackall <mpm@selenic.com> |
|
|
104 | 104 | |
|
|
105 | 105 | Resources |
|
|
106 | 106 | """"""""" |
|
|
107 | 107 | Main Web Site: https://mercurial-scm.org/ |
|
|
108 | 108 | |
|
|
109 | 109 | Source code repository: https://www.mercurial-scm.org/repo/hg |
|
|
110 | 110 | |
|
|
111 | 111 | Mailing list: https://www.mercurial-scm.org/mailman/listinfo/mercurial/ |
|
|
112 | 112 | |
|
|
113 | 113 | Copying |
|
|
114 | 114 | """"""" |
|
|
115 |
Copyright (C) 2005-202 |
|
|
|
115 | Copyright (C) 2005-2021 Matt Mackall. | |
|
|
116 | 116 | Free use of this software is granted under the terms of the GNU General |
|
|
117 | 117 | Public License version 2 or any later version. |
|
|
118 | 118 | |
|
|
119 | 119 | .. include:: common.txt |
| @@ -1,34 +1,34 b'' | |||
|
|
1 | 1 | ========== |
|
|
2 | 2 | hgignore |
|
|
3 | 3 | ========== |
|
|
4 | 4 | |
|
|
5 | 5 | --------------------------------- |
|
|
6 | 6 | syntax for Mercurial ignore files |
|
|
7 | 7 | --------------------------------- |
|
|
8 | 8 | |
|
|
9 | 9 | :Author: Vadim Gelfer <vadim.gelfer@gmail.com> |
|
|
10 | 10 | :Organization: Mercurial |
|
|
11 | 11 | :Manual section: 5 |
|
|
12 | 12 | :Manual group: Mercurial Manual |
|
|
13 | 13 | |
|
|
14 | 14 | .. include:: hgignore.5.gendoc.txt |
|
|
15 | 15 | |
|
|
16 | 16 | Author |
|
|
17 | 17 | ====== |
|
|
18 | 18 | Vadim Gelfer <vadim.gelfer@gmail.com> |
|
|
19 | 19 | |
|
|
20 | 20 | Mercurial was written by Matt Mackall <mpm@selenic.com>. |
|
|
21 | 21 | |
|
|
22 | 22 | See Also |
|
|
23 | 23 | ======== |
|
|
24 | 24 | |hg(1)|_, |hgrc(5)|_ |
|
|
25 | 25 | |
|
|
26 | 26 | Copying |
|
|
27 | 27 | ======= |
|
|
28 | 28 | This manual page is copyright 2006 Vadim Gelfer. |
|
|
29 |
Mercurial is copyright 2005-202 |
|
|
|
29 | Mercurial is copyright 2005-2021 Matt Mackall. | |
|
|
30 | 30 | Free use of this software is granted under the terms of the GNU General |
|
|
31 | 31 | Public License version 2 or any later version. |
|
|
32 | 32 | |
|
|
33 | 33 | .. include:: common.txt |
|
|
34 | 34 | |
| @@ -1,41 +1,41 b'' | |||
|
|
1 | 1 | ====== |
|
|
2 | 2 | hgrc |
|
|
3 | 3 | ====== |
|
|
4 | 4 | |
|
|
5 | 5 | --------------------------------- |
|
|
6 | 6 | configuration files for Mercurial |
|
|
7 | 7 | --------------------------------- |
|
|
8 | 8 | |
|
|
9 | 9 | :Author: Bryan O'Sullivan <bos@serpentine.com> |
|
|
10 | 10 | :Organization: Mercurial |
|
|
11 | 11 | :Manual section: 5 |
|
|
12 | 12 | :Manual group: Mercurial Manual |
|
|
13 | 13 | |
|
|
14 | 14 | .. contents:: |
|
|
15 | 15 | :backlinks: top |
|
|
16 | 16 | :class: htmlonly |
|
|
17 | 17 | |
|
|
18 | 18 | |
|
|
19 | 19 | Description |
|
|
20 | 20 | =========== |
|
|
21 | 21 | |
|
|
22 | 22 | .. include:: hgrc.5.gendoc.txt |
|
|
23 | 23 | |
|
|
24 | 24 | Author |
|
|
25 | 25 | ====== |
|
|
26 | 26 | Bryan O'Sullivan <bos@serpentine.com>. |
|
|
27 | 27 | |
|
|
28 | 28 | Mercurial was written by Matt Mackall <mpm@selenic.com>. |
|
|
29 | 29 | |
|
|
30 | 30 | See Also |
|
|
31 | 31 | ======== |
|
|
32 | 32 | |hg(1)|_, |hgignore(5)|_ |
|
|
33 | 33 | |
|
|
34 | 34 | Copying |
|
|
35 | 35 | ======= |
|
|
36 | 36 | This manual page is copyright 2005 Bryan O'Sullivan. |
|
|
37 |
Mercurial is copyright 2005-202 |
|
|
|
37 | Mercurial is copyright 2005-2021 Matt Mackall. | |
|
|
38 | 38 | Free use of this software is granted under the terms of the GNU General |
|
|
39 | 39 | Public License version 2 or any later version. |
|
|
40 | 40 | |
|
|
41 | 41 | .. include:: common.txt |
| @@ -1,1842 +1,1842 b'' | |||
|
|
1 | 1 | # |
|
|
2 | 2 | # This is the mercurial setup script. |
|
|
3 | 3 | # |
|
|
4 | 4 | # 'python setup.py install', or |
|
|
5 | 5 | # 'python setup.py --help' for more options |
|
|
6 | 6 | import os |
|
|
7 | 7 | |
|
|
8 | 8 | # Mercurial will never work on Python 3 before 3.5 due to a lack |
|
|
9 | 9 | # of % formatting on bytestrings, and can't work on 3.6.0 or 3.6.1 |
|
|
10 | 10 | # due to a bug in % formatting in bytestrings. |
|
|
11 | 11 | # We cannot support Python 3.5.0, 3.5.1, 3.5.2 because of bug in |
|
|
12 | 12 | # codecs.escape_encode() where it raises SystemError on empty bytestring |
|
|
13 | 13 | # bug link: https://bugs.python.org/issue25270 |
|
|
14 | 14 | supportedpy = ','.join( |
|
|
15 | 15 | [ |
|
|
16 | 16 | '>=2.7.4', |
|
|
17 | 17 | '!=3.0.*', |
|
|
18 | 18 | '!=3.1.*', |
|
|
19 | 19 | '!=3.2.*', |
|
|
20 | 20 | '!=3.3.*', |
|
|
21 | 21 | '!=3.4.*', |
|
|
22 | 22 | '!=3.5.0', |
|
|
23 | 23 | '!=3.5.1', |
|
|
24 | 24 | '!=3.5.2', |
|
|
25 | 25 | '!=3.6.0', |
|
|
26 | 26 | '!=3.6.1', |
|
|
27 | 27 | ] |
|
|
28 | 28 | ) |
|
|
29 | 29 | |
|
|
30 | 30 | import sys, platform |
|
|
31 | 31 | import sysconfig |
|
|
32 | 32 | |
|
|
33 | 33 | if sys.version_info[0] >= 3: |
|
|
34 | 34 | printf = eval('print') |
|
|
35 | 35 | libdir_escape = 'unicode_escape' |
|
|
36 | 36 | |
|
|
37 | 37 | def sysstr(s): |
|
|
38 | 38 | return s.decode('latin-1') |
|
|
39 | 39 | |
|
|
40 | 40 | |
|
|
41 | 41 | else: |
|
|
42 | 42 | libdir_escape = 'string_escape' |
|
|
43 | 43 | |
|
|
44 | 44 | def printf(*args, **kwargs): |
|
|
45 | 45 | f = kwargs.get('file', sys.stdout) |
|
|
46 | 46 | end = kwargs.get('end', '\n') |
|
|
47 | 47 | f.write(b' '.join(args) + end) |
|
|
48 | 48 | |
|
|
49 | 49 | def sysstr(s): |
|
|
50 | 50 | return s |
|
|
51 | 51 | |
|
|
52 | 52 | |
|
|
53 | 53 | # Attempt to guide users to a modern pip - this means that 2.6 users |
|
|
54 | 54 | # should have a chance of getting a 4.2 release, and when we ratchet |
|
|
55 | 55 | # the version requirement forward again hopefully everyone will get |
|
|
56 | 56 | # something that works for them. |
|
|
57 | 57 | if sys.version_info < (2, 7, 4, 'final'): |
|
|
58 | 58 | pip_message = ( |
|
|
59 | 59 | 'This may be due to an out of date pip. ' |
|
|
60 | 60 | 'Make sure you have pip >= 9.0.1.' |
|
|
61 | 61 | ) |
|
|
62 | 62 | try: |
|
|
63 | 63 | import pip |
|
|
64 | 64 | |
|
|
65 | 65 | pip_version = tuple([int(x) for x in pip.__version__.split('.')[:3]]) |
|
|
66 | 66 | if pip_version < (9, 0, 1): |
|
|
67 | 67 | pip_message = ( |
|
|
68 | 68 | 'Your pip version is out of date, please install ' |
|
|
69 | 69 | 'pip >= 9.0.1. pip {} detected.'.format(pip.__version__) |
|
|
70 | 70 | ) |
|
|
71 | 71 | else: |
|
|
72 | 72 | # pip is new enough - it must be something else |
|
|
73 | 73 | pip_message = '' |
|
|
74 | 74 | except Exception: |
|
|
75 | 75 | pass |
|
|
76 | 76 | error = """ |
|
|
77 | 77 | Mercurial does not support Python older than 2.7.4. |
|
|
78 | 78 | Python {py} detected. |
|
|
79 | 79 | {pip} |
|
|
80 | 80 | """.format( |
|
|
81 | 81 | py=sys.version_info, pip=pip_message |
|
|
82 | 82 | ) |
|
|
83 | 83 | printf(error, file=sys.stderr) |
|
|
84 | 84 | sys.exit(1) |
|
|
85 | 85 | |
|
|
86 | 86 | import ssl |
|
|
87 | 87 | |
|
|
88 | 88 | try: |
|
|
89 | 89 | ssl.SSLContext |
|
|
90 | 90 | except AttributeError: |
|
|
91 | 91 | error = """ |
|
|
92 | 92 | The `ssl` module does not have the `SSLContext` class. This indicates an old |
|
|
93 | 93 | Python version which does not support modern security features (which were |
|
|
94 | 94 | added to Python 2.7 as part of "PEP 466"). Please make sure you have installed |
|
|
95 | 95 | at least Python 2.7.9 or a Python version with backports of these security |
|
|
96 | 96 | features. |
|
|
97 | 97 | """ |
|
|
98 | 98 | printf(error, file=sys.stderr) |
|
|
99 | 99 | sys.exit(1) |
|
|
100 | 100 | |
|
|
101 | 101 | # ssl.HAS_TLSv1* are preferred to check support but they were added in Python |
|
|
102 | 102 | # 3.7. Prior to CPython commit 6e8cda91d92da72800d891b2fc2073ecbc134d98 |
|
|
103 | 103 | # (backported to the 3.7 branch), ssl.PROTOCOL_TLSv1_1 / ssl.PROTOCOL_TLSv1_2 |
|
|
104 | 104 | # were defined only if compiled against a OpenSSL version with TLS 1.1 / 1.2 |
|
|
105 | 105 | # support. At the mentioned commit, they were unconditionally defined. |
|
|
106 | 106 | _notset = object() |
|
|
107 | 107 | has_tlsv1_1 = getattr(ssl, 'HAS_TLSv1_1', _notset) |
|
|
108 | 108 | if has_tlsv1_1 is _notset: |
|
|
109 | 109 | has_tlsv1_1 = getattr(ssl, 'PROTOCOL_TLSv1_1', _notset) is not _notset |
|
|
110 | 110 | has_tlsv1_2 = getattr(ssl, 'HAS_TLSv1_2', _notset) |
|
|
111 | 111 | if has_tlsv1_2 is _notset: |
|
|
112 | 112 | has_tlsv1_2 = getattr(ssl, 'PROTOCOL_TLSv1_2', _notset) is not _notset |
|
|
113 | 113 | if not (has_tlsv1_1 or has_tlsv1_2): |
|
|
114 | 114 | error = """ |
|
|
115 | 115 | The `ssl` module does not advertise support for TLS 1.1 or TLS 1.2. |
|
|
116 | 116 | Please make sure that your Python installation was compiled against an OpenSSL |
|
|
117 | 117 | version enabling these features (likely this requires the OpenSSL version to |
|
|
118 | 118 | be at least 1.0.1). |
|
|
119 | 119 | """ |
|
|
120 | 120 | printf(error, file=sys.stderr) |
|
|
121 | 121 | sys.exit(1) |
|
|
122 | 122 | |
|
|
123 | 123 | if sys.version_info[0] >= 3: |
|
|
124 | 124 | DYLIB_SUFFIX = sysconfig.get_config_vars()['EXT_SUFFIX'] |
|
|
125 | 125 | else: |
|
|
126 | 126 | # deprecated in Python 3 |
|
|
127 | 127 | DYLIB_SUFFIX = sysconfig.get_config_vars()['SO'] |
|
|
128 | 128 | |
|
|
129 | 129 | # Solaris Python packaging brain damage |
|
|
130 | 130 | try: |
|
|
131 | 131 | import hashlib |
|
|
132 | 132 | |
|
|
133 | 133 | sha = hashlib.sha1() |
|
|
134 | 134 | except ImportError: |
|
|
135 | 135 | try: |
|
|
136 | 136 | import sha |
|
|
137 | 137 | |
|
|
138 | 138 | sha.sha # silence unused import warning |
|
|
139 | 139 | except ImportError: |
|
|
140 | 140 | raise SystemExit( |
|
|
141 | 141 | "Couldn't import standard hashlib (incomplete Python install)." |
|
|
142 | 142 | ) |
|
|
143 | 143 | |
|
|
144 | 144 | try: |
|
|
145 | 145 | import zlib |
|
|
146 | 146 | |
|
|
147 | 147 | zlib.compressobj # silence unused import warning |
|
|
148 | 148 | except ImportError: |
|
|
149 | 149 | raise SystemExit( |
|
|
150 | 150 | "Couldn't import standard zlib (incomplete Python install)." |
|
|
151 | 151 | ) |
|
|
152 | 152 | |
|
|
153 | 153 | # The base IronPython distribution (as of 2.7.1) doesn't support bz2 |
|
|
154 | 154 | isironpython = False |
|
|
155 | 155 | try: |
|
|
156 | 156 | isironpython = ( |
|
|
157 | 157 | platform.python_implementation().lower().find("ironpython") != -1 |
|
|
158 | 158 | ) |
|
|
159 | 159 | except AttributeError: |
|
|
160 | 160 | pass |
|
|
161 | 161 | |
|
|
162 | 162 | if isironpython: |
|
|
163 | 163 | sys.stderr.write("warning: IronPython detected (no bz2 support)\n") |
|
|
164 | 164 | else: |
|
|
165 | 165 | try: |
|
|
166 | 166 | import bz2 |
|
|
167 | 167 | |
|
|
168 | 168 | bz2.BZ2Compressor # silence unused import warning |
|
|
169 | 169 | except ImportError: |
|
|
170 | 170 | raise SystemExit( |
|
|
171 | 171 | "Couldn't import standard bz2 (incomplete Python install)." |
|
|
172 | 172 | ) |
|
|
173 | 173 | |
|
|
174 | 174 | ispypy = "PyPy" in sys.version |
|
|
175 | 175 | |
|
|
176 | 176 | import ctypes |
|
|
177 | 177 | import errno |
|
|
178 | 178 | import stat, subprocess, time |
|
|
179 | 179 | import re |
|
|
180 | 180 | import shutil |
|
|
181 | 181 | import tempfile |
|
|
182 | 182 | |
|
|
183 | 183 | # We have issues with setuptools on some platforms and builders. Until |
|
|
184 | 184 | # those are resolved, setuptools is opt-in except for platforms where |
|
|
185 | 185 | # we don't have issues. |
|
|
186 | 186 | issetuptools = os.name == 'nt' or 'FORCE_SETUPTOOLS' in os.environ |
|
|
187 | 187 | if issetuptools: |
|
|
188 | 188 | from setuptools import setup |
|
|
189 | 189 | else: |
|
|
190 | 190 | from distutils.core import setup |
|
|
191 | 191 | from distutils.ccompiler import new_compiler |
|
|
192 | 192 | from distutils.core import Command, Extension |
|
|
193 | 193 | from distutils.dist import Distribution |
|
|
194 | 194 | from distutils.command.build import build |
|
|
195 | 195 | from distutils.command.build_ext import build_ext |
|
|
196 | 196 | from distutils.command.build_py import build_py |
|
|
197 | 197 | from distutils.command.build_scripts import build_scripts |
|
|
198 | 198 | from distutils.command.install import install |
|
|
199 | 199 | from distutils.command.install_lib import install_lib |
|
|
200 | 200 | from distutils.command.install_scripts import install_scripts |
|
|
201 | 201 | from distutils import log |
|
|
202 | 202 | from distutils.spawn import spawn, find_executable |
|
|
203 | 203 | from distutils import file_util |
|
|
204 | 204 | from distutils.errors import ( |
|
|
205 | 205 | CCompilerError, |
|
|
206 | 206 | DistutilsError, |
|
|
207 | 207 | DistutilsExecError, |
|
|
208 | 208 | ) |
|
|
209 | 209 | from distutils.sysconfig import get_python_inc, get_config_var |
|
|
210 | 210 | from distutils.version import StrictVersion |
|
|
211 | 211 | |
|
|
212 | 212 | # Explain to distutils.StrictVersion how our release candidates are versionned |
|
|
213 | 213 | StrictVersion.version_re = re.compile(r'^(\d+)\.(\d+)(\.(\d+))?-?(rc(\d+))?$') |
|
|
214 | 214 | |
|
|
215 | 215 | |
|
|
216 | 216 | def write_if_changed(path, content): |
|
|
217 | 217 | """Write content to a file iff the content hasn't changed.""" |
|
|
218 | 218 | if os.path.exists(path): |
|
|
219 | 219 | with open(path, 'rb') as fh: |
|
|
220 | 220 | current = fh.read() |
|
|
221 | 221 | else: |
|
|
222 | 222 | current = b'' |
|
|
223 | 223 | |
|
|
224 | 224 | if current != content: |
|
|
225 | 225 | with open(path, 'wb') as fh: |
|
|
226 | 226 | fh.write(content) |
|
|
227 | 227 | |
|
|
228 | 228 | |
|
|
229 | 229 | scripts = ['hg'] |
|
|
230 | 230 | if os.name == 'nt': |
|
|
231 | 231 | # We remove hg.bat if we are able to build hg.exe. |
|
|
232 | 232 | scripts.append('contrib/win32/hg.bat') |
|
|
233 | 233 | |
|
|
234 | 234 | |
|
|
235 | 235 | def cancompile(cc, code): |
|
|
236 | 236 | tmpdir = tempfile.mkdtemp(prefix='hg-install-') |
|
|
237 | 237 | devnull = oldstderr = None |
|
|
238 | 238 | try: |
|
|
239 | 239 | fname = os.path.join(tmpdir, 'testcomp.c') |
|
|
240 | 240 | f = open(fname, 'w') |
|
|
241 | 241 | f.write(code) |
|
|
242 | 242 | f.close() |
|
|
243 | 243 | # Redirect stderr to /dev/null to hide any error messages |
|
|
244 | 244 | # from the compiler. |
|
|
245 | 245 | # This will have to be changed if we ever have to check |
|
|
246 | 246 | # for a function on Windows. |
|
|
247 | 247 | devnull = open('/dev/null', 'w') |
|
|
248 | 248 | oldstderr = os.dup(sys.stderr.fileno()) |
|
|
249 | 249 | os.dup2(devnull.fileno(), sys.stderr.fileno()) |
|
|
250 | 250 | objects = cc.compile([fname], output_dir=tmpdir) |
|
|
251 | 251 | cc.link_executable(objects, os.path.join(tmpdir, "a.out")) |
|
|
252 | 252 | return True |
|
|
253 | 253 | except Exception: |
|
|
254 | 254 | return False |
|
|
255 | 255 | finally: |
|
|
256 | 256 | if oldstderr is not None: |
|
|
257 | 257 | os.dup2(oldstderr, sys.stderr.fileno()) |
|
|
258 | 258 | if devnull is not None: |
|
|
259 | 259 | devnull.close() |
|
|
260 | 260 | shutil.rmtree(tmpdir) |
|
|
261 | 261 | |
|
|
262 | 262 | |
|
|
263 | 263 | # simplified version of distutils.ccompiler.CCompiler.has_function |
|
|
264 | 264 | # that actually removes its temporary files. |
|
|
265 | 265 | def hasfunction(cc, funcname): |
|
|
266 | 266 | code = 'int main(void) { %s(); }\n' % funcname |
|
|
267 | 267 | return cancompile(cc, code) |
|
|
268 | 268 | |
|
|
269 | 269 | |
|
|
270 | 270 | def hasheader(cc, headername): |
|
|
271 | 271 | code = '#include <%s>\nint main(void) { return 0; }\n' % headername |
|
|
272 | 272 | return cancompile(cc, code) |
|
|
273 | 273 | |
|
|
274 | 274 | |
|
|
275 | 275 | # py2exe needs to be installed to work |
|
|
276 | 276 | try: |
|
|
277 | 277 | import py2exe |
|
|
278 | 278 | |
|
|
279 | 279 | py2exe.Distribution # silence unused import warning |
|
|
280 | 280 | py2exeloaded = True |
|
|
281 | 281 | # import py2exe's patched Distribution class |
|
|
282 | 282 | from distutils.core import Distribution |
|
|
283 | 283 | except ImportError: |
|
|
284 | 284 | py2exeloaded = False |
|
|
285 | 285 | |
|
|
286 | 286 | |
|
|
287 | 287 | def runcmd(cmd, env, cwd=None): |
|
|
288 | 288 | p = subprocess.Popen( |
|
|
289 | 289 | cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env, cwd=cwd |
|
|
290 | 290 | ) |
|
|
291 | 291 | out, err = p.communicate() |
|
|
292 | 292 | return p.returncode, out, err |
|
|
293 | 293 | |
|
|
294 | 294 | |
|
|
295 | 295 | class hgcommand(object): |
|
|
296 | 296 | def __init__(self, cmd, env): |
|
|
297 | 297 | self.cmd = cmd |
|
|
298 | 298 | self.env = env |
|
|
299 | 299 | |
|
|
300 | 300 | def run(self, args): |
|
|
301 | 301 | cmd = self.cmd + args |
|
|
302 | 302 | returncode, out, err = runcmd(cmd, self.env) |
|
|
303 | 303 | err = filterhgerr(err) |
|
|
304 | 304 | if err or returncode != 0: |
|
|
305 | 305 | printf("stderr from '%s':" % (' '.join(cmd)), file=sys.stderr) |
|
|
306 | 306 | printf(err, file=sys.stderr) |
|
|
307 | 307 | return b'' |
|
|
308 | 308 | return out |
|
|
309 | 309 | |
|
|
310 | 310 | |
|
|
311 | 311 | def filterhgerr(err): |
|
|
312 | 312 | # If root is executing setup.py, but the repository is owned by |
|
|
313 | 313 | # another user (as in "sudo python setup.py install") we will get |
|
|
314 | 314 | # trust warnings since the .hg/hgrc file is untrusted. That is |
|
|
315 | 315 | # fine, we don't want to load it anyway. Python may warn about |
|
|
316 | 316 | # a missing __init__.py in mercurial/locale, we also ignore that. |
|
|
317 | 317 | err = [ |
|
|
318 | 318 | e |
|
|
319 | 319 | for e in err.splitlines() |
|
|
320 | 320 | if ( |
|
|
321 | 321 | not e.startswith(b'not trusting file') |
|
|
322 | 322 | and not e.startswith(b'warning: Not importing') |
|
|
323 | 323 | and not e.startswith(b'obsolete feature not enabled') |
|
|
324 | 324 | and not e.startswith(b'*** failed to import extension') |
|
|
325 | 325 | and not e.startswith(b'devel-warn:') |
|
|
326 | 326 | and not ( |
|
|
327 | 327 | e.startswith(b'(third party extension') |
|
|
328 | 328 | and e.endswith(b'or newer of Mercurial; disabling)') |
|
|
329 | 329 | ) |
|
|
330 | 330 | ) |
|
|
331 | 331 | ] |
|
|
332 | 332 | return b'\n'.join(b' ' + e for e in err) |
|
|
333 | 333 | |
|
|
334 | 334 | |
|
|
335 | 335 | def findhg(): |
|
|
336 | 336 | """Try to figure out how we should invoke hg for examining the local |
|
|
337 | 337 | repository contents. |
|
|
338 | 338 | |
|
|
339 | 339 | Returns an hgcommand object.""" |
|
|
340 | 340 | # By default, prefer the "hg" command in the user's path. This was |
|
|
341 | 341 | # presumably the hg command that the user used to create this repository. |
|
|
342 | 342 | # |
|
|
343 | 343 | # This repository may require extensions or other settings that would not |
|
|
344 | 344 | # be enabled by running the hg script directly from this local repository. |
|
|
345 | 345 | hgenv = os.environ.copy() |
|
|
346 | 346 | # Use HGPLAIN to disable hgrc settings that would change output formatting, |
|
|
347 | 347 | # and disable localization for the same reasons. |
|
|
348 | 348 | hgenv['HGPLAIN'] = '1' |
|
|
349 | 349 | hgenv['LANGUAGE'] = 'C' |
|
|
350 | 350 | hgcmd = ['hg'] |
|
|
351 | 351 | # Run a simple "hg log" command just to see if using hg from the user's |
|
|
352 | 352 | # path works and can successfully interact with this repository. Windows |
|
|
353 | 353 | # gives precedence to hg.exe in the current directory, so fall back to the |
|
|
354 | 354 | # python invocation of local hg, where pythonXY.dll can always be found. |
|
|
355 | 355 | check_cmd = ['log', '-r.', '-Ttest'] |
|
|
356 | 356 | if os.name != 'nt' or not os.path.exists("hg.exe"): |
|
|
357 | 357 | try: |
|
|
358 | 358 | retcode, out, err = runcmd(hgcmd + check_cmd, hgenv) |
|
|
359 | 359 | except EnvironmentError: |
|
|
360 | 360 | retcode = -1 |
|
|
361 | 361 | if retcode == 0 and not filterhgerr(err): |
|
|
362 | 362 | return hgcommand(hgcmd, hgenv) |
|
|
363 | 363 | |
|
|
364 | 364 | # Fall back to trying the local hg installation. |
|
|
365 | 365 | hgenv = localhgenv() |
|
|
366 | 366 | hgcmd = [sys.executable, 'hg'] |
|
|
367 | 367 | try: |
|
|
368 | 368 | retcode, out, err = runcmd(hgcmd + check_cmd, hgenv) |
|
|
369 | 369 | except EnvironmentError: |
|
|
370 | 370 | retcode = -1 |
|
|
371 | 371 | if retcode == 0 and not filterhgerr(err): |
|
|
372 | 372 | return hgcommand(hgcmd, hgenv) |
|
|
373 | 373 | |
|
|
374 | 374 | raise SystemExit( |
|
|
375 | 375 | 'Unable to find a working hg binary to extract the ' |
|
|
376 | 376 | 'version from the repository tags' |
|
|
377 | 377 | ) |
|
|
378 | 378 | |
|
|
379 | 379 | |
|
|
380 | 380 | def localhgenv(): |
|
|
381 | 381 | """Get an environment dictionary to use for invoking or importing |
|
|
382 | 382 | mercurial from the local repository.""" |
|
|
383 | 383 | # Execute hg out of this directory with a custom environment which takes |
|
|
384 | 384 | # care to not use any hgrc files and do no localization. |
|
|
385 | 385 | env = { |
|
|
386 | 386 | 'HGMODULEPOLICY': 'py', |
|
|
387 | 387 | 'HGRCPATH': '', |
|
|
388 | 388 | 'LANGUAGE': 'C', |
|
|
389 | 389 | 'PATH': '', |
|
|
390 | 390 | } # make pypi modules that use os.environ['PATH'] happy |
|
|
391 | 391 | if 'LD_LIBRARY_PATH' in os.environ: |
|
|
392 | 392 | env['LD_LIBRARY_PATH'] = os.environ['LD_LIBRARY_PATH'] |
|
|
393 | 393 | if 'SystemRoot' in os.environ: |
|
|
394 | 394 | # SystemRoot is required by Windows to load various DLLs. See: |
|
|
395 | 395 | # https://bugs.python.org/issue13524#msg148850 |
|
|
396 | 396 | env['SystemRoot'] = os.environ['SystemRoot'] |
|
|
397 | 397 | return env |
|
|
398 | 398 | |
|
|
399 | 399 | |
|
|
400 | 400 | version = '' |
|
|
401 | 401 | |
|
|
402 | 402 | if os.path.isdir('.hg'): |
|
|
403 | 403 | hg = findhg() |
|
|
404 | 404 | cmd = ['log', '-r', '.', '--template', '{tags}\n'] |
|
|
405 | 405 | numerictags = [t for t in sysstr(hg.run(cmd)).split() if t[0:1].isdigit()] |
|
|
406 | 406 | hgid = sysstr(hg.run(['id', '-i'])).strip() |
|
|
407 | 407 | if not hgid: |
|
|
408 | 408 | # Bail out if hg is having problems interacting with this repository, |
|
|
409 | 409 | # rather than falling through and producing a bogus version number. |
|
|
410 | 410 | # Continuing with an invalid version number will break extensions |
|
|
411 | 411 | # that define minimumhgversion. |
|
|
412 | 412 | raise SystemExit('Unable to determine hg version from local repository') |
|
|
413 | 413 | if numerictags: # tag(s) found |
|
|
414 | 414 | version = numerictags[-1] |
|
|
415 | 415 | if hgid.endswith('+'): # propagate the dirty status to the tag |
|
|
416 | 416 | version += '+' |
|
|
417 | 417 | else: # no tag found |
|
|
418 | 418 | ltagcmd = ['parents', '--template', '{latesttag}'] |
|
|
419 | 419 | ltag = sysstr(hg.run(ltagcmd)) |
|
|
420 | 420 | changessincecmd = ['log', '-T', 'x\n', '-r', "only(.,'%s')" % ltag] |
|
|
421 | 421 | changessince = len(hg.run(changessincecmd).splitlines()) |
|
|
422 | 422 | version = '%s+%s-%s' % (ltag, changessince, hgid) |
|
|
423 | 423 | if version.endswith('+'): |
|
|
424 | 424 | version += time.strftime('%Y%m%d') |
|
|
425 | 425 | elif os.path.exists('.hg_archival.txt'): |
|
|
426 | 426 | kw = dict( |
|
|
427 | 427 | [[t.strip() for t in l.split(':', 1)] for l in open('.hg_archival.txt')] |
|
|
428 | 428 | ) |
|
|
429 | 429 | if 'tag' in kw: |
|
|
430 | 430 | version = kw['tag'] |
|
|
431 | 431 | elif 'latesttag' in kw: |
|
|
432 | 432 | if 'changessincelatesttag' in kw: |
|
|
433 | 433 | version = '%(latesttag)s+%(changessincelatesttag)s-%(node).12s' % kw |
|
|
434 | 434 | else: |
|
|
435 | 435 | version = '%(latesttag)s+%(latesttagdistance)s-%(node).12s' % kw |
|
|
436 | 436 | else: |
|
|
437 | 437 | version = kw.get('node', '')[:12] |
|
|
438 | 438 | |
|
|
439 | 439 | if version: |
|
|
440 | 440 | versionb = version |
|
|
441 | 441 | if not isinstance(versionb, bytes): |
|
|
442 | 442 | versionb = versionb.encode('ascii') |
|
|
443 | 443 | |
|
|
444 | 444 | write_if_changed( |
|
|
445 | 445 | 'mercurial/__version__.py', |
|
|
446 | 446 | b''.join( |
|
|
447 | 447 | [ |
|
|
448 | 448 | b'# this file is autogenerated by setup.py\n' |
|
|
449 | 449 | b'version = b"%s"\n' % versionb, |
|
|
450 | 450 | ] |
|
|
451 | 451 | ), |
|
|
452 | 452 | ) |
|
|
453 | 453 | |
|
|
454 | 454 | try: |
|
|
455 | 455 | oldpolicy = os.environ.get('HGMODULEPOLICY', None) |
|
|
456 | 456 | os.environ['HGMODULEPOLICY'] = 'py' |
|
|
457 | 457 | from mercurial import __version__ |
|
|
458 | 458 | |
|
|
459 | 459 | version = __version__.version |
|
|
460 | 460 | except ImportError: |
|
|
461 | 461 | version = b'unknown' |
|
|
462 | 462 | finally: |
|
|
463 | 463 | if oldpolicy is None: |
|
|
464 | 464 | del os.environ['HGMODULEPOLICY'] |
|
|
465 | 465 | else: |
|
|
466 | 466 | os.environ['HGMODULEPOLICY'] = oldpolicy |
|
|
467 | 467 | |
|
|
468 | 468 | |
|
|
469 | 469 | class hgbuild(build): |
|
|
470 | 470 | # Insert hgbuildmo first so that files in mercurial/locale/ are found |
|
|
471 | 471 | # when build_py is run next. |
|
|
472 | 472 | sub_commands = [('build_mo', None)] + build.sub_commands |
|
|
473 | 473 | |
|
|
474 | 474 | |
|
|
475 | 475 | class hgbuildmo(build): |
|
|
476 | 476 | |
|
|
477 | 477 | description = "build translations (.mo files)" |
|
|
478 | 478 | |
|
|
479 | 479 | def run(self): |
|
|
480 | 480 | if not find_executable('msgfmt'): |
|
|
481 | 481 | self.warn( |
|
|
482 | 482 | "could not find msgfmt executable, no translations " |
|
|
483 | 483 | "will be built" |
|
|
484 | 484 | ) |
|
|
485 | 485 | return |
|
|
486 | 486 | |
|
|
487 | 487 | podir = 'i18n' |
|
|
488 | 488 | if not os.path.isdir(podir): |
|
|
489 | 489 | self.warn("could not find %s/ directory" % podir) |
|
|
490 | 490 | return |
|
|
491 | 491 | |
|
|
492 | 492 | join = os.path.join |
|
|
493 | 493 | for po in os.listdir(podir): |
|
|
494 | 494 | if not po.endswith('.po'): |
|
|
495 | 495 | continue |
|
|
496 | 496 | pofile = join(podir, po) |
|
|
497 | 497 | modir = join('locale', po[:-3], 'LC_MESSAGES') |
|
|
498 | 498 | mofile = join(modir, 'hg.mo') |
|
|
499 | 499 | mobuildfile = join('mercurial', mofile) |
|
|
500 | 500 | cmd = ['msgfmt', '-v', '-o', mobuildfile, pofile] |
|
|
501 | 501 | if sys.platform != 'sunos5': |
|
|
502 | 502 | # msgfmt on Solaris does not know about -c |
|
|
503 | 503 | cmd.append('-c') |
|
|
504 | 504 | self.mkpath(join('mercurial', modir)) |
|
|
505 | 505 | self.make_file([pofile], mobuildfile, spawn, (cmd,)) |
|
|
506 | 506 | |
|
|
507 | 507 | |
|
|
508 | 508 | class hgdist(Distribution): |
|
|
509 | 509 | pure = False |
|
|
510 | 510 | rust = False |
|
|
511 | 511 | no_rust = False |
|
|
512 | 512 | cffi = ispypy |
|
|
513 | 513 | |
|
|
514 | 514 | global_options = Distribution.global_options + [ |
|
|
515 | 515 | ('pure', None, "use pure (slow) Python code instead of C extensions"), |
|
|
516 | 516 | ('rust', None, "use Rust extensions additionally to C extensions"), |
|
|
517 | 517 | ( |
|
|
518 | 518 | 'no-rust', |
|
|
519 | 519 | None, |
|
|
520 | 520 | "do not use Rust extensions additionally to C extensions", |
|
|
521 | 521 | ), |
|
|
522 | 522 | ] |
|
|
523 | 523 | |
|
|
524 | 524 | negative_opt = Distribution.negative_opt.copy() |
|
|
525 | 525 | boolean_options = ['pure', 'rust', 'no-rust'] |
|
|
526 | 526 | negative_opt['no-rust'] = 'rust' |
|
|
527 | 527 | |
|
|
528 | 528 | def _set_command_options(self, command_obj, option_dict=None): |
|
|
529 | 529 | # Not all distutils versions in the wild have boolean_options. |
|
|
530 | 530 | # This should be cleaned up when we're Python 3 only. |
|
|
531 | 531 | command_obj.boolean_options = ( |
|
|
532 | 532 | getattr(command_obj, 'boolean_options', []) + self.boolean_options |
|
|
533 | 533 | ) |
|
|
534 | 534 | return Distribution._set_command_options( |
|
|
535 | 535 | self, command_obj, option_dict=option_dict |
|
|
536 | 536 | ) |
|
|
537 | 537 | |
|
|
538 | 538 | def parse_command_line(self): |
|
|
539 | 539 | ret = Distribution.parse_command_line(self) |
|
|
540 | 540 | if not (self.rust or self.no_rust): |
|
|
541 | 541 | hgrustext = os.environ.get('HGWITHRUSTEXT') |
|
|
542 | 542 | # TODO record it for proper rebuild upon changes |
|
|
543 | 543 | # (see mercurial/__modulepolicy__.py) |
|
|
544 | 544 | if hgrustext != 'cpython' and hgrustext is not None: |
|
|
545 | 545 | if hgrustext: |
|
|
546 | 546 | msg = 'unkown HGWITHRUSTEXT value: %s' % hgrustext |
|
|
547 | 547 | printf(msg, file=sys.stderr) |
|
|
548 | 548 | hgrustext = None |
|
|
549 | 549 | self.rust = hgrustext is not None |
|
|
550 | 550 | self.no_rust = not self.rust |
|
|
551 | 551 | return ret |
|
|
552 | 552 | |
|
|
553 | 553 | def has_ext_modules(self): |
|
|
554 | 554 | # self.ext_modules is emptied in hgbuildpy.finalize_options which is |
|
|
555 | 555 | # too late for some cases |
|
|
556 | 556 | return not self.pure and Distribution.has_ext_modules(self) |
|
|
557 | 557 | |
|
|
558 | 558 | |
|
|
559 | 559 | # This is ugly as a one-liner. So use a variable. |
|
|
560 | 560 | buildextnegops = dict(getattr(build_ext, 'negative_options', {})) |
|
|
561 | 561 | buildextnegops['no-zstd'] = 'zstd' |
|
|
562 | 562 | buildextnegops['no-rust'] = 'rust' |
|
|
563 | 563 | |
|
|
564 | 564 | |
|
|
565 | 565 | class hgbuildext(build_ext): |
|
|
566 | 566 | user_options = build_ext.user_options + [ |
|
|
567 | 567 | ('zstd', None, 'compile zstd bindings [default]'), |
|
|
568 | 568 | ('no-zstd', None, 'do not compile zstd bindings'), |
|
|
569 | 569 | ( |
|
|
570 | 570 | 'rust', |
|
|
571 | 571 | None, |
|
|
572 | 572 | 'compile Rust extensions if they are in use ' |
|
|
573 | 573 | '(requires Cargo) [default]', |
|
|
574 | 574 | ), |
|
|
575 | 575 | ('no-rust', None, 'do not compile Rust extensions'), |
|
|
576 | 576 | ] |
|
|
577 | 577 | |
|
|
578 | 578 | boolean_options = build_ext.boolean_options + ['zstd', 'rust'] |
|
|
579 | 579 | negative_opt = buildextnegops |
|
|
580 | 580 | |
|
|
581 | 581 | def initialize_options(self): |
|
|
582 | 582 | self.zstd = True |
|
|
583 | 583 | self.rust = True |
|
|
584 | 584 | |
|
|
585 | 585 | return build_ext.initialize_options(self) |
|
|
586 | 586 | |
|
|
587 | 587 | def finalize_options(self): |
|
|
588 | 588 | # Unless overridden by the end user, build extensions in parallel. |
|
|
589 | 589 | # Only influences behavior on Python 3.5+. |
|
|
590 | 590 | if getattr(self, 'parallel', None) is None: |
|
|
591 | 591 | self.parallel = True |
|
|
592 | 592 | |
|
|
593 | 593 | return build_ext.finalize_options(self) |
|
|
594 | 594 | |
|
|
595 | 595 | def build_extensions(self): |
|
|
596 | 596 | ruststandalones = [ |
|
|
597 | 597 | e for e in self.extensions if isinstance(e, RustStandaloneExtension) |
|
|
598 | 598 | ] |
|
|
599 | 599 | self.extensions = [ |
|
|
600 | 600 | e for e in self.extensions if e not in ruststandalones |
|
|
601 | 601 | ] |
|
|
602 | 602 | # Filter out zstd if disabled via argument. |
|
|
603 | 603 | if not self.zstd: |
|
|
604 | 604 | self.extensions = [ |
|
|
605 | 605 | e for e in self.extensions if e.name != 'mercurial.zstd' |
|
|
606 | 606 | ] |
|
|
607 | 607 | |
|
|
608 | 608 | # Build Rust standalon extensions if it'll be used |
|
|
609 | 609 | # and its build is not explictely disabled (for external build |
|
|
610 | 610 | # as Linux distributions would do) |
|
|
611 | 611 | if self.distribution.rust and self.rust: |
|
|
612 | 612 | for rustext in ruststandalones: |
|
|
613 | 613 | rustext.build('' if self.inplace else self.build_lib) |
|
|
614 | 614 | |
|
|
615 | 615 | return build_ext.build_extensions(self) |
|
|
616 | 616 | |
|
|
617 | 617 | def build_extension(self, ext): |
|
|
618 | 618 | if ( |
|
|
619 | 619 | self.distribution.rust |
|
|
620 | 620 | and self.rust |
|
|
621 | 621 | and isinstance(ext, RustExtension) |
|
|
622 | 622 | ): |
|
|
623 | 623 | ext.rustbuild() |
|
|
624 | 624 | try: |
|
|
625 | 625 | build_ext.build_extension(self, ext) |
|
|
626 | 626 | except CCompilerError: |
|
|
627 | 627 | if not getattr(ext, 'optional', False): |
|
|
628 | 628 | raise |
|
|
629 | 629 | log.warn( |
|
|
630 | 630 | "Failed to build optional extension '%s' (skipping)", ext.name |
|
|
631 | 631 | ) |
|
|
632 | 632 | |
|
|
633 | 633 | |
|
|
634 | 634 | class hgbuildscripts(build_scripts): |
|
|
635 | 635 | def run(self): |
|
|
636 | 636 | if os.name != 'nt' or self.distribution.pure: |
|
|
637 | 637 | return build_scripts.run(self) |
|
|
638 | 638 | |
|
|
639 | 639 | exebuilt = False |
|
|
640 | 640 | try: |
|
|
641 | 641 | self.run_command('build_hgexe') |
|
|
642 | 642 | exebuilt = True |
|
|
643 | 643 | except (DistutilsError, CCompilerError): |
|
|
644 | 644 | log.warn('failed to build optional hg.exe') |
|
|
645 | 645 | |
|
|
646 | 646 | if exebuilt: |
|
|
647 | 647 | # Copying hg.exe to the scripts build directory ensures it is |
|
|
648 | 648 | # installed by the install_scripts command. |
|
|
649 | 649 | hgexecommand = self.get_finalized_command('build_hgexe') |
|
|
650 | 650 | dest = os.path.join(self.build_dir, 'hg.exe') |
|
|
651 | 651 | self.mkpath(self.build_dir) |
|
|
652 | 652 | self.copy_file(hgexecommand.hgexepath, dest) |
|
|
653 | 653 | |
|
|
654 | 654 | # Remove hg.bat because it is redundant with hg.exe. |
|
|
655 | 655 | self.scripts.remove('contrib/win32/hg.bat') |
|
|
656 | 656 | |
|
|
657 | 657 | return build_scripts.run(self) |
|
|
658 | 658 | |
|
|
659 | 659 | |
|
|
660 | 660 | class hgbuildpy(build_py): |
|
|
661 | 661 | def finalize_options(self): |
|
|
662 | 662 | build_py.finalize_options(self) |
|
|
663 | 663 | |
|
|
664 | 664 | if self.distribution.pure: |
|
|
665 | 665 | self.distribution.ext_modules = [] |
|
|
666 | 666 | elif self.distribution.cffi: |
|
|
667 | 667 | from mercurial.cffi import ( |
|
|
668 | 668 | bdiffbuild, |
|
|
669 | 669 | mpatchbuild, |
|
|
670 | 670 | ) |
|
|
671 | 671 | |
|
|
672 | 672 | exts = [ |
|
|
673 | 673 | mpatchbuild.ffi.distutils_extension(), |
|
|
674 | 674 | bdiffbuild.ffi.distutils_extension(), |
|
|
675 | 675 | ] |
|
|
676 | 676 | # cffi modules go here |
|
|
677 | 677 | if sys.platform == 'darwin': |
|
|
678 | 678 | from mercurial.cffi import osutilbuild |
|
|
679 | 679 | |
|
|
680 | 680 | exts.append(osutilbuild.ffi.distutils_extension()) |
|
|
681 | 681 | self.distribution.ext_modules = exts |
|
|
682 | 682 | else: |
|
|
683 | 683 | h = os.path.join(get_python_inc(), 'Python.h') |
|
|
684 | 684 | if not os.path.exists(h): |
|
|
685 | 685 | raise SystemExit( |
|
|
686 | 686 | 'Python headers are required to build ' |
|
|
687 | 687 | 'Mercurial but weren\'t found in %s' % h |
|
|
688 | 688 | ) |
|
|
689 | 689 | |
|
|
690 | 690 | def run(self): |
|
|
691 | 691 | basepath = os.path.join(self.build_lib, 'mercurial') |
|
|
692 | 692 | self.mkpath(basepath) |
|
|
693 | 693 | |
|
|
694 | 694 | rust = self.distribution.rust |
|
|
695 | 695 | if self.distribution.pure: |
|
|
696 | 696 | modulepolicy = 'py' |
|
|
697 | 697 | elif self.build_lib == '.': |
|
|
698 | 698 | # in-place build should run without rebuilding and Rust extensions |
|
|
699 | 699 | modulepolicy = 'rust+c-allow' if rust else 'allow' |
|
|
700 | 700 | else: |
|
|
701 | 701 | modulepolicy = 'rust+c' if rust else 'c' |
|
|
702 | 702 | |
|
|
703 | 703 | content = b''.join( |
|
|
704 | 704 | [ |
|
|
705 | 705 | b'# this file is autogenerated by setup.py\n', |
|
|
706 | 706 | b'modulepolicy = b"%s"\n' % modulepolicy.encode('ascii'), |
|
|
707 | 707 | ] |
|
|
708 | 708 | ) |
|
|
709 | 709 | write_if_changed(os.path.join(basepath, '__modulepolicy__.py'), content) |
|
|
710 | 710 | |
|
|
711 | 711 | build_py.run(self) |
|
|
712 | 712 | |
|
|
713 | 713 | |
|
|
714 | 714 | class buildhgextindex(Command): |
|
|
715 | 715 | description = 'generate prebuilt index of hgext (for frozen package)' |
|
|
716 | 716 | user_options = [] |
|
|
717 | 717 | _indexfilename = 'hgext/__index__.py' |
|
|
718 | 718 | |
|
|
719 | 719 | def initialize_options(self): |
|
|
720 | 720 | pass |
|
|
721 | 721 | |
|
|
722 | 722 | def finalize_options(self): |
|
|
723 | 723 | pass |
|
|
724 | 724 | |
|
|
725 | 725 | def run(self): |
|
|
726 | 726 | if os.path.exists(self._indexfilename): |
|
|
727 | 727 | with open(self._indexfilename, 'w') as f: |
|
|
728 | 728 | f.write('# empty\n') |
|
|
729 | 729 | |
|
|
730 | 730 | # here no extension enabled, disabled() lists up everything |
|
|
731 | 731 | code = ( |
|
|
732 | 732 | 'import pprint; from mercurial import extensions; ' |
|
|
733 | 733 | 'ext = extensions.disabled();' |
|
|
734 | 734 | 'ext.pop("__index__", None);' |
|
|
735 | 735 | 'pprint.pprint(ext)' |
|
|
736 | 736 | ) |
|
|
737 | 737 | returncode, out, err = runcmd( |
|
|
738 | 738 | [sys.executable, '-c', code], localhgenv() |
|
|
739 | 739 | ) |
|
|
740 | 740 | if err or returncode != 0: |
|
|
741 | 741 | raise DistutilsExecError(err) |
|
|
742 | 742 | |
|
|
743 | 743 | with open(self._indexfilename, 'wb') as f: |
|
|
744 | 744 | f.write(b'# this file is autogenerated by setup.py\n') |
|
|
745 | 745 | f.write(b'docs = ') |
|
|
746 | 746 | f.write(out) |
|
|
747 | 747 | |
|
|
748 | 748 | |
|
|
749 | 749 | class buildhgexe(build_ext): |
|
|
750 | 750 | description = 'compile hg.exe from mercurial/exewrapper.c' |
|
|
751 | 751 | user_options = build_ext.user_options + [ |
|
|
752 | 752 | ( |
|
|
753 | 753 | 'long-paths-support', |
|
|
754 | 754 | None, |
|
|
755 | 755 | 'enable support for long paths on ' |
|
|
756 | 756 | 'Windows (off by default and ' |
|
|
757 | 757 | 'experimental)', |
|
|
758 | 758 | ), |
|
|
759 | 759 | ] |
|
|
760 | 760 | |
|
|
761 | 761 | LONG_PATHS_MANIFEST = """ |
|
|
762 | 762 | <?xml version="1.0" encoding="UTF-8" standalone="yes"?> |
|
|
763 | 763 | <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> |
|
|
764 | 764 | <application> |
|
|
765 | 765 | <windowsSettings |
|
|
766 | 766 | xmlns:ws2="http://schemas.microsoft.com/SMI/2016/WindowsSettings"> |
|
|
767 | 767 | <ws2:longPathAware>true</ws2:longPathAware> |
|
|
768 | 768 | </windowsSettings> |
|
|
769 | 769 | </application> |
|
|
770 | 770 | </assembly>""" |
|
|
771 | 771 | |
|
|
772 | 772 | def initialize_options(self): |
|
|
773 | 773 | build_ext.initialize_options(self) |
|
|
774 | 774 | self.long_paths_support = False |
|
|
775 | 775 | |
|
|
776 | 776 | def build_extensions(self): |
|
|
777 | 777 | if os.name != 'nt': |
|
|
778 | 778 | return |
|
|
779 | 779 | if isinstance(self.compiler, HackedMingw32CCompiler): |
|
|
780 | 780 | self.compiler.compiler_so = self.compiler.compiler # no -mdll |
|
|
781 | 781 | self.compiler.dll_libraries = [] # no -lmsrvc90 |
|
|
782 | 782 | |
|
|
783 | 783 | pythonlib = None |
|
|
784 | 784 | |
|
|
785 | 785 | dir = os.path.dirname(self.get_ext_fullpath('dummy')) |
|
|
786 | 786 | self.hgtarget = os.path.join(dir, 'hg') |
|
|
787 | 787 | |
|
|
788 | 788 | if getattr(sys, 'dllhandle', None): |
|
|
789 | 789 | # Different Python installs can have different Python library |
|
|
790 | 790 | # names. e.g. the official CPython distribution uses pythonXY.dll |
|
|
791 | 791 | # and MinGW uses libpythonX.Y.dll. |
|
|
792 | 792 | _kernel32 = ctypes.windll.kernel32 |
|
|
793 | 793 | _kernel32.GetModuleFileNameA.argtypes = [ |
|
|
794 | 794 | ctypes.c_void_p, |
|
|
795 | 795 | ctypes.c_void_p, |
|
|
796 | 796 | ctypes.c_ulong, |
|
|
797 | 797 | ] |
|
|
798 | 798 | _kernel32.GetModuleFileNameA.restype = ctypes.c_ulong |
|
|
799 | 799 | size = 1000 |
|
|
800 | 800 | buf = ctypes.create_string_buffer(size + 1) |
|
|
801 | 801 | filelen = _kernel32.GetModuleFileNameA( |
|
|
802 | 802 | sys.dllhandle, ctypes.byref(buf), size |
|
|
803 | 803 | ) |
|
|
804 | 804 | |
|
|
805 | 805 | if filelen > 0 and filelen != size: |
|
|
806 | 806 | dllbasename = os.path.basename(buf.value) |
|
|
807 | 807 | if not dllbasename.lower().endswith(b'.dll'): |
|
|
808 | 808 | raise SystemExit( |
|
|
809 | 809 | 'Python DLL does not end with .dll: %s' % dllbasename |
|
|
810 | 810 | ) |
|
|
811 | 811 | pythonlib = dllbasename[:-4] |
|
|
812 | 812 | |
|
|
813 | 813 | # Copy the pythonXY.dll next to the binary so that it runs |
|
|
814 | 814 | # without tampering with PATH. |
|
|
815 | 815 | fsdecode = lambda x: x |
|
|
816 | 816 | if sys.version_info[0] >= 3: |
|
|
817 | 817 | fsdecode = os.fsdecode |
|
|
818 | 818 | dest = os.path.join( |
|
|
819 | 819 | os.path.dirname(self.hgtarget), |
|
|
820 | 820 | fsdecode(dllbasename), |
|
|
821 | 821 | ) |
|
|
822 | 822 | |
|
|
823 | 823 | if not os.path.exists(dest): |
|
|
824 | 824 | shutil.copy(buf.value, dest) |
|
|
825 | 825 | |
|
|
826 | 826 | if not pythonlib: |
|
|
827 | 827 | log.warn( |
|
|
828 | 828 | 'could not determine Python DLL filename; assuming pythonXY' |
|
|
829 | 829 | ) |
|
|
830 | 830 | |
|
|
831 | 831 | hv = sys.hexversion |
|
|
832 | 832 | pythonlib = b'python%d%d' % (hv >> 24, (hv >> 16) & 0xFF) |
|
|
833 | 833 | |
|
|
834 | 834 | log.info('using %s as Python library name' % pythonlib) |
|
|
835 | 835 | with open('mercurial/hgpythonlib.h', 'wb') as f: |
|
|
836 | 836 | f.write(b'/* this file is autogenerated by setup.py */\n') |
|
|
837 | 837 | f.write(b'#define HGPYTHONLIB "%s"\n' % pythonlib) |
|
|
838 | 838 | |
|
|
839 | 839 | macros = None |
|
|
840 | 840 | if sys.version_info[0] >= 3: |
|
|
841 | 841 | macros = [('_UNICODE', None), ('UNICODE', None)] |
|
|
842 | 842 | |
|
|
843 | 843 | objects = self.compiler.compile( |
|
|
844 | 844 | ['mercurial/exewrapper.c'], |
|
|
845 | 845 | output_dir=self.build_temp, |
|
|
846 | 846 | macros=macros, |
|
|
847 | 847 | ) |
|
|
848 | 848 | self.compiler.link_executable( |
|
|
849 | 849 | objects, self.hgtarget, libraries=[], output_dir=self.build_temp |
|
|
850 | 850 | ) |
|
|
851 | 851 | if self.long_paths_support: |
|
|
852 | 852 | self.addlongpathsmanifest() |
|
|
853 | 853 | |
|
|
854 | 854 | def addlongpathsmanifest(self): |
|
|
855 | 855 | r"""Add manifest pieces so that hg.exe understands long paths |
|
|
856 | 856 | |
|
|
857 | 857 | This is an EXPERIMENTAL feature, use with care. |
|
|
858 | 858 | To enable long paths support, one needs to do two things: |
|
|
859 | 859 | - build Mercurial with --long-paths-support option |
|
|
860 | 860 | - change HKLM\SYSTEM\CurrentControlSet\Control\FileSystem\ |
|
|
861 | 861 | LongPathsEnabled to have value 1. |
|
|
862 | 862 | |
|
|
863 | 863 | Please ignore 'warning 81010002: Unrecognized Element "longPathAware"'; |
|
|
864 | 864 | it happens because Mercurial uses mt.exe circa 2008, which is not |
|
|
865 | 865 | yet aware of long paths support in the manifest (I think so at least). |
|
|
866 | 866 | This does not stop mt.exe from embedding/merging the XML properly. |
|
|
867 | 867 | |
|
|
868 | 868 | Why resource #1 should be used for .exe manifests? I don't know and |
|
|
869 | 869 | wasn't able to find an explanation for mortals. But it seems to work. |
|
|
870 | 870 | """ |
|
|
871 | 871 | exefname = self.compiler.executable_filename(self.hgtarget) |
|
|
872 | 872 | fdauto, manfname = tempfile.mkstemp(suffix='.hg.exe.manifest') |
|
|
873 | 873 | os.close(fdauto) |
|
|
874 | 874 | with open(manfname, 'w') as f: |
|
|
875 | 875 | f.write(self.LONG_PATHS_MANIFEST) |
|
|
876 | 876 | log.info("long paths manifest is written to '%s'" % manfname) |
|
|
877 | 877 | inputresource = '-inputresource:%s;#1' % exefname |
|
|
878 | 878 | outputresource = '-outputresource:%s;#1' % exefname |
|
|
879 | 879 | log.info("running mt.exe to update hg.exe's manifest in-place") |
|
|
880 | 880 | # supplying both -manifest and -inputresource to mt.exe makes |
|
|
881 | 881 | # it merge the embedded and supplied manifests in the -outputresource |
|
|
882 | 882 | self.spawn( |
|
|
883 | 883 | [ |
|
|
884 | 884 | 'mt.exe', |
|
|
885 | 885 | '-nologo', |
|
|
886 | 886 | '-manifest', |
|
|
887 | 887 | manfname, |
|
|
888 | 888 | inputresource, |
|
|
889 | 889 | outputresource, |
|
|
890 | 890 | ] |
|
|
891 | 891 | ) |
|
|
892 | 892 | log.info("done updating hg.exe's manifest") |
|
|
893 | 893 | os.remove(manfname) |
|
|
894 | 894 | |
|
|
895 | 895 | @property |
|
|
896 | 896 | def hgexepath(self): |
|
|
897 | 897 | dir = os.path.dirname(self.get_ext_fullpath('dummy')) |
|
|
898 | 898 | return os.path.join(self.build_temp, dir, 'hg.exe') |
|
|
899 | 899 | |
|
|
900 | 900 | |
|
|
901 | 901 | class hgbuilddoc(Command): |
|
|
902 | 902 | description = 'build documentation' |
|
|
903 | 903 | user_options = [ |
|
|
904 | 904 | ('man', None, 'generate man pages'), |
|
|
905 | 905 | ('html', None, 'generate html pages'), |
|
|
906 | 906 | ] |
|
|
907 | 907 | |
|
|
908 | 908 | def initialize_options(self): |
|
|
909 | 909 | self.man = None |
|
|
910 | 910 | self.html = None |
|
|
911 | 911 | |
|
|
912 | 912 | def finalize_options(self): |
|
|
913 | 913 | # If --man or --html are set, only generate what we're told to. |
|
|
914 | 914 | # Otherwise generate everything. |
|
|
915 | 915 | have_subset = self.man is not None or self.html is not None |
|
|
916 | 916 | |
|
|
917 | 917 | if have_subset: |
|
|
918 | 918 | self.man = True if self.man else False |
|
|
919 | 919 | self.html = True if self.html else False |
|
|
920 | 920 | else: |
|
|
921 | 921 | self.man = True |
|
|
922 | 922 | self.html = True |
|
|
923 | 923 | |
|
|
924 | 924 | def run(self): |
|
|
925 | 925 | def normalizecrlf(p): |
|
|
926 | 926 | with open(p, 'rb') as fh: |
|
|
927 | 927 | orig = fh.read() |
|
|
928 | 928 | |
|
|
929 | 929 | if b'\r\n' not in orig: |
|
|
930 | 930 | return |
|
|
931 | 931 | |
|
|
932 | 932 | log.info('normalizing %s to LF line endings' % p) |
|
|
933 | 933 | with open(p, 'wb') as fh: |
|
|
934 | 934 | fh.write(orig.replace(b'\r\n', b'\n')) |
|
|
935 | 935 | |
|
|
936 | 936 | def gentxt(root): |
|
|
937 | 937 | txt = 'doc/%s.txt' % root |
|
|
938 | 938 | log.info('generating %s' % txt) |
|
|
939 | 939 | res, out, err = runcmd( |
|
|
940 | 940 | [sys.executable, 'gendoc.py', root], os.environ, cwd='doc' |
|
|
941 | 941 | ) |
|
|
942 | 942 | if res: |
|
|
943 | 943 | raise SystemExit( |
|
|
944 | 944 | 'error running gendoc.py: %s' |
|
|
945 | 945 | % '\n'.join([sysstr(out), sysstr(err)]) |
|
|
946 | 946 | ) |
|
|
947 | 947 | |
|
|
948 | 948 | with open(txt, 'wb') as fh: |
|
|
949 | 949 | fh.write(out) |
|
|
950 | 950 | |
|
|
951 | 951 | def gengendoc(root): |
|
|
952 | 952 | gendoc = 'doc/%s.gendoc.txt' % root |
|
|
953 | 953 | |
|
|
954 | 954 | log.info('generating %s' % gendoc) |
|
|
955 | 955 | res, out, err = runcmd( |
|
|
956 | 956 | [sys.executable, 'gendoc.py', '%s.gendoc' % root], |
|
|
957 | 957 | os.environ, |
|
|
958 | 958 | cwd='doc', |
|
|
959 | 959 | ) |
|
|
960 | 960 | if res: |
|
|
961 | 961 | raise SystemExit( |
|
|
962 | 962 | 'error running gendoc: %s' |
|
|
963 | 963 | % '\n'.join([sysstr(out), sysstr(err)]) |
|
|
964 | 964 | ) |
|
|
965 | 965 | |
|
|
966 | 966 | with open(gendoc, 'wb') as fh: |
|
|
967 | 967 | fh.write(out) |
|
|
968 | 968 | |
|
|
969 | 969 | def genman(root): |
|
|
970 | 970 | log.info('generating doc/%s' % root) |
|
|
971 | 971 | res, out, err = runcmd( |
|
|
972 | 972 | [ |
|
|
973 | 973 | sys.executable, |
|
|
974 | 974 | 'runrst', |
|
|
975 | 975 | 'hgmanpage', |
|
|
976 | 976 | '--halt', |
|
|
977 | 977 | 'warning', |
|
|
978 | 978 | '--strip-elements-with-class', |
|
|
979 | 979 | 'htmlonly', |
|
|
980 | 980 | '%s.txt' % root, |
|
|
981 | 981 | root, |
|
|
982 | 982 | ], |
|
|
983 | 983 | os.environ, |
|
|
984 | 984 | cwd='doc', |
|
|
985 | 985 | ) |
|
|
986 | 986 | if res: |
|
|
987 | 987 | raise SystemExit( |
|
|
988 | 988 | 'error running runrst: %s' |
|
|
989 | 989 | % '\n'.join([sysstr(out), sysstr(err)]) |
|
|
990 | 990 | ) |
|
|
991 | 991 | |
|
|
992 | 992 | normalizecrlf('doc/%s' % root) |
|
|
993 | 993 | |
|
|
994 | 994 | def genhtml(root): |
|
|
995 | 995 | log.info('generating doc/%s.html' % root) |
|
|
996 | 996 | res, out, err = runcmd( |
|
|
997 | 997 | [ |
|
|
998 | 998 | sys.executable, |
|
|
999 | 999 | 'runrst', |
|
|
1000 | 1000 | 'html', |
|
|
1001 | 1001 | '--halt', |
|
|
1002 | 1002 | 'warning', |
|
|
1003 | 1003 | '--link-stylesheet', |
|
|
1004 | 1004 | '--stylesheet-path', |
|
|
1005 | 1005 | 'style.css', |
|
|
1006 | 1006 | '%s.txt' % root, |
|
|
1007 | 1007 | '%s.html' % root, |
|
|
1008 | 1008 | ], |
|
|
1009 | 1009 | os.environ, |
|
|
1010 | 1010 | cwd='doc', |
|
|
1011 | 1011 | ) |
|
|
1012 | 1012 | if res: |
|
|
1013 | 1013 | raise SystemExit( |
|
|
1014 | 1014 | 'error running runrst: %s' |
|
|
1015 | 1015 | % '\n'.join([sysstr(out), sysstr(err)]) |
|
|
1016 | 1016 | ) |
|
|
1017 | 1017 | |
|
|
1018 | 1018 | normalizecrlf('doc/%s.html' % root) |
|
|
1019 | 1019 | |
|
|
1020 | 1020 | # This logic is duplicated in doc/Makefile. |
|
|
1021 | 1021 | sources = { |
|
|
1022 | 1022 | f |
|
|
1023 | 1023 | for f in os.listdir('mercurial/helptext') |
|
|
1024 | 1024 | if re.search(r'[0-9]\.txt$', f) |
|
|
1025 | 1025 | } |
|
|
1026 | 1026 | |
|
|
1027 | 1027 | # common.txt is a one-off. |
|
|
1028 | 1028 | gentxt('common') |
|
|
1029 | 1029 | |
|
|
1030 | 1030 | for source in sorted(sources): |
|
|
1031 | 1031 | assert source[-4:] == '.txt' |
|
|
1032 | 1032 | root = source[:-4] |
|
|
1033 | 1033 | |
|
|
1034 | 1034 | gentxt(root) |
|
|
1035 | 1035 | gengendoc(root) |
|
|
1036 | 1036 | |
|
|
1037 | 1037 | if self.man: |
|
|
1038 | 1038 | genman(root) |
|
|
1039 | 1039 | if self.html: |
|
|
1040 | 1040 | genhtml(root) |
|
|
1041 | 1041 | |
|
|
1042 | 1042 | |
|
|
1043 | 1043 | class hginstall(install): |
|
|
1044 | 1044 | |
|
|
1045 | 1045 | user_options = install.user_options + [ |
|
|
1046 | 1046 | ( |
|
|
1047 | 1047 | 'old-and-unmanageable', |
|
|
1048 | 1048 | None, |
|
|
1049 | 1049 | 'noop, present for eggless setuptools compat', |
|
|
1050 | 1050 | ), |
|
|
1051 | 1051 | ( |
|
|
1052 | 1052 | 'single-version-externally-managed', |
|
|
1053 | 1053 | None, |
|
|
1054 | 1054 | 'noop, present for eggless setuptools compat', |
|
|
1055 | 1055 | ), |
|
|
1056 | 1056 | ] |
|
|
1057 | 1057 | |
|
|
1058 | 1058 | # Also helps setuptools not be sad while we refuse to create eggs. |
|
|
1059 | 1059 | single_version_externally_managed = True |
|
|
1060 | 1060 | |
|
|
1061 | 1061 | def get_sub_commands(self): |
|
|
1062 | 1062 | # Screen out egg related commands to prevent egg generation. But allow |
|
|
1063 | 1063 | # mercurial.egg-info generation, since that is part of modern |
|
|
1064 | 1064 | # packaging. |
|
|
1065 | 1065 | excl = {'bdist_egg'} |
|
|
1066 | 1066 | return filter(lambda x: x not in excl, install.get_sub_commands(self)) |
|
|
1067 | 1067 | |
|
|
1068 | 1068 | |
|
|
1069 | 1069 | class hginstalllib(install_lib): |
|
|
1070 | 1070 | """ |
|
|
1071 | 1071 | This is a specialization of install_lib that replaces the copy_file used |
|
|
1072 | 1072 | there so that it supports setting the mode of files after copying them, |
|
|
1073 | 1073 | instead of just preserving the mode that the files originally had. If your |
|
|
1074 | 1074 | system has a umask of something like 027, preserving the permissions when |
|
|
1075 | 1075 | copying will lead to a broken install. |
|
|
1076 | 1076 | |
|
|
1077 | 1077 | Note that just passing keep_permissions=False to copy_file would be |
|
|
1078 | 1078 | insufficient, as it might still be applying a umask. |
|
|
1079 | 1079 | """ |
|
|
1080 | 1080 | |
|
|
1081 | 1081 | def run(self): |
|
|
1082 | 1082 | realcopyfile = file_util.copy_file |
|
|
1083 | 1083 | |
|
|
1084 | 1084 | def copyfileandsetmode(*args, **kwargs): |
|
|
1085 | 1085 | src, dst = args[0], args[1] |
|
|
1086 | 1086 | dst, copied = realcopyfile(*args, **kwargs) |
|
|
1087 | 1087 | if copied: |
|
|
1088 | 1088 | st = os.stat(src) |
|
|
1089 | 1089 | # Persist executable bit (apply it to group and other if user |
|
|
1090 | 1090 | # has it) |
|
|
1091 | 1091 | if st[stat.ST_MODE] & stat.S_IXUSR: |
|
|
1092 | 1092 | setmode = int('0755', 8) |
|
|
1093 | 1093 | else: |
|
|
1094 | 1094 | setmode = int('0644', 8) |
|
|
1095 | 1095 | m = stat.S_IMODE(st[stat.ST_MODE]) |
|
|
1096 | 1096 | m = (m & ~int('0777', 8)) | setmode |
|
|
1097 | 1097 | os.chmod(dst, m) |
|
|
1098 | 1098 | |
|
|
1099 | 1099 | file_util.copy_file = copyfileandsetmode |
|
|
1100 | 1100 | try: |
|
|
1101 | 1101 | install_lib.run(self) |
|
|
1102 | 1102 | finally: |
|
|
1103 | 1103 | file_util.copy_file = realcopyfile |
|
|
1104 | 1104 | |
|
|
1105 | 1105 | |
|
|
1106 | 1106 | class hginstallscripts(install_scripts): |
|
|
1107 | 1107 | """ |
|
|
1108 | 1108 | This is a specialization of install_scripts that replaces the @LIBDIR@ with |
|
|
1109 | 1109 | the configured directory for modules. If possible, the path is made relative |
|
|
1110 | 1110 | to the directory for scripts. |
|
|
1111 | 1111 | """ |
|
|
1112 | 1112 | |
|
|
1113 | 1113 | def initialize_options(self): |
|
|
1114 | 1114 | install_scripts.initialize_options(self) |
|
|
1115 | 1115 | |
|
|
1116 | 1116 | self.install_lib = None |
|
|
1117 | 1117 | |
|
|
1118 | 1118 | def finalize_options(self): |
|
|
1119 | 1119 | install_scripts.finalize_options(self) |
|
|
1120 | 1120 | self.set_undefined_options('install', ('install_lib', 'install_lib')) |
|
|
1121 | 1121 | |
|
|
1122 | 1122 | def run(self): |
|
|
1123 | 1123 | install_scripts.run(self) |
|
|
1124 | 1124 | |
|
|
1125 | 1125 | # It only makes sense to replace @LIBDIR@ with the install path if |
|
|
1126 | 1126 | # the install path is known. For wheels, the logic below calculates |
|
|
1127 | 1127 | # the libdir to be "../..". This is because the internal layout of a |
|
|
1128 | 1128 | # wheel archive looks like: |
|
|
1129 | 1129 | # |
|
|
1130 | 1130 | # mercurial-3.6.1.data/scripts/hg |
|
|
1131 | 1131 | # mercurial/__init__.py |
|
|
1132 | 1132 | # |
|
|
1133 | 1133 | # When installing wheels, the subdirectories of the "<pkg>.data" |
|
|
1134 | 1134 | # directory are translated to system local paths and files therein |
|
|
1135 | 1135 | # are copied in place. The mercurial/* files are installed into the |
|
|
1136 | 1136 | # site-packages directory. However, the site-packages directory |
|
|
1137 | 1137 | # isn't known until wheel install time. This means we have no clue |
|
|
1138 | 1138 | # at wheel generation time what the installed site-packages directory |
|
|
1139 | 1139 | # will be. And, wheels don't appear to provide the ability to register |
|
|
1140 | 1140 | # custom code to run during wheel installation. This all means that |
|
|
1141 | 1141 | # we can't reliably set the libdir in wheels: the default behavior |
|
|
1142 | 1142 | # of looking in sys.path must do. |
|
|
1143 | 1143 | |
|
|
1144 | 1144 | if ( |
|
|
1145 | 1145 | os.path.splitdrive(self.install_dir)[0] |
|
|
1146 | 1146 | != os.path.splitdrive(self.install_lib)[0] |
|
|
1147 | 1147 | ): |
|
|
1148 | 1148 | # can't make relative paths from one drive to another, so use an |
|
|
1149 | 1149 | # absolute path instead |
|
|
1150 | 1150 | libdir = self.install_lib |
|
|
1151 | 1151 | else: |
|
|
1152 | 1152 | libdir = os.path.relpath(self.install_lib, self.install_dir) |
|
|
1153 | 1153 | |
|
|
1154 | 1154 | for outfile in self.outfiles: |
|
|
1155 | 1155 | with open(outfile, 'rb') as fp: |
|
|
1156 | 1156 | data = fp.read() |
|
|
1157 | 1157 | |
|
|
1158 | 1158 | # skip binary files |
|
|
1159 | 1159 | if b'\0' in data: |
|
|
1160 | 1160 | continue |
|
|
1161 | 1161 | |
|
|
1162 | 1162 | # During local installs, the shebang will be rewritten to the final |
|
|
1163 | 1163 | # install path. During wheel packaging, the shebang has a special |
|
|
1164 | 1164 | # value. |
|
|
1165 | 1165 | if data.startswith(b'#!python'): |
|
|
1166 | 1166 | log.info( |
|
|
1167 | 1167 | 'not rewriting @LIBDIR@ in %s because install path ' |
|
|
1168 | 1168 | 'not known' % outfile |
|
|
1169 | 1169 | ) |
|
|
1170 | 1170 | continue |
|
|
1171 | 1171 | |
|
|
1172 | 1172 | data = data.replace(b'@LIBDIR@', libdir.encode(libdir_escape)) |
|
|
1173 | 1173 | with open(outfile, 'wb') as fp: |
|
|
1174 | 1174 | fp.write(data) |
|
|
1175 | 1175 | |
|
|
1176 | 1176 | |
|
|
1177 | 1177 | # virtualenv installs custom distutils/__init__.py and |
|
|
1178 | 1178 | # distutils/distutils.cfg files which essentially proxy back to the |
|
|
1179 | 1179 | # "real" distutils in the main Python install. The presence of this |
|
|
1180 | 1180 | # directory causes py2exe to pick up the "hacked" distutils package |
|
|
1181 | 1181 | # from the virtualenv and "import distutils" will fail from the py2exe |
|
|
1182 | 1182 | # build because the "real" distutils files can't be located. |
|
|
1183 | 1183 | # |
|
|
1184 | 1184 | # We work around this by monkeypatching the py2exe code finding Python |
|
|
1185 | 1185 | # modules to replace the found virtualenv distutils modules with the |
|
|
1186 | 1186 | # original versions via filesystem scanning. This is a bit hacky. But |
|
|
1187 | 1187 | # it allows us to use virtualenvs for py2exe packaging, which is more |
|
|
1188 | 1188 | # deterministic and reproducible. |
|
|
1189 | 1189 | # |
|
|
1190 | 1190 | # It's worth noting that the common StackOverflow suggestions for this |
|
|
1191 | 1191 | # problem involve copying the original distutils files into the |
|
|
1192 | 1192 | # virtualenv or into the staging directory after setup() is invoked. |
|
|
1193 | 1193 | # The former is very brittle and can easily break setup(). Our hacking |
|
|
1194 | 1194 | # of the found modules routine has a similar result as copying the files |
|
|
1195 | 1195 | # manually. But it makes fewer assumptions about how py2exe works and |
|
|
1196 | 1196 | # is less brittle. |
|
|
1197 | 1197 | |
|
|
1198 | 1198 | # This only catches virtualenvs made with virtualenv (as opposed to |
|
|
1199 | 1199 | # venv, which is likely what Python 3 uses). |
|
|
1200 | 1200 | py2exehacked = py2exeloaded and getattr(sys, 'real_prefix', None) is not None |
|
|
1201 | 1201 | |
|
|
1202 | 1202 | if py2exehacked: |
|
|
1203 | 1203 | from distutils.command.py2exe import py2exe as buildpy2exe |
|
|
1204 | 1204 | from py2exe.mf import Module as py2exemodule |
|
|
1205 | 1205 | |
|
|
1206 | 1206 | class hgbuildpy2exe(buildpy2exe): |
|
|
1207 | 1207 | def find_needed_modules(self, mf, files, modules): |
|
|
1208 | 1208 | res = buildpy2exe.find_needed_modules(self, mf, files, modules) |
|
|
1209 | 1209 | |
|
|
1210 | 1210 | # Replace virtualenv's distutils modules with the real ones. |
|
|
1211 | 1211 | modules = {} |
|
|
1212 | 1212 | for k, v in res.modules.items(): |
|
|
1213 | 1213 | if k != 'distutils' and not k.startswith('distutils.'): |
|
|
1214 | 1214 | modules[k] = v |
|
|
1215 | 1215 | |
|
|
1216 | 1216 | res.modules = modules |
|
|
1217 | 1217 | |
|
|
1218 | 1218 | import opcode |
|
|
1219 | 1219 | |
|
|
1220 | 1220 | distutilsreal = os.path.join( |
|
|
1221 | 1221 | os.path.dirname(opcode.__file__), 'distutils' |
|
|
1222 | 1222 | ) |
|
|
1223 | 1223 | |
|
|
1224 | 1224 | for root, dirs, files in os.walk(distutilsreal): |
|
|
1225 | 1225 | for f in sorted(files): |
|
|
1226 | 1226 | if not f.endswith('.py'): |
|
|
1227 | 1227 | continue |
|
|
1228 | 1228 | |
|
|
1229 | 1229 | full = os.path.join(root, f) |
|
|
1230 | 1230 | |
|
|
1231 | 1231 | parents = ['distutils'] |
|
|
1232 | 1232 | |
|
|
1233 | 1233 | if root != distutilsreal: |
|
|
1234 | 1234 | rel = os.path.relpath(root, distutilsreal) |
|
|
1235 | 1235 | parents.extend(p for p in rel.split(os.sep)) |
|
|
1236 | 1236 | |
|
|
1237 | 1237 | modname = '%s.%s' % ('.'.join(parents), f[:-3]) |
|
|
1238 | 1238 | |
|
|
1239 | 1239 | if modname.startswith('distutils.tests.'): |
|
|
1240 | 1240 | continue |
|
|
1241 | 1241 | |
|
|
1242 | 1242 | if modname.endswith('.__init__'): |
|
|
1243 | 1243 | modname = modname[: -len('.__init__')] |
|
|
1244 | 1244 | path = os.path.dirname(full) |
|
|
1245 | 1245 | else: |
|
|
1246 | 1246 | path = None |
|
|
1247 | 1247 | |
|
|
1248 | 1248 | res.modules[modname] = py2exemodule( |
|
|
1249 | 1249 | modname, full, path=path |
|
|
1250 | 1250 | ) |
|
|
1251 | 1251 | |
|
|
1252 | 1252 | if 'distutils' not in res.modules: |
|
|
1253 | 1253 | raise SystemExit('could not find distutils modules') |
|
|
1254 | 1254 | |
|
|
1255 | 1255 | return res |
|
|
1256 | 1256 | |
|
|
1257 | 1257 | |
|
|
1258 | 1258 | cmdclass = { |
|
|
1259 | 1259 | 'build': hgbuild, |
|
|
1260 | 1260 | 'build_doc': hgbuilddoc, |
|
|
1261 | 1261 | 'build_mo': hgbuildmo, |
|
|
1262 | 1262 | 'build_ext': hgbuildext, |
|
|
1263 | 1263 | 'build_py': hgbuildpy, |
|
|
1264 | 1264 | 'build_scripts': hgbuildscripts, |
|
|
1265 | 1265 | 'build_hgextindex': buildhgextindex, |
|
|
1266 | 1266 | 'install': hginstall, |
|
|
1267 | 1267 | 'install_lib': hginstalllib, |
|
|
1268 | 1268 | 'install_scripts': hginstallscripts, |
|
|
1269 | 1269 | 'build_hgexe': buildhgexe, |
|
|
1270 | 1270 | } |
|
|
1271 | 1271 | |
|
|
1272 | 1272 | if py2exehacked: |
|
|
1273 | 1273 | cmdclass['py2exe'] = hgbuildpy2exe |
|
|
1274 | 1274 | |
|
|
1275 | 1275 | packages = [ |
|
|
1276 | 1276 | 'mercurial', |
|
|
1277 | 1277 | 'mercurial.cext', |
|
|
1278 | 1278 | 'mercurial.cffi', |
|
|
1279 | 1279 | 'mercurial.defaultrc', |
|
|
1280 | 1280 | 'mercurial.helptext', |
|
|
1281 | 1281 | 'mercurial.helptext.internals', |
|
|
1282 | 1282 | 'mercurial.hgweb', |
|
|
1283 | 1283 | 'mercurial.interfaces', |
|
|
1284 | 1284 | 'mercurial.pure', |
|
|
1285 | 1285 | 'mercurial.templates', |
|
|
1286 | 1286 | 'mercurial.thirdparty', |
|
|
1287 | 1287 | 'mercurial.thirdparty.attr', |
|
|
1288 | 1288 | 'mercurial.thirdparty.zope', |
|
|
1289 | 1289 | 'mercurial.thirdparty.zope.interface', |
|
|
1290 | 1290 | 'mercurial.upgrade_utils', |
|
|
1291 | 1291 | 'mercurial.utils', |
|
|
1292 | 1292 | 'mercurial.revlogutils', |
|
|
1293 | 1293 | 'mercurial.testing', |
|
|
1294 | 1294 | 'hgext', |
|
|
1295 | 1295 | 'hgext.convert', |
|
|
1296 | 1296 | 'hgext.fsmonitor', |
|
|
1297 | 1297 | 'hgext.fastannotate', |
|
|
1298 | 1298 | 'hgext.fsmonitor.pywatchman', |
|
|
1299 | 1299 | 'hgext.git', |
|
|
1300 | 1300 | 'hgext.highlight', |
|
|
1301 | 1301 | 'hgext.hooklib', |
|
|
1302 | 1302 | 'hgext.infinitepush', |
|
|
1303 | 1303 | 'hgext.largefiles', |
|
|
1304 | 1304 | 'hgext.lfs', |
|
|
1305 | 1305 | 'hgext.narrow', |
|
|
1306 | 1306 | 'hgext.remotefilelog', |
|
|
1307 | 1307 | 'hgext.zeroconf', |
|
|
1308 | 1308 | 'hgext3rd', |
|
|
1309 | 1309 | 'hgdemandimport', |
|
|
1310 | 1310 | ] |
|
|
1311 | 1311 | |
|
|
1312 | 1312 | # The pygit2 dependency dropped py2 support with the 1.0 release in Dec 2019. |
|
|
1313 | 1313 | # Prior releases do not build at all on Windows, because Visual Studio 2008 |
|
|
1314 | 1314 | # doesn't understand C 11. Older Linux releases are buggy. |
|
|
1315 | 1315 | if sys.version_info[0] == 2: |
|
|
1316 | 1316 | packages.remove('hgext.git') |
|
|
1317 | 1317 | |
|
|
1318 | 1318 | |
|
|
1319 | 1319 | for name in os.listdir(os.path.join('mercurial', 'templates')): |
|
|
1320 | 1320 | if name != '__pycache__' and os.path.isdir( |
|
|
1321 | 1321 | os.path.join('mercurial', 'templates', name) |
|
|
1322 | 1322 | ): |
|
|
1323 | 1323 | packages.append('mercurial.templates.%s' % name) |
|
|
1324 | 1324 | |
|
|
1325 | 1325 | if sys.version_info[0] == 2: |
|
|
1326 | 1326 | packages.extend( |
|
|
1327 | 1327 | [ |
|
|
1328 | 1328 | 'mercurial.thirdparty.concurrent', |
|
|
1329 | 1329 | 'mercurial.thirdparty.concurrent.futures', |
|
|
1330 | 1330 | ] |
|
|
1331 | 1331 | ) |
|
|
1332 | 1332 | |
|
|
1333 | 1333 | if 'HG_PY2EXE_EXTRA_INSTALL_PACKAGES' in os.environ: |
|
|
1334 | 1334 | # py2exe can't cope with namespace packages very well, so we have to |
|
|
1335 | 1335 | # install any hgext3rd.* extensions that we want in the final py2exe |
|
|
1336 | 1336 | # image here. This is gross, but you gotta do what you gotta do. |
|
|
1337 | 1337 | packages.extend(os.environ['HG_PY2EXE_EXTRA_INSTALL_PACKAGES'].split(' ')) |
|
|
1338 | 1338 | |
|
|
1339 | 1339 | common_depends = [ |
|
|
1340 | 1340 | 'mercurial/bitmanipulation.h', |
|
|
1341 | 1341 | 'mercurial/compat.h', |
|
|
1342 | 1342 | 'mercurial/cext/util.h', |
|
|
1343 | 1343 | ] |
|
|
1344 | 1344 | common_include_dirs = ['mercurial'] |
|
|
1345 | 1345 | |
|
|
1346 | 1346 | common_cflags = [] |
|
|
1347 | 1347 | |
|
|
1348 | 1348 | # MSVC 2008 still needs declarations at the top of the scope, but Python 3.9 |
|
|
1349 | 1349 | # makes declarations not at the top of a scope in the headers. |
|
|
1350 | 1350 | if os.name != 'nt' and sys.version_info[1] < 9: |
|
|
1351 | 1351 | common_cflags = ['-Werror=declaration-after-statement'] |
|
|
1352 | 1352 | |
|
|
1353 | 1353 | osutil_cflags = [] |
|
|
1354 | 1354 | osutil_ldflags = [] |
|
|
1355 | 1355 | |
|
|
1356 | 1356 | # platform specific macros |
|
|
1357 | 1357 | for plat, func in [('bsd', 'setproctitle')]: |
|
|
1358 | 1358 | if re.search(plat, sys.platform) and hasfunction(new_compiler(), func): |
|
|
1359 | 1359 | osutil_cflags.append('-DHAVE_%s' % func.upper()) |
|
|
1360 | 1360 | |
|
|
1361 | 1361 | for plat, macro, code in [ |
|
|
1362 | 1362 | ( |
|
|
1363 | 1363 | 'bsd|darwin', |
|
|
1364 | 1364 | 'BSD_STATFS', |
|
|
1365 | 1365 | ''' |
|
|
1366 | 1366 | #include <sys/param.h> |
|
|
1367 | 1367 | #include <sys/mount.h> |
|
|
1368 | 1368 | int main() { struct statfs s; return sizeof(s.f_fstypename); } |
|
|
1369 | 1369 | ''', |
|
|
1370 | 1370 | ), |
|
|
1371 | 1371 | ( |
|
|
1372 | 1372 | 'linux', |
|
|
1373 | 1373 | 'LINUX_STATFS', |
|
|
1374 | 1374 | ''' |
|
|
1375 | 1375 | #include <linux/magic.h> |
|
|
1376 | 1376 | #include <sys/vfs.h> |
|
|
1377 | 1377 | int main() { struct statfs s; return sizeof(s.f_type); } |
|
|
1378 | 1378 | ''', |
|
|
1379 | 1379 | ), |
|
|
1380 | 1380 | ]: |
|
|
1381 | 1381 | if re.search(plat, sys.platform) and cancompile(new_compiler(), code): |
|
|
1382 | 1382 | osutil_cflags.append('-DHAVE_%s' % macro) |
|
|
1383 | 1383 | |
|
|
1384 | 1384 | if sys.platform == 'darwin': |
|
|
1385 | 1385 | osutil_ldflags += ['-framework', 'ApplicationServices'] |
|
|
1386 | 1386 | |
|
|
1387 | 1387 | if sys.platform == 'sunos5': |
|
|
1388 | 1388 | osutil_ldflags += ['-lsocket'] |
|
|
1389 | 1389 | |
|
|
1390 | 1390 | xdiff_srcs = [ |
|
|
1391 | 1391 | 'mercurial/thirdparty/xdiff/xdiffi.c', |
|
|
1392 | 1392 | 'mercurial/thirdparty/xdiff/xprepare.c', |
|
|
1393 | 1393 | 'mercurial/thirdparty/xdiff/xutils.c', |
|
|
1394 | 1394 | ] |
|
|
1395 | 1395 | |
|
|
1396 | 1396 | xdiff_headers = [ |
|
|
1397 | 1397 | 'mercurial/thirdparty/xdiff/xdiff.h', |
|
|
1398 | 1398 | 'mercurial/thirdparty/xdiff/xdiffi.h', |
|
|
1399 | 1399 | 'mercurial/thirdparty/xdiff/xinclude.h', |
|
|
1400 | 1400 | 'mercurial/thirdparty/xdiff/xmacros.h', |
|
|
1401 | 1401 | 'mercurial/thirdparty/xdiff/xprepare.h', |
|
|
1402 | 1402 | 'mercurial/thirdparty/xdiff/xtypes.h', |
|
|
1403 | 1403 | 'mercurial/thirdparty/xdiff/xutils.h', |
|
|
1404 | 1404 | ] |
|
|
1405 | 1405 | |
|
|
1406 | 1406 | |
|
|
1407 | 1407 | class RustCompilationError(CCompilerError): |
|
|
1408 | 1408 | """Exception class for Rust compilation errors.""" |
|
|
1409 | 1409 | |
|
|
1410 | 1410 | |
|
|
1411 | 1411 | class RustExtension(Extension): |
|
|
1412 | 1412 | """Base classes for concrete Rust Extension classes.""" |
|
|
1413 | 1413 | |
|
|
1414 | 1414 | rusttargetdir = os.path.join('rust', 'target', 'release') |
|
|
1415 | 1415 | |
|
|
1416 | 1416 | def __init__( |
|
|
1417 | 1417 | self, mpath, sources, rustlibname, subcrate, py3_features=None, **kw |
|
|
1418 | 1418 | ): |
|
|
1419 | 1419 | Extension.__init__(self, mpath, sources, **kw) |
|
|
1420 | 1420 | srcdir = self.rustsrcdir = os.path.join('rust', subcrate) |
|
|
1421 | 1421 | self.py3_features = py3_features |
|
|
1422 | 1422 | |
|
|
1423 | 1423 | # adding Rust source and control files to depends so that the extension |
|
|
1424 | 1424 | # gets rebuilt if they've changed |
|
|
1425 | 1425 | self.depends.append(os.path.join(srcdir, 'Cargo.toml')) |
|
|
1426 | 1426 | cargo_lock = os.path.join(srcdir, 'Cargo.lock') |
|
|
1427 | 1427 | if os.path.exists(cargo_lock): |
|
|
1428 | 1428 | self.depends.append(cargo_lock) |
|
|
1429 | 1429 | for dirpath, subdir, fnames in os.walk(os.path.join(srcdir, 'src')): |
|
|
1430 | 1430 | self.depends.extend( |
|
|
1431 | 1431 | os.path.join(dirpath, fname) |
|
|
1432 | 1432 | for fname in fnames |
|
|
1433 | 1433 | if os.path.splitext(fname)[1] == '.rs' |
|
|
1434 | 1434 | ) |
|
|
1435 | 1435 | |
|
|
1436 | 1436 | @staticmethod |
|
|
1437 | 1437 | def rustdylibsuffix(): |
|
|
1438 | 1438 | """Return the suffix for shared libraries produced by rustc. |
|
|
1439 | 1439 | |
|
|
1440 | 1440 | See also: https://doc.rust-lang.org/reference/linkage.html |
|
|
1441 | 1441 | """ |
|
|
1442 | 1442 | if sys.platform == 'darwin': |
|
|
1443 | 1443 | return '.dylib' |
|
|
1444 | 1444 | elif os.name == 'nt': |
|
|
1445 | 1445 | return '.dll' |
|
|
1446 | 1446 | else: |
|
|
1447 | 1447 | return '.so' |
|
|
1448 | 1448 | |
|
|
1449 | 1449 | def rustbuild(self): |
|
|
1450 | 1450 | env = os.environ.copy() |
|
|
1451 | 1451 | if 'HGTEST_RESTOREENV' in env: |
|
|
1452 | 1452 | # Mercurial tests change HOME to a temporary directory, |
|
|
1453 | 1453 | # but, if installed with rustup, the Rust toolchain needs |
|
|
1454 | 1454 | # HOME to be correct (otherwise the 'no default toolchain' |
|
|
1455 | 1455 | # error message is issued and the build fails). |
|
|
1456 | 1456 | # This happens currently with test-hghave.t, which does |
|
|
1457 | 1457 | # invoke this build. |
|
|
1458 | 1458 | |
|
|
1459 | 1459 | # Unix only fix (os.path.expanduser not really reliable if |
|
|
1460 | 1460 | # HOME is shadowed like this) |
|
|
1461 | 1461 | import pwd |
|
|
1462 | 1462 | |
|
|
1463 | 1463 | env['HOME'] = pwd.getpwuid(os.getuid()).pw_dir |
|
|
1464 | 1464 | |
|
|
1465 | 1465 | cargocmd = ['cargo', 'rustc', '--release'] |
|
|
1466 | 1466 | |
|
|
1467 | 1467 | feature_flags = [] |
|
|
1468 | 1468 | |
|
|
1469 | 1469 | if sys.version_info[0] == 3 and self.py3_features is not None: |
|
|
1470 | 1470 | feature_flags.append(self.py3_features) |
|
|
1471 | 1471 | cargocmd.append('--no-default-features') |
|
|
1472 | 1472 | |
|
|
1473 | 1473 | rust_features = env.get("HG_RUST_FEATURES") |
|
|
1474 | 1474 | if rust_features: |
|
|
1475 | 1475 | feature_flags.append(rust_features) |
|
|
1476 | 1476 | |
|
|
1477 | 1477 | cargocmd.extend(('--features', " ".join(feature_flags))) |
|
|
1478 | 1478 | |
|
|
1479 | 1479 | cargocmd.append('--') |
|
|
1480 | 1480 | if sys.platform == 'darwin': |
|
|
1481 | 1481 | cargocmd.extend( |
|
|
1482 | 1482 | ("-C", "link-arg=-undefined", "-C", "link-arg=dynamic_lookup") |
|
|
1483 | 1483 | ) |
|
|
1484 | 1484 | try: |
|
|
1485 | 1485 | subprocess.check_call(cargocmd, env=env, cwd=self.rustsrcdir) |
|
|
1486 | 1486 | except OSError as exc: |
|
|
1487 | 1487 | if exc.errno == errno.ENOENT: |
|
|
1488 | 1488 | raise RustCompilationError("Cargo not found") |
|
|
1489 | 1489 | elif exc.errno == errno.EACCES: |
|
|
1490 | 1490 | raise RustCompilationError( |
|
|
1491 | 1491 | "Cargo found, but permisssion to execute it is denied" |
|
|
1492 | 1492 | ) |
|
|
1493 | 1493 | else: |
|
|
1494 | 1494 | raise |
|
|
1495 | 1495 | except subprocess.CalledProcessError: |
|
|
1496 | 1496 | raise RustCompilationError( |
|
|
1497 | 1497 | "Cargo failed. Working directory: %r, " |
|
|
1498 | 1498 | "command: %r, environment: %r" |
|
|
1499 | 1499 | % (self.rustsrcdir, cargocmd, env) |
|
|
1500 | 1500 | ) |
|
|
1501 | 1501 | |
|
|
1502 | 1502 | |
|
|
1503 | 1503 | class RustStandaloneExtension(RustExtension): |
|
|
1504 | 1504 | def __init__(self, pydottedname, rustcrate, dylibname, **kw): |
|
|
1505 | 1505 | RustExtension.__init__( |
|
|
1506 | 1506 | self, pydottedname, [], dylibname, rustcrate, **kw |
|
|
1507 | 1507 | ) |
|
|
1508 | 1508 | self.dylibname = dylibname |
|
|
1509 | 1509 | |
|
|
1510 | 1510 | def build(self, target_dir): |
|
|
1511 | 1511 | self.rustbuild() |
|
|
1512 | 1512 | target = [target_dir] |
|
|
1513 | 1513 | target.extend(self.name.split('.')) |
|
|
1514 | 1514 | target[-1] += DYLIB_SUFFIX |
|
|
1515 | 1515 | shutil.copy2( |
|
|
1516 | 1516 | os.path.join( |
|
|
1517 | 1517 | self.rusttargetdir, self.dylibname + self.rustdylibsuffix() |
|
|
1518 | 1518 | ), |
|
|
1519 | 1519 | os.path.join(*target), |
|
|
1520 | 1520 | ) |
|
|
1521 | 1521 | |
|
|
1522 | 1522 | |
|
|
1523 | 1523 | extmodules = [ |
|
|
1524 | 1524 | Extension( |
|
|
1525 | 1525 | 'mercurial.cext.base85', |
|
|
1526 | 1526 | ['mercurial/cext/base85.c'], |
|
|
1527 | 1527 | include_dirs=common_include_dirs, |
|
|
1528 | 1528 | extra_compile_args=common_cflags, |
|
|
1529 | 1529 | depends=common_depends, |
|
|
1530 | 1530 | ), |
|
|
1531 | 1531 | Extension( |
|
|
1532 | 1532 | 'mercurial.cext.bdiff', |
|
|
1533 | 1533 | ['mercurial/bdiff.c', 'mercurial/cext/bdiff.c'] + xdiff_srcs, |
|
|
1534 | 1534 | include_dirs=common_include_dirs, |
|
|
1535 | 1535 | extra_compile_args=common_cflags, |
|
|
1536 | 1536 | depends=common_depends + ['mercurial/bdiff.h'] + xdiff_headers, |
|
|
1537 | 1537 | ), |
|
|
1538 | 1538 | Extension( |
|
|
1539 | 1539 | 'mercurial.cext.mpatch', |
|
|
1540 | 1540 | ['mercurial/mpatch.c', 'mercurial/cext/mpatch.c'], |
|
|
1541 | 1541 | include_dirs=common_include_dirs, |
|
|
1542 | 1542 | extra_compile_args=common_cflags, |
|
|
1543 | 1543 | depends=common_depends, |
|
|
1544 | 1544 | ), |
|
|
1545 | 1545 | Extension( |
|
|
1546 | 1546 | 'mercurial.cext.parsers', |
|
|
1547 | 1547 | [ |
|
|
1548 | 1548 | 'mercurial/cext/charencode.c', |
|
|
1549 | 1549 | 'mercurial/cext/dirs.c', |
|
|
1550 | 1550 | 'mercurial/cext/manifest.c', |
|
|
1551 | 1551 | 'mercurial/cext/parsers.c', |
|
|
1552 | 1552 | 'mercurial/cext/pathencode.c', |
|
|
1553 | 1553 | 'mercurial/cext/revlog.c', |
|
|
1554 | 1554 | ], |
|
|
1555 | 1555 | include_dirs=common_include_dirs, |
|
|
1556 | 1556 | extra_compile_args=common_cflags, |
|
|
1557 | 1557 | depends=common_depends |
|
|
1558 | 1558 | + [ |
|
|
1559 | 1559 | 'mercurial/cext/charencode.h', |
|
|
1560 | 1560 | 'mercurial/cext/revlog.h', |
|
|
1561 | 1561 | ], |
|
|
1562 | 1562 | ), |
|
|
1563 | 1563 | Extension( |
|
|
1564 | 1564 | 'mercurial.cext.osutil', |
|
|
1565 | 1565 | ['mercurial/cext/osutil.c'], |
|
|
1566 | 1566 | include_dirs=common_include_dirs, |
|
|
1567 | 1567 | extra_compile_args=common_cflags + osutil_cflags, |
|
|
1568 | 1568 | extra_link_args=osutil_ldflags, |
|
|
1569 | 1569 | depends=common_depends, |
|
|
1570 | 1570 | ), |
|
|
1571 | 1571 | Extension( |
|
|
1572 | 1572 | 'mercurial.thirdparty.zope.interface._zope_interface_coptimizations', |
|
|
1573 | 1573 | [ |
|
|
1574 | 1574 | 'mercurial/thirdparty/zope/interface/_zope_interface_coptimizations.c', |
|
|
1575 | 1575 | ], |
|
|
1576 | 1576 | extra_compile_args=common_cflags, |
|
|
1577 | 1577 | ), |
|
|
1578 | 1578 | Extension( |
|
|
1579 | 1579 | 'mercurial.thirdparty.sha1dc', |
|
|
1580 | 1580 | [ |
|
|
1581 | 1581 | 'mercurial/thirdparty/sha1dc/cext.c', |
|
|
1582 | 1582 | 'mercurial/thirdparty/sha1dc/lib/sha1.c', |
|
|
1583 | 1583 | 'mercurial/thirdparty/sha1dc/lib/ubc_check.c', |
|
|
1584 | 1584 | ], |
|
|
1585 | 1585 | extra_compile_args=common_cflags, |
|
|
1586 | 1586 | ), |
|
|
1587 | 1587 | Extension( |
|
|
1588 | 1588 | 'hgext.fsmonitor.pywatchman.bser', |
|
|
1589 | 1589 | ['hgext/fsmonitor/pywatchman/bser.c'], |
|
|
1590 | 1590 | extra_compile_args=common_cflags, |
|
|
1591 | 1591 | ), |
|
|
1592 | 1592 | RustStandaloneExtension( |
|
|
1593 | 1593 | 'mercurial.rustext', 'hg-cpython', 'librusthg', py3_features='python3' |
|
|
1594 | 1594 | ), |
|
|
1595 | 1595 | ] |
|
|
1596 | 1596 | |
|
|
1597 | 1597 | |
|
|
1598 | 1598 | sys.path.insert(0, 'contrib/python-zstandard') |
|
|
1599 | 1599 | import setup_zstd |
|
|
1600 | 1600 | |
|
|
1601 | 1601 | zstd = setup_zstd.get_c_extension( |
|
|
1602 | 1602 | name='mercurial.zstd', root=os.path.abspath(os.path.dirname(__file__)) |
|
|
1603 | 1603 | ) |
|
|
1604 | 1604 | zstd.extra_compile_args += common_cflags |
|
|
1605 | 1605 | extmodules.append(zstd) |
|
|
1606 | 1606 | |
|
|
1607 | 1607 | try: |
|
|
1608 | 1608 | from distutils import cygwinccompiler |
|
|
1609 | 1609 | |
|
|
1610 | 1610 | # the -mno-cygwin option has been deprecated for years |
|
|
1611 | 1611 | mingw32compilerclass = cygwinccompiler.Mingw32CCompiler |
|
|
1612 | 1612 | |
|
|
1613 | 1613 | class HackedMingw32CCompiler(cygwinccompiler.Mingw32CCompiler): |
|
|
1614 | 1614 | def __init__(self, *args, **kwargs): |
|
|
1615 | 1615 | mingw32compilerclass.__init__(self, *args, **kwargs) |
|
|
1616 | 1616 | for i in 'compiler compiler_so linker_exe linker_so'.split(): |
|
|
1617 | 1617 | try: |
|
|
1618 | 1618 | getattr(self, i).remove('-mno-cygwin') |
|
|
1619 | 1619 | except ValueError: |
|
|
1620 | 1620 | pass |
|
|
1621 | 1621 | |
|
|
1622 | 1622 | cygwinccompiler.Mingw32CCompiler = HackedMingw32CCompiler |
|
|
1623 | 1623 | except ImportError: |
|
|
1624 | 1624 | # the cygwinccompiler package is not available on some Python |
|
|
1625 | 1625 | # distributions like the ones from the optware project for Synology |
|
|
1626 | 1626 | # DiskStation boxes |
|
|
1627 | 1627 | class HackedMingw32CCompiler(object): |
|
|
1628 | 1628 | pass |
|
|
1629 | 1629 | |
|
|
1630 | 1630 | |
|
|
1631 | 1631 | if os.name == 'nt': |
|
|
1632 | 1632 | # Allow compiler/linker flags to be added to Visual Studio builds. Passing |
|
|
1633 | 1633 | # extra_link_args to distutils.extensions.Extension() doesn't have any |
|
|
1634 | 1634 | # effect. |
|
|
1635 | 1635 | from distutils import msvccompiler |
|
|
1636 | 1636 | |
|
|
1637 | 1637 | msvccompilerclass = msvccompiler.MSVCCompiler |
|
|
1638 | 1638 | |
|
|
1639 | 1639 | class HackedMSVCCompiler(msvccompiler.MSVCCompiler): |
|
|
1640 | 1640 | def initialize(self): |
|
|
1641 | 1641 | msvccompilerclass.initialize(self) |
|
|
1642 | 1642 | # "warning LNK4197: export 'func' specified multiple times" |
|
|
1643 | 1643 | self.ldflags_shared.append('/ignore:4197') |
|
|
1644 | 1644 | self.ldflags_shared_debug.append('/ignore:4197') |
|
|
1645 | 1645 | |
|
|
1646 | 1646 | msvccompiler.MSVCCompiler = HackedMSVCCompiler |
|
|
1647 | 1647 | |
|
|
1648 | 1648 | packagedata = { |
|
|
1649 | 1649 | 'mercurial': [ |
|
|
1650 | 1650 | 'locale/*/LC_MESSAGES/hg.mo', |
|
|
1651 | 1651 | 'dummycert.pem', |
|
|
1652 | 1652 | ], |
|
|
1653 | 1653 | 'mercurial.defaultrc': [ |
|
|
1654 | 1654 | '*.rc', |
|
|
1655 | 1655 | ], |
|
|
1656 | 1656 | 'mercurial.helptext': [ |
|
|
1657 | 1657 | '*.txt', |
|
|
1658 | 1658 | ], |
|
|
1659 | 1659 | 'mercurial.helptext.internals': [ |
|
|
1660 | 1660 | '*.txt', |
|
|
1661 | 1661 | ], |
|
|
1662 | 1662 | } |
|
|
1663 | 1663 | |
|
|
1664 | 1664 | |
|
|
1665 | 1665 | def ordinarypath(p): |
|
|
1666 | 1666 | return p and p[0] != '.' and p[-1] != '~' |
|
|
1667 | 1667 | |
|
|
1668 | 1668 | |
|
|
1669 | 1669 | for root in ('templates',): |
|
|
1670 | 1670 | for curdir, dirs, files in os.walk(os.path.join('mercurial', root)): |
|
|
1671 | 1671 | packagename = curdir.replace(os.sep, '.') |
|
|
1672 | 1672 | packagedata[packagename] = list(filter(ordinarypath, files)) |
|
|
1673 | 1673 | |
|
|
1674 | 1674 | datafiles = [] |
|
|
1675 | 1675 | |
|
|
1676 | 1676 | # distutils expects version to be str/unicode. Converting it to |
|
|
1677 | 1677 | # unicode on Python 2 still works because it won't contain any |
|
|
1678 | 1678 | # non-ascii bytes and will be implicitly converted back to bytes |
|
|
1679 | 1679 | # when operated on. |
|
|
1680 | 1680 | assert isinstance(version, bytes) |
|
|
1681 | 1681 | setupversion = version.decode('ascii') |
|
|
1682 | 1682 | |
|
|
1683 | 1683 | extra = {} |
|
|
1684 | 1684 | |
|
|
1685 | 1685 | py2exepackages = [ |
|
|
1686 | 1686 | 'hgdemandimport', |
|
|
1687 | 1687 | 'hgext3rd', |
|
|
1688 | 1688 | 'hgext', |
|
|
1689 | 1689 | 'email', |
|
|
1690 | 1690 | # implicitly imported per module policy |
|
|
1691 | 1691 | # (cffi wouldn't be used as a frozen exe) |
|
|
1692 | 1692 | 'mercurial.cext', |
|
|
1693 | 1693 | #'mercurial.cffi', |
|
|
1694 | 1694 | 'mercurial.pure', |
|
|
1695 | 1695 | ] |
|
|
1696 | 1696 | |
|
|
1697 | 1697 | py2exe_includes = [] |
|
|
1698 | 1698 | |
|
|
1699 | 1699 | py2exeexcludes = [] |
|
|
1700 | 1700 | py2exedllexcludes = ['crypt32.dll'] |
|
|
1701 | 1701 | |
|
|
1702 | 1702 | if issetuptools: |
|
|
1703 | 1703 | extra['python_requires'] = supportedpy |
|
|
1704 | 1704 | |
|
|
1705 | 1705 | if py2exeloaded: |
|
|
1706 | 1706 | extra['console'] = [ |
|
|
1707 | 1707 | { |
|
|
1708 | 1708 | 'script': 'hg', |
|
|
1709 |
'copyright': 'Copyright (C) 2005-202 |
|
|
|
1709 | 'copyright': 'Copyright (C) 2005-2021 Matt Mackall and others', | |
|
|
1710 | 1710 | 'product_version': version, |
|
|
1711 | 1711 | } |
|
|
1712 | 1712 | ] |
|
|
1713 | 1713 | # Sub command of 'build' because 'py2exe' does not handle sub_commands. |
|
|
1714 | 1714 | # Need to override hgbuild because it has a private copy of |
|
|
1715 | 1715 | # build.sub_commands. |
|
|
1716 | 1716 | hgbuild.sub_commands.insert(0, ('build_hgextindex', None)) |
|
|
1717 | 1717 | # put dlls in sub directory so that they won't pollute PATH |
|
|
1718 | 1718 | extra['zipfile'] = 'lib/library.zip' |
|
|
1719 | 1719 | |
|
|
1720 | 1720 | # We allow some configuration to be supplemented via environment |
|
|
1721 | 1721 | # variables. This is better than setup.cfg files because it allows |
|
|
1722 | 1722 | # supplementing configs instead of replacing them. |
|
|
1723 | 1723 | extrapackages = os.environ.get('HG_PY2EXE_EXTRA_PACKAGES') |
|
|
1724 | 1724 | if extrapackages: |
|
|
1725 | 1725 | py2exepackages.extend(extrapackages.split(' ')) |
|
|
1726 | 1726 | |
|
|
1727 | 1727 | extra_includes = os.environ.get('HG_PY2EXE_EXTRA_INCLUDES') |
|
|
1728 | 1728 | if extra_includes: |
|
|
1729 | 1729 | py2exe_includes.extend(extra_includes.split(' ')) |
|
|
1730 | 1730 | |
|
|
1731 | 1731 | excludes = os.environ.get('HG_PY2EXE_EXTRA_EXCLUDES') |
|
|
1732 | 1732 | if excludes: |
|
|
1733 | 1733 | py2exeexcludes.extend(excludes.split(' ')) |
|
|
1734 | 1734 | |
|
|
1735 | 1735 | dllexcludes = os.environ.get('HG_PY2EXE_EXTRA_DLL_EXCLUDES') |
|
|
1736 | 1736 | if dllexcludes: |
|
|
1737 | 1737 | py2exedllexcludes.extend(dllexcludes.split(' ')) |
|
|
1738 | 1738 | |
|
|
1739 | 1739 | if os.environ.get('PYOXIDIZER'): |
|
|
1740 | 1740 | hgbuild.sub_commands.insert(0, ('build_hgextindex', None)) |
|
|
1741 | 1741 | |
|
|
1742 | 1742 | if os.name == 'nt': |
|
|
1743 | 1743 | # Windows binary file versions for exe/dll files must have the |
|
|
1744 | 1744 | # form W.X.Y.Z, where W,X,Y,Z are numbers in the range 0..65535 |
|
|
1745 | 1745 | setupversion = setupversion.split(r'+', 1)[0] |
|
|
1746 | 1746 | |
|
|
1747 | 1747 | if sys.platform == 'darwin' and os.path.exists('/usr/bin/xcodebuild'): |
|
|
1748 | 1748 | version = runcmd(['/usr/bin/xcodebuild', '-version'], {})[1].splitlines() |
|
|
1749 | 1749 | if version: |
|
|
1750 | 1750 | version = version[0] |
|
|
1751 | 1751 | if sys.version_info[0] == 3: |
|
|
1752 | 1752 | version = version.decode('utf-8') |
|
|
1753 | 1753 | xcode4 = version.startswith('Xcode') and StrictVersion( |
|
|
1754 | 1754 | version.split()[1] |
|
|
1755 | 1755 | ) >= StrictVersion('4.0') |
|
|
1756 | 1756 | xcode51 = re.match(r'^Xcode\s+5\.1', version) is not None |
|
|
1757 | 1757 | else: |
|
|
1758 | 1758 | # xcodebuild returns empty on OS X Lion with XCode 4.3 not |
|
|
1759 | 1759 | # installed, but instead with only command-line tools. Assume |
|
|
1760 | 1760 | # that only happens on >= Lion, thus no PPC support. |
|
|
1761 | 1761 | xcode4 = True |
|
|
1762 | 1762 | xcode51 = False |
|
|
1763 | 1763 | |
|
|
1764 | 1764 | # XCode 4.0 dropped support for ppc architecture, which is hardcoded in |
|
|
1765 | 1765 | # distutils.sysconfig |
|
|
1766 | 1766 | if xcode4: |
|
|
1767 | 1767 | os.environ['ARCHFLAGS'] = '' |
|
|
1768 | 1768 | |
|
|
1769 | 1769 | # XCode 5.1 changes clang such that it now fails to compile if the |
|
|
1770 | 1770 | # -mno-fused-madd flag is passed, but the version of Python shipped with |
|
|
1771 | 1771 | # OS X 10.9 Mavericks includes this flag. This causes problems in all |
|
|
1772 | 1772 | # C extension modules, and a bug has been filed upstream at |
|
|
1773 | 1773 | # http://bugs.python.org/issue21244. We also need to patch this here |
|
|
1774 | 1774 | # so Mercurial can continue to compile in the meantime. |
|
|
1775 | 1775 | if xcode51: |
|
|
1776 | 1776 | cflags = get_config_var('CFLAGS') |
|
|
1777 | 1777 | if cflags and re.search(r'-mno-fused-madd\b', cflags) is not None: |
|
|
1778 | 1778 | os.environ['CFLAGS'] = ( |
|
|
1779 | 1779 | os.environ.get('CFLAGS', '') + ' -Qunused-arguments' |
|
|
1780 | 1780 | ) |
|
|
1781 | 1781 | |
|
|
1782 | 1782 | setup( |
|
|
1783 | 1783 | name='mercurial', |
|
|
1784 | 1784 | version=setupversion, |
|
|
1785 | 1785 | author='Matt Mackall and many others', |
|
|
1786 | 1786 | author_email='mercurial@mercurial-scm.org', |
|
|
1787 | 1787 | url='https://mercurial-scm.org/', |
|
|
1788 | 1788 | download_url='https://mercurial-scm.org/release/', |
|
|
1789 | 1789 | description=( |
|
|
1790 | 1790 | 'Fast scalable distributed SCM (revision control, version ' |
|
|
1791 | 1791 | 'control) system' |
|
|
1792 | 1792 | ), |
|
|
1793 | 1793 | long_description=( |
|
|
1794 | 1794 | 'Mercurial is a distributed SCM tool written in Python.' |
|
|
1795 | 1795 | ' It is used by a number of large projects that require' |
|
|
1796 | 1796 | ' fast, reliable distributed revision control, such as ' |
|
|
1797 | 1797 | 'Mozilla.' |
|
|
1798 | 1798 | ), |
|
|
1799 | 1799 | license='GNU GPLv2 or any later version', |
|
|
1800 | 1800 | classifiers=[ |
|
|
1801 | 1801 | 'Development Status :: 6 - Mature', |
|
|
1802 | 1802 | 'Environment :: Console', |
|
|
1803 | 1803 | 'Intended Audience :: Developers', |
|
|
1804 | 1804 | 'Intended Audience :: System Administrators', |
|
|
1805 | 1805 | 'License :: OSI Approved :: GNU General Public License (GPL)', |
|
|
1806 | 1806 | 'Natural Language :: Danish', |
|
|
1807 | 1807 | 'Natural Language :: English', |
|
|
1808 | 1808 | 'Natural Language :: German', |
|
|
1809 | 1809 | 'Natural Language :: Italian', |
|
|
1810 | 1810 | 'Natural Language :: Japanese', |
|
|
1811 | 1811 | 'Natural Language :: Portuguese (Brazilian)', |
|
|
1812 | 1812 | 'Operating System :: Microsoft :: Windows', |
|
|
1813 | 1813 | 'Operating System :: OS Independent', |
|
|
1814 | 1814 | 'Operating System :: POSIX', |
|
|
1815 | 1815 | 'Programming Language :: C', |
|
|
1816 | 1816 | 'Programming Language :: Python', |
|
|
1817 | 1817 | 'Topic :: Software Development :: Version Control', |
|
|
1818 | 1818 | ], |
|
|
1819 | 1819 | scripts=scripts, |
|
|
1820 | 1820 | packages=packages, |
|
|
1821 | 1821 | ext_modules=extmodules, |
|
|
1822 | 1822 | data_files=datafiles, |
|
|
1823 | 1823 | package_data=packagedata, |
|
|
1824 | 1824 | cmdclass=cmdclass, |
|
|
1825 | 1825 | distclass=hgdist, |
|
|
1826 | 1826 | options={ |
|
|
1827 | 1827 | 'py2exe': { |
|
|
1828 | 1828 | 'bundle_files': 3, |
|
|
1829 | 1829 | 'dll_excludes': py2exedllexcludes, |
|
|
1830 | 1830 | 'includes': py2exe_includes, |
|
|
1831 | 1831 | 'excludes': py2exeexcludes, |
|
|
1832 | 1832 | 'packages': py2exepackages, |
|
|
1833 | 1833 | }, |
|
|
1834 | 1834 | 'bdist_mpkg': { |
|
|
1835 | 1835 | 'zipdist': False, |
|
|
1836 | 1836 | 'license': 'COPYING', |
|
|
1837 | 1837 | 'readme': 'contrib/packaging/macosx/Readme.html', |
|
|
1838 | 1838 | 'welcome': 'contrib/packaging/macosx/Welcome.html', |
|
|
1839 | 1839 | }, |
|
|
1840 | 1840 | }, |
|
|
1841 | 1841 | **extra |
|
|
1842 | 1842 | ) |
General Comments 0
You need to be logged in to leave comments.
Login now