##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

copyright: update to 2016
timeless -
r27925:f6d73c87 stable
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -1,162 +1,162 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="http://hgbook.red-bean.com/">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@selenic.com">mercurial@selenic.com</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-2015 Matt Mackall and others. See
143 Mercurial is Copyright 2005-2016 Matt Mackall and others. See
144 144 the <tt>Contributors.txt</tt> file for a list of contributors.
145 145 </p>
146 146
147 147 <p>
148 148 Mercurial is free software; you can redistribute it and/or
149 149 modify it under the terms of the <a
150 150 href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt">GNU
151 151 General Public License version 2</a> or any later version.
152 152 </p>
153 153
154 154 <p>
155 155 Mercurial is distributed in the hope that it will be useful, but
156 156 <b>without any warranty</b>; without even the implied warranty
157 157 of <b>merchantability</b> or <b>fitness for a particular
158 158 purpose</b>. See the GNU General Public License for more
159 159 details.
160 160 </p>
161 161 </body>
162 162 </html>
Show file before | Show file after | Hide comments
@@ -1,120 +1,120 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 VERSION
5 5 #define FileHandle
6 6 #define FileLine
7 7 #define VERSION = "unknown"
8 8 #if FileHandle = FileOpen(SourcePath + "\..\..\mercurial\__version__.py")
9 9 #expr FileLine = FileRead(FileHandle)
10 10 #expr FileLine = FileRead(FileHandle)
11 11 #define VERSION = Copy(FileLine, Pos('"', FileLine)+1, Len(FileLine)-Pos('"', FileLine)-1)
12 12 #endif
13 13 #if FileHandle
14 14 #expr FileClose(FileHandle)
15 15 #endif
16 16 #pragma message "Detected Version: " + VERSION
17 17 #endif
18 18
19 19 #ifndef ARCH
20 20 #define ARCH = "x86"
21 21 #endif
22 22
23 23 [Setup]
24 AppCopyright=Copyright 2005-2015 Matt Mackall and others
24 AppCopyright=Copyright 2005-2016 Matt Mackall and others
25 25 AppName=Mercurial
26 26 AppVersion={#VERSION}
27 27 #if ARCH == "x64"
28 28 AppVerName=Mercurial {#VERSION} (64-bit)
29 29 OutputBaseFilename=Mercurial-{#VERSION}-x64
30 30 ArchitecturesAllowed=x64
31 31 ArchitecturesInstallIn64BitMode=x64
32 32 #else
33 33 AppVerName=Mercurial {#VERSION}
34 34 OutputBaseFilename=Mercurial-{#VERSION}
35 35 #endif
36 36 InfoAfterFile=contrib/win32/postinstall.txt
37 37 LicenseFile=COPYING
38 38 ShowLanguageDialog=yes
39 39 AppPublisher=Matt Mackall and others
40 40 AppPublisherURL=https://mercurial-scm.org/
41 41 AppSupportURL=https://mercurial-scm.org/
42 42 AppUpdatesURL=https://mercurial-scm.org/
43 43 AppID={{4B95A5F1-EF59-4B08-BED8-C891C46121B3}
44 44 AppContact=mercurial@selenic.com
45 45 DefaultDirName={pf}\Mercurial
46 46 SourceDir=..\..
47 47 VersionInfoDescription=Mercurial distributed SCM (version {#VERSION})
48 VersionInfoCopyright=Copyright 2005-2015 Matt Mackall and others
48 VersionInfoCopyright=Copyright 2005-2016 Matt Mackall and others
49 49 VersionInfoCompany=Matt Mackall and others
50 50 InternalCompressLevel=max
51 51 SolidCompression=true
52 52 SetupIconFile=contrib\win32\mercurial.ico
53 53 AllowNoIcons=true
54 54 DefaultGroupName=Mercurial
55 55 PrivilegesRequired=none
56 56
57 57 [Files]
58 58 Source: contrib\mercurial.el; DestDir: {app}/Contrib
59 59 Source: contrib\vim\*.*; DestDir: {app}/Contrib/Vim
60 60 Source: contrib\zsh_completion; DestDir: {app}/Contrib
61 61 Source: contrib\bash_completion; DestDir: {app}/Contrib
62 62 Source: contrib\tcsh_completion; DestDir: {app}/Contrib
63 63 Source: contrib\tcsh_completion_build.sh; DestDir: {app}/Contrib
64 64 Source: contrib\hgk; DestDir: {app}/Contrib; DestName: hgk.tcl
65 65 Source: contrib\xml.rnc; DestDir: {app}/Contrib
66 66 Source: contrib\mercurial.el; DestDir: {app}/Contrib
67 67 Source: contrib\mq.el; DestDir: {app}/Contrib
68 68 Source: contrib\hgweb.fcgi; DestDir: {app}/Contrib
69 69 Source: contrib\hgweb.wsgi; DestDir: {app}/Contrib
70 70 Source: contrib\win32\ReadMe.html; DestDir: {app}; Flags: isreadme
71 71 Source: contrib\win32\postinstall.txt; DestDir: {app}; DestName: ReleaseNotes.txt
72 72 Source: dist\hg.exe; DestDir: {app}; AfterInstall: Touch('{app}\hg.exe.local')
73 73 #if ARCH == "x64"
74 74 Source: dist\lib\*.dll; Destdir: {app}\lib
75 75 Source: dist\lib\*.pyd; Destdir: {app}\lib
76 76 #else
77 77 Source: dist\w9xpopen.exe; DestDir: {app}
78 78 #endif
79 79 Source: dist\python*.dll; Destdir: {app}; Flags: skipifsourcedoesntexist
80 80 Source: dist\msvc*.dll; DestDir: {app}; Flags: skipifsourcedoesntexist
81 81 Source: dist\Microsoft.VC*.CRT.manifest; DestDir: {app}; Flags: skipifsourcedoesntexist
82 82 Source: dist\lib\library.zip; DestDir: {app}\lib
83 83 Source: dist\add_path.exe; DestDir: {app}
84 84 Source: doc\*.html; DestDir: {app}\Docs
85 85 Source: doc\style.css; DestDir: {app}\Docs
86 86 Source: mercurial\help\*.txt; DestDir: {app}\help
87 87 Source: mercurial\help\internals\*.txt; DestDir: {app}\help\internals
88 88 Source: mercurial\default.d\*.rc; DestDir: {app}\default.d
89 89 Source: mercurial\locale\*.*; DestDir: {app}\locale; Flags: recursesubdirs createallsubdirs skipifsourcedoesntexist
90 90 Source: mercurial\templates\*.*; DestDir: {app}\Templates; Flags: recursesubdirs createallsubdirs
91 91 Source: CONTRIBUTORS; DestDir: {app}; DestName: Contributors.txt
92 92 Source: COPYING; DestDir: {app}; DestName: Copying.txt
93 93
94 94 [INI]
95 95 Filename: {app}\Mercurial.url; Section: InternetShortcut; Key: URL; String: https://mercurial-scm.org/
96 96 Filename: {app}\default.d\editor.rc; Section: ui; Key: editor; String: notepad
97 97
98 98 [UninstallDelete]
99 99 Type: files; Name: {app}\Mercurial.url
100 100 Type: filesandordirs; Name: {app}\default.d
101 101 Type: files; Name: "{app}\hg.exe.local"
102 102
103 103 [Icons]
104 104 Name: {group}\Uninstall Mercurial; Filename: {uninstallexe}
105 105 Name: {group}\Mercurial Command Reference; Filename: {app}\Docs\hg.1.html
106 106 Name: {group}\Mercurial Configuration Files; Filename: {app}\Docs\hgrc.5.html
107 107 Name: {group}\Mercurial Ignore Files; Filename: {app}\Docs\hgignore.5.html
108 108 Name: {group}\Mercurial Web Site; Filename: {app}\Mercurial.url
109 109
110 110 [Run]
111 111 Filename: "{app}\add_path.exe"; Parameters: "{app}"; Flags: postinstall; Description: "Add the installation path to the search path"
112 112
113 113 [UninstallRun]
114 114 Filename: "{app}\add_path.exe"; Parameters: "/del {app}"
115 115
116 116 [Code]
117 117 procedure Touch(fn: String);
118 118 begin
119 119 SaveStringToFile(ExpandConstant(fn), '', False);
120 120 end;
Show file before | Show file after | Hide comments
1 NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Hide comments
@@ -1,7038 +1,7038 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 node import hex, bin, nullhex, nullid, nullrev, short
9 9 from lock import release
10 10 from i18n import _
11 11 import os, re, difflib, time, tempfile, errno, shlex
12 12 import sys, socket
13 13 import hg, scmutil, util, revlog, copies, error, bookmarks
14 14 import patch, help, encoding, templatekw, discovery
15 15 import archival, changegroup, cmdutil, hbisect
16 16 import sshserver, hgweb
17 17 import extensions
18 18 import merge as mergemod
19 19 import minirst, revset, fileset
20 20 import dagparser, context, simplemerge, graphmod, copies
21 21 import random, operator
22 22 import setdiscovery, treediscovery, dagutil, pvec, localrepo, destutil
23 23 import phases, obsolete, exchange, bundle2, repair, lock as lockmod
24 24 import ui as uimod
25 25 import streamclone
26 26 import commandserver
27 27
28 28 table = {}
29 29
30 30 command = cmdutil.command(table)
31 31
32 32 # Space delimited list of commands that don't require local repositories.
33 33 # This should be populated by passing norepo=True into the @command decorator.
34 34 norepo = ''
35 35 # Space delimited list of commands that optionally require local repositories.
36 36 # This should be populated by passing optionalrepo=True into the @command
37 37 # decorator.
38 38 optionalrepo = ''
39 39 # Space delimited list of commands that will examine arguments looking for
40 40 # a repository. This should be populated by passing inferrepo=True into the
41 41 # @command decorator.
42 42 inferrepo = ''
43 43
44 44 # label constants
45 45 # until 3.5, bookmarks.current was the advertised name, not
46 46 # bookmarks.active, so we must use both to avoid breaking old
47 47 # custom styles
48 48 activebookmarklabel = 'bookmarks.active bookmarks.current'
49 49
50 50 # common command options
51 51
52 52 globalopts = [
53 53 ('R', 'repository', '',
54 54 _('repository root directory or name of overlay bundle file'),
55 55 _('REPO')),
56 56 ('', 'cwd', '',
57 57 _('change working directory'), _('DIR')),
58 58 ('y', 'noninteractive', None,
59 59 _('do not prompt, automatically pick the first choice for all prompts')),
60 60 ('q', 'quiet', None, _('suppress output')),
61 61 ('v', 'verbose', None, _('enable additional output')),
62 62 ('', 'config', [],
63 63 _('set/override config option (use \'section.name=value\')'),
64 64 _('CONFIG')),
65 65 ('', 'debug', None, _('enable debugging output')),
66 66 ('', 'debugger', None, _('start debugger')),
67 67 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
68 68 _('ENCODE')),
69 69 ('', 'encodingmode', encoding.encodingmode,
70 70 _('set the charset encoding mode'), _('MODE')),
71 71 ('', 'traceback', None, _('always print a traceback on exception')),
72 72 ('', 'time', None, _('time how long the command takes')),
73 73 ('', 'profile', None, _('print command execution profile')),
74 74 ('', 'version', None, _('output version information and exit')),
75 75 ('h', 'help', None, _('display help and exit')),
76 76 ('', 'hidden', False, _('consider hidden changesets')),
77 77 ]
78 78
79 79 dryrunopts = [('n', 'dry-run', None,
80 80 _('do not perform actions, just print output'))]
81 81
82 82 remoteopts = [
83 83 ('e', 'ssh', '',
84 84 _('specify ssh command to use'), _('CMD')),
85 85 ('', 'remotecmd', '',
86 86 _('specify hg command to run on the remote side'), _('CMD')),
87 87 ('', 'insecure', None,
88 88 _('do not verify server certificate (ignoring web.cacerts config)')),
89 89 ]
90 90
91 91 walkopts = [
92 92 ('I', 'include', [],
93 93 _('include names matching the given patterns'), _('PATTERN')),
94 94 ('X', 'exclude', [],
95 95 _('exclude names matching the given patterns'), _('PATTERN')),
96 96 ]
97 97
98 98 commitopts = [
99 99 ('m', 'message', '',
100 100 _('use text as commit message'), _('TEXT')),
101 101 ('l', 'logfile', '',
102 102 _('read commit message from file'), _('FILE')),
103 103 ]
104 104
105 105 commitopts2 = [
106 106 ('d', 'date', '',
107 107 _('record the specified date as commit date'), _('DATE')),
108 108 ('u', 'user', '',
109 109 _('record the specified user as committer'), _('USER')),
110 110 ]
111 111
112 112 # hidden for now
113 113 formatteropts = [
114 114 ('T', 'template', '',
115 115 _('display with template (EXPERIMENTAL)'), _('TEMPLATE')),
116 116 ]
117 117
118 118 templateopts = [
119 119 ('', 'style', '',
120 120 _('display using template map file (DEPRECATED)'), _('STYLE')),
121 121 ('T', 'template', '',
122 122 _('display with template'), _('TEMPLATE')),
123 123 ]
124 124
125 125 logopts = [
126 126 ('p', 'patch', None, _('show patch')),
127 127 ('g', 'git', None, _('use git extended diff format')),
128 128 ('l', 'limit', '',
129 129 _('limit number of changes displayed'), _('NUM')),
130 130 ('M', 'no-merges', None, _('do not show merges')),
131 131 ('', 'stat', None, _('output diffstat-style summary of changes')),
132 132 ('G', 'graph', None, _("show the revision DAG")),
133 133 ] + templateopts
134 134
135 135 diffopts = [
136 136 ('a', 'text', None, _('treat all files as text')),
137 137 ('g', 'git', None, _('use git extended diff format')),
138 138 ('', 'nodates', None, _('omit dates from diff headers'))
139 139 ]
140 140
141 141 diffwsopts = [
142 142 ('w', 'ignore-all-space', None,
143 143 _('ignore white space when comparing lines')),
144 144 ('b', 'ignore-space-change', None,
145 145 _('ignore changes in the amount of white space')),
146 146 ('B', 'ignore-blank-lines', None,
147 147 _('ignore changes whose lines are all blank')),
148 148 ]
149 149
150 150 diffopts2 = [
151 151 ('', 'noprefix', None, _('omit a/ and b/ prefixes from filenames')),
152 152 ('p', 'show-function', None, _('show which function each change is in')),
153 153 ('', 'reverse', None, _('produce a diff that undoes the changes')),
154 154 ] + diffwsopts + [
155 155 ('U', 'unified', '',
156 156 _('number of lines of context to show'), _('NUM')),
157 157 ('', 'stat', None, _('output diffstat-style summary of changes')),
158 158 ('', 'root', '', _('produce diffs relative to subdirectory'), _('DIR')),
159 159 ]
160 160
161 161 mergetoolopts = [
162 162 ('t', 'tool', '', _('specify merge tool')),
163 163 ]
164 164
165 165 similarityopts = [
166 166 ('s', 'similarity', '',
167 167 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
168 168 ]
169 169
170 170 subrepoopts = [
171 171 ('S', 'subrepos', None,
172 172 _('recurse into subrepositories'))
173 173 ]
174 174
175 175 debugrevlogopts = [
176 176 ('c', 'changelog', False, _('open changelog')),
177 177 ('m', 'manifest', False, _('open manifest')),
178 178 ('', 'dir', False, _('open directory manifest')),
179 179 ]
180 180
181 181 # Commands start here, listed alphabetically
182 182
183 183 @command('^add',
184 184 walkopts + subrepoopts + dryrunopts,
185 185 _('[OPTION]... [FILE]...'),
186 186 inferrepo=True)
187 187 def add(ui, repo, *pats, **opts):
188 188 """add the specified files on the next commit
189 189
190 190 Schedule files to be version controlled and added to the
191 191 repository.
192 192
193 193 The files will be added to the repository at the next commit. To
194 194 undo an add before that, see :hg:`forget`.
195 195
196 196 If no names are given, add all files to the repository (except
197 197 files matching ``.hgignore``).
198 198
199 199 .. container:: verbose
200 200
201 201 Examples:
202 202
203 203 - New (unknown) files are added
204 204 automatically by :hg:`add`::
205 205
206 206 $ ls
207 207 foo.c
208 208 $ hg status
209 209 ? foo.c
210 210 $ hg add
211 211 adding foo.c
212 212 $ hg status
213 213 A foo.c
214 214
215 215 - Specific files to be added can be specified::
216 216
217 217 $ ls
218 218 bar.c foo.c
219 219 $ hg status
220 220 ? bar.c
221 221 ? foo.c
222 222 $ hg add bar.c
223 223 $ hg status
224 224 A bar.c
225 225 ? foo.c
226 226
227 227 Returns 0 if all files are successfully added.
228 228 """
229 229
230 230 m = scmutil.match(repo[None], pats, opts)
231 231 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
232 232 return rejected and 1 or 0
233 233
234 234 @command('addremove',
235 235 similarityopts + subrepoopts + walkopts + dryrunopts,
236 236 _('[OPTION]... [FILE]...'),
237 237 inferrepo=True)
238 238 def addremove(ui, repo, *pats, **opts):
239 239 """add all new files, delete all missing files
240 240
241 241 Add all new files and remove all missing files from the
242 242 repository.
243 243
244 244 Unless names are given, new files are ignored if they match any of
245 245 the patterns in ``.hgignore``. As with add, these changes take
246 246 effect at the next commit.
247 247
248 248 Use the -s/--similarity option to detect renamed files. This
249 249 option takes a percentage between 0 (disabled) and 100 (files must
250 250 be identical) as its parameter. With a parameter greater than 0,
251 251 this compares every removed file with every added file and records
252 252 those similar enough as renames. Detecting renamed files this way
253 253 can be expensive. After using this option, :hg:`status -C` can be
254 254 used to check which files were identified as moved or renamed. If
255 255 not specified, -s/--similarity defaults to 100 and only renames of
256 256 identical files are detected.
257 257
258 258 .. container:: verbose
259 259
260 260 Examples:
261 261
262 262 - A number of files (bar.c and foo.c) are new,
263 263 while foobar.c has been removed (without using :hg:`remove`)
264 264 from the repository::
265 265
266 266 $ ls
267 267 bar.c foo.c
268 268 $ hg status
269 269 ! foobar.c
270 270 ? bar.c
271 271 ? foo.c
272 272 $ hg addremove
273 273 adding bar.c
274 274 adding foo.c
275 275 removing foobar.c
276 276 $ hg status
277 277 A bar.c
278 278 A foo.c
279 279 R foobar.c
280 280
281 281 - A file foobar.c was moved to foo.c without using :hg:`rename`.
282 282 Afterwards, it was edited slightly::
283 283
284 284 $ ls
285 285 foo.c
286 286 $ hg status
287 287 ! foobar.c
288 288 ? foo.c
289 289 $ hg addremove --similarity 90
290 290 removing foobar.c
291 291 adding foo.c
292 292 recording removal of foobar.c as rename to foo.c (94% similar)
293 293 $ hg status -C
294 294 A foo.c
295 295 foobar.c
296 296 R foobar.c
297 297
298 298 Returns 0 if all files are successfully added.
299 299 """
300 300 try:
301 301 sim = float(opts.get('similarity') or 100)
302 302 except ValueError:
303 303 raise error.Abort(_('similarity must be a number'))
304 304 if sim < 0 or sim > 100:
305 305 raise error.Abort(_('similarity must be between 0 and 100'))
306 306 matcher = scmutil.match(repo[None], pats, opts)
307 307 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
308 308
309 309 @command('^annotate|blame',
310 310 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
311 311 ('', 'follow', None,
312 312 _('follow copies/renames and list the filename (DEPRECATED)')),
313 313 ('', 'no-follow', None, _("don't follow copies and renames")),
314 314 ('a', 'text', None, _('treat all files as text')),
315 315 ('u', 'user', None, _('list the author (long with -v)')),
316 316 ('f', 'file', None, _('list the filename')),
317 317 ('d', 'date', None, _('list the date (short with -q)')),
318 318 ('n', 'number', None, _('list the revision number (default)')),
319 319 ('c', 'changeset', None, _('list the changeset')),
320 320 ('l', 'line-number', None, _('show line number at the first appearance'))
321 321 ] + diffwsopts + walkopts + formatteropts,
322 322 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
323 323 inferrepo=True)
324 324 def annotate(ui, repo, *pats, **opts):
325 325 """show changeset information by line for each file
326 326
327 327 List changes in files, showing the revision id responsible for
328 328 each line.
329 329
330 330 This command is useful for discovering when a change was made and
331 331 by whom.
332 332
333 333 If you include --file, --user, or --date, the revision number is
334 334 suppressed unless you also include --number.
335 335
336 336 Without the -a/--text option, annotate will avoid processing files
337 337 it detects as binary. With -a, annotate will annotate the file
338 338 anyway, although the results will probably be neither useful
339 339 nor desirable.
340 340
341 341 Returns 0 on success.
342 342 """
343 343 if not pats:
344 344 raise error.Abort(_('at least one filename or pattern is required'))
345 345
346 346 if opts.get('follow'):
347 347 # --follow is deprecated and now just an alias for -f/--file
348 348 # to mimic the behavior of Mercurial before version 1.5
349 349 opts['file'] = True
350 350
351 351 ctx = scmutil.revsingle(repo, opts.get('rev'))
352 352
353 353 fm = ui.formatter('annotate', opts)
354 354 if ui.quiet:
355 355 datefunc = util.shortdate
356 356 else:
357 357 datefunc = util.datestr
358 358 if ctx.rev() is None:
359 359 def hexfn(node):
360 360 if node is None:
361 361 return None
362 362 else:
363 363 return fm.hexfunc(node)
364 364 if opts.get('changeset'):
365 365 # omit "+" suffix which is appended to node hex
366 366 def formatrev(rev):
367 367 if rev is None:
368 368 return '%d' % ctx.p1().rev()
369 369 else:
370 370 return '%d' % rev
371 371 else:
372 372 def formatrev(rev):
373 373 if rev is None:
374 374 return '%d+' % ctx.p1().rev()
375 375 else:
376 376 return '%d ' % rev
377 377 def formathex(hex):
378 378 if hex is None:
379 379 return '%s+' % fm.hexfunc(ctx.p1().node())
380 380 else:
381 381 return '%s ' % hex
382 382 else:
383 383 hexfn = fm.hexfunc
384 384 formatrev = formathex = str
385 385
386 386 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
387 387 ('number', ' ', lambda x: x[0].rev(), formatrev),
388 388 ('changeset', ' ', lambda x: hexfn(x[0].node()), formathex),
389 389 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
390 390 ('file', ' ', lambda x: x[0].path(), str),
391 391 ('line_number', ':', lambda x: x[1], str),
392 392 ]
393 393 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
394 394
395 395 if (not opts.get('user') and not opts.get('changeset')
396 396 and not opts.get('date') and not opts.get('file')):
397 397 opts['number'] = True
398 398
399 399 linenumber = opts.get('line_number') is not None
400 400 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
401 401 raise error.Abort(_('at least one of -n/-c is required for -l'))
402 402
403 403 if fm:
404 404 def makefunc(get, fmt):
405 405 return get
406 406 else:
407 407 def makefunc(get, fmt):
408 408 return lambda x: fmt(get(x))
409 409 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
410 410 if opts.get(op)]
411 411 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
412 412 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
413 413 if opts.get(op))
414 414
415 415 def bad(x, y):
416 416 raise error.Abort("%s: %s" % (x, y))
417 417
418 418 m = scmutil.match(ctx, pats, opts, badfn=bad)
419 419
420 420 follow = not opts.get('no_follow')
421 421 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
422 422 whitespace=True)
423 423 for abs in ctx.walk(m):
424 424 fctx = ctx[abs]
425 425 if not opts.get('text') and util.binary(fctx.data()):
426 426 fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
427 427 continue
428 428
429 429 lines = fctx.annotate(follow=follow, linenumber=linenumber,
430 430 diffopts=diffopts)
431 431 formats = []
432 432 pieces = []
433 433
434 434 for f, sep in funcmap:
435 435 l = [f(n) for n, dummy in lines]
436 436 if l:
437 437 if fm:
438 438 formats.append(['%s' for x in l])
439 439 else:
440 440 sizes = [encoding.colwidth(x) for x in l]
441 441 ml = max(sizes)
442 442 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
443 443 pieces.append(l)
444 444
445 445 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
446 446 fm.startitem()
447 447 fm.write(fields, "".join(f), *p)
448 448 fm.write('line', ": %s", l[1])
449 449
450 450 if lines and not lines[-1][1].endswith('\n'):
451 451 fm.plain('\n')
452 452
453 453 fm.end()
454 454
455 455 @command('archive',
456 456 [('', 'no-decode', None, _('do not pass files through decoders')),
457 457 ('p', 'prefix', '', _('directory prefix for files in archive'),
458 458 _('PREFIX')),
459 459 ('r', 'rev', '', _('revision to distribute'), _('REV')),
460 460 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
461 461 ] + subrepoopts + walkopts,
462 462 _('[OPTION]... DEST'))
463 463 def archive(ui, repo, dest, **opts):
464 464 '''create an unversioned archive of a repository revision
465 465
466 466 By default, the revision used is the parent of the working
467 467 directory; use -r/--rev to specify a different revision.
468 468
469 469 The archive type is automatically detected based on file
470 470 extension (to override, use -t/--type).
471 471
472 472 .. container:: verbose
473 473
474 474 Examples:
475 475
476 476 - create a zip file containing the 1.0 release::
477 477
478 478 hg archive -r 1.0 project-1.0.zip
479 479
480 480 - create a tarball excluding .hg files::
481 481
482 482 hg archive project.tar.gz -X ".hg*"
483 483
484 484 Valid types are:
485 485
486 486 :``files``: a directory full of files (default)
487 487 :``tar``: tar archive, uncompressed
488 488 :``tbz2``: tar archive, compressed using bzip2
489 489 :``tgz``: tar archive, compressed using gzip
490 490 :``uzip``: zip archive, uncompressed
491 491 :``zip``: zip archive, compressed using deflate
492 492
493 493 The exact name of the destination archive or directory is given
494 494 using a format string; see :hg:`help export` for details.
495 495
496 496 Each member added to an archive file has a directory prefix
497 497 prepended. Use -p/--prefix to specify a format string for the
498 498 prefix. The default is the basename of the archive, with suffixes
499 499 removed.
500 500
501 501 Returns 0 on success.
502 502 '''
503 503
504 504 ctx = scmutil.revsingle(repo, opts.get('rev'))
505 505 if not ctx:
506 506 raise error.Abort(_('no working directory: please specify a revision'))
507 507 node = ctx.node()
508 508 dest = cmdutil.makefilename(repo, dest, node)
509 509 if os.path.realpath(dest) == repo.root:
510 510 raise error.Abort(_('repository root cannot be destination'))
511 511
512 512 kind = opts.get('type') or archival.guesskind(dest) or 'files'
513 513 prefix = opts.get('prefix')
514 514
515 515 if dest == '-':
516 516 if kind == 'files':
517 517 raise error.Abort(_('cannot archive plain files to stdout'))
518 518 dest = cmdutil.makefileobj(repo, dest)
519 519 if not prefix:
520 520 prefix = os.path.basename(repo.root) + '-%h'
521 521
522 522 prefix = cmdutil.makefilename(repo, prefix, node)
523 523 matchfn = scmutil.match(ctx, [], opts)
524 524 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
525 525 matchfn, prefix, subrepos=opts.get('subrepos'))
526 526
527 527 @command('backout',
528 528 [('', 'merge', None, _('merge with old dirstate parent after backout')),
529 529 ('', 'commit', None,
530 530 _('commit if no conflicts were encountered (DEPRECATED)')),
531 531 ('', 'no-commit', None, _('do not commit')),
532 532 ('', 'parent', '',
533 533 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
534 534 ('r', 'rev', '', _('revision to backout'), _('REV')),
535 535 ('e', 'edit', False, _('invoke editor on commit messages')),
536 536 ] + mergetoolopts + walkopts + commitopts + commitopts2,
537 537 _('[OPTION]... [-r] REV'))
538 538 def backout(ui, repo, node=None, rev=None, **opts):
539 539 '''reverse effect of earlier changeset
540 540
541 541 Prepare a new changeset with the effect of REV undone in the
542 542 current working directory. If no conflicts were encountered,
543 543 it will be committed immediately.
544 544
545 545 If REV is the parent of the working directory, then this new changeset
546 546 is committed automatically (unless --no-commit is specified).
547 547
548 548 .. note::
549 549
550 550 :hg:`backout` cannot be used to fix either an unwanted or
551 551 incorrect merge.
552 552
553 553 .. container:: verbose
554 554
555 555 Examples:
556 556
557 557 - Reverse the effect of the parent of the working directory.
558 558 This backout will be committed immediately::
559 559
560 560 hg backout -r .
561 561
562 562 - Reverse the effect of previous bad revision 23::
563 563
564 564 hg backout -r 23
565 565
566 566 - Reverse the effect of previous bad revision 23 and
567 567 leave changes uncommitted::
568 568
569 569 hg backout -r 23 --no-commit
570 570 hg commit -m "Backout revision 23"
571 571
572 572 By default, the pending changeset will have one parent,
573 573 maintaining a linear history. With --merge, the pending
574 574 changeset will instead have two parents: the old parent of the
575 575 working directory and a new child of REV that simply undoes REV.
576 576
577 577 Before version 1.7, the behavior without --merge was equivalent
578 578 to specifying --merge followed by :hg:`update --clean .` to
579 579 cancel the merge and leave the child of REV as a head to be
580 580 merged separately.
581 581
582 582 See :hg:`help dates` for a list of formats valid for -d/--date.
583 583
584 584 See :hg:`help revert` for a way to restore files to the state
585 585 of another revision.
586 586
587 587 Returns 0 on success, 1 if nothing to backout or there are unresolved
588 588 files.
589 589 '''
590 590 wlock = lock = None
591 591 try:
592 592 wlock = repo.wlock()
593 593 lock = repo.lock()
594 594 return _dobackout(ui, repo, node, rev, **opts)
595 595 finally:
596 596 release(lock, wlock)
597 597
598 598 def _dobackout(ui, repo, node=None, rev=None, **opts):
599 599 if opts.get('commit') and opts.get('no_commit'):
600 600 raise error.Abort(_("cannot use --commit with --no-commit"))
601 601
602 602 if rev and node:
603 603 raise error.Abort(_("please specify just one revision"))
604 604
605 605 if not rev:
606 606 rev = node
607 607
608 608 if not rev:
609 609 raise error.Abort(_("please specify a revision to backout"))
610 610
611 611 date = opts.get('date')
612 612 if date:
613 613 opts['date'] = util.parsedate(date)
614 614
615 615 cmdutil.checkunfinished(repo)
616 616 cmdutil.bailifchanged(repo)
617 617 node = scmutil.revsingle(repo, rev).node()
618 618
619 619 op1, op2 = repo.dirstate.parents()
620 620 if not repo.changelog.isancestor(node, op1):
621 621 raise error.Abort(_('cannot backout change that is not an ancestor'))
622 622
623 623 p1, p2 = repo.changelog.parents(node)
624 624 if p1 == nullid:
625 625 raise error.Abort(_('cannot backout a change with no parents'))
626 626 if p2 != nullid:
627 627 if not opts.get('parent'):
628 628 raise error.Abort(_('cannot backout a merge changeset'))
629 629 p = repo.lookup(opts['parent'])
630 630 if p not in (p1, p2):
631 631 raise error.Abort(_('%s is not a parent of %s') %
632 632 (short(p), short(node)))
633 633 parent = p
634 634 else:
635 635 if opts.get('parent'):
636 636 raise error.Abort(_('cannot use --parent on non-merge changeset'))
637 637 parent = p1
638 638
639 639 # the backout should appear on the same branch
640 640 branch = repo.dirstate.branch()
641 641 bheads = repo.branchheads(branch)
642 642 rctx = scmutil.revsingle(repo, hex(parent))
643 643 if not opts.get('merge') and op1 != node:
644 644 dsguard = cmdutil.dirstateguard(repo, 'backout')
645 645 try:
646 646 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
647 647 'backout')
648 648 stats = mergemod.update(repo, parent, True, True, node, False)
649 649 repo.setparents(op1, op2)
650 650 dsguard.close()
651 651 hg._showstats(repo, stats)
652 652 if stats[3]:
653 653 repo.ui.status(_("use 'hg resolve' to retry unresolved "
654 654 "file merges\n"))
655 655 return 1
656 656 finally:
657 657 ui.setconfig('ui', 'forcemerge', '', '')
658 658 lockmod.release(dsguard)
659 659 else:
660 660 hg.clean(repo, node, show_stats=False)
661 661 repo.dirstate.setbranch(branch)
662 662 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
663 663
664 664 if opts.get('no_commit'):
665 665 msg = _("changeset %s backed out, "
666 666 "don't forget to commit.\n")
667 667 ui.status(msg % short(node))
668 668 return 0
669 669
670 670 def commitfunc(ui, repo, message, match, opts):
671 671 editform = 'backout'
672 672 e = cmdutil.getcommiteditor(editform=editform, **opts)
673 673 if not message:
674 674 # we don't translate commit messages
675 675 message = "Backed out changeset %s" % short(node)
676 676 e = cmdutil.getcommiteditor(edit=True, editform=editform)
677 677 return repo.commit(message, opts.get('user'), opts.get('date'),
678 678 match, editor=e)
679 679 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
680 680 if not newnode:
681 681 ui.status(_("nothing changed\n"))
682 682 return 1
683 683 cmdutil.commitstatus(repo, newnode, branch, bheads)
684 684
685 685 def nice(node):
686 686 return '%d:%s' % (repo.changelog.rev(node), short(node))
687 687 ui.status(_('changeset %s backs out changeset %s\n') %
688 688 (nice(repo.changelog.tip()), nice(node)))
689 689 if opts.get('merge') and op1 != node:
690 690 hg.clean(repo, op1, show_stats=False)
691 691 ui.status(_('merging with changeset %s\n')
692 692 % nice(repo.changelog.tip()))
693 693 try:
694 694 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
695 695 'backout')
696 696 return hg.merge(repo, hex(repo.changelog.tip()))
697 697 finally:
698 698 ui.setconfig('ui', 'forcemerge', '', '')
699 699 return 0
700 700
701 701 @command('bisect',
702 702 [('r', 'reset', False, _('reset bisect state')),
703 703 ('g', 'good', False, _('mark changeset good')),
704 704 ('b', 'bad', False, _('mark changeset bad')),
705 705 ('s', 'skip', False, _('skip testing changeset')),
706 706 ('e', 'extend', False, _('extend the bisect range')),
707 707 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
708 708 ('U', 'noupdate', False, _('do not update to target'))],
709 709 _("[-gbsr] [-U] [-c CMD] [REV]"))
710 710 def bisect(ui, repo, rev=None, extra=None, command=None,
711 711 reset=None, good=None, bad=None, skip=None, extend=None,
712 712 noupdate=None):
713 713 """subdivision search of changesets
714 714
715 715 This command helps to find changesets which introduce problems. To
716 716 use, mark the earliest changeset you know exhibits the problem as
717 717 bad, then mark the latest changeset which is free from the problem
718 718 as good. Bisect will update your working directory to a revision
719 719 for testing (unless the -U/--noupdate option is specified). Once
720 720 you have performed tests, mark the working directory as good or
721 721 bad, and bisect will either update to another candidate changeset
722 722 or announce that it has found the bad revision.
723 723
724 724 As a shortcut, you can also use the revision argument to mark a
725 725 revision as good or bad without checking it out first.
726 726
727 727 If you supply a command, it will be used for automatic bisection.
728 728 The environment variable HG_NODE will contain the ID of the
729 729 changeset being tested. The exit status of the command will be
730 730 used to mark revisions as good or bad: status 0 means good, 125
731 731 means to skip the revision, 127 (command not found) will abort the
732 732 bisection, and any other non-zero exit status means the revision
733 733 is bad.
734 734
735 735 .. container:: verbose
736 736
737 737 Some examples:
738 738
739 739 - start a bisection with known bad revision 34, and good revision 12::
740 740
741 741 hg bisect --bad 34
742 742 hg bisect --good 12
743 743
744 744 - advance the current bisection by marking current revision as good or
745 745 bad::
746 746
747 747 hg bisect --good
748 748 hg bisect --bad
749 749
750 750 - mark the current revision, or a known revision, to be skipped (e.g. if
751 751 that revision is not usable because of another issue)::
752 752
753 753 hg bisect --skip
754 754 hg bisect --skip 23
755 755
756 756 - skip all revisions that do not touch directories ``foo`` or ``bar``::
757 757
758 758 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
759 759
760 760 - forget the current bisection::
761 761
762 762 hg bisect --reset
763 763
764 764 - use 'make && make tests' to automatically find the first broken
765 765 revision::
766 766
767 767 hg bisect --reset
768 768 hg bisect --bad 34
769 769 hg bisect --good 12
770 770 hg bisect --command "make && make tests"
771 771
772 772 - see all changesets whose states are already known in the current
773 773 bisection::
774 774
775 775 hg log -r "bisect(pruned)"
776 776
777 777 - see the changeset currently being bisected (especially useful
778 778 if running with -U/--noupdate)::
779 779
780 780 hg log -r "bisect(current)"
781 781
782 782 - see all changesets that took part in the current bisection::
783 783
784 784 hg log -r "bisect(range)"
785 785
786 786 - you can even get a nice graph::
787 787
788 788 hg log --graph -r "bisect(range)"
789 789
790 790 See :hg:`help revsets` for more about the `bisect()` keyword.
791 791
792 792 Returns 0 on success.
793 793 """
794 794 def extendbisectrange(nodes, good):
795 795 # bisect is incomplete when it ends on a merge node and
796 796 # one of the parent was not checked.
797 797 parents = repo[nodes[0]].parents()
798 798 if len(parents) > 1:
799 799 if good:
800 800 side = state['bad']
801 801 else:
802 802 side = state['good']
803 803 num = len(set(i.node() for i in parents) & set(side))
804 804 if num == 1:
805 805 return parents[0].ancestor(parents[1])
806 806 return None
807 807
808 808 def print_result(nodes, good):
809 809 displayer = cmdutil.show_changeset(ui, repo, {})
810 810 if len(nodes) == 1:
811 811 # narrowed it down to a single revision
812 812 if good:
813 813 ui.write(_("The first good revision is:\n"))
814 814 else:
815 815 ui.write(_("The first bad revision is:\n"))
816 816 displayer.show(repo[nodes[0]])
817 817 extendnode = extendbisectrange(nodes, good)
818 818 if extendnode is not None:
819 819 ui.write(_('Not all ancestors of this changeset have been'
820 820 ' checked.\nUse bisect --extend to continue the '
821 821 'bisection from\nthe common ancestor, %s.\n')
822 822 % extendnode)
823 823 else:
824 824 # multiple possible revisions
825 825 if good:
826 826 ui.write(_("Due to skipped revisions, the first "
827 827 "good revision could be any of:\n"))
828 828 else:
829 829 ui.write(_("Due to skipped revisions, the first "
830 830 "bad revision could be any of:\n"))
831 831 for n in nodes:
832 832 displayer.show(repo[n])
833 833 displayer.close()
834 834
835 835 def check_state(state, interactive=True):
836 836 if not state['good'] or not state['bad']:
837 837 if (good or bad or skip or reset) and interactive:
838 838 return
839 839 if not state['good']:
840 840 raise error.Abort(_('cannot bisect (no known good revisions)'))
841 841 else:
842 842 raise error.Abort(_('cannot bisect (no known bad revisions)'))
843 843 return True
844 844
845 845 # backward compatibility
846 846 if rev in "good bad reset init".split():
847 847 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
848 848 cmd, rev, extra = rev, extra, None
849 849 if cmd == "good":
850 850 good = True
851 851 elif cmd == "bad":
852 852 bad = True
853 853 else:
854 854 reset = True
855 855 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
856 856 raise error.Abort(_('incompatible arguments'))
857 857
858 858 cmdutil.checkunfinished(repo)
859 859
860 860 if reset:
861 861 p = repo.join("bisect.state")
862 862 if os.path.exists(p):
863 863 os.unlink(p)
864 864 return
865 865
866 866 state = hbisect.load_state(repo)
867 867
868 868 if command:
869 869 changesets = 1
870 870 if noupdate:
871 871 try:
872 872 node = state['current'][0]
873 873 except LookupError:
874 874 raise error.Abort(_('current bisect revision is unknown - '
875 875 'start a new bisect to fix'))
876 876 else:
877 877 node, p2 = repo.dirstate.parents()
878 878 if p2 != nullid:
879 879 raise error.Abort(_('current bisect revision is a merge'))
880 880 try:
881 881 while changesets:
882 882 # update state
883 883 state['current'] = [node]
884 884 hbisect.save_state(repo, state)
885 885 status = ui.system(command, environ={'HG_NODE': hex(node)})
886 886 if status == 125:
887 887 transition = "skip"
888 888 elif status == 0:
889 889 transition = "good"
890 890 # status < 0 means process was killed
891 891 elif status == 127:
892 892 raise error.Abort(_("failed to execute %s") % command)
893 893 elif status < 0:
894 894 raise error.Abort(_("%s killed") % command)
895 895 else:
896 896 transition = "bad"
897 897 ctx = scmutil.revsingle(repo, rev, node)
898 898 rev = None # clear for future iterations
899 899 state[transition].append(ctx.node())
900 900 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
901 901 check_state(state, interactive=False)
902 902 # bisect
903 903 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
904 904 # update to next check
905 905 node = nodes[0]
906 906 if not noupdate:
907 907 cmdutil.bailifchanged(repo)
908 908 hg.clean(repo, node, show_stats=False)
909 909 finally:
910 910 state['current'] = [node]
911 911 hbisect.save_state(repo, state)
912 912 print_result(nodes, bgood)
913 913 return
914 914
915 915 # update state
916 916
917 917 if rev:
918 918 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
919 919 else:
920 920 nodes = [repo.lookup('.')]
921 921
922 922 if good or bad or skip:
923 923 if good:
924 924 state['good'] += nodes
925 925 elif bad:
926 926 state['bad'] += nodes
927 927 elif skip:
928 928 state['skip'] += nodes
929 929 hbisect.save_state(repo, state)
930 930
931 931 if not check_state(state):
932 932 return
933 933
934 934 # actually bisect
935 935 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
936 936 if extend:
937 937 if not changesets:
938 938 extendnode = extendbisectrange(nodes, good)
939 939 if extendnode is not None:
940 940 ui.write(_("Extending search to changeset %d:%s\n")
941 941 % (extendnode.rev(), extendnode))
942 942 state['current'] = [extendnode.node()]
943 943 hbisect.save_state(repo, state)
944 944 if noupdate:
945 945 return
946 946 cmdutil.bailifchanged(repo)
947 947 return hg.clean(repo, extendnode.node())
948 948 raise error.Abort(_("nothing to extend"))
949 949
950 950 if changesets == 0:
951 951 print_result(nodes, good)
952 952 else:
953 953 assert len(nodes) == 1 # only a single node can be tested next
954 954 node = nodes[0]
955 955 # compute the approximate number of remaining tests
956 956 tests, size = 0, 2
957 957 while size <= changesets:
958 958 tests, size = tests + 1, size * 2
959 959 rev = repo.changelog.rev(node)
960 960 ui.write(_("Testing changeset %d:%s "
961 961 "(%d changesets remaining, ~%d tests)\n")
962 962 % (rev, short(node), changesets, tests))
963 963 state['current'] = [node]
964 964 hbisect.save_state(repo, state)
965 965 if not noupdate:
966 966 cmdutil.bailifchanged(repo)
967 967 return hg.clean(repo, node)
968 968
969 969 @command('bookmarks|bookmark',
970 970 [('f', 'force', False, _('force')),
971 971 ('r', 'rev', '', _('revision'), _('REV')),
972 972 ('d', 'delete', False, _('delete a given bookmark')),
973 973 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
974 974 ('i', 'inactive', False, _('mark a bookmark inactive')),
975 975 ] + formatteropts,
976 976 _('hg bookmarks [OPTIONS]... [NAME]...'))
977 977 def bookmark(ui, repo, *names, **opts):
978 978 '''create a new bookmark or list existing bookmarks
979 979
980 980 Bookmarks are labels on changesets to help track lines of development.
981 981 Bookmarks are unversioned and can be moved, renamed and deleted.
982 982 Deleting or moving a bookmark has no effect on the associated changesets.
983 983
984 984 Creating or updating to a bookmark causes it to be marked as 'active'.
985 985 The active bookmark is indicated with a '*'.
986 986 When a commit is made, the active bookmark will advance to the new commit.
987 987 A plain :hg:`update` will also advance an active bookmark, if possible.
988 988 Updating away from a bookmark will cause it to be deactivated.
989 989
990 990 Bookmarks can be pushed and pulled between repositories (see
991 991 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
992 992 diverged, a new 'divergent bookmark' of the form 'name@path' will
993 993 be created. Using :hg:`merge` will resolve the divergence.
994 994
995 995 A bookmark named '@' has the special property that :hg:`clone` will
996 996 check it out by default if it exists.
997 997
998 998 .. container:: verbose
999 999
1000 1000 Examples:
1001 1001
1002 1002 - create an active bookmark for a new line of development::
1003 1003
1004 1004 hg book new-feature
1005 1005
1006 1006 - create an inactive bookmark as a place marker::
1007 1007
1008 1008 hg book -i reviewed
1009 1009
1010 1010 - create an inactive bookmark on another changeset::
1011 1011
1012 1012 hg book -r .^ tested
1013 1013
1014 1014 - rename bookmark turkey to dinner::
1015 1015
1016 1016 hg book -m turkey dinner
1017 1017
1018 1018 - move the '@' bookmark from another branch::
1019 1019
1020 1020 hg book -f @
1021 1021 '''
1022 1022 force = opts.get('force')
1023 1023 rev = opts.get('rev')
1024 1024 delete = opts.get('delete')
1025 1025 rename = opts.get('rename')
1026 1026 inactive = opts.get('inactive')
1027 1027
1028 1028 def checkformat(mark):
1029 1029 mark = mark.strip()
1030 1030 if not mark:
1031 1031 raise error.Abort(_("bookmark names cannot consist entirely of "
1032 1032 "whitespace"))
1033 1033 scmutil.checknewlabel(repo, mark, 'bookmark')
1034 1034 return mark
1035 1035
1036 1036 def checkconflict(repo, mark, cur, force=False, target=None):
1037 1037 if mark in marks and not force:
1038 1038 if target:
1039 1039 if marks[mark] == target and target == cur:
1040 1040 # re-activating a bookmark
1041 1041 return
1042 1042 anc = repo.changelog.ancestors([repo[target].rev()])
1043 1043 bmctx = repo[marks[mark]]
1044 1044 divs = [repo[b].node() for b in marks
1045 1045 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
1046 1046
1047 1047 # allow resolving a single divergent bookmark even if moving
1048 1048 # the bookmark across branches when a revision is specified
1049 1049 # that contains a divergent bookmark
1050 1050 if bmctx.rev() not in anc and target in divs:
1051 1051 bookmarks.deletedivergent(repo, [target], mark)
1052 1052 return
1053 1053
1054 1054 deletefrom = [b for b in divs
1055 1055 if repo[b].rev() in anc or b == target]
1056 1056 bookmarks.deletedivergent(repo, deletefrom, mark)
1057 1057 if bookmarks.validdest(repo, bmctx, repo[target]):
1058 1058 ui.status(_("moving bookmark '%s' forward from %s\n") %
1059 1059 (mark, short(bmctx.node())))
1060 1060 return
1061 1061 raise error.Abort(_("bookmark '%s' already exists "
1062 1062 "(use -f to force)") % mark)
1063 1063 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
1064 1064 and not force):
1065 1065 raise error.Abort(
1066 1066 _("a bookmark cannot have the name of an existing branch"))
1067 1067
1068 1068 if delete and rename:
1069 1069 raise error.Abort(_("--delete and --rename are incompatible"))
1070 1070 if delete and rev:
1071 1071 raise error.Abort(_("--rev is incompatible with --delete"))
1072 1072 if rename and rev:
1073 1073 raise error.Abort(_("--rev is incompatible with --rename"))
1074 1074 if not names and (delete or rev):
1075 1075 raise error.Abort(_("bookmark name required"))
1076 1076
1077 1077 if delete or rename or names or inactive:
1078 1078 wlock = lock = tr = None
1079 1079 try:
1080 1080 wlock = repo.wlock()
1081 1081 lock = repo.lock()
1082 1082 cur = repo.changectx('.').node()
1083 1083 marks = repo._bookmarks
1084 1084 if delete:
1085 1085 tr = repo.transaction('bookmark')
1086 1086 for mark in names:
1087 1087 if mark not in marks:
1088 1088 raise error.Abort(_("bookmark '%s' does not exist") %
1089 1089 mark)
1090 1090 if mark == repo._activebookmark:
1091 1091 bookmarks.deactivate(repo)
1092 1092 del marks[mark]
1093 1093
1094 1094 elif rename:
1095 1095 tr = repo.transaction('bookmark')
1096 1096 if not names:
1097 1097 raise error.Abort(_("new bookmark name required"))
1098 1098 elif len(names) > 1:
1099 1099 raise error.Abort(_("only one new bookmark name allowed"))
1100 1100 mark = checkformat(names[0])
1101 1101 if rename not in marks:
1102 1102 raise error.Abort(_("bookmark '%s' does not exist")
1103 1103 % rename)
1104 1104 checkconflict(repo, mark, cur, force)
1105 1105 marks[mark] = marks[rename]
1106 1106 if repo._activebookmark == rename and not inactive:
1107 1107 bookmarks.activate(repo, mark)
1108 1108 del marks[rename]
1109 1109 elif names:
1110 1110 tr = repo.transaction('bookmark')
1111 1111 newact = None
1112 1112 for mark in names:
1113 1113 mark = checkformat(mark)
1114 1114 if newact is None:
1115 1115 newact = mark
1116 1116 if inactive and mark == repo._activebookmark:
1117 1117 bookmarks.deactivate(repo)
1118 1118 return
1119 1119 tgt = cur
1120 1120 if rev:
1121 1121 tgt = scmutil.revsingle(repo, rev).node()
1122 1122 checkconflict(repo, mark, cur, force, tgt)
1123 1123 marks[mark] = tgt
1124 1124 if not inactive and cur == marks[newact] and not rev:
1125 1125 bookmarks.activate(repo, newact)
1126 1126 elif cur != tgt and newact == repo._activebookmark:
1127 1127 bookmarks.deactivate(repo)
1128 1128 elif inactive:
1129 1129 if len(marks) == 0:
1130 1130 ui.status(_("no bookmarks set\n"))
1131 1131 elif not repo._activebookmark:
1132 1132 ui.status(_("no active bookmark\n"))
1133 1133 else:
1134 1134 bookmarks.deactivate(repo)
1135 1135 if tr is not None:
1136 1136 marks.recordchange(tr)
1137 1137 tr.close()
1138 1138 finally:
1139 1139 lockmod.release(tr, lock, wlock)
1140 1140 else: # show bookmarks
1141 1141 fm = ui.formatter('bookmarks', opts)
1142 1142 hexfn = fm.hexfunc
1143 1143 marks = repo._bookmarks
1144 1144 if len(marks) == 0 and not fm:
1145 1145 ui.status(_("no bookmarks set\n"))
1146 1146 for bmark, n in sorted(marks.iteritems()):
1147 1147 active = repo._activebookmark
1148 1148 if bmark == active:
1149 1149 prefix, label = '*', activebookmarklabel
1150 1150 else:
1151 1151 prefix, label = ' ', ''
1152 1152
1153 1153 fm.startitem()
1154 1154 if not ui.quiet:
1155 1155 fm.plain(' %s ' % prefix, label=label)
1156 1156 fm.write('bookmark', '%s', bmark, label=label)
1157 1157 pad = " " * (25 - encoding.colwidth(bmark))
1158 1158 fm.condwrite(not ui.quiet, 'rev node', pad + ' %d:%s',
1159 1159 repo.changelog.rev(n), hexfn(n), label=label)
1160 1160 fm.data(active=(bmark == active))
1161 1161 fm.plain('\n')
1162 1162 fm.end()
1163 1163
1164 1164 @command('branch',
1165 1165 [('f', 'force', None,
1166 1166 _('set branch name even if it shadows an existing branch')),
1167 1167 ('C', 'clean', None, _('reset branch name to parent branch name'))],
1168 1168 _('[-fC] [NAME]'))
1169 1169 def branch(ui, repo, label=None, **opts):
1170 1170 """set or show the current branch name
1171 1171
1172 1172 .. note::
1173 1173
1174 1174 Branch names are permanent and global. Use :hg:`bookmark` to create a
1175 1175 light-weight bookmark instead. See :hg:`help glossary` for more
1176 1176 information about named branches and bookmarks.
1177 1177
1178 1178 With no argument, show the current branch name. With one argument,
1179 1179 set the working directory branch name (the branch will not exist
1180 1180 in the repository until the next commit). Standard practice
1181 1181 recommends that primary development take place on the 'default'
1182 1182 branch.
1183 1183
1184 1184 Unless -f/--force is specified, branch will not let you set a
1185 1185 branch name that already exists.
1186 1186
1187 1187 Use -C/--clean to reset the working directory branch to that of
1188 1188 the parent of the working directory, negating a previous branch
1189 1189 change.
1190 1190
1191 1191 Use the command :hg:`update` to switch to an existing branch. Use
1192 1192 :hg:`commit --close-branch` to mark this branch head as closed.
1193 1193 When all heads of a branch are closed, the branch will be
1194 1194 considered closed.
1195 1195
1196 1196 Returns 0 on success.
1197 1197 """
1198 1198 if label:
1199 1199 label = label.strip()
1200 1200
1201 1201 if not opts.get('clean') and not label:
1202 1202 ui.write("%s\n" % repo.dirstate.branch())
1203 1203 return
1204 1204
1205 1205 with repo.wlock():
1206 1206 if opts.get('clean'):
1207 1207 label = repo[None].p1().branch()
1208 1208 repo.dirstate.setbranch(label)
1209 1209 ui.status(_('reset working directory to branch %s\n') % label)
1210 1210 elif label:
1211 1211 if not opts.get('force') and label in repo.branchmap():
1212 1212 if label not in [p.branch() for p in repo[None].parents()]:
1213 1213 raise error.Abort(_('a branch of the same name already'
1214 1214 ' exists'),
1215 1215 # i18n: "it" refers to an existing branch
1216 1216 hint=_("use 'hg update' to switch to it"))
1217 1217 scmutil.checknewlabel(repo, label, 'branch')
1218 1218 repo.dirstate.setbranch(label)
1219 1219 ui.status(_('marked working directory as branch %s\n') % label)
1220 1220
1221 1221 # find any open named branches aside from default
1222 1222 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1223 1223 if n != "default" and not c]
1224 1224 if not others:
1225 1225 ui.status(_('(branches are permanent and global, '
1226 1226 'did you want a bookmark?)\n'))
1227 1227
1228 1228 @command('branches',
1229 1229 [('a', 'active', False,
1230 1230 _('show only branches that have unmerged heads (DEPRECATED)')),
1231 1231 ('c', 'closed', False, _('show normal and closed branches')),
1232 1232 ] + formatteropts,
1233 1233 _('[-ac]'))
1234 1234 def branches(ui, repo, active=False, closed=False, **opts):
1235 1235 """list repository named branches
1236 1236
1237 1237 List the repository's named branches, indicating which ones are
1238 1238 inactive. If -c/--closed is specified, also list branches which have
1239 1239 been marked closed (see :hg:`commit --close-branch`).
1240 1240
1241 1241 Use the command :hg:`update` to switch to an existing branch.
1242 1242
1243 1243 Returns 0.
1244 1244 """
1245 1245
1246 1246 fm = ui.formatter('branches', opts)
1247 1247 hexfunc = fm.hexfunc
1248 1248
1249 1249 allheads = set(repo.heads())
1250 1250 branches = []
1251 1251 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1252 1252 isactive = not isclosed and bool(set(heads) & allheads)
1253 1253 branches.append((tag, repo[tip], isactive, not isclosed))
1254 1254 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1255 1255 reverse=True)
1256 1256
1257 1257 for tag, ctx, isactive, isopen in branches:
1258 1258 if active and not isactive:
1259 1259 continue
1260 1260 if isactive:
1261 1261 label = 'branches.active'
1262 1262 notice = ''
1263 1263 elif not isopen:
1264 1264 if not closed:
1265 1265 continue
1266 1266 label = 'branches.closed'
1267 1267 notice = _(' (closed)')
1268 1268 else:
1269 1269 label = 'branches.inactive'
1270 1270 notice = _(' (inactive)')
1271 1271 current = (tag == repo.dirstate.branch())
1272 1272 if current:
1273 1273 label = 'branches.current'
1274 1274
1275 1275 fm.startitem()
1276 1276 fm.write('branch', '%s', tag, label=label)
1277 1277 rev = ctx.rev()
1278 1278 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1279 1279 fmt = ' ' * padsize + ' %d:%s'
1280 1280 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1281 1281 label='log.changeset changeset.%s' % ctx.phasestr())
1282 1282 fm.data(active=isactive, closed=not isopen, current=current)
1283 1283 if not ui.quiet:
1284 1284 fm.plain(notice)
1285 1285 fm.plain('\n')
1286 1286 fm.end()
1287 1287
1288 1288 @command('bundle',
1289 1289 [('f', 'force', None, _('run even when the destination is unrelated')),
1290 1290 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1291 1291 _('REV')),
1292 1292 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1293 1293 _('BRANCH')),
1294 1294 ('', 'base', [],
1295 1295 _('a base changeset assumed to be available at the destination'),
1296 1296 _('REV')),
1297 1297 ('a', 'all', None, _('bundle all changesets in the repository')),
1298 1298 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1299 1299 ] + remoteopts,
1300 1300 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1301 1301 def bundle(ui, repo, fname, dest=None, **opts):
1302 1302 """create a changegroup file
1303 1303
1304 1304 Generate a changegroup file collecting changesets to be added
1305 1305 to a repository.
1306 1306
1307 1307 To create a bundle containing all changesets, use -a/--all
1308 1308 (or --base null). Otherwise, hg assumes the destination will have
1309 1309 all the nodes you specify with --base parameters. Otherwise, hg
1310 1310 will assume the repository has all the nodes in destination, or
1311 1311 default-push/default if no destination is specified.
1312 1312
1313 1313 You can change bundle format with the -t/--type option. You can
1314 1314 specify a compression, a bundle version or both using a dash
1315 1315 (comp-version). The available compression methods are: none, bzip2,
1316 1316 and gzip (by default, bundles are compressed using bzip2). The
1317 1317 available formats are: v1, v2 (default to most suitable).
1318 1318
1319 1319 The bundle file can then be transferred using conventional means
1320 1320 and applied to another repository with the unbundle or pull
1321 1321 command. This is useful when direct push and pull are not
1322 1322 available or when exporting an entire repository is undesirable.
1323 1323
1324 1324 Applying bundles preserves all changeset contents including
1325 1325 permissions, copy/rename information, and revision history.
1326 1326
1327 1327 Returns 0 on success, 1 if no changes found.
1328 1328 """
1329 1329 revs = None
1330 1330 if 'rev' in opts:
1331 1331 revstrings = opts['rev']
1332 1332 revs = scmutil.revrange(repo, revstrings)
1333 1333 if revstrings and not revs:
1334 1334 raise error.Abort(_('no commits to bundle'))
1335 1335
1336 1336 bundletype = opts.get('type', 'bzip2').lower()
1337 1337 try:
1338 1338 bcompression, cgversion, params = exchange.parsebundlespec(
1339 1339 repo, bundletype, strict=False)
1340 1340 except error.UnsupportedBundleSpecification as e:
1341 1341 raise error.Abort(str(e),
1342 1342 hint=_('see "hg help bundle" for supported '
1343 1343 'values for --type'))
1344 1344
1345 1345 # Packed bundles are a pseudo bundle format for now.
1346 1346 if cgversion == 's1':
1347 1347 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1348 1348 hint=_('use "hg debugcreatestreamclonebundle"'))
1349 1349
1350 1350 if opts.get('all'):
1351 1351 if dest:
1352 1352 raise error.Abort(_("--all is incompatible with specifying "
1353 1353 "a destination"))
1354 1354 if opts.get('base'):
1355 1355 ui.warn(_("ignoring --base because --all was specified\n"))
1356 1356 base = ['null']
1357 1357 else:
1358 1358 base = scmutil.revrange(repo, opts.get('base'))
1359 1359 # TODO: get desired bundlecaps from command line.
1360 1360 bundlecaps = None
1361 1361 if base:
1362 1362 if dest:
1363 1363 raise error.Abort(_("--base is incompatible with specifying "
1364 1364 "a destination"))
1365 1365 common = [repo.lookup(rev) for rev in base]
1366 1366 heads = revs and map(repo.lookup, revs) or revs
1367 1367 cg = changegroup.getchangegroup(repo, 'bundle', heads=heads,
1368 1368 common=common, bundlecaps=bundlecaps,
1369 1369 version=cgversion)
1370 1370 outgoing = None
1371 1371 else:
1372 1372 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1373 1373 dest, branches = hg.parseurl(dest, opts.get('branch'))
1374 1374 other = hg.peer(repo, opts, dest)
1375 1375 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1376 1376 heads = revs and map(repo.lookup, revs) or revs
1377 1377 outgoing = discovery.findcommonoutgoing(repo, other,
1378 1378 onlyheads=heads,
1379 1379 force=opts.get('force'),
1380 1380 portable=True)
1381 1381 cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing,
1382 1382 bundlecaps, version=cgversion)
1383 1383 if not cg:
1384 1384 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1385 1385 return 1
1386 1386
1387 1387 if cgversion == '01': #bundle1
1388 1388 if bcompression is None:
1389 1389 bcompression = 'UN'
1390 1390 bversion = 'HG10' + bcompression
1391 1391 bcompression = None
1392 1392 else:
1393 1393 assert cgversion == '02'
1394 1394 bversion = 'HG20'
1395 1395
1396 1396
1397 1397 changegroup.writebundle(ui, cg, fname, bversion, compression=bcompression)
1398 1398
1399 1399 @command('cat',
1400 1400 [('o', 'output', '',
1401 1401 _('print output to file with formatted name'), _('FORMAT')),
1402 1402 ('r', 'rev', '', _('print the given revision'), _('REV')),
1403 1403 ('', 'decode', None, _('apply any matching decode filter')),
1404 1404 ] + walkopts,
1405 1405 _('[OPTION]... FILE...'),
1406 1406 inferrepo=True)
1407 1407 def cat(ui, repo, file1, *pats, **opts):
1408 1408 """output the current or given revision of files
1409 1409
1410 1410 Print the specified files as they were at the given revision. If
1411 1411 no revision is given, the parent of the working directory is used.
1412 1412
1413 1413 Output may be to a file, in which case the name of the file is
1414 1414 given using a format string. The formatting rules as follows:
1415 1415
1416 1416 :``%%``: literal "%" character
1417 1417 :``%s``: basename of file being printed
1418 1418 :``%d``: dirname of file being printed, or '.' if in repository root
1419 1419 :``%p``: root-relative path name of file being printed
1420 1420 :``%H``: changeset hash (40 hexadecimal digits)
1421 1421 :``%R``: changeset revision number
1422 1422 :``%h``: short-form changeset hash (12 hexadecimal digits)
1423 1423 :``%r``: zero-padded changeset revision number
1424 1424 :``%b``: basename of the exporting repository
1425 1425
1426 1426 Returns 0 on success.
1427 1427 """
1428 1428 ctx = scmutil.revsingle(repo, opts.get('rev'))
1429 1429 m = scmutil.match(ctx, (file1,) + pats, opts)
1430 1430
1431 1431 return cmdutil.cat(ui, repo, ctx, m, '', **opts)
1432 1432
1433 1433 @command('^clone',
1434 1434 [('U', 'noupdate', None, _('the clone will include an empty working '
1435 1435 'directory (only a repository)')),
1436 1436 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1437 1437 _('REV')),
1438 1438 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1439 1439 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1440 1440 ('', 'pull', None, _('use pull protocol to copy metadata')),
1441 1441 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1442 1442 ] + remoteopts,
1443 1443 _('[OPTION]... SOURCE [DEST]'),
1444 1444 norepo=True)
1445 1445 def clone(ui, source, dest=None, **opts):
1446 1446 """make a copy of an existing repository
1447 1447
1448 1448 Create a copy of an existing repository in a new directory.
1449 1449
1450 1450 If no destination directory name is specified, it defaults to the
1451 1451 basename of the source.
1452 1452
1453 1453 The location of the source is added to the new repository's
1454 1454 ``.hg/hgrc`` file, as the default to be used for future pulls.
1455 1455
1456 1456 Only local paths and ``ssh://`` URLs are supported as
1457 1457 destinations. For ``ssh://`` destinations, no working directory or
1458 1458 ``.hg/hgrc`` will be created on the remote side.
1459 1459
1460 1460 If the source repository has a bookmark called '@' set, that
1461 1461 revision will be checked out in the new repository by default.
1462 1462
1463 1463 To check out a particular version, use -u/--update, or
1464 1464 -U/--noupdate to create a clone with no working directory.
1465 1465
1466 1466 To pull only a subset of changesets, specify one or more revisions
1467 1467 identifiers with -r/--rev or branches with -b/--branch. The
1468 1468 resulting clone will contain only the specified changesets and
1469 1469 their ancestors. These options (or 'clone src#rev dest') imply
1470 1470 --pull, even for local source repositories.
1471 1471
1472 1472 .. note::
1473 1473
1474 1474 Specifying a tag will include the tagged changeset but not the
1475 1475 changeset containing the tag.
1476 1476
1477 1477 .. container:: verbose
1478 1478
1479 1479 For efficiency, hardlinks are used for cloning whenever the
1480 1480 source and destination are on the same filesystem (note this
1481 1481 applies only to the repository data, not to the working
1482 1482 directory). Some filesystems, such as AFS, implement hardlinking
1483 1483 incorrectly, but do not report errors. In these cases, use the
1484 1484 --pull option to avoid hardlinking.
1485 1485
1486 1486 In some cases, you can clone repositories and the working
1487 1487 directory using full hardlinks with ::
1488 1488
1489 1489 $ cp -al REPO REPOCLONE
1490 1490
1491 1491 This is the fastest way to clone, but it is not always safe. The
1492 1492 operation is not atomic (making sure REPO is not modified during
1493 1493 the operation is up to you) and you have to make sure your
1494 1494 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1495 1495 so). Also, this is not compatible with certain extensions that
1496 1496 place their metadata under the .hg directory, such as mq.
1497 1497
1498 1498 Mercurial will update the working directory to the first applicable
1499 1499 revision from this list:
1500 1500
1501 1501 a) null if -U or the source repository has no changesets
1502 1502 b) if -u . and the source repository is local, the first parent of
1503 1503 the source repository's working directory
1504 1504 c) the changeset specified with -u (if a branch name, this means the
1505 1505 latest head of that branch)
1506 1506 d) the changeset specified with -r
1507 1507 e) the tipmost head specified with -b
1508 1508 f) the tipmost head specified with the url#branch source syntax
1509 1509 g) the revision marked with the '@' bookmark, if present
1510 1510 h) the tipmost head of the default branch
1511 1511 i) tip
1512 1512
1513 1513 When cloning from servers that support it, Mercurial may fetch
1514 1514 pre-generated data from a server-advertised URL. When this is done,
1515 1515 hooks operating on incoming changesets and changegroups may fire twice,
1516 1516 once for the bundle fetched from the URL and another for any additional
1517 1517 data not fetched from this URL. In addition, if an error occurs, the
1518 1518 repository may be rolled back to a partial clone. This behavior may
1519 1519 change in future releases. See :hg:`help -e clonebundles` for more.
1520 1520
1521 1521 Examples:
1522 1522
1523 1523 - clone a remote repository to a new directory named hg/::
1524 1524
1525 1525 hg clone http://selenic.com/hg
1526 1526
1527 1527 - create a lightweight local clone::
1528 1528
1529 1529 hg clone project/ project-feature/
1530 1530
1531 1531 - clone from an absolute path on an ssh server (note double-slash)::
1532 1532
1533 1533 hg clone ssh://user@server//home/projects/alpha/
1534 1534
1535 1535 - do a high-speed clone over a LAN while checking out a
1536 1536 specified version::
1537 1537
1538 1538 hg clone --uncompressed http://server/repo -u 1.5
1539 1539
1540 1540 - create a repository without changesets after a particular revision::
1541 1541
1542 1542 hg clone -r 04e544 experimental/ good/
1543 1543
1544 1544 - clone (and track) a particular named branch::
1545 1545
1546 1546 hg clone http://selenic.com/hg#stable
1547 1547
1548 1548 See :hg:`help urls` for details on specifying URLs.
1549 1549
1550 1550 Returns 0 on success.
1551 1551 """
1552 1552 if opts.get('noupdate') and opts.get('updaterev'):
1553 1553 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1554 1554
1555 1555 r = hg.clone(ui, opts, source, dest,
1556 1556 pull=opts.get('pull'),
1557 1557 stream=opts.get('uncompressed'),
1558 1558 rev=opts.get('rev'),
1559 1559 update=opts.get('updaterev') or not opts.get('noupdate'),
1560 1560 branch=opts.get('branch'),
1561 1561 shareopts=opts.get('shareopts'))
1562 1562
1563 1563 return r is None
1564 1564
1565 1565 @command('^commit|ci',
1566 1566 [('A', 'addremove', None,
1567 1567 _('mark new/missing files as added/removed before committing')),
1568 1568 ('', 'close-branch', None,
1569 1569 _('mark a branch head as closed')),
1570 1570 ('', 'amend', None, _('amend the parent of the working directory')),
1571 1571 ('s', 'secret', None, _('use the secret phase for committing')),
1572 1572 ('e', 'edit', None, _('invoke editor on commit messages')),
1573 1573 ('i', 'interactive', None, _('use interactive mode')),
1574 1574 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1575 1575 _('[OPTION]... [FILE]...'),
1576 1576 inferrepo=True)
1577 1577 def commit(ui, repo, *pats, **opts):
1578 1578 """commit the specified files or all outstanding changes
1579 1579
1580 1580 Commit changes to the given files into the repository. Unlike a
1581 1581 centralized SCM, this operation is a local operation. See
1582 1582 :hg:`push` for a way to actively distribute your changes.
1583 1583
1584 1584 If a list of files is omitted, all changes reported by :hg:`status`
1585 1585 will be committed.
1586 1586
1587 1587 If you are committing the result of a merge, do not provide any
1588 1588 filenames or -I/-X filters.
1589 1589
1590 1590 If no commit message is specified, Mercurial starts your
1591 1591 configured editor where you can enter a message. In case your
1592 1592 commit fails, you will find a backup of your message in
1593 1593 ``.hg/last-message.txt``.
1594 1594
1595 1595 The --close-branch flag can be used to mark the current branch
1596 1596 head closed. When all heads of a branch are closed, the branch
1597 1597 will be considered closed and no longer listed.
1598 1598
1599 1599 The --amend flag can be used to amend the parent of the
1600 1600 working directory with a new commit that contains the changes
1601 1601 in the parent in addition to those currently reported by :hg:`status`,
1602 1602 if there are any. The old commit is stored in a backup bundle in
1603 1603 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1604 1604 on how to restore it).
1605 1605
1606 1606 Message, user and date are taken from the amended commit unless
1607 1607 specified. When a message isn't specified on the command line,
1608 1608 the editor will open with the message of the amended commit.
1609 1609
1610 1610 It is not possible to amend public changesets (see :hg:`help phases`)
1611 1611 or changesets that have children.
1612 1612
1613 1613 See :hg:`help dates` for a list of formats valid for -d/--date.
1614 1614
1615 1615 Returns 0 on success, 1 if nothing changed.
1616 1616
1617 1617 .. container:: verbose
1618 1618
1619 1619 Examples:
1620 1620
1621 1621 - commit all files ending in .py::
1622 1622
1623 1623 hg commit --include "set:**.py"
1624 1624
1625 1625 - commit all non-binary files::
1626 1626
1627 1627 hg commit --exclude "set:binary()"
1628 1628
1629 1629 - amend the current commit and set the date to now::
1630 1630
1631 1631 hg commit --amend --date now
1632 1632 """
1633 1633 wlock = lock = None
1634 1634 try:
1635 1635 wlock = repo.wlock()
1636 1636 lock = repo.lock()
1637 1637 return _docommit(ui, repo, *pats, **opts)
1638 1638 finally:
1639 1639 release(lock, wlock)
1640 1640
1641 1641 def _docommit(ui, repo, *pats, **opts):
1642 1642 if opts.get('interactive'):
1643 1643 opts.pop('interactive')
1644 1644 cmdutil.dorecord(ui, repo, commit, None, False,
1645 1645 cmdutil.recordfilter, *pats, **opts)
1646 1646 return
1647 1647
1648 1648 if opts.get('subrepos'):
1649 1649 if opts.get('amend'):
1650 1650 raise error.Abort(_('cannot amend with --subrepos'))
1651 1651 # Let --subrepos on the command line override config setting.
1652 1652 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1653 1653
1654 1654 cmdutil.checkunfinished(repo, commit=True)
1655 1655
1656 1656 branch = repo[None].branch()
1657 1657 bheads = repo.branchheads(branch)
1658 1658
1659 1659 extra = {}
1660 1660 if opts.get('close_branch'):
1661 1661 extra['close'] = 1
1662 1662
1663 1663 if not bheads:
1664 1664 raise error.Abort(_('can only close branch heads'))
1665 1665 elif opts.get('amend'):
1666 1666 if repo[None].parents()[0].p1().branch() != branch and \
1667 1667 repo[None].parents()[0].p2().branch() != branch:
1668 1668 raise error.Abort(_('can only close branch heads'))
1669 1669
1670 1670 if opts.get('amend'):
1671 1671 if ui.configbool('ui', 'commitsubrepos'):
1672 1672 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1673 1673
1674 1674 old = repo['.']
1675 1675 if not old.mutable():
1676 1676 raise error.Abort(_('cannot amend public changesets'))
1677 1677 if len(repo[None].parents()) > 1:
1678 1678 raise error.Abort(_('cannot amend while merging'))
1679 1679 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
1680 1680 if not allowunstable and old.children():
1681 1681 raise error.Abort(_('cannot amend changeset with children'))
1682 1682
1683 1683 newextra = extra.copy()
1684 1684 newextra['branch'] = branch
1685 1685 extra = newextra
1686 1686 # commitfunc is used only for temporary amend commit by cmdutil.amend
1687 1687 def commitfunc(ui, repo, message, match, opts):
1688 1688 return repo.commit(message,
1689 1689 opts.get('user') or old.user(),
1690 1690 opts.get('date') or old.date(),
1691 1691 match,
1692 1692 extra=extra)
1693 1693
1694 1694 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1695 1695 if node == old.node():
1696 1696 ui.status(_("nothing changed\n"))
1697 1697 return 1
1698 1698 else:
1699 1699 def commitfunc(ui, repo, message, match, opts):
1700 1700 backup = ui.backupconfig('phases', 'new-commit')
1701 1701 baseui = repo.baseui
1702 1702 basebackup = baseui.backupconfig('phases', 'new-commit')
1703 1703 try:
1704 1704 if opts.get('secret'):
1705 1705 ui.setconfig('phases', 'new-commit', 'secret', 'commit')
1706 1706 # Propagate to subrepos
1707 1707 baseui.setconfig('phases', 'new-commit', 'secret', 'commit')
1708 1708
1709 1709 editform = cmdutil.mergeeditform(repo[None], 'commit.normal')
1710 1710 editor = cmdutil.getcommiteditor(editform=editform, **opts)
1711 1711 return repo.commit(message, opts.get('user'), opts.get('date'),
1712 1712 match,
1713 1713 editor=editor,
1714 1714 extra=extra)
1715 1715 finally:
1716 1716 ui.restoreconfig(backup)
1717 1717 repo.baseui.restoreconfig(basebackup)
1718 1718
1719 1719
1720 1720 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1721 1721
1722 1722 if not node:
1723 1723 stat = repo.status(match=scmutil.match(repo[None], pats, opts))
1724 1724 if stat[3]:
1725 1725 ui.status(_("nothing changed (%d missing files, see "
1726 1726 "'hg status')\n") % len(stat[3]))
1727 1727 else:
1728 1728 ui.status(_("nothing changed\n"))
1729 1729 return 1
1730 1730
1731 1731 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1732 1732
1733 1733 @command('config|showconfig|debugconfig',
1734 1734 [('u', 'untrusted', None, _('show untrusted configuration options')),
1735 1735 ('e', 'edit', None, _('edit user config')),
1736 1736 ('l', 'local', None, _('edit repository config')),
1737 1737 ('g', 'global', None, _('edit global config'))],
1738 1738 _('[-u] [NAME]...'),
1739 1739 optionalrepo=True)
1740 1740 def config(ui, repo, *values, **opts):
1741 1741 """show combined config settings from all hgrc files
1742 1742
1743 1743 With no arguments, print names and values of all config items.
1744 1744
1745 1745 With one argument of the form section.name, print just the value
1746 1746 of that config item.
1747 1747
1748 1748 With multiple arguments, print names and values of all config
1749 1749 items with matching section names.
1750 1750
1751 1751 With --edit, start an editor on the user-level config file. With
1752 1752 --global, edit the system-wide config file. With --local, edit the
1753 1753 repository-level config file.
1754 1754
1755 1755 With --debug, the source (filename and line number) is printed
1756 1756 for each config item.
1757 1757
1758 1758 See :hg:`help config` for more information about config files.
1759 1759
1760 1760 Returns 0 on success, 1 if NAME does not exist.
1761 1761
1762 1762 """
1763 1763
1764 1764 if opts.get('edit') or opts.get('local') or opts.get('global'):
1765 1765 if opts.get('local') and opts.get('global'):
1766 1766 raise error.Abort(_("can't use --local and --global together"))
1767 1767
1768 1768 if opts.get('local'):
1769 1769 if not repo:
1770 1770 raise error.Abort(_("can't use --local outside a repository"))
1771 1771 paths = [repo.join('hgrc')]
1772 1772 elif opts.get('global'):
1773 1773 paths = scmutil.systemrcpath()
1774 1774 else:
1775 1775 paths = scmutil.userrcpath()
1776 1776
1777 1777 for f in paths:
1778 1778 if os.path.exists(f):
1779 1779 break
1780 1780 else:
1781 1781 if opts.get('global'):
1782 1782 samplehgrc = uimod.samplehgrcs['global']
1783 1783 elif opts.get('local'):
1784 1784 samplehgrc = uimod.samplehgrcs['local']
1785 1785 else:
1786 1786 samplehgrc = uimod.samplehgrcs['user']
1787 1787
1788 1788 f = paths[0]
1789 1789 fp = open(f, "w")
1790 1790 fp.write(samplehgrc)
1791 1791 fp.close()
1792 1792
1793 1793 editor = ui.geteditor()
1794 1794 ui.system("%s \"%s\"" % (editor, f),
1795 1795 onerr=error.Abort, errprefix=_("edit failed"))
1796 1796 return
1797 1797
1798 1798 for f in scmutil.rcpath():
1799 1799 ui.debug('read config from: %s\n' % f)
1800 1800 untrusted = bool(opts.get('untrusted'))
1801 1801 if values:
1802 1802 sections = [v for v in values if '.' not in v]
1803 1803 items = [v for v in values if '.' in v]
1804 1804 if len(items) > 1 or items and sections:
1805 1805 raise error.Abort(_('only one config item permitted'))
1806 1806 matched = False
1807 1807 for section, name, value in ui.walkconfig(untrusted=untrusted):
1808 1808 value = str(value).replace('\n', '\\n')
1809 1809 sectname = section + '.' + name
1810 1810 if values:
1811 1811 for v in values:
1812 1812 if v == section:
1813 1813 ui.debug('%s: ' %
1814 1814 ui.configsource(section, name, untrusted))
1815 1815 ui.write('%s=%s\n' % (sectname, value))
1816 1816 matched = True
1817 1817 elif v == sectname:
1818 1818 ui.debug('%s: ' %
1819 1819 ui.configsource(section, name, untrusted))
1820 1820 ui.write(value, '\n')
1821 1821 matched = True
1822 1822 else:
1823 1823 ui.debug('%s: ' %
1824 1824 ui.configsource(section, name, untrusted))
1825 1825 ui.write('%s=%s\n' % (sectname, value))
1826 1826 matched = True
1827 1827 if matched:
1828 1828 return 0
1829 1829 return 1
1830 1830
1831 1831 @command('copy|cp',
1832 1832 [('A', 'after', None, _('record a copy that has already occurred')),
1833 1833 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1834 1834 ] + walkopts + dryrunopts,
1835 1835 _('[OPTION]... [SOURCE]... DEST'))
1836 1836 def copy(ui, repo, *pats, **opts):
1837 1837 """mark files as copied for the next commit
1838 1838
1839 1839 Mark dest as having copies of source files. If dest is a
1840 1840 directory, copies are put in that directory. If dest is a file,
1841 1841 the source must be a single file.
1842 1842
1843 1843 By default, this command copies the contents of files as they
1844 1844 exist in the working directory. If invoked with -A/--after, the
1845 1845 operation is recorded, but no copying is performed.
1846 1846
1847 1847 This command takes effect with the next commit. To undo a copy
1848 1848 before that, see :hg:`revert`.
1849 1849
1850 1850 Returns 0 on success, 1 if errors are encountered.
1851 1851 """
1852 1852 with repo.wlock(False):
1853 1853 return cmdutil.copy(ui, repo, pats, opts)
1854 1854
1855 1855 @command('debugancestor', [], _('[INDEX] REV1 REV2'), optionalrepo=True)
1856 1856 def debugancestor(ui, repo, *args):
1857 1857 """find the ancestor revision of two revisions in a given index"""
1858 1858 if len(args) == 3:
1859 1859 index, rev1, rev2 = args
1860 1860 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index)
1861 1861 lookup = r.lookup
1862 1862 elif len(args) == 2:
1863 1863 if not repo:
1864 1864 raise error.Abort(_("there is no Mercurial repository here "
1865 1865 "(.hg not found)"))
1866 1866 rev1, rev2 = args
1867 1867 r = repo.changelog
1868 1868 lookup = repo.lookup
1869 1869 else:
1870 1870 raise error.Abort(_('either two or three arguments required'))
1871 1871 a = r.ancestor(lookup(rev1), lookup(rev2))
1872 1872 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1873 1873
1874 1874 @command('debugbuilddag',
1875 1875 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
1876 1876 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
1877 1877 ('n', 'new-file', None, _('add new file at each rev'))],
1878 1878 _('[OPTION]... [TEXT]'))
1879 1879 def debugbuilddag(ui, repo, text=None,
1880 1880 mergeable_file=False,
1881 1881 overwritten_file=False,
1882 1882 new_file=False):
1883 1883 """builds a repo with a given DAG from scratch in the current empty repo
1884 1884
1885 1885 The description of the DAG is read from stdin if not given on the
1886 1886 command line.
1887 1887
1888 1888 Elements:
1889 1889
1890 1890 - "+n" is a linear run of n nodes based on the current default parent
1891 1891 - "." is a single node based on the current default parent
1892 1892 - "$" resets the default parent to null (implied at the start);
1893 1893 otherwise the default parent is always the last node created
1894 1894 - "<p" sets the default parent to the backref p
1895 1895 - "*p" is a fork at parent p, which is a backref
1896 1896 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
1897 1897 - "/p2" is a merge of the preceding node and p2
1898 1898 - ":tag" defines a local tag for the preceding node
1899 1899 - "@branch" sets the named branch for subsequent nodes
1900 1900 - "#...\\n" is a comment up to the end of the line
1901 1901
1902 1902 Whitespace between the above elements is ignored.
1903 1903
1904 1904 A backref is either
1905 1905
1906 1906 - a number n, which references the node curr-n, where curr is the current
1907 1907 node, or
1908 1908 - the name of a local tag you placed earlier using ":tag", or
1909 1909 - empty to denote the default parent.
1910 1910
1911 1911 All string valued-elements are either strictly alphanumeric, or must
1912 1912 be enclosed in double quotes ("..."), with "\\" as escape character.
1913 1913 """
1914 1914
1915 1915 if text is None:
1916 1916 ui.status(_("reading DAG from stdin\n"))
1917 1917 text = ui.fin.read()
1918 1918
1919 1919 cl = repo.changelog
1920 1920 if len(cl) > 0:
1921 1921 raise error.Abort(_('repository is not empty'))
1922 1922
1923 1923 # determine number of revs in DAG
1924 1924 total = 0
1925 1925 for type, data in dagparser.parsedag(text):
1926 1926 if type == 'n':
1927 1927 total += 1
1928 1928
1929 1929 if mergeable_file:
1930 1930 linesperrev = 2
1931 1931 # make a file with k lines per rev
1932 1932 initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]
1933 1933 initialmergedlines.append("")
1934 1934
1935 1935 tags = []
1936 1936
1937 1937 lock = tr = None
1938 1938 try:
1939 1939 lock = repo.lock()
1940 1940 tr = repo.transaction("builddag")
1941 1941
1942 1942 at = -1
1943 1943 atbranch = 'default'
1944 1944 nodeids = []
1945 1945 id = 0
1946 1946 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1947 1947 for type, data in dagparser.parsedag(text):
1948 1948 if type == 'n':
1949 1949 ui.note(('node %s\n' % str(data)))
1950 1950 id, ps = data
1951 1951
1952 1952 files = []
1953 1953 fctxs = {}
1954 1954
1955 1955 p2 = None
1956 1956 if mergeable_file:
1957 1957 fn = "mf"
1958 1958 p1 = repo[ps[0]]
1959 1959 if len(ps) > 1:
1960 1960 p2 = repo[ps[1]]
1961 1961 pa = p1.ancestor(p2)
1962 1962 base, local, other = [x[fn].data() for x in (pa, p1,
1963 1963 p2)]
1964 1964 m3 = simplemerge.Merge3Text(base, local, other)
1965 1965 ml = [l.strip() for l in m3.merge_lines()]
1966 1966 ml.append("")
1967 1967 elif at > 0:
1968 1968 ml = p1[fn].data().split("\n")
1969 1969 else:
1970 1970 ml = initialmergedlines
1971 1971 ml[id * linesperrev] += " r%i" % id
1972 1972 mergedtext = "\n".join(ml)
1973 1973 files.append(fn)
1974 1974 fctxs[fn] = context.memfilectx(repo, fn, mergedtext)
1975 1975
1976 1976 if overwritten_file:
1977 1977 fn = "of"
1978 1978 files.append(fn)
1979 1979 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
1980 1980
1981 1981 if new_file:
1982 1982 fn = "nf%i" % id
1983 1983 files.append(fn)
1984 1984 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
1985 1985 if len(ps) > 1:
1986 1986 if not p2:
1987 1987 p2 = repo[ps[1]]
1988 1988 for fn in p2:
1989 1989 if fn.startswith("nf"):
1990 1990 files.append(fn)
1991 1991 fctxs[fn] = p2[fn]
1992 1992
1993 1993 def fctxfn(repo, cx, path):
1994 1994 return fctxs.get(path)
1995 1995
1996 1996 if len(ps) == 0 or ps[0] < 0:
1997 1997 pars = [None, None]
1998 1998 elif len(ps) == 1:
1999 1999 pars = [nodeids[ps[0]], None]
2000 2000 else:
2001 2001 pars = [nodeids[p] for p in ps]
2002 2002 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
2003 2003 date=(id, 0),
2004 2004 user="debugbuilddag",
2005 2005 extra={'branch': atbranch})
2006 2006 nodeid = repo.commitctx(cx)
2007 2007 nodeids.append(nodeid)
2008 2008 at = id
2009 2009 elif type == 'l':
2010 2010 id, name = data
2011 2011 ui.note(('tag %s\n' % name))
2012 2012 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
2013 2013 elif type == 'a':
2014 2014 ui.note(('branch %s\n' % data))
2015 2015 atbranch = data
2016 2016 ui.progress(_('building'), id, unit=_('revisions'), total=total)
2017 2017 tr.close()
2018 2018
2019 2019 if tags:
2020 2020 repo.vfs.write("localtags", "".join(tags))
2021 2021 finally:
2022 2022 ui.progress(_('building'), None)
2023 2023 release(tr, lock)
2024 2024
2025 2025 @command('debugbundle',
2026 2026 [('a', 'all', None, _('show all details')),
2027 2027 ('', 'spec', None, _('print the bundlespec of the bundle'))],
2028 2028 _('FILE'),
2029 2029 norepo=True)
2030 2030 def debugbundle(ui, bundlepath, all=None, spec=None, **opts):
2031 2031 """lists the contents of a bundle"""
2032 2032 with hg.openpath(ui, bundlepath) as f:
2033 2033 if spec:
2034 2034 spec = exchange.getbundlespec(ui, f)
2035 2035 ui.write('%s\n' % spec)
2036 2036 return
2037 2037
2038 2038 gen = exchange.readbundle(ui, f, bundlepath)
2039 2039 if isinstance(gen, bundle2.unbundle20):
2040 2040 return _debugbundle2(ui, gen, all=all, **opts)
2041 2041 if all:
2042 2042 ui.write(("format: id, p1, p2, cset, delta base, len(delta)\n"))
2043 2043
2044 2044 def showchunks(named):
2045 2045 ui.write("\n%s\n" % named)
2046 2046 chain = None
2047 2047 while True:
2048 2048 chunkdata = gen.deltachunk(chain)
2049 2049 if not chunkdata:
2050 2050 break
2051 2051 node = chunkdata['node']
2052 2052 p1 = chunkdata['p1']
2053 2053 p2 = chunkdata['p2']
2054 2054 cs = chunkdata['cs']
2055 2055 deltabase = chunkdata['deltabase']
2056 2056 delta = chunkdata['delta']
2057 2057 ui.write("%s %s %s %s %s %s\n" %
2058 2058 (hex(node), hex(p1), hex(p2),
2059 2059 hex(cs), hex(deltabase), len(delta)))
2060 2060 chain = node
2061 2061
2062 2062 chunkdata = gen.changelogheader()
2063 2063 showchunks("changelog")
2064 2064 chunkdata = gen.manifestheader()
2065 2065 showchunks("manifest")
2066 2066 while True:
2067 2067 chunkdata = gen.filelogheader()
2068 2068 if not chunkdata:
2069 2069 break
2070 2070 fname = chunkdata['filename']
2071 2071 showchunks(fname)
2072 2072 else:
2073 2073 if isinstance(gen, bundle2.unbundle20):
2074 2074 raise error.Abort(_('use debugbundle2 for this file'))
2075 2075 chunkdata = gen.changelogheader()
2076 2076 chain = None
2077 2077 while True:
2078 2078 chunkdata = gen.deltachunk(chain)
2079 2079 if not chunkdata:
2080 2080 break
2081 2081 node = chunkdata['node']
2082 2082 ui.write("%s\n" % hex(node))
2083 2083 chain = node
2084 2084
2085 2085 def _debugbundle2(ui, gen, **opts):
2086 2086 """lists the contents of a bundle2"""
2087 2087 if not isinstance(gen, bundle2.unbundle20):
2088 2088 raise error.Abort(_('not a bundle2 file'))
2089 2089 ui.write(('Stream params: %s\n' % repr(gen.params)))
2090 2090 for part in gen.iterparts():
2091 2091 ui.write('%s -- %r\n' % (part.type, repr(part.params)))
2092 2092 if part.type == 'changegroup':
2093 2093 version = part.params.get('version', '01')
2094 2094 cg = changegroup.getunbundler(version, part, 'UN')
2095 2095 chunkdata = cg.changelogheader()
2096 2096 chain = None
2097 2097 while True:
2098 2098 chunkdata = cg.deltachunk(chain)
2099 2099 if not chunkdata:
2100 2100 break
2101 2101 node = chunkdata['node']
2102 2102 ui.write(" %s\n" % hex(node))
2103 2103 chain = node
2104 2104
2105 2105 @command('debugcreatestreamclonebundle', [], 'FILE')
2106 2106 def debugcreatestreamclonebundle(ui, repo, fname):
2107 2107 """create a stream clone bundle file
2108 2108
2109 2109 Stream bundles are special bundles that are essentially archives of
2110 2110 revlog files. They are commonly used for cloning very quickly.
2111 2111 """
2112 2112 requirements, gen = streamclone.generatebundlev1(repo)
2113 2113 changegroup.writechunks(ui, gen, fname)
2114 2114
2115 2115 ui.write(_('bundle requirements: %s\n') % ', '.join(sorted(requirements)))
2116 2116
2117 2117 @command('debugapplystreamclonebundle', [], 'FILE')
2118 2118 def debugapplystreamclonebundle(ui, repo, fname):
2119 2119 """apply a stream clone bundle file"""
2120 2120 f = hg.openpath(ui, fname)
2121 2121 gen = exchange.readbundle(ui, f, fname)
2122 2122 gen.apply(repo)
2123 2123
2124 2124 @command('debugcheckstate', [], '')
2125 2125 def debugcheckstate(ui, repo):
2126 2126 """validate the correctness of the current dirstate"""
2127 2127 parent1, parent2 = repo.dirstate.parents()
2128 2128 m1 = repo[parent1].manifest()
2129 2129 m2 = repo[parent2].manifest()
2130 2130 errors = 0
2131 2131 for f in repo.dirstate:
2132 2132 state = repo.dirstate[f]
2133 2133 if state in "nr" and f not in m1:
2134 2134 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
2135 2135 errors += 1
2136 2136 if state in "a" and f in m1:
2137 2137 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
2138 2138 errors += 1
2139 2139 if state in "m" and f not in m1 and f not in m2:
2140 2140 ui.warn(_("%s in state %s, but not in either manifest\n") %
2141 2141 (f, state))
2142 2142 errors += 1
2143 2143 for f in m1:
2144 2144 state = repo.dirstate[f]
2145 2145 if state not in "nrm":
2146 2146 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
2147 2147 errors += 1
2148 2148 if errors:
2149 2149 error = _(".hg/dirstate inconsistent with current parent's manifest")
2150 2150 raise error.Abort(error)
2151 2151
2152 2152 @command('debugcommands', [], _('[COMMAND]'), norepo=True)
2153 2153 def debugcommands(ui, cmd='', *args):
2154 2154 """list all available commands and options"""
2155 2155 for cmd, vals in sorted(table.iteritems()):
2156 2156 cmd = cmd.split('|')[0].strip('^')
2157 2157 opts = ', '.join([i[1] for i in vals[1]])
2158 2158 ui.write('%s: %s\n' % (cmd, opts))
2159 2159
2160 2160 @command('debugcomplete',
2161 2161 [('o', 'options', None, _('show the command options'))],
2162 2162 _('[-o] CMD'),
2163 2163 norepo=True)
2164 2164 def debugcomplete(ui, cmd='', **opts):
2165 2165 """returns the completion list associated with the given command"""
2166 2166
2167 2167 if opts.get('options'):
2168 2168 options = []
2169 2169 otables = [globalopts]
2170 2170 if cmd:
2171 2171 aliases, entry = cmdutil.findcmd(cmd, table, False)
2172 2172 otables.append(entry[1])
2173 2173 for t in otables:
2174 2174 for o in t:
2175 2175 if "(DEPRECATED)" in o[3]:
2176 2176 continue
2177 2177 if o[0]:
2178 2178 options.append('-%s' % o[0])
2179 2179 options.append('--%s' % o[1])
2180 2180 ui.write("%s\n" % "\n".join(options))
2181 2181 return
2182 2182
2183 2183 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2184 2184 if ui.verbose:
2185 2185 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
2186 2186 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
2187 2187
2188 2188 @command('debugdag',
2189 2189 [('t', 'tags', None, _('use tags as labels')),
2190 2190 ('b', 'branches', None, _('annotate with branch names')),
2191 2191 ('', 'dots', None, _('use dots for runs')),
2192 2192 ('s', 'spaces', None, _('separate elements by spaces'))],
2193 2193 _('[OPTION]... [FILE [REV]...]'),
2194 2194 optionalrepo=True)
2195 2195 def debugdag(ui, repo, file_=None, *revs, **opts):
2196 2196 """format the changelog or an index DAG as a concise textual description
2197 2197
2198 2198 If you pass a revlog index, the revlog's DAG is emitted. If you list
2199 2199 revision numbers, they get labeled in the output as rN.
2200 2200
2201 2201 Otherwise, the changelog DAG of the current repo is emitted.
2202 2202 """
2203 2203 spaces = opts.get('spaces')
2204 2204 dots = opts.get('dots')
2205 2205 if file_:
2206 2206 rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
2207 2207 revs = set((int(r) for r in revs))
2208 2208 def events():
2209 2209 for r in rlog:
2210 2210 yield 'n', (r, list(p for p in rlog.parentrevs(r)
2211 2211 if p != -1))
2212 2212 if r in revs:
2213 2213 yield 'l', (r, "r%i" % r)
2214 2214 elif repo:
2215 2215 cl = repo.changelog
2216 2216 tags = opts.get('tags')
2217 2217 branches = opts.get('branches')
2218 2218 if tags:
2219 2219 labels = {}
2220 2220 for l, n in repo.tags().items():
2221 2221 labels.setdefault(cl.rev(n), []).append(l)
2222 2222 def events():
2223 2223 b = "default"
2224 2224 for r in cl:
2225 2225 if branches:
2226 2226 newb = cl.read(cl.node(r))[5]['branch']
2227 2227 if newb != b:
2228 2228 yield 'a', newb
2229 2229 b = newb
2230 2230 yield 'n', (r, list(p for p in cl.parentrevs(r)
2231 2231 if p != -1))
2232 2232 if tags:
2233 2233 ls = labels.get(r)
2234 2234 if ls:
2235 2235 for l in ls:
2236 2236 yield 'l', (r, l)
2237 2237 else:
2238 2238 raise error.Abort(_('need repo for changelog dag'))
2239 2239
2240 2240 for line in dagparser.dagtextlines(events(),
2241 2241 addspaces=spaces,
2242 2242 wraplabels=True,
2243 2243 wrapannotations=True,
2244 2244 wrapnonlinear=dots,
2245 2245 usedots=dots,
2246 2246 maxlinewidth=70):
2247 2247 ui.write(line)
2248 2248 ui.write("\n")
2249 2249
2250 2250 @command('debugdata', debugrevlogopts, _('-c|-m|FILE REV'))
2251 2251 def debugdata(ui, repo, file_, rev=None, **opts):
2252 2252 """dump the contents of a data file revision"""
2253 2253 if opts.get('changelog') or opts.get('manifest'):
2254 2254 file_, rev = None, file_
2255 2255 elif rev is None:
2256 2256 raise error.CommandError('debugdata', _('invalid arguments'))
2257 2257 r = cmdutil.openrevlog(repo, 'debugdata', file_, opts)
2258 2258 try:
2259 2259 ui.write(r.revision(r.lookup(rev)))
2260 2260 except KeyError:
2261 2261 raise error.Abort(_('invalid revision identifier %s') % rev)
2262 2262
2263 2263 @command('debugdate',
2264 2264 [('e', 'extended', None, _('try extended date formats'))],
2265 2265 _('[-e] DATE [RANGE]'),
2266 2266 norepo=True, optionalrepo=True)
2267 2267 def debugdate(ui, date, range=None, **opts):
2268 2268 """parse and display a date"""
2269 2269 if opts["extended"]:
2270 2270 d = util.parsedate(date, util.extendeddateformats)
2271 2271 else:
2272 2272 d = util.parsedate(date)
2273 2273 ui.write(("internal: %s %s\n") % d)
2274 2274 ui.write(("standard: %s\n") % util.datestr(d))
2275 2275 if range:
2276 2276 m = util.matchdate(range)
2277 2277 ui.write(("match: %s\n") % m(d[0]))
2278 2278
2279 2279 @command('debugdiscovery',
2280 2280 [('', 'old', None, _('use old-style discovery')),
2281 2281 ('', 'nonheads', None,
2282 2282 _('use old-style discovery with non-heads included')),
2283 2283 ] + remoteopts,
2284 2284 _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]'))
2285 2285 def debugdiscovery(ui, repo, remoteurl="default", **opts):
2286 2286 """runs the changeset discovery protocol in isolation"""
2287 2287 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl),
2288 2288 opts.get('branch'))
2289 2289 remote = hg.peer(repo, opts, remoteurl)
2290 2290 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
2291 2291
2292 2292 # make sure tests are repeatable
2293 2293 random.seed(12323)
2294 2294
2295 2295 def doit(localheads, remoteheads, remote=remote):
2296 2296 if opts.get('old'):
2297 2297 if localheads:
2298 2298 raise error.Abort('cannot use localheads with old style '
2299 2299 'discovery')
2300 2300 if not util.safehasattr(remote, 'branches'):
2301 2301 # enable in-client legacy support
2302 2302 remote = localrepo.locallegacypeer(remote.local())
2303 2303 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
2304 2304 force=True)
2305 2305 common = set(common)
2306 2306 if not opts.get('nonheads'):
2307 2307 ui.write(("unpruned common: %s\n") %
2308 2308 " ".join(sorted(short(n) for n in common)))
2309 2309 dag = dagutil.revlogdag(repo.changelog)
2310 2310 all = dag.ancestorset(dag.internalizeall(common))
2311 2311 common = dag.externalizeall(dag.headsetofconnecteds(all))
2312 2312 else:
2313 2313 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote)
2314 2314 common = set(common)
2315 2315 rheads = set(hds)
2316 2316 lheads = set(repo.heads())
2317 2317 ui.write(("common heads: %s\n") %
2318 2318 " ".join(sorted(short(n) for n in common)))
2319 2319 if lheads <= common:
2320 2320 ui.write(("local is subset\n"))
2321 2321 elif rheads <= common:
2322 2322 ui.write(("remote is subset\n"))
2323 2323
2324 2324 serverlogs = opts.get('serverlog')
2325 2325 if serverlogs:
2326 2326 for filename in serverlogs:
2327 2327 with open(filename, 'r') as logfile:
2328 2328 line = logfile.readline()
2329 2329 while line:
2330 2330 parts = line.strip().split(';')
2331 2331 op = parts[1]
2332 2332 if op == 'cg':
2333 2333 pass
2334 2334 elif op == 'cgss':
2335 2335 doit(parts[2].split(' '), parts[3].split(' '))
2336 2336 elif op == 'unb':
2337 2337 doit(parts[3].split(' '), parts[2].split(' '))
2338 2338 line = logfile.readline()
2339 2339 else:
2340 2340 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
2341 2341 opts.get('remote_head'))
2342 2342 localrevs = opts.get('local_head')
2343 2343 doit(localrevs, remoterevs)
2344 2344
2345 2345 @command('debugextensions', formatteropts, [], norepo=True)
2346 2346 def debugextensions(ui, **opts):
2347 2347 '''show information about active extensions'''
2348 2348 exts = extensions.extensions(ui)
2349 2349 fm = ui.formatter('debugextensions', opts)
2350 2350 for extname, extmod in sorted(exts, key=operator.itemgetter(0)):
2351 2351 extsource = extmod.__file__
2352 2352 exttestedwith = getattr(extmod, 'testedwith', None)
2353 2353 if exttestedwith is not None:
2354 2354 exttestedwith = exttestedwith.split()
2355 2355 extbuglink = getattr(extmod, 'buglink', None)
2356 2356
2357 2357 fm.startitem()
2358 2358
2359 2359 if ui.quiet or ui.verbose:
2360 2360 fm.write('name', '%s\n', extname)
2361 2361 else:
2362 2362 fm.write('name', '%s', extname)
2363 2363 if not exttestedwith:
2364 2364 fm.plain(_(' (untested!)\n'))
2365 2365 else:
2366 2366 if exttestedwith == ['internal'] or \
2367 2367 util.version() in exttestedwith:
2368 2368 fm.plain('\n')
2369 2369 else:
2370 2370 lasttestedversion = exttestedwith[-1]
2371 2371 fm.plain(' (%s!)\n' % lasttestedversion)
2372 2372
2373 2373 fm.condwrite(ui.verbose and extsource, 'source',
2374 2374 _(' location: %s\n'), extsource or "")
2375 2375
2376 2376 fm.condwrite(ui.verbose and exttestedwith, 'testedwith',
2377 2377 _(' tested with: %s\n'), ' '.join(exttestedwith or []))
2378 2378
2379 2379 fm.condwrite(ui.verbose and extbuglink, 'buglink',
2380 2380 _(' bug reporting: %s\n'), extbuglink or "")
2381 2381
2382 2382 fm.end()
2383 2383
2384 2384 @command('debugfileset',
2385 2385 [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))],
2386 2386 _('[-r REV] FILESPEC'))
2387 2387 def debugfileset(ui, repo, expr, **opts):
2388 2388 '''parse and apply a fileset specification'''
2389 2389 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
2390 2390 if ui.verbose:
2391 2391 tree = fileset.parse(expr)
2392 2392 ui.note(fileset.prettyformat(tree), "\n")
2393 2393
2394 2394 for f in ctx.getfileset(expr):
2395 2395 ui.write("%s\n" % f)
2396 2396
2397 2397 @command('debugfsinfo', [], _('[PATH]'), norepo=True)
2398 2398 def debugfsinfo(ui, path="."):
2399 2399 """show information detected about current filesystem"""
2400 2400 util.writefile('.debugfsinfo', '')
2401 2401 ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no'))
2402 2402 ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no'))
2403 2403 ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no'))
2404 2404 ui.write(('case-sensitive: %s\n') % (util.checkcase('.debugfsinfo')
2405 2405 and 'yes' or 'no'))
2406 2406 os.unlink('.debugfsinfo')
2407 2407
2408 2408 @command('debuggetbundle',
2409 2409 [('H', 'head', [], _('id of head node'), _('ID')),
2410 2410 ('C', 'common', [], _('id of common node'), _('ID')),
2411 2411 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
2412 2412 _('REPO FILE [-H|-C ID]...'),
2413 2413 norepo=True)
2414 2414 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
2415 2415 """retrieves a bundle from a repo
2416 2416
2417 2417 Every ID must be a full-length hex node id string. Saves the bundle to the
2418 2418 given file.
2419 2419 """
2420 2420 repo = hg.peer(ui, opts, repopath)
2421 2421 if not repo.capable('getbundle'):
2422 2422 raise error.Abort("getbundle() not supported by target repository")
2423 2423 args = {}
2424 2424 if common:
2425 2425 args['common'] = [bin(s) for s in common]
2426 2426 if head:
2427 2427 args['heads'] = [bin(s) for s in head]
2428 2428 # TODO: get desired bundlecaps from command line.
2429 2429 args['bundlecaps'] = None
2430 2430 bundle = repo.getbundle('debug', **args)
2431 2431
2432 2432 bundletype = opts.get('type', 'bzip2').lower()
2433 2433 btypes = {'none': 'HG10UN',
2434 2434 'bzip2': 'HG10BZ',
2435 2435 'gzip': 'HG10GZ',
2436 2436 'bundle2': 'HG20'}
2437 2437 bundletype = btypes.get(bundletype)
2438 2438 if bundletype not in changegroup.bundletypes:
2439 2439 raise error.Abort(_('unknown bundle type specified with --type'))
2440 2440 changegroup.writebundle(ui, bundle, bundlepath, bundletype)
2441 2441
2442 2442 @command('debugignore', [], '[FILE]')
2443 2443 def debugignore(ui, repo, *files, **opts):
2444 2444 """display the combined ignore pattern and information about ignored files
2445 2445
2446 2446 With no argument display the combined ignore pattern.
2447 2447
2448 2448 Given space separated file names, shows if the given file is ignored and
2449 2449 if so, show the ignore rule (file and line number) that matched it.
2450 2450 """
2451 2451 ignore = repo.dirstate._ignore
2452 2452 if not files:
2453 2453 # Show all the patterns
2454 2454 includepat = getattr(ignore, 'includepat', None)
2455 2455 if includepat is not None:
2456 2456 ui.write("%s\n" % includepat)
2457 2457 else:
2458 2458 raise error.Abort(_("no ignore patterns found"))
2459 2459 else:
2460 2460 for f in files:
2461 2461 ignored = None
2462 2462 ignoredata = None
2463 2463 if f != '.':
2464 2464 if ignore(f):
2465 2465 ignored = f
2466 2466 ignoredata = repo.dirstate._ignorefileandline(f)
2467 2467 else:
2468 2468 for p in util.finddirs(f):
2469 2469 if ignore(p):
2470 2470 ignored = p
2471 2471 ignoredata = repo.dirstate._ignorefileandline(p)
2472 2472 break
2473 2473 if ignored:
2474 2474 if ignored == f:
2475 2475 ui.write("%s is ignored\n" % f)
2476 2476 else:
2477 2477 ui.write("%s is ignored because of containing folder %s\n"
2478 2478 % (f, ignored))
2479 2479 ignorefile, lineno, line = ignoredata
2480 2480 ui.write("(ignore rule in %s, line %d: '%s')\n"
2481 2481 % (ignorefile, lineno, line))
2482 2482 else:
2483 2483 ui.write("%s is not ignored\n" % f)
2484 2484
2485 2485 @command('debugindex', debugrevlogopts +
2486 2486 [('f', 'format', 0, _('revlog format'), _('FORMAT'))],
2487 2487 _('[-f FORMAT] -c|-m|FILE'),
2488 2488 optionalrepo=True)
2489 2489 def debugindex(ui, repo, file_=None, **opts):
2490 2490 """dump the contents of an index file"""
2491 2491 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
2492 2492 format = opts.get('format', 0)
2493 2493 if format not in (0, 1):
2494 2494 raise error.Abort(_("unknown format %d") % format)
2495 2495
2496 2496 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2497 2497 if generaldelta:
2498 2498 basehdr = ' delta'
2499 2499 else:
2500 2500 basehdr = ' base'
2501 2501
2502 2502 if ui.debugflag:
2503 2503 shortfn = hex
2504 2504 else:
2505 2505 shortfn = short
2506 2506
2507 2507 # There might not be anything in r, so have a sane default
2508 2508 idlen = 12
2509 2509 for i in r:
2510 2510 idlen = len(shortfn(r.node(i)))
2511 2511 break
2512 2512
2513 2513 if format == 0:
2514 2514 ui.write(" rev offset length " + basehdr + " linkrev"
2515 2515 " %s %s p2\n" % ("nodeid".ljust(idlen), "p1".ljust(idlen)))
2516 2516 elif format == 1:
2517 2517 ui.write(" rev flag offset length"
2518 2518 " size " + basehdr + " link p1 p2"
2519 2519 " %s\n" % "nodeid".rjust(idlen))
2520 2520
2521 2521 for i in r:
2522 2522 node = r.node(i)
2523 2523 if generaldelta:
2524 2524 base = r.deltaparent(i)
2525 2525 else:
2526 2526 base = r.chainbase(i)
2527 2527 if format == 0:
2528 2528 try:
2529 2529 pp = r.parents(node)
2530 2530 except Exception:
2531 2531 pp = [nullid, nullid]
2532 2532 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
2533 2533 i, r.start(i), r.length(i), base, r.linkrev(i),
2534 2534 shortfn(node), shortfn(pp[0]), shortfn(pp[1])))
2535 2535 elif format == 1:
2536 2536 pr = r.parentrevs(i)
2537 2537 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
2538 2538 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
2539 2539 base, r.linkrev(i), pr[0], pr[1], shortfn(node)))
2540 2540
2541 2541 @command('debugindexdot', debugrevlogopts,
2542 2542 _('-c|-m|FILE'), optionalrepo=True)
2543 2543 def debugindexdot(ui, repo, file_=None, **opts):
2544 2544 """dump an index DAG as a graphviz dot file"""
2545 2545 r = cmdutil.openrevlog(repo, 'debugindexdot', file_, opts)
2546 2546 ui.write(("digraph G {\n"))
2547 2547 for i in r:
2548 2548 node = r.node(i)
2549 2549 pp = r.parents(node)
2550 2550 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
2551 2551 if pp[1] != nullid:
2552 2552 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
2553 2553 ui.write("}\n")
2554 2554
2555 2555 @command('debugdeltachain',
2556 2556 debugrevlogopts + formatteropts,
2557 2557 _('-c|-m|FILE'),
2558 2558 optionalrepo=True)
2559 2559 def debugdeltachain(ui, repo, file_=None, **opts):
2560 2560 """dump information about delta chains in a revlog
2561 2561
2562 2562 Output can be templatized. Available template keywords are:
2563 2563
2564 2564 rev revision number
2565 2565 chainid delta chain identifier (numbered by unique base)
2566 2566 chainlen delta chain length to this revision
2567 2567 prevrev previous revision in delta chain
2568 2568 deltatype role of delta / how it was computed
2569 2569 compsize compressed size of revision
2570 2570 uncompsize uncompressed size of revision
2571 2571 chainsize total size of compressed revisions in chain
2572 2572 chainratio total chain size divided by uncompressed revision size
2573 2573 (new delta chains typically start at ratio 2.00)
2574 2574 lindist linear distance from base revision in delta chain to end
2575 2575 of this revision
2576 2576 extradist total size of revisions not part of this delta chain from
2577 2577 base of delta chain to end of this revision; a measurement
2578 2578 of how much extra data we need to read/seek across to read
2579 2579 the delta chain for this revision
2580 2580 extraratio extradist divided by chainsize; another representation of
2581 2581 how much unrelated data is needed to load this delta chain
2582 2582 """
2583 2583 r = cmdutil.openrevlog(repo, 'debugdeltachain', file_, opts)
2584 2584 index = r.index
2585 2585 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2586 2586
2587 2587 def revinfo(rev):
2588 2588 e = index[rev]
2589 2589 compsize = e[1]
2590 2590 uncompsize = e[2]
2591 2591 chainsize = 0
2592 2592
2593 2593 if generaldelta:
2594 2594 if e[3] == e[5]:
2595 2595 deltatype = 'p1'
2596 2596 elif e[3] == e[6]:
2597 2597 deltatype = 'p2'
2598 2598 elif e[3] == rev - 1:
2599 2599 deltatype = 'prev'
2600 2600 elif e[3] == rev:
2601 2601 deltatype = 'base'
2602 2602 else:
2603 2603 deltatype = 'other'
2604 2604 else:
2605 2605 if e[3] == rev:
2606 2606 deltatype = 'base'
2607 2607 else:
2608 2608 deltatype = 'prev'
2609 2609
2610 2610 chain = r._deltachain(rev)[0]
2611 2611 for iterrev in chain:
2612 2612 e = index[iterrev]
2613 2613 chainsize += e[1]
2614 2614
2615 2615 return compsize, uncompsize, deltatype, chain, chainsize
2616 2616
2617 2617 fm = ui.formatter('debugdeltachain', opts)
2618 2618
2619 2619 fm.plain(' rev chain# chainlen prev delta '
2620 2620 'size rawsize chainsize ratio lindist extradist '
2621 2621 'extraratio\n')
2622 2622
2623 2623 chainbases = {}
2624 2624 for rev in r:
2625 2625 comp, uncomp, deltatype, chain, chainsize = revinfo(rev)
2626 2626 chainbase = chain[0]
2627 2627 chainid = chainbases.setdefault(chainbase, len(chainbases) + 1)
2628 2628 basestart = r.start(chainbase)
2629 2629 revstart = r.start(rev)
2630 2630 lineardist = revstart + comp - basestart
2631 2631 extradist = lineardist - chainsize
2632 2632 try:
2633 2633 prevrev = chain[-2]
2634 2634 except IndexError:
2635 2635 prevrev = -1
2636 2636
2637 2637 chainratio = float(chainsize) / float(uncomp)
2638 2638 extraratio = float(extradist) / float(chainsize)
2639 2639
2640 2640 fm.startitem()
2641 2641 fm.write('rev chainid chainlen prevrev deltatype compsize '
2642 2642 'uncompsize chainsize chainratio lindist extradist '
2643 2643 'extraratio',
2644 2644 '%7d %7d %8d %8d %7s %10d %10d %10d %9.5f %9d %9d %10.5f\n',
2645 2645 rev, chainid, len(chain), prevrev, deltatype, comp,
2646 2646 uncomp, chainsize, chainratio, lineardist, extradist,
2647 2647 extraratio,
2648 2648 rev=rev, chainid=chainid, chainlen=len(chain),
2649 2649 prevrev=prevrev, deltatype=deltatype, compsize=comp,
2650 2650 uncompsize=uncomp, chainsize=chainsize,
2651 2651 chainratio=chainratio, lindist=lineardist,
2652 2652 extradist=extradist, extraratio=extraratio)
2653 2653
2654 2654 fm.end()
2655 2655
2656 2656 @command('debuginstall', [], '', norepo=True)
2657 2657 def debuginstall(ui):
2658 2658 '''test Mercurial installation
2659 2659
2660 2660 Returns 0 on success.
2661 2661 '''
2662 2662
2663 2663 def writetemp(contents):
2664 2664 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
2665 2665 f = os.fdopen(fd, "wb")
2666 2666 f.write(contents)
2667 2667 f.close()
2668 2668 return name
2669 2669
2670 2670 problems = 0
2671 2671
2672 2672 # encoding
2673 2673 ui.status(_("checking encoding (%s)...\n") % encoding.encoding)
2674 2674 try:
2675 2675 encoding.fromlocal("test")
2676 2676 except error.Abort as inst:
2677 2677 ui.write(" %s\n" % inst)
2678 2678 ui.write(_(" (check that your locale is properly set)\n"))
2679 2679 problems += 1
2680 2680
2681 2681 # Python
2682 2682 ui.status(_("checking Python executable (%s)\n") % sys.executable)
2683 2683 ui.status(_("checking Python version (%s)\n")
2684 2684 % ("%s.%s.%s" % sys.version_info[:3]))
2685 2685 ui.status(_("checking Python lib (%s)...\n")
2686 2686 % os.path.dirname(os.__file__))
2687 2687
2688 2688 # compiled modules
2689 2689 ui.status(_("checking installed modules (%s)...\n")
2690 2690 % os.path.dirname(__file__))
2691 2691 try:
2692 2692 import bdiff, mpatch, base85, osutil
2693 2693 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
2694 2694 except Exception as inst:
2695 2695 ui.write(" %s\n" % inst)
2696 2696 ui.write(_(" One or more extensions could not be found"))
2697 2697 ui.write(_(" (check that you compiled the extensions)\n"))
2698 2698 problems += 1
2699 2699
2700 2700 # templates
2701 2701 import templater
2702 2702 p = templater.templatepaths()
2703 2703 ui.status(_("checking templates (%s)...\n") % ' '.join(p))
2704 2704 if p:
2705 2705 m = templater.templatepath("map-cmdline.default")
2706 2706 if m:
2707 2707 # template found, check if it is working
2708 2708 try:
2709 2709 templater.templater(m)
2710 2710 except Exception as inst:
2711 2711 ui.write(" %s\n" % inst)
2712 2712 p = None
2713 2713 else:
2714 2714 ui.write(_(" template 'default' not found\n"))
2715 2715 p = None
2716 2716 else:
2717 2717 ui.write(_(" no template directories found\n"))
2718 2718 if not p:
2719 2719 ui.write(_(" (templates seem to have been installed incorrectly)\n"))
2720 2720 problems += 1
2721 2721
2722 2722 # editor
2723 2723 ui.status(_("checking commit editor...\n"))
2724 2724 editor = ui.geteditor()
2725 2725 editor = util.expandpath(editor)
2726 2726 cmdpath = util.findexe(shlex.split(editor)[0])
2727 2727 if not cmdpath:
2728 2728 if editor == 'vi':
2729 2729 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
2730 2730 ui.write(_(" (specify a commit editor in your configuration"
2731 2731 " file)\n"))
2732 2732 else:
2733 2733 ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
2734 2734 ui.write(_(" (specify a commit editor in your configuration"
2735 2735 " file)\n"))
2736 2736 problems += 1
2737 2737
2738 2738 # check username
2739 2739 ui.status(_("checking username...\n"))
2740 2740 try:
2741 2741 ui.username()
2742 2742 except error.Abort as e:
2743 2743 ui.write(" %s\n" % e)
2744 2744 ui.write(_(" (specify a username in your configuration file)\n"))
2745 2745 problems += 1
2746 2746
2747 2747 if not problems:
2748 2748 ui.status(_("no problems detected\n"))
2749 2749 else:
2750 2750 ui.write(_("%s problems detected,"
2751 2751 " please check your install!\n") % problems)
2752 2752
2753 2753 return problems
2754 2754
2755 2755 @command('debugknown', [], _('REPO ID...'), norepo=True)
2756 2756 def debugknown(ui, repopath, *ids, **opts):
2757 2757 """test whether node ids are known to a repo
2758 2758
2759 2759 Every ID must be a full-length hex node id string. Returns a list of 0s
2760 2760 and 1s indicating unknown/known.
2761 2761 """
2762 2762 repo = hg.peer(ui, opts, repopath)
2763 2763 if not repo.capable('known'):
2764 2764 raise error.Abort("known() not supported by target repository")
2765 2765 flags = repo.known([bin(s) for s in ids])
2766 2766 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
2767 2767
2768 2768 @command('debuglabelcomplete', [], _('LABEL...'))
2769 2769 def debuglabelcomplete(ui, repo, *args):
2770 2770 '''backwards compatibility with old bash completion scripts (DEPRECATED)'''
2771 2771 debugnamecomplete(ui, repo, *args)
2772 2772
2773 2773 @command('debugmergestate', [], '')
2774 2774 def debugmergestate(ui, repo, *args):
2775 2775 """print merge state
2776 2776
2777 2777 Use --verbose to print out information about whether v1 or v2 merge state
2778 2778 was chosen."""
2779 2779 def _hashornull(h):
2780 2780 if h == nullhex:
2781 2781 return 'null'
2782 2782 else:
2783 2783 return h
2784 2784
2785 2785 def printrecords(version):
2786 2786 ui.write(('* version %s records\n') % version)
2787 2787 if version == 1:
2788 2788 records = v1records
2789 2789 else:
2790 2790 records = v2records
2791 2791
2792 2792 for rtype, record in records:
2793 2793 # pretty print some record types
2794 2794 if rtype == 'L':
2795 2795 ui.write(('local: %s\n') % record)
2796 2796 elif rtype == 'O':
2797 2797 ui.write(('other: %s\n') % record)
2798 2798 elif rtype == 'm':
2799 2799 driver, mdstate = record.split('\0', 1)
2800 2800 ui.write(('merge driver: %s (state "%s")\n')
2801 2801 % (driver, mdstate))
2802 2802 elif rtype in 'FDC':
2803 2803 r = record.split('\0')
2804 2804 f, state, hash, lfile, afile, anode, ofile = r[0:7]
2805 2805 if version == 1:
2806 2806 onode = 'not stored in v1 format'
2807 2807 flags = r[7]
2808 2808 else:
2809 2809 onode, flags = r[7:9]
2810 2810 ui.write(('file: %s (record type "%s", state "%s", hash %s)\n')
2811 2811 % (f, rtype, state, _hashornull(hash)))
2812 2812 ui.write((' local path: %s (flags "%s")\n') % (lfile, flags))
2813 2813 ui.write((' ancestor path: %s (node %s)\n')
2814 2814 % (afile, _hashornull(anode)))
2815 2815 ui.write((' other path: %s (node %s)\n')
2816 2816 % (ofile, _hashornull(onode)))
2817 2817 else:
2818 2818 ui.write(('unrecognized entry: %s\t%s\n')
2819 2819 % (rtype, record.replace('\0', '\t')))
2820 2820
2821 2821 # Avoid mergestate.read() since it may raise an exception for unsupported
2822 2822 # merge state records. We shouldn't be doing this, but this is OK since this
2823 2823 # command is pretty low-level.
2824 2824 ms = mergemod.mergestate(repo)
2825 2825
2826 2826 # sort so that reasonable information is on top
2827 2827 v1records = ms._readrecordsv1()
2828 2828 v2records = ms._readrecordsv2()
2829 2829 order = 'LOm'
2830 2830 def key(r):
2831 2831 idx = order.find(r[0])
2832 2832 if idx == -1:
2833 2833 return (1, r[1])
2834 2834 else:
2835 2835 return (0, idx)
2836 2836 v1records.sort(key=key)
2837 2837 v2records.sort(key=key)
2838 2838
2839 2839 if not v1records and not v2records:
2840 2840 ui.write(('no merge state found\n'))
2841 2841 elif not v2records:
2842 2842 ui.note(('no version 2 merge state\n'))
2843 2843 printrecords(1)
2844 2844 elif ms._v1v2match(v1records, v2records):
2845 2845 ui.note(('v1 and v2 states match: using v2\n'))
2846 2846 printrecords(2)
2847 2847 else:
2848 2848 ui.note(('v1 and v2 states mismatch: using v1\n'))
2849 2849 printrecords(1)
2850 2850 if ui.verbose:
2851 2851 printrecords(2)
2852 2852
2853 2853 @command('debugnamecomplete', [], _('NAME...'))
2854 2854 def debugnamecomplete(ui, repo, *args):
2855 2855 '''complete "names" - tags, open branch names, bookmark names'''
2856 2856
2857 2857 names = set()
2858 2858 # since we previously only listed open branches, we will handle that
2859 2859 # specially (after this for loop)
2860 2860 for name, ns in repo.names.iteritems():
2861 2861 if name != 'branches':
2862 2862 names.update(ns.listnames(repo))
2863 2863 names.update(tag for (tag, heads, tip, closed)
2864 2864 in repo.branchmap().iterbranches() if not closed)
2865 2865 completions = set()
2866 2866 if not args:
2867 2867 args = ['']
2868 2868 for a in args:
2869 2869 completions.update(n for n in names if n.startswith(a))
2870 2870 ui.write('\n'.join(sorted(completions)))
2871 2871 ui.write('\n')
2872 2872
2873 2873 @command('debuglocks',
2874 2874 [('L', 'force-lock', None, _('free the store lock (DANGEROUS)')),
2875 2875 ('W', 'force-wlock', None,
2876 2876 _('free the working state lock (DANGEROUS)'))],
2877 2877 _('[OPTION]...'))
2878 2878 def debuglocks(ui, repo, **opts):
2879 2879 """show or modify state of locks
2880 2880
2881 2881 By default, this command will show which locks are held. This
2882 2882 includes the user and process holding the lock, the amount of time
2883 2883 the lock has been held, and the machine name where the process is
2884 2884 running if it's not local.
2885 2885
2886 2886 Locks protect the integrity of Mercurial's data, so should be
2887 2887 treated with care. System crashes or other interruptions may cause
2888 2888 locks to not be properly released, though Mercurial will usually
2889 2889 detect and remove such stale locks automatically.
2890 2890
2891 2891 However, detecting stale locks may not always be possible (for
2892 2892 instance, on a shared filesystem). Removing locks may also be
2893 2893 blocked by filesystem permissions.
2894 2894
2895 2895 Returns 0 if no locks are held.
2896 2896
2897 2897 """
2898 2898
2899 2899 if opts.get('force_lock'):
2900 2900 repo.svfs.unlink('lock')
2901 2901 if opts.get('force_wlock'):
2902 2902 repo.vfs.unlink('wlock')
2903 2903 if opts.get('force_lock') or opts.get('force_lock'):
2904 2904 return 0
2905 2905
2906 2906 now = time.time()
2907 2907 held = 0
2908 2908
2909 2909 def report(vfs, name, method):
2910 2910 # this causes stale locks to get reaped for more accurate reporting
2911 2911 try:
2912 2912 l = method(False)
2913 2913 except error.LockHeld:
2914 2914 l = None
2915 2915
2916 2916 if l:
2917 2917 l.release()
2918 2918 else:
2919 2919 try:
2920 2920 stat = vfs.lstat(name)
2921 2921 age = now - stat.st_mtime
2922 2922 user = util.username(stat.st_uid)
2923 2923 locker = vfs.readlock(name)
2924 2924 if ":" in locker:
2925 2925 host, pid = locker.split(':')
2926 2926 if host == socket.gethostname():
2927 2927 locker = 'user %s, process %s' % (user, pid)
2928 2928 else:
2929 2929 locker = 'user %s, process %s, host %s' \
2930 2930 % (user, pid, host)
2931 2931 ui.write("%-6s %s (%ds)\n" % (name + ":", locker, age))
2932 2932 return 1
2933 2933 except OSError as e:
2934 2934 if e.errno != errno.ENOENT:
2935 2935 raise
2936 2936
2937 2937 ui.write("%-6s free\n" % (name + ":"))
2938 2938 return 0
2939 2939
2940 2940 held += report(repo.svfs, "lock", repo.lock)
2941 2941 held += report(repo.vfs, "wlock", repo.wlock)
2942 2942
2943 2943 return held
2944 2944
2945 2945 @command('debugobsolete',
2946 2946 [('', 'flags', 0, _('markers flag')),
2947 2947 ('', 'record-parents', False,
2948 2948 _('record parent information for the precursor')),
2949 2949 ('r', 'rev', [], _('display markers relevant to REV')),
2950 2950 ] + commitopts2,
2951 2951 _('[OBSOLETED [REPLACEMENT ...]]'))
2952 2952 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
2953 2953 """create arbitrary obsolete marker
2954 2954
2955 2955 With no arguments, displays the list of obsolescence markers."""
2956 2956
2957 2957 def parsenodeid(s):
2958 2958 try:
2959 2959 # We do not use revsingle/revrange functions here to accept
2960 2960 # arbitrary node identifiers, possibly not present in the
2961 2961 # local repository.
2962 2962 n = bin(s)
2963 2963 if len(n) != len(nullid):
2964 2964 raise TypeError()
2965 2965 return n
2966 2966 except TypeError:
2967 2967 raise error.Abort('changeset references must be full hexadecimal '
2968 2968 'node identifiers')
2969 2969
2970 2970 if precursor is not None:
2971 2971 if opts['rev']:
2972 2972 raise error.Abort('cannot select revision when creating marker')
2973 2973 metadata = {}
2974 2974 metadata['user'] = opts['user'] or ui.username()
2975 2975 succs = tuple(parsenodeid(succ) for succ in successors)
2976 2976 l = repo.lock()
2977 2977 try:
2978 2978 tr = repo.transaction('debugobsolete')
2979 2979 try:
2980 2980 date = opts.get('date')
2981 2981 if date:
2982 2982 date = util.parsedate(date)
2983 2983 else:
2984 2984 date = None
2985 2985 prec = parsenodeid(precursor)
2986 2986 parents = None
2987 2987 if opts['record_parents']:
2988 2988 if prec not in repo.unfiltered():
2989 2989 raise error.Abort('cannot used --record-parents on '
2990 2990 'unknown changesets')
2991 2991 parents = repo.unfiltered()[prec].parents()
2992 2992 parents = tuple(p.node() for p in parents)
2993 2993 repo.obsstore.create(tr, prec, succs, opts['flags'],
2994 2994 parents=parents, date=date,
2995 2995 metadata=metadata)
2996 2996 tr.close()
2997 2997 except ValueError as exc:
2998 2998 raise error.Abort(_('bad obsmarker input: %s') % exc)
2999 2999 finally:
3000 3000 tr.release()
3001 3001 finally:
3002 3002 l.release()
3003 3003 else:
3004 3004 if opts['rev']:
3005 3005 revs = scmutil.revrange(repo, opts['rev'])
3006 3006 nodes = [repo[r].node() for r in revs]
3007 3007 markers = list(obsolete.getmarkers(repo, nodes=nodes))
3008 3008 markers.sort(key=lambda x: x._data)
3009 3009 else:
3010 3010 markers = obsolete.getmarkers(repo)
3011 3011
3012 3012 for m in markers:
3013 3013 cmdutil.showmarker(ui, m)
3014 3014
3015 3015 @command('debugpathcomplete',
3016 3016 [('f', 'full', None, _('complete an entire path')),
3017 3017 ('n', 'normal', None, _('show only normal files')),
3018 3018 ('a', 'added', None, _('show only added files')),
3019 3019 ('r', 'removed', None, _('show only removed files'))],
3020 3020 _('FILESPEC...'))
3021 3021 def debugpathcomplete(ui, repo, *specs, **opts):
3022 3022 '''complete part or all of a tracked path
3023 3023
3024 3024 This command supports shells that offer path name completion. It
3025 3025 currently completes only files already known to the dirstate.
3026 3026
3027 3027 Completion extends only to the next path segment unless
3028 3028 --full is specified, in which case entire paths are used.'''
3029 3029
3030 3030 def complete(path, acceptable):
3031 3031 dirstate = repo.dirstate
3032 3032 spec = os.path.normpath(os.path.join(os.getcwd(), path))
3033 3033 rootdir = repo.root + os.sep
3034 3034 if spec != repo.root and not spec.startswith(rootdir):
3035 3035 return [], []
3036 3036 if os.path.isdir(spec):
3037 3037 spec += '/'
3038 3038 spec = spec[len(rootdir):]
3039 3039 fixpaths = os.sep != '/'
3040 3040 if fixpaths:
3041 3041 spec = spec.replace(os.sep, '/')
3042 3042 speclen = len(spec)
3043 3043 fullpaths = opts['full']
3044 3044 files, dirs = set(), set()
3045 3045 adddir, addfile = dirs.add, files.add
3046 3046 for f, st in dirstate.iteritems():
3047 3047 if f.startswith(spec) and st[0] in acceptable:
3048 3048 if fixpaths:
3049 3049 f = f.replace('/', os.sep)
3050 3050 if fullpaths:
3051 3051 addfile(f)
3052 3052 continue
3053 3053 s = f.find(os.sep, speclen)
3054 3054 if s >= 0:
3055 3055 adddir(f[:s])
3056 3056 else:
3057 3057 addfile(f)
3058 3058 return files, dirs
3059 3059
3060 3060 acceptable = ''
3061 3061 if opts['normal']:
3062 3062 acceptable += 'nm'
3063 3063 if opts['added']:
3064 3064 acceptable += 'a'
3065 3065 if opts['removed']:
3066 3066 acceptable += 'r'
3067 3067 cwd = repo.getcwd()
3068 3068 if not specs:
3069 3069 specs = ['.']
3070 3070
3071 3071 files, dirs = set(), set()
3072 3072 for spec in specs:
3073 3073 f, d = complete(spec, acceptable or 'nmar')
3074 3074 files.update(f)
3075 3075 dirs.update(d)
3076 3076 files.update(dirs)
3077 3077 ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
3078 3078 ui.write('\n')
3079 3079
3080 3080 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'), norepo=True)
3081 3081 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
3082 3082 '''access the pushkey key/value protocol
3083 3083
3084 3084 With two args, list the keys in the given namespace.
3085 3085
3086 3086 With five args, set a key to new if it currently is set to old.
3087 3087 Reports success or failure.
3088 3088 '''
3089 3089
3090 3090 target = hg.peer(ui, {}, repopath)
3091 3091 if keyinfo:
3092 3092 key, old, new = keyinfo
3093 3093 r = target.pushkey(namespace, key, old, new)
3094 3094 ui.status(str(r) + '\n')
3095 3095 return not r
3096 3096 else:
3097 3097 for k, v in sorted(target.listkeys(namespace).iteritems()):
3098 3098 ui.write("%s\t%s\n" % (k.encode('string-escape'),
3099 3099 v.encode('string-escape')))
3100 3100
3101 3101 @command('debugpvec', [], _('A B'))
3102 3102 def debugpvec(ui, repo, a, b=None):
3103 3103 ca = scmutil.revsingle(repo, a)
3104 3104 cb = scmutil.revsingle(repo, b)
3105 3105 pa = pvec.ctxpvec(ca)
3106 3106 pb = pvec.ctxpvec(cb)
3107 3107 if pa == pb:
3108 3108 rel = "="
3109 3109 elif pa > pb:
3110 3110 rel = ">"
3111 3111 elif pa < pb:
3112 3112 rel = "<"
3113 3113 elif pa | pb:
3114 3114 rel = "|"
3115 3115 ui.write(_("a: %s\n") % pa)
3116 3116 ui.write(_("b: %s\n") % pb)
3117 3117 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
3118 3118 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
3119 3119 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
3120 3120 pa.distance(pb), rel))
3121 3121
3122 3122 @command('debugrebuilddirstate|debugrebuildstate',
3123 3123 [('r', 'rev', '', _('revision to rebuild to'), _('REV')),
3124 3124 ('', 'minimal', None, _('only rebuild files that are inconsistent with '
3125 3125 'the working copy parent')),
3126 3126 ],
3127 3127 _('[-r REV]'))
3128 3128 def debugrebuilddirstate(ui, repo, rev, **opts):
3129 3129 """rebuild the dirstate as it would look like for the given revision
3130 3130
3131 3131 If no revision is specified the first current parent will be used.
3132 3132
3133 3133 The dirstate will be set to the files of the given revision.
3134 3134 The actual working directory content or existing dirstate
3135 3135 information such as adds or removes is not considered.
3136 3136
3137 3137 ``minimal`` will only rebuild the dirstate status for files that claim to be
3138 3138 tracked but are not in the parent manifest, or that exist in the parent
3139 3139 manifest but are not in the dirstate. It will not change adds, removes, or
3140 3140 modified files that are in the working copy parent.
3141 3141
3142 3142 One use of this command is to make the next :hg:`status` invocation
3143 3143 check the actual file content.
3144 3144 """
3145 3145 ctx = scmutil.revsingle(repo, rev)
3146 3146 with repo.wlock():
3147 3147 dirstate = repo.dirstate
3148 3148 changedfiles = None
3149 3149 # See command doc for what minimal does.
3150 3150 if opts.get('minimal'):
3151 3151 manifestfiles = set(ctx.manifest().keys())
3152 3152 dirstatefiles = set(dirstate)
3153 3153 manifestonly = manifestfiles - dirstatefiles
3154 3154 dsonly = dirstatefiles - manifestfiles
3155 3155 dsnotadded = set(f for f in dsonly if dirstate[f] != 'a')
3156 3156 changedfiles = manifestonly | dsnotadded
3157 3157
3158 3158 dirstate.rebuild(ctx.node(), ctx.manifest(), changedfiles)
3159 3159
3160 3160 @command('debugrebuildfncache', [], '')
3161 3161 def debugrebuildfncache(ui, repo):
3162 3162 """rebuild the fncache file"""
3163 3163 repair.rebuildfncache(ui, repo)
3164 3164
3165 3165 @command('debugrename',
3166 3166 [('r', 'rev', '', _('revision to debug'), _('REV'))],
3167 3167 _('[-r REV] FILE'))
3168 3168 def debugrename(ui, repo, file1, *pats, **opts):
3169 3169 """dump rename information"""
3170 3170
3171 3171 ctx = scmutil.revsingle(repo, opts.get('rev'))
3172 3172 m = scmutil.match(ctx, (file1,) + pats, opts)
3173 3173 for abs in ctx.walk(m):
3174 3174 fctx = ctx[abs]
3175 3175 o = fctx.filelog().renamed(fctx.filenode())
3176 3176 rel = m.rel(abs)
3177 3177 if o:
3178 3178 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
3179 3179 else:
3180 3180 ui.write(_("%s not renamed\n") % rel)
3181 3181
3182 3182 @command('debugrevlog', debugrevlogopts +
3183 3183 [('d', 'dump', False, _('dump index data'))],
3184 3184 _('-c|-m|FILE'),
3185 3185 optionalrepo=True)
3186 3186 def debugrevlog(ui, repo, file_=None, **opts):
3187 3187 """show data and statistics about a revlog"""
3188 3188 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
3189 3189
3190 3190 if opts.get("dump"):
3191 3191 numrevs = len(r)
3192 3192 ui.write("# rev p1rev p2rev start end deltastart base p1 p2"
3193 3193 " rawsize totalsize compression heads chainlen\n")
3194 3194 ts = 0
3195 3195 heads = set()
3196 3196
3197 3197 for rev in xrange(numrevs):
3198 3198 dbase = r.deltaparent(rev)
3199 3199 if dbase == -1:
3200 3200 dbase = rev
3201 3201 cbase = r.chainbase(rev)
3202 3202 clen = r.chainlen(rev)
3203 3203 p1, p2 = r.parentrevs(rev)
3204 3204 rs = r.rawsize(rev)
3205 3205 ts = ts + rs
3206 3206 heads -= set(r.parentrevs(rev))
3207 3207 heads.add(rev)
3208 3208 ui.write("%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d "
3209 3209 "%11d %5d %8d\n" %
3210 3210 (rev, p1, p2, r.start(rev), r.end(rev),
3211 3211 r.start(dbase), r.start(cbase),
3212 3212 r.start(p1), r.start(p2),
3213 3213 rs, ts, ts / r.end(rev), len(heads), clen))
3214 3214 return 0
3215 3215
3216 3216 v = r.version
3217 3217 format = v & 0xFFFF
3218 3218 flags = []
3219 3219 gdelta = False
3220 3220 if v & revlog.REVLOGNGINLINEDATA:
3221 3221 flags.append('inline')
3222 3222 if v & revlog.REVLOGGENERALDELTA:
3223 3223 gdelta = True
3224 3224 flags.append('generaldelta')
3225 3225 if not flags:
3226 3226 flags = ['(none)']
3227 3227
3228 3228 nummerges = 0
3229 3229 numfull = 0
3230 3230 numprev = 0
3231 3231 nump1 = 0
3232 3232 nump2 = 0
3233 3233 numother = 0
3234 3234 nump1prev = 0
3235 3235 nump2prev = 0
3236 3236 chainlengths = []
3237 3237
3238 3238 datasize = [None, 0, 0L]
3239 3239 fullsize = [None, 0, 0L]
3240 3240 deltasize = [None, 0, 0L]
3241 3241
3242 3242 def addsize(size, l):
3243 3243 if l[0] is None or size < l[0]:
3244 3244 l[0] = size
3245 3245 if size > l[1]:
3246 3246 l[1] = size
3247 3247 l[2] += size
3248 3248
3249 3249 numrevs = len(r)
3250 3250 for rev in xrange(numrevs):
3251 3251 p1, p2 = r.parentrevs(rev)
3252 3252 delta = r.deltaparent(rev)
3253 3253 if format > 0:
3254 3254 addsize(r.rawsize(rev), datasize)
3255 3255 if p2 != nullrev:
3256 3256 nummerges += 1
3257 3257 size = r.length(rev)
3258 3258 if delta == nullrev:
3259 3259 chainlengths.append(0)
3260 3260 numfull += 1
3261 3261 addsize(size, fullsize)
3262 3262 else:
3263 3263 chainlengths.append(chainlengths[delta] + 1)
3264 3264 addsize(size, deltasize)
3265 3265 if delta == rev - 1:
3266 3266 numprev += 1
3267 3267 if delta == p1:
3268 3268 nump1prev += 1
3269 3269 elif delta == p2:
3270 3270 nump2prev += 1
3271 3271 elif delta == p1:
3272 3272 nump1 += 1
3273 3273 elif delta == p2:
3274 3274 nump2 += 1
3275 3275 elif delta != nullrev:
3276 3276 numother += 1
3277 3277
3278 3278 # Adjust size min value for empty cases
3279 3279 for size in (datasize, fullsize, deltasize):
3280 3280 if size[0] is None:
3281 3281 size[0] = 0
3282 3282
3283 3283 numdeltas = numrevs - numfull
3284 3284 numoprev = numprev - nump1prev - nump2prev
3285 3285 totalrawsize = datasize[2]
3286 3286 datasize[2] /= numrevs
3287 3287 fulltotal = fullsize[2]
3288 3288 fullsize[2] /= numfull
3289 3289 deltatotal = deltasize[2]
3290 3290 if numrevs - numfull > 0:
3291 3291 deltasize[2] /= numrevs - numfull
3292 3292 totalsize = fulltotal + deltatotal
3293 3293 avgchainlen = sum(chainlengths) / numrevs
3294 3294 maxchainlen = max(chainlengths)
3295 3295 compratio = 1
3296 3296 if totalsize:
3297 3297 compratio = totalrawsize / totalsize
3298 3298
3299 3299 basedfmtstr = '%%%dd\n'
3300 3300 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
3301 3301
3302 3302 def dfmtstr(max):
3303 3303 return basedfmtstr % len(str(max))
3304 3304 def pcfmtstr(max, padding=0):
3305 3305 return basepcfmtstr % (len(str(max)), ' ' * padding)
3306 3306
3307 3307 def pcfmt(value, total):
3308 3308 if total:
3309 3309 return (value, 100 * float(value) / total)
3310 3310 else:
3311 3311 return value, 100.0
3312 3312
3313 3313 ui.write(('format : %d\n') % format)
3314 3314 ui.write(('flags : %s\n') % ', '.join(flags))
3315 3315
3316 3316 ui.write('\n')
3317 3317 fmt = pcfmtstr(totalsize)
3318 3318 fmt2 = dfmtstr(totalsize)
3319 3319 ui.write(('revisions : ') + fmt2 % numrevs)
3320 3320 ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
3321 3321 ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
3322 3322 ui.write(('revisions : ') + fmt2 % numrevs)
3323 3323 ui.write((' full : ') + fmt % pcfmt(numfull, numrevs))
3324 3324 ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
3325 3325 ui.write(('revision size : ') + fmt2 % totalsize)
3326 3326 ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize))
3327 3327 ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
3328 3328
3329 3329 ui.write('\n')
3330 3330 fmt = dfmtstr(max(avgchainlen, compratio))
3331 3331 ui.write(('avg chain length : ') + fmt % avgchainlen)
3332 3332 ui.write(('max chain length : ') + fmt % maxchainlen)
3333 3333 ui.write(('compression ratio : ') + fmt % compratio)
3334 3334
3335 3335 if format > 0:
3336 3336 ui.write('\n')
3337 3337 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
3338 3338 % tuple(datasize))
3339 3339 ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
3340 3340 % tuple(fullsize))
3341 3341 ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
3342 3342 % tuple(deltasize))
3343 3343
3344 3344 if numdeltas > 0:
3345 3345 ui.write('\n')
3346 3346 fmt = pcfmtstr(numdeltas)
3347 3347 fmt2 = pcfmtstr(numdeltas, 4)
3348 3348 ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
3349 3349 if numprev > 0:
3350 3350 ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
3351 3351 numprev))
3352 3352 ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
3353 3353 numprev))
3354 3354 ui.write((' other : ') + fmt2 % pcfmt(numoprev,
3355 3355 numprev))
3356 3356 if gdelta:
3357 3357 ui.write(('deltas against p1 : ')
3358 3358 + fmt % pcfmt(nump1, numdeltas))
3359 3359 ui.write(('deltas against p2 : ')
3360 3360 + fmt % pcfmt(nump2, numdeltas))
3361 3361 ui.write(('deltas against other : ') + fmt % pcfmt(numother,
3362 3362 numdeltas))
3363 3363
3364 3364 @command('debugrevspec',
3365 3365 [('', 'optimize', None, _('print parsed tree after optimizing'))],
3366 3366 ('REVSPEC'))
3367 3367 def debugrevspec(ui, repo, expr, **opts):
3368 3368 """parse and apply a revision specification
3369 3369
3370 3370 Use --verbose to print the parsed tree before and after aliases
3371 3371 expansion.
3372 3372 """
3373 3373 if ui.verbose:
3374 3374 tree = revset.parse(expr, lookup=repo.__contains__)
3375 3375 ui.note(revset.prettyformat(tree), "\n")
3376 3376 newtree = revset.findaliases(ui, tree)
3377 3377 if newtree != tree:
3378 3378 ui.note(revset.prettyformat(newtree), "\n")
3379 3379 tree = newtree
3380 3380 newtree = revset.foldconcat(tree)
3381 3381 if newtree != tree:
3382 3382 ui.note(revset.prettyformat(newtree), "\n")
3383 3383 if opts["optimize"]:
3384 3384 weight, optimizedtree = revset.optimize(newtree, True)
3385 3385 ui.note("* optimized:\n", revset.prettyformat(optimizedtree), "\n")
3386 3386 func = revset.match(ui, expr, repo)
3387 3387 revs = func(repo)
3388 3388 if ui.verbose:
3389 3389 ui.note("* set:\n", revset.prettyformatset(revs), "\n")
3390 3390 for c in revs:
3391 3391 ui.write("%s\n" % c)
3392 3392
3393 3393 @command('debugsetparents', [], _('REV1 [REV2]'))
3394 3394 def debugsetparents(ui, repo, rev1, rev2=None):
3395 3395 """manually set the parents of the current working directory
3396 3396
3397 3397 This is useful for writing repository conversion tools, but should
3398 3398 be used with care. For example, neither the working directory nor the
3399 3399 dirstate is updated, so file status may be incorrect after running this
3400 3400 command.
3401 3401
3402 3402 Returns 0 on success.
3403 3403 """
3404 3404
3405 3405 r1 = scmutil.revsingle(repo, rev1).node()
3406 3406 r2 = scmutil.revsingle(repo, rev2, 'null').node()
3407 3407
3408 3408 with repo.wlock():
3409 3409 repo.dirstate.beginparentchange()
3410 3410 repo.setparents(r1, r2)
3411 3411 repo.dirstate.endparentchange()
3412 3412
3413 3413 @command('debugdirstate|debugstate',
3414 3414 [('', 'nodates', None, _('do not display the saved mtime')),
3415 3415 ('', 'datesort', None, _('sort by saved mtime'))],
3416 3416 _('[OPTION]...'))
3417 3417 def debugstate(ui, repo, **opts):
3418 3418 """show the contents of the current dirstate"""
3419 3419
3420 3420 nodates = opts.get('nodates')
3421 3421 datesort = opts.get('datesort')
3422 3422
3423 3423 timestr = ""
3424 3424 if datesort:
3425 3425 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
3426 3426 else:
3427 3427 keyfunc = None # sort by filename
3428 3428 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
3429 3429 if ent[3] == -1:
3430 3430 timestr = 'unset '
3431 3431 elif nodates:
3432 3432 timestr = 'set '
3433 3433 else:
3434 3434 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
3435 3435 time.localtime(ent[3]))
3436 3436 if ent[1] & 0o20000:
3437 3437 mode = 'lnk'
3438 3438 else:
3439 3439 mode = '%3o' % (ent[1] & 0o777 & ~util.umask)
3440 3440 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
3441 3441 for f in repo.dirstate.copies():
3442 3442 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
3443 3443
3444 3444 @command('debugsub',
3445 3445 [('r', 'rev', '',
3446 3446 _('revision to check'), _('REV'))],
3447 3447 _('[-r REV] [REV]'))
3448 3448 def debugsub(ui, repo, rev=None):
3449 3449 ctx = scmutil.revsingle(repo, rev, None)
3450 3450 for k, v in sorted(ctx.substate.items()):
3451 3451 ui.write(('path %s\n') % k)
3452 3452 ui.write((' source %s\n') % v[0])
3453 3453 ui.write((' revision %s\n') % v[1])
3454 3454
3455 3455 @command('debugsuccessorssets',
3456 3456 [],
3457 3457 _('[REV]'))
3458 3458 def debugsuccessorssets(ui, repo, *revs):
3459 3459 """show set of successors for revision
3460 3460
3461 3461 A successors set of changeset A is a consistent group of revisions that
3462 3462 succeed A. It contains non-obsolete changesets only.
3463 3463
3464 3464 In most cases a changeset A has a single successors set containing a single
3465 3465 successor (changeset A replaced by A').
3466 3466
3467 3467 A changeset that is made obsolete with no successors are called "pruned".
3468 3468 Such changesets have no successors sets at all.
3469 3469
3470 3470 A changeset that has been "split" will have a successors set containing
3471 3471 more than one successor.
3472 3472
3473 3473 A changeset that has been rewritten in multiple different ways is called
3474 3474 "divergent". Such changesets have multiple successor sets (each of which
3475 3475 may also be split, i.e. have multiple successors).
3476 3476
3477 3477 Results are displayed as follows::
3478 3478
3479 3479 <rev1>
3480 3480 <successors-1A>
3481 3481 <rev2>
3482 3482 <successors-2A>
3483 3483 <successors-2B1> <successors-2B2> <successors-2B3>
3484 3484
3485 3485 Here rev2 has two possible (i.e. divergent) successors sets. The first
3486 3486 holds one element, whereas the second holds three (i.e. the changeset has
3487 3487 been split).
3488 3488 """
3489 3489 # passed to successorssets caching computation from one call to another
3490 3490 cache = {}
3491 3491 ctx2str = str
3492 3492 node2str = short
3493 3493 if ui.debug():
3494 3494 def ctx2str(ctx):
3495 3495 return ctx.hex()
3496 3496 node2str = hex
3497 3497 for rev in scmutil.revrange(repo, revs):
3498 3498 ctx = repo[rev]
3499 3499 ui.write('%s\n'% ctx2str(ctx))
3500 3500 for succsset in obsolete.successorssets(repo, ctx.node(), cache):
3501 3501 if succsset:
3502 3502 ui.write(' ')
3503 3503 ui.write(node2str(succsset[0]))
3504 3504 for node in succsset[1:]:
3505 3505 ui.write(' ')
3506 3506 ui.write(node2str(node))
3507 3507 ui.write('\n')
3508 3508
3509 3509 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'), inferrepo=True)
3510 3510 def debugwalk(ui, repo, *pats, **opts):
3511 3511 """show how files match on given patterns"""
3512 3512 m = scmutil.match(repo[None], pats, opts)
3513 3513 items = list(repo.walk(m))
3514 3514 if not items:
3515 3515 return
3516 3516 f = lambda fn: fn
3517 3517 if ui.configbool('ui', 'slash') and os.sep != '/':
3518 3518 f = lambda fn: util.normpath(fn)
3519 3519 fmt = 'f %%-%ds %%-%ds %%s' % (
3520 3520 max([len(abs) for abs in items]),
3521 3521 max([len(m.rel(abs)) for abs in items]))
3522 3522 for abs in items:
3523 3523 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
3524 3524 ui.write("%s\n" % line.rstrip())
3525 3525
3526 3526 @command('debugwireargs',
3527 3527 [('', 'three', '', 'three'),
3528 3528 ('', 'four', '', 'four'),
3529 3529 ('', 'five', '', 'five'),
3530 3530 ] + remoteopts,
3531 3531 _('REPO [OPTIONS]... [ONE [TWO]]'),
3532 3532 norepo=True)
3533 3533 def debugwireargs(ui, repopath, *vals, **opts):
3534 3534 repo = hg.peer(ui, opts, repopath)
3535 3535 for opt in remoteopts:
3536 3536 del opts[opt[1]]
3537 3537 args = {}
3538 3538 for k, v in opts.iteritems():
3539 3539 if v:
3540 3540 args[k] = v
3541 3541 # run twice to check that we don't mess up the stream for the next command
3542 3542 res1 = repo.debugwireargs(*vals, **args)
3543 3543 res2 = repo.debugwireargs(*vals, **args)
3544 3544 ui.write("%s\n" % res1)
3545 3545 if res1 != res2:
3546 3546 ui.warn("%s\n" % res2)
3547 3547
3548 3548 @command('^diff',
3549 3549 [('r', 'rev', [], _('revision'), _('REV')),
3550 3550 ('c', 'change', '', _('change made by revision'), _('REV'))
3551 3551 ] + diffopts + diffopts2 + walkopts + subrepoopts,
3552 3552 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
3553 3553 inferrepo=True)
3554 3554 def diff(ui, repo, *pats, **opts):
3555 3555 """diff repository (or selected files)
3556 3556
3557 3557 Show differences between revisions for the specified files.
3558 3558
3559 3559 Differences between files are shown using the unified diff format.
3560 3560
3561 3561 .. note::
3562 3562
3563 3563 :hg:`diff` may generate unexpected results for merges, as it will
3564 3564 default to comparing against the working directory's first
3565 3565 parent changeset if no revisions are specified.
3566 3566
3567 3567 When two revision arguments are given, then changes are shown
3568 3568 between those revisions. If only one revision is specified then
3569 3569 that revision is compared to the working directory, and, when no
3570 3570 revisions are specified, the working directory files are compared
3571 3571 to its first parent.
3572 3572
3573 3573 Alternatively you can specify -c/--change with a revision to see
3574 3574 the changes in that changeset relative to its first parent.
3575 3575
3576 3576 Without the -a/--text option, diff will avoid generating diffs of
3577 3577 files it detects as binary. With -a, diff will generate a diff
3578 3578 anyway, probably with undesirable results.
3579 3579
3580 3580 Use the -g/--git option to generate diffs in the git extended diff
3581 3581 format. For more information, read :hg:`help diffs`.
3582 3582
3583 3583 .. container:: verbose
3584 3584
3585 3585 Examples:
3586 3586
3587 3587 - compare a file in the current working directory to its parent::
3588 3588
3589 3589 hg diff foo.c
3590 3590
3591 3591 - compare two historical versions of a directory, with rename info::
3592 3592
3593 3593 hg diff --git -r 1.0:1.2 lib/
3594 3594
3595 3595 - get change stats relative to the last change on some date::
3596 3596
3597 3597 hg diff --stat -r "date('may 2')"
3598 3598
3599 3599 - diff all newly-added files that contain a keyword::
3600 3600
3601 3601 hg diff "set:added() and grep(GNU)"
3602 3602
3603 3603 - compare a revision and its parents::
3604 3604
3605 3605 hg diff -c 9353 # compare against first parent
3606 3606 hg diff -r 9353^:9353 # same using revset syntax
3607 3607 hg diff -r 9353^2:9353 # compare against the second parent
3608 3608
3609 3609 Returns 0 on success.
3610 3610 """
3611 3611
3612 3612 revs = opts.get('rev')
3613 3613 change = opts.get('change')
3614 3614 stat = opts.get('stat')
3615 3615 reverse = opts.get('reverse')
3616 3616
3617 3617 if revs and change:
3618 3618 msg = _('cannot specify --rev and --change at the same time')
3619 3619 raise error.Abort(msg)
3620 3620 elif change:
3621 3621 node2 = scmutil.revsingle(repo, change, None).node()
3622 3622 node1 = repo[node2].p1().node()
3623 3623 else:
3624 3624 node1, node2 = scmutil.revpair(repo, revs)
3625 3625
3626 3626 if reverse:
3627 3627 node1, node2 = node2, node1
3628 3628
3629 3629 diffopts = patch.diffallopts(ui, opts)
3630 3630 m = scmutil.match(repo[node2], pats, opts)
3631 3631 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
3632 3632 listsubrepos=opts.get('subrepos'),
3633 3633 root=opts.get('root'))
3634 3634
3635 3635 @command('^export',
3636 3636 [('o', 'output', '',
3637 3637 _('print output to file with formatted name'), _('FORMAT')),
3638 3638 ('', 'switch-parent', None, _('diff against the second parent')),
3639 3639 ('r', 'rev', [], _('revisions to export'), _('REV')),
3640 3640 ] + diffopts,
3641 3641 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
3642 3642 def export(ui, repo, *changesets, **opts):
3643 3643 """dump the header and diffs for one or more changesets
3644 3644
3645 3645 Print the changeset header and diffs for one or more revisions.
3646 3646 If no revision is given, the parent of the working directory is used.
3647 3647
3648 3648 The information shown in the changeset header is: author, date,
3649 3649 branch name (if non-default), changeset hash, parent(s) and commit
3650 3650 comment.
3651 3651
3652 3652 .. note::
3653 3653
3654 3654 :hg:`export` may generate unexpected diff output for merge
3655 3655 changesets, as it will compare the merge changeset against its
3656 3656 first parent only.
3657 3657
3658 3658 Output may be to a file, in which case the name of the file is
3659 3659 given using a format string. The formatting rules are as follows:
3660 3660
3661 3661 :``%%``: literal "%" character
3662 3662 :``%H``: changeset hash (40 hexadecimal digits)
3663 3663 :``%N``: number of patches being generated
3664 3664 :``%R``: changeset revision number
3665 3665 :``%b``: basename of the exporting repository
3666 3666 :``%h``: short-form changeset hash (12 hexadecimal digits)
3667 3667 :``%m``: first line of the commit message (only alphanumeric characters)
3668 3668 :``%n``: zero-padded sequence number, starting at 1
3669 3669 :``%r``: zero-padded changeset revision number
3670 3670
3671 3671 Without the -a/--text option, export will avoid generating diffs
3672 3672 of files it detects as binary. With -a, export will generate a
3673 3673 diff anyway, probably with undesirable results.
3674 3674
3675 3675 Use the -g/--git option to generate diffs in the git extended diff
3676 3676 format. See :hg:`help diffs` for more information.
3677 3677
3678 3678 With the --switch-parent option, the diff will be against the
3679 3679 second parent. It can be useful to review a merge.
3680 3680
3681 3681 .. container:: verbose
3682 3682
3683 3683 Examples:
3684 3684
3685 3685 - use export and import to transplant a bugfix to the current
3686 3686 branch::
3687 3687
3688 3688 hg export -r 9353 | hg import -
3689 3689
3690 3690 - export all the changesets between two revisions to a file with
3691 3691 rename information::
3692 3692
3693 3693 hg export --git -r 123:150 > changes.txt
3694 3694
3695 3695 - split outgoing changes into a series of patches with
3696 3696 descriptive names::
3697 3697
3698 3698 hg export -r "outgoing()" -o "%n-%m.patch"
3699 3699
3700 3700 Returns 0 on success.
3701 3701 """
3702 3702 changesets += tuple(opts.get('rev', []))
3703 3703 if not changesets:
3704 3704 changesets = ['.']
3705 3705 revs = scmutil.revrange(repo, changesets)
3706 3706 if not revs:
3707 3707 raise error.Abort(_("export requires at least one changeset"))
3708 3708 if len(revs) > 1:
3709 3709 ui.note(_('exporting patches:\n'))
3710 3710 else:
3711 3711 ui.note(_('exporting patch:\n'))
3712 3712 cmdutil.export(repo, revs, template=opts.get('output'),
3713 3713 switch_parent=opts.get('switch_parent'),
3714 3714 opts=patch.diffallopts(ui, opts))
3715 3715
3716 3716 @command('files',
3717 3717 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3718 3718 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3719 3719 ] + walkopts + formatteropts + subrepoopts,
3720 3720 _('[OPTION]... [PATTERN]...'))
3721 3721 def files(ui, repo, *pats, **opts):
3722 3722 """list tracked files
3723 3723
3724 3724 Print files under Mercurial control in the working directory or
3725 3725 specified revision whose names match the given patterns (excluding
3726 3726 removed files).
3727 3727
3728 3728 If no patterns are given to match, this command prints the names
3729 3729 of all files under Mercurial control in the working directory.
3730 3730
3731 3731 .. container:: verbose
3732 3732
3733 3733 Examples:
3734 3734
3735 3735 - list all files under the current directory::
3736 3736
3737 3737 hg files .
3738 3738
3739 3739 - shows sizes and flags for current revision::
3740 3740
3741 3741 hg files -vr .
3742 3742
3743 3743 - list all files named README::
3744 3744
3745 3745 hg files -I "**/README"
3746 3746
3747 3747 - list all binary files::
3748 3748
3749 3749 hg files "set:binary()"
3750 3750
3751 3751 - find files containing a regular expression::
3752 3752
3753 3753 hg files "set:grep('bob')"
3754 3754
3755 3755 - search tracked file contents with xargs and grep::
3756 3756
3757 3757 hg files -0 | xargs -0 grep foo
3758 3758
3759 3759 See :hg:`help patterns` and :hg:`help filesets` for more information
3760 3760 on specifying file patterns.
3761 3761
3762 3762 Returns 0 if a match is found, 1 otherwise.
3763 3763
3764 3764 """
3765 3765 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3766 3766
3767 3767 end = '\n'
3768 3768 if opts.get('print0'):
3769 3769 end = '\0'
3770 3770 fm = ui.formatter('files', opts)
3771 3771 fmt = '%s' + end
3772 3772
3773 3773 m = scmutil.match(ctx, pats, opts)
3774 3774 ret = cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
3775 3775
3776 3776 fm.end()
3777 3777
3778 3778 return ret
3779 3779
3780 3780 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
3781 3781 def forget(ui, repo, *pats, **opts):
3782 3782 """forget the specified files on the next commit
3783 3783
3784 3784 Mark the specified files so they will no longer be tracked
3785 3785 after the next commit.
3786 3786
3787 3787 This only removes files from the current branch, not from the
3788 3788 entire project history, and it does not delete them from the
3789 3789 working directory.
3790 3790
3791 3791 To delete the file from the working directory, see :hg:`remove`.
3792 3792
3793 3793 To undo a forget before the next commit, see :hg:`add`.
3794 3794
3795 3795 .. container:: verbose
3796 3796
3797 3797 Examples:
3798 3798
3799 3799 - forget newly-added binary files::
3800 3800
3801 3801 hg forget "set:added() and binary()"
3802 3802
3803 3803 - forget files that would be excluded by .hgignore::
3804 3804
3805 3805 hg forget "set:hgignore()"
3806 3806
3807 3807 Returns 0 on success.
3808 3808 """
3809 3809
3810 3810 if not pats:
3811 3811 raise error.Abort(_('no files specified'))
3812 3812
3813 3813 m = scmutil.match(repo[None], pats, opts)
3814 3814 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
3815 3815 return rejected and 1 or 0
3816 3816
3817 3817 @command(
3818 3818 'graft',
3819 3819 [('r', 'rev', [], _('revisions to graft'), _('REV')),
3820 3820 ('c', 'continue', False, _('resume interrupted graft')),
3821 3821 ('e', 'edit', False, _('invoke editor on commit messages')),
3822 3822 ('', 'log', None, _('append graft info to log message')),
3823 3823 ('f', 'force', False, _('force graft')),
3824 3824 ('D', 'currentdate', False,
3825 3825 _('record the current date as commit date')),
3826 3826 ('U', 'currentuser', False,
3827 3827 _('record the current user as committer'), _('DATE'))]
3828 3828 + commitopts2 + mergetoolopts + dryrunopts,
3829 3829 _('[OPTION]... [-r REV]... REV...'))
3830 3830 def graft(ui, repo, *revs, **opts):
3831 3831 '''copy changes from other branches onto the current branch
3832 3832
3833 3833 This command uses Mercurial's merge logic to copy individual
3834 3834 changes from other branches without merging branches in the
3835 3835 history graph. This is sometimes known as 'backporting' or
3836 3836 'cherry-picking'. By default, graft will copy user, date, and
3837 3837 description from the source changesets.
3838 3838
3839 3839 Changesets that are ancestors of the current revision, that have
3840 3840 already been grafted, or that are merges will be skipped.
3841 3841
3842 3842 If --log is specified, log messages will have a comment appended
3843 3843 of the form::
3844 3844
3845 3845 (grafted from CHANGESETHASH)
3846 3846
3847 3847 If --force is specified, revisions will be grafted even if they
3848 3848 are already ancestors of or have been grafted to the destination.
3849 3849 This is useful when the revisions have since been backed out.
3850 3850
3851 3851 If a graft merge results in conflicts, the graft process is
3852 3852 interrupted so that the current merge can be manually resolved.
3853 3853 Once all conflicts are addressed, the graft process can be
3854 3854 continued with the -c/--continue option.
3855 3855
3856 3856 .. note::
3857 3857
3858 3858 The -c/--continue option does not reapply earlier options, except
3859 3859 for --force.
3860 3860
3861 3861 .. container:: verbose
3862 3862
3863 3863 Examples:
3864 3864
3865 3865 - copy a single change to the stable branch and edit its description::
3866 3866
3867 3867 hg update stable
3868 3868 hg graft --edit 9393
3869 3869
3870 3870 - graft a range of changesets with one exception, updating dates::
3871 3871
3872 3872 hg graft -D "2085::2093 and not 2091"
3873 3873
3874 3874 - continue a graft after resolving conflicts::
3875 3875
3876 3876 hg graft -c
3877 3877
3878 3878 - show the source of a grafted changeset::
3879 3879
3880 3880 hg log --debug -r .
3881 3881
3882 3882 - show revisions sorted by date::
3883 3883
3884 3884 hg log -r 'sort(all(), date)'
3885 3885
3886 3886 See :hg:`help revisions` and :hg:`help revsets` for more about
3887 3887 specifying revisions.
3888 3888
3889 3889 Returns 0 on successful completion.
3890 3890 '''
3891 3891 with repo.wlock():
3892 3892 return _dograft(ui, repo, *revs, **opts)
3893 3893
3894 3894 def _dograft(ui, repo, *revs, **opts):
3895 3895 if revs and opts['rev']:
3896 3896 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
3897 3897 'revision ordering!\n'))
3898 3898
3899 3899 revs = list(revs)
3900 3900 revs.extend(opts['rev'])
3901 3901
3902 3902 if not opts.get('user') and opts.get('currentuser'):
3903 3903 opts['user'] = ui.username()
3904 3904 if not opts.get('date') and opts.get('currentdate'):
3905 3905 opts['date'] = "%d %d" % util.makedate()
3906 3906
3907 3907 editor = cmdutil.getcommiteditor(editform='graft', **opts)
3908 3908
3909 3909 cont = False
3910 3910 if opts['continue']:
3911 3911 cont = True
3912 3912 if revs:
3913 3913 raise error.Abort(_("can't specify --continue and revisions"))
3914 3914 # read in unfinished revisions
3915 3915 try:
3916 3916 nodes = repo.vfs.read('graftstate').splitlines()
3917 3917 revs = [repo[node].rev() for node in nodes]
3918 3918 except IOError as inst:
3919 3919 if inst.errno != errno.ENOENT:
3920 3920 raise
3921 3921 raise error.Abort(_("no graft state found, can't continue"))
3922 3922 else:
3923 3923 cmdutil.checkunfinished(repo)
3924 3924 cmdutil.bailifchanged(repo)
3925 3925 if not revs:
3926 3926 raise error.Abort(_('no revisions specified'))
3927 3927 revs = scmutil.revrange(repo, revs)
3928 3928
3929 3929 skipped = set()
3930 3930 # check for merges
3931 3931 for rev in repo.revs('%ld and merge()', revs):
3932 3932 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
3933 3933 skipped.add(rev)
3934 3934 revs = [r for r in revs if r not in skipped]
3935 3935 if not revs:
3936 3936 return -1
3937 3937
3938 3938 # Don't check in the --continue case, in effect retaining --force across
3939 3939 # --continues. That's because without --force, any revisions we decided to
3940 3940 # skip would have been filtered out here, so they wouldn't have made their
3941 3941 # way to the graftstate. With --force, any revisions we would have otherwise
3942 3942 # skipped would not have been filtered out, and if they hadn't been applied
3943 3943 # already, they'd have been in the graftstate.
3944 3944 if not (cont or opts.get('force')):
3945 3945 # check for ancestors of dest branch
3946 3946 crev = repo['.'].rev()
3947 3947 ancestors = repo.changelog.ancestors([crev], inclusive=True)
3948 3948 # Cannot use x.remove(y) on smart set, this has to be a list.
3949 3949 # XXX make this lazy in the future
3950 3950 revs = list(revs)
3951 3951 # don't mutate while iterating, create a copy
3952 3952 for rev in list(revs):
3953 3953 if rev in ancestors:
3954 3954 ui.warn(_('skipping ancestor revision %d:%s\n') %
3955 3955 (rev, repo[rev]))
3956 3956 # XXX remove on list is slow
3957 3957 revs.remove(rev)
3958 3958 if not revs:
3959 3959 return -1
3960 3960
3961 3961 # analyze revs for earlier grafts
3962 3962 ids = {}
3963 3963 for ctx in repo.set("%ld", revs):
3964 3964 ids[ctx.hex()] = ctx.rev()
3965 3965 n = ctx.extra().get('source')
3966 3966 if n:
3967 3967 ids[n] = ctx.rev()
3968 3968
3969 3969 # check ancestors for earlier grafts
3970 3970 ui.debug('scanning for duplicate grafts\n')
3971 3971
3972 3972 for rev in repo.changelog.findmissingrevs(revs, [crev]):
3973 3973 ctx = repo[rev]
3974 3974 n = ctx.extra().get('source')
3975 3975 if n in ids:
3976 3976 try:
3977 3977 r = repo[n].rev()
3978 3978 except error.RepoLookupError:
3979 3979 r = None
3980 3980 if r in revs:
3981 3981 ui.warn(_('skipping revision %d:%s '
3982 3982 '(already grafted to %d:%s)\n')
3983 3983 % (r, repo[r], rev, ctx))
3984 3984 revs.remove(r)
3985 3985 elif ids[n] in revs:
3986 3986 if r is None:
3987 3987 ui.warn(_('skipping already grafted revision %d:%s '
3988 3988 '(%d:%s also has unknown origin %s)\n')
3989 3989 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
3990 3990 else:
3991 3991 ui.warn(_('skipping already grafted revision %d:%s '
3992 3992 '(%d:%s also has origin %d:%s)\n')
3993 3993 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
3994 3994 revs.remove(ids[n])
3995 3995 elif ctx.hex() in ids:
3996 3996 r = ids[ctx.hex()]
3997 3997 ui.warn(_('skipping already grafted revision %d:%s '
3998 3998 '(was grafted from %d:%s)\n') %
3999 3999 (r, repo[r], rev, ctx))
4000 4000 revs.remove(r)
4001 4001 if not revs:
4002 4002 return -1
4003 4003
4004 4004 for pos, ctx in enumerate(repo.set("%ld", revs)):
4005 4005 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
4006 4006 ctx.description().split('\n', 1)[0])
4007 4007 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
4008 4008 if names:
4009 4009 desc += ' (%s)' % ' '.join(names)
4010 4010 ui.status(_('grafting %s\n') % desc)
4011 4011 if opts.get('dry_run'):
4012 4012 continue
4013 4013
4014 4014 extra = ctx.extra().copy()
4015 4015 del extra['branch']
4016 4016 source = extra.get('source')
4017 4017 if source:
4018 4018 extra['intermediate-source'] = ctx.hex()
4019 4019 else:
4020 4020 extra['source'] = ctx.hex()
4021 4021 user = ctx.user()
4022 4022 if opts.get('user'):
4023 4023 user = opts['user']
4024 4024 date = ctx.date()
4025 4025 if opts.get('date'):
4026 4026 date = opts['date']
4027 4027 message = ctx.description()
4028 4028 if opts.get('log'):
4029 4029 message += '\n(grafted from %s)' % ctx.hex()
4030 4030
4031 4031 # we don't merge the first commit when continuing
4032 4032 if not cont:
4033 4033 # perform the graft merge with p1(rev) as 'ancestor'
4034 4034 try:
4035 4035 # ui.forcemerge is an internal variable, do not document
4036 4036 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4037 4037 'graft')
4038 4038 stats = mergemod.graft(repo, ctx, ctx.p1(),
4039 4039 ['local', 'graft'])
4040 4040 finally:
4041 4041 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
4042 4042 # report any conflicts
4043 4043 if stats and stats[3] > 0:
4044 4044 # write out state for --continue
4045 4045 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
4046 4046 repo.vfs.write('graftstate', ''.join(nodelines))
4047 4047 extra = ''
4048 4048 if opts.get('user'):
4049 4049 extra += ' --user %s' % opts['user']
4050 4050 if opts.get('date'):
4051 4051 extra += ' --date %s' % opts['date']
4052 4052 if opts.get('log'):
4053 4053 extra += ' --log'
4054 4054 hint=_('use hg resolve and hg graft --continue%s') % extra
4055 4055 raise error.Abort(
4056 4056 _("unresolved conflicts, can't continue"),
4057 4057 hint=hint)
4058 4058 else:
4059 4059 cont = False
4060 4060
4061 4061 # commit
4062 4062 node = repo.commit(text=message, user=user,
4063 4063 date=date, extra=extra, editor=editor)
4064 4064 if node is None:
4065 4065 ui.warn(
4066 4066 _('note: graft of %d:%s created no changes to commit\n') %
4067 4067 (ctx.rev(), ctx))
4068 4068
4069 4069 # remove state when we complete successfully
4070 4070 if not opts.get('dry_run'):
4071 4071 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
4072 4072
4073 4073 return 0
4074 4074
4075 4075 @command('grep',
4076 4076 [('0', 'print0', None, _('end fields with NUL')),
4077 4077 ('', 'all', None, _('print all revisions that match')),
4078 4078 ('a', 'text', None, _('treat all files as text')),
4079 4079 ('f', 'follow', None,
4080 4080 _('follow changeset history,'
4081 4081 ' or file history across copies and renames')),
4082 4082 ('i', 'ignore-case', None, _('ignore case when matching')),
4083 4083 ('l', 'files-with-matches', None,
4084 4084 _('print only filenames and revisions that match')),
4085 4085 ('n', 'line-number', None, _('print matching line numbers')),
4086 4086 ('r', 'rev', [],
4087 4087 _('only search files changed within revision range'), _('REV')),
4088 4088 ('u', 'user', None, _('list the author (long with -v)')),
4089 4089 ('d', 'date', None, _('list the date (short with -q)')),
4090 4090 ] + walkopts,
4091 4091 _('[OPTION]... PATTERN [FILE]...'),
4092 4092 inferrepo=True)
4093 4093 def grep(ui, repo, pattern, *pats, **opts):
4094 4094 """search for a pattern in specified files and revisions
4095 4095
4096 4096 Search revisions of files for a regular expression.
4097 4097
4098 4098 This command behaves differently than Unix grep. It only accepts
4099 4099 Python/Perl regexps. It searches repository history, not the
4100 4100 working directory. It always prints the revision number in which a
4101 4101 match appears.
4102 4102
4103 4103 By default, grep only prints output for the first revision of a
4104 4104 file in which it finds a match. To get it to print every revision
4105 4105 that contains a change in match status ("-" for a match that
4106 4106 becomes a non-match, or "+" for a non-match that becomes a match),
4107 4107 use the --all flag.
4108 4108
4109 4109 Returns 0 if a match is found, 1 otherwise.
4110 4110 """
4111 4111 reflags = re.M
4112 4112 if opts.get('ignore_case'):
4113 4113 reflags |= re.I
4114 4114 try:
4115 4115 regexp = util.re.compile(pattern, reflags)
4116 4116 except re.error as inst:
4117 4117 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
4118 4118 return 1
4119 4119 sep, eol = ':', '\n'
4120 4120 if opts.get('print0'):
4121 4121 sep = eol = '\0'
4122 4122
4123 4123 getfile = util.lrucachefunc(repo.file)
4124 4124
4125 4125 def matchlines(body):
4126 4126 begin = 0
4127 4127 linenum = 0
4128 4128 while begin < len(body):
4129 4129 match = regexp.search(body, begin)
4130 4130 if not match:
4131 4131 break
4132 4132 mstart, mend = match.span()
4133 4133 linenum += body.count('\n', begin, mstart) + 1
4134 4134 lstart = body.rfind('\n', begin, mstart) + 1 or begin
4135 4135 begin = body.find('\n', mend) + 1 or len(body) + 1
4136 4136 lend = begin - 1
4137 4137 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
4138 4138
4139 4139 class linestate(object):
4140 4140 def __init__(self, line, linenum, colstart, colend):
4141 4141 self.line = line
4142 4142 self.linenum = linenum
4143 4143 self.colstart = colstart
4144 4144 self.colend = colend
4145 4145
4146 4146 def __hash__(self):
4147 4147 return hash((self.linenum, self.line))
4148 4148
4149 4149 def __eq__(self, other):
4150 4150 return self.line == other.line
4151 4151
4152 4152 def __iter__(self):
4153 4153 yield (self.line[:self.colstart], '')
4154 4154 yield (self.line[self.colstart:self.colend], 'grep.match')
4155 4155 rest = self.line[self.colend:]
4156 4156 while rest != '':
4157 4157 match = regexp.search(rest)
4158 4158 if not match:
4159 4159 yield (rest, '')
4160 4160 break
4161 4161 mstart, mend = match.span()
4162 4162 yield (rest[:mstart], '')
4163 4163 yield (rest[mstart:mend], 'grep.match')
4164 4164 rest = rest[mend:]
4165 4165
4166 4166 matches = {}
4167 4167 copies = {}
4168 4168 def grepbody(fn, rev, body):
4169 4169 matches[rev].setdefault(fn, [])
4170 4170 m = matches[rev][fn]
4171 4171 for lnum, cstart, cend, line in matchlines(body):
4172 4172 s = linestate(line, lnum, cstart, cend)
4173 4173 m.append(s)
4174 4174
4175 4175 def difflinestates(a, b):
4176 4176 sm = difflib.SequenceMatcher(None, a, b)
4177 4177 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
4178 4178 if tag == 'insert':
4179 4179 for i in xrange(blo, bhi):
4180 4180 yield ('+', b[i])
4181 4181 elif tag == 'delete':
4182 4182 for i in xrange(alo, ahi):
4183 4183 yield ('-', a[i])
4184 4184 elif tag == 'replace':
4185 4185 for i in xrange(alo, ahi):
4186 4186 yield ('-', a[i])
4187 4187 for i in xrange(blo, bhi):
4188 4188 yield ('+', b[i])
4189 4189
4190 4190 def display(fn, ctx, pstates, states):
4191 4191 rev = ctx.rev()
4192 4192 if ui.quiet:
4193 4193 datefunc = util.shortdate
4194 4194 else:
4195 4195 datefunc = util.datestr
4196 4196 found = False
4197 4197 @util.cachefunc
4198 4198 def binary():
4199 4199 flog = getfile(fn)
4200 4200 return util.binary(flog.read(ctx.filenode(fn)))
4201 4201
4202 4202 if opts.get('all'):
4203 4203 iter = difflinestates(pstates, states)
4204 4204 else:
4205 4205 iter = [('', l) for l in states]
4206 4206 for change, l in iter:
4207 4207 cols = [(fn, 'grep.filename'), (str(rev), 'grep.rev')]
4208 4208
4209 4209 if opts.get('line_number'):
4210 4210 cols.append((str(l.linenum), 'grep.linenumber'))
4211 4211 if opts.get('all'):
4212 4212 cols.append((change, 'grep.change'))
4213 4213 if opts.get('user'):
4214 4214 cols.append((ui.shortuser(ctx.user()), 'grep.user'))
4215 4215 if opts.get('date'):
4216 4216 cols.append((datefunc(ctx.date()), 'grep.date'))
4217 4217 for col, label in cols[:-1]:
4218 4218 ui.write(col, label=label)
4219 4219 ui.write(sep, label='grep.sep')
4220 4220 ui.write(cols[-1][0], label=cols[-1][1])
4221 4221 if not opts.get('files_with_matches'):
4222 4222 ui.write(sep, label='grep.sep')
4223 4223 if not opts.get('text') and binary():
4224 4224 ui.write(" Binary file matches")
4225 4225 else:
4226 4226 for s, label in l:
4227 4227 ui.write(s, label=label)
4228 4228 ui.write(eol)
4229 4229 found = True
4230 4230 if opts.get('files_with_matches'):
4231 4231 break
4232 4232 return found
4233 4233
4234 4234 skip = {}
4235 4235 revfiles = {}
4236 4236 matchfn = scmutil.match(repo[None], pats, opts)
4237 4237 found = False
4238 4238 follow = opts.get('follow')
4239 4239
4240 4240 def prep(ctx, fns):
4241 4241 rev = ctx.rev()
4242 4242 pctx = ctx.p1()
4243 4243 parent = pctx.rev()
4244 4244 matches.setdefault(rev, {})
4245 4245 matches.setdefault(parent, {})
4246 4246 files = revfiles.setdefault(rev, [])
4247 4247 for fn in fns:
4248 4248 flog = getfile(fn)
4249 4249 try:
4250 4250 fnode = ctx.filenode(fn)
4251 4251 except error.LookupError:
4252 4252 continue
4253 4253
4254 4254 copied = flog.renamed(fnode)
4255 4255 copy = follow and copied and copied[0]
4256 4256 if copy:
4257 4257 copies.setdefault(rev, {})[fn] = copy
4258 4258 if fn in skip:
4259 4259 if copy:
4260 4260 skip[copy] = True
4261 4261 continue
4262 4262 files.append(fn)
4263 4263
4264 4264 if fn not in matches[rev]:
4265 4265 grepbody(fn, rev, flog.read(fnode))
4266 4266
4267 4267 pfn = copy or fn
4268 4268 if pfn not in matches[parent]:
4269 4269 try:
4270 4270 fnode = pctx.filenode(pfn)
4271 4271 grepbody(pfn, parent, flog.read(fnode))
4272 4272 except error.LookupError:
4273 4273 pass
4274 4274
4275 4275 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
4276 4276 rev = ctx.rev()
4277 4277 parent = ctx.p1().rev()
4278 4278 for fn in sorted(revfiles.get(rev, [])):
4279 4279 states = matches[rev][fn]
4280 4280 copy = copies.get(rev, {}).get(fn)
4281 4281 if fn in skip:
4282 4282 if copy:
4283 4283 skip[copy] = True
4284 4284 continue
4285 4285 pstates = matches.get(parent, {}).get(copy or fn, [])
4286 4286 if pstates or states:
4287 4287 r = display(fn, ctx, pstates, states)
4288 4288 found = found or r
4289 4289 if r and not opts.get('all'):
4290 4290 skip[fn] = True
4291 4291 if copy:
4292 4292 skip[copy] = True
4293 4293 del matches[rev]
4294 4294 del revfiles[rev]
4295 4295
4296 4296 return not found
4297 4297
4298 4298 @command('heads',
4299 4299 [('r', 'rev', '',
4300 4300 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
4301 4301 ('t', 'topo', False, _('show topological heads only')),
4302 4302 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
4303 4303 ('c', 'closed', False, _('show normal and closed branch heads')),
4304 4304 ] + templateopts,
4305 4305 _('[-ct] [-r STARTREV] [REV]...'))
4306 4306 def heads(ui, repo, *branchrevs, **opts):
4307 4307 """show branch heads
4308 4308
4309 4309 With no arguments, show all open branch heads in the repository.
4310 4310 Branch heads are changesets that have no descendants on the
4311 4311 same branch. They are where development generally takes place and
4312 4312 are the usual targets for update and merge operations.
4313 4313
4314 4314 If one or more REVs are given, only open branch heads on the
4315 4315 branches associated with the specified changesets are shown. This
4316 4316 means that you can use :hg:`heads .` to see the heads on the
4317 4317 currently checked-out branch.
4318 4318
4319 4319 If -c/--closed is specified, also show branch heads marked closed
4320 4320 (see :hg:`commit --close-branch`).
4321 4321
4322 4322 If STARTREV is specified, only those heads that are descendants of
4323 4323 STARTREV will be displayed.
4324 4324
4325 4325 If -t/--topo is specified, named branch mechanics will be ignored and only
4326 4326 topological heads (changesets with no children) will be shown.
4327 4327
4328 4328 Returns 0 if matching heads are found, 1 if not.
4329 4329 """
4330 4330
4331 4331 start = None
4332 4332 if 'rev' in opts:
4333 4333 start = scmutil.revsingle(repo, opts['rev'], None).node()
4334 4334
4335 4335 if opts.get('topo'):
4336 4336 heads = [repo[h] for h in repo.heads(start)]
4337 4337 else:
4338 4338 heads = []
4339 4339 for branch in repo.branchmap():
4340 4340 heads += repo.branchheads(branch, start, opts.get('closed'))
4341 4341 heads = [repo[h] for h in heads]
4342 4342
4343 4343 if branchrevs:
4344 4344 branches = set(repo[br].branch() for br in branchrevs)
4345 4345 heads = [h for h in heads if h.branch() in branches]
4346 4346
4347 4347 if opts.get('active') and branchrevs:
4348 4348 dagheads = repo.heads(start)
4349 4349 heads = [h for h in heads if h.node() in dagheads]
4350 4350
4351 4351 if branchrevs:
4352 4352 haveheads = set(h.branch() for h in heads)
4353 4353 if branches - haveheads:
4354 4354 headless = ', '.join(b for b in branches - haveheads)
4355 4355 msg = _('no open branch heads found on branches %s')
4356 4356 if opts.get('rev'):
4357 4357 msg += _(' (started at %s)') % opts['rev']
4358 4358 ui.warn((msg + '\n') % headless)
4359 4359
4360 4360 if not heads:
4361 4361 return 1
4362 4362
4363 4363 heads = sorted(heads, key=lambda x: -x.rev())
4364 4364 displayer = cmdutil.show_changeset(ui, repo, opts)
4365 4365 for ctx in heads:
4366 4366 displayer.show(ctx)
4367 4367 displayer.close()
4368 4368
4369 4369 @command('help',
4370 4370 [('e', 'extension', None, _('show only help for extensions')),
4371 4371 ('c', 'command', None, _('show only help for commands')),
4372 4372 ('k', 'keyword', None, _('show topics matching keyword')),
4373 4373 ('s', 'system', [], _('show help for specific platform(s)')),
4374 4374 ],
4375 4375 _('[-ecks] [TOPIC]'),
4376 4376 norepo=True)
4377 4377 def help_(ui, name=None, **opts):
4378 4378 """show help for a given topic or a help overview
4379 4379
4380 4380 With no arguments, print a list of commands with short help messages.
4381 4381
4382 4382 Given a topic, extension, or command name, print help for that
4383 4383 topic.
4384 4384
4385 4385 Returns 0 if successful.
4386 4386 """
4387 4387
4388 4388 textwidth = min(ui.termwidth(), 80) - 2
4389 4389
4390 4390 keep = opts.get('system') or []
4391 4391 if len(keep) == 0:
4392 4392 if sys.platform.startswith('win'):
4393 4393 keep.append('windows')
4394 4394 elif sys.platform == 'OpenVMS':
4395 4395 keep.append('vms')
4396 4396 elif sys.platform == 'plan9':
4397 4397 keep.append('plan9')
4398 4398 else:
4399 4399 keep.append('unix')
4400 4400 keep.append(sys.platform.lower())
4401 4401 if ui.verbose:
4402 4402 keep.append('verbose')
4403 4403
4404 4404 section = None
4405 4405 subtopic = None
4406 4406 if name and '.' in name:
4407 4407 name, section = name.split('.', 1)
4408 4408 section = section.lower()
4409 4409 if '.' in section:
4410 4410 subtopic, section = section.split('.', 1)
4411 4411 else:
4412 4412 subtopic = section
4413 4413
4414 4414 text = help.help_(ui, name, subtopic=subtopic, **opts)
4415 4415
4416 4416 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4417 4417 section=section)
4418 4418
4419 4419 # We could have been given a weird ".foo" section without a name
4420 4420 # to look for, or we could have simply failed to found "foo.bar"
4421 4421 # because bar isn't a section of foo
4422 4422 if section and not (formatted and name):
4423 4423 raise error.Abort(_("help section not found"))
4424 4424
4425 4425 if 'verbose' in pruned:
4426 4426 keep.append('omitted')
4427 4427 else:
4428 4428 keep.append('notomitted')
4429 4429 formatted, pruned = minirst.format(text, textwidth, keep=keep,
4430 4430 section=section)
4431 4431 ui.write(formatted)
4432 4432
4433 4433
4434 4434 @command('identify|id',
4435 4435 [('r', 'rev', '',
4436 4436 _('identify the specified revision'), _('REV')),
4437 4437 ('n', 'num', None, _('show local revision number')),
4438 4438 ('i', 'id', None, _('show global revision id')),
4439 4439 ('b', 'branch', None, _('show branch')),
4440 4440 ('t', 'tags', None, _('show tags')),
4441 4441 ('B', 'bookmarks', None, _('show bookmarks')),
4442 4442 ] + remoteopts,
4443 4443 _('[-nibtB] [-r REV] [SOURCE]'),
4444 4444 optionalrepo=True)
4445 4445 def identify(ui, repo, source=None, rev=None,
4446 4446 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
4447 4447 """identify the working directory or specified revision
4448 4448
4449 4449 Print a summary identifying the repository state at REV using one or
4450 4450 two parent hash identifiers, followed by a "+" if the working
4451 4451 directory has uncommitted changes, the branch name (if not default),
4452 4452 a list of tags, and a list of bookmarks.
4453 4453
4454 4454 When REV is not given, print a summary of the current state of the
4455 4455 repository.
4456 4456
4457 4457 Specifying a path to a repository root or Mercurial bundle will
4458 4458 cause lookup to operate on that repository/bundle.
4459 4459
4460 4460 .. container:: verbose
4461 4461
4462 4462 Examples:
4463 4463
4464 4464 - generate a build identifier for the working directory::
4465 4465
4466 4466 hg id --id > build-id.dat
4467 4467
4468 4468 - find the revision corresponding to a tag::
4469 4469
4470 4470 hg id -n -r 1.3
4471 4471
4472 4472 - check the most recent revision of a remote repository::
4473 4473
4474 4474 hg id -r tip http://selenic.com/hg/
4475 4475
4476 4476 See :hg:`log` for generating more information about specific revisions,
4477 4477 including full hash identifiers.
4478 4478
4479 4479 Returns 0 if successful.
4480 4480 """
4481 4481
4482 4482 if not repo and not source:
4483 4483 raise error.Abort(_("there is no Mercurial repository here "
4484 4484 "(.hg not found)"))
4485 4485
4486 4486 if ui.debugflag:
4487 4487 hexfunc = hex
4488 4488 else:
4489 4489 hexfunc = short
4490 4490 default = not (num or id or branch or tags or bookmarks)
4491 4491 output = []
4492 4492 revs = []
4493 4493
4494 4494 if source:
4495 4495 source, branches = hg.parseurl(ui.expandpath(source))
4496 4496 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
4497 4497 repo = peer.local()
4498 4498 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
4499 4499
4500 4500 if not repo:
4501 4501 if num or branch or tags:
4502 4502 raise error.Abort(
4503 4503 _("can't query remote revision number, branch, or tags"))
4504 4504 if not rev and revs:
4505 4505 rev = revs[0]
4506 4506 if not rev:
4507 4507 rev = "tip"
4508 4508
4509 4509 remoterev = peer.lookup(rev)
4510 4510 if default or id:
4511 4511 output = [hexfunc(remoterev)]
4512 4512
4513 4513 def getbms():
4514 4514 bms = []
4515 4515
4516 4516 if 'bookmarks' in peer.listkeys('namespaces'):
4517 4517 hexremoterev = hex(remoterev)
4518 4518 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
4519 4519 if bmr == hexremoterev]
4520 4520
4521 4521 return sorted(bms)
4522 4522
4523 4523 if bookmarks:
4524 4524 output.extend(getbms())
4525 4525 elif default and not ui.quiet:
4526 4526 # multiple bookmarks for a single parent separated by '/'
4527 4527 bm = '/'.join(getbms())
4528 4528 if bm:
4529 4529 output.append(bm)
4530 4530 else:
4531 4531 ctx = scmutil.revsingle(repo, rev, None)
4532 4532
4533 4533 if ctx.rev() is None:
4534 4534 ctx = repo[None]
4535 4535 parents = ctx.parents()
4536 4536 taglist = []
4537 4537 for p in parents:
4538 4538 taglist.extend(p.tags())
4539 4539
4540 4540 changed = ""
4541 4541 if default or id or num:
4542 4542 if (any(repo.status())
4543 4543 or any(ctx.sub(s).dirty() for s in ctx.substate)):
4544 4544 changed = '+'
4545 4545 if default or id:
4546 4546 output = ["%s%s" %
4547 4547 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
4548 4548 if num:
4549 4549 output.append("%s%s" %
4550 4550 ('+'.join([str(p.rev()) for p in parents]), changed))
4551 4551 else:
4552 4552 if default or id:
4553 4553 output = [hexfunc(ctx.node())]
4554 4554 if num:
4555 4555 output.append(str(ctx.rev()))
4556 4556 taglist = ctx.tags()
4557 4557
4558 4558 if default and not ui.quiet:
4559 4559 b = ctx.branch()
4560 4560 if b != 'default':
4561 4561 output.append("(%s)" % b)
4562 4562
4563 4563 # multiple tags for a single parent separated by '/'
4564 4564 t = '/'.join(taglist)
4565 4565 if t:
4566 4566 output.append(t)
4567 4567
4568 4568 # multiple bookmarks for a single parent separated by '/'
4569 4569 bm = '/'.join(ctx.bookmarks())
4570 4570 if bm:
4571 4571 output.append(bm)
4572 4572 else:
4573 4573 if branch:
4574 4574 output.append(ctx.branch())
4575 4575
4576 4576 if tags:
4577 4577 output.extend(taglist)
4578 4578
4579 4579 if bookmarks:
4580 4580 output.extend(ctx.bookmarks())
4581 4581
4582 4582 ui.write("%s\n" % ' '.join(output))
4583 4583
4584 4584 @command('import|patch',
4585 4585 [('p', 'strip', 1,
4586 4586 _('directory strip option for patch. This has the same '
4587 4587 'meaning as the corresponding patch option'), _('NUM')),
4588 4588 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
4589 4589 ('e', 'edit', False, _('invoke editor on commit messages')),
4590 4590 ('f', 'force', None,
4591 4591 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
4592 4592 ('', 'no-commit', None,
4593 4593 _("don't commit, just update the working directory")),
4594 4594 ('', 'bypass', None,
4595 4595 _("apply patch without touching the working directory")),
4596 4596 ('', 'partial', None,
4597 4597 _('commit even if some hunks fail')),
4598 4598 ('', 'exact', None,
4599 4599 _('apply patch to the nodes from which it was generated')),
4600 4600 ('', 'prefix', '',
4601 4601 _('apply patch to subdirectory'), _('DIR')),
4602 4602 ('', 'import-branch', None,
4603 4603 _('use any branch information in patch (implied by --exact)'))] +
4604 4604 commitopts + commitopts2 + similarityopts,
4605 4605 _('[OPTION]... PATCH...'))
4606 4606 def import_(ui, repo, patch1=None, *patches, **opts):
4607 4607 """import an ordered set of patches
4608 4608
4609 4609 Import a list of patches and commit them individually (unless
4610 4610 --no-commit is specified).
4611 4611
4612 4612 To read a patch from standard input, use "-" as the patch name. If
4613 4613 a URL is specified, the patch will be downloaded from there.
4614 4614
4615 4615 Import first applies changes to the working directory (unless
4616 4616 --bypass is specified), import will abort if there are outstanding
4617 4617 changes.
4618 4618
4619 4619 Use --bypass to apply and commit patches directly to the
4620 4620 repository, without affecting the working directory. Without
4621 4621 --exact, patches will be applied on top of the working directory
4622 4622 parent revision.
4623 4623
4624 4624 You can import a patch straight from a mail message. Even patches
4625 4625 as attachments work (to use the body part, it must have type
4626 4626 text/plain or text/x-patch). From and Subject headers of email
4627 4627 message are used as default committer and commit message. All
4628 4628 text/plain body parts before first diff are added to the commit
4629 4629 message.
4630 4630
4631 4631 If the imported patch was generated by :hg:`export`, user and
4632 4632 description from patch override values from message headers and
4633 4633 body. Values given on command line with -m/--message and -u/--user
4634 4634 override these.
4635 4635
4636 4636 If --exact is specified, import will set the working directory to
4637 4637 the parent of each patch before applying it, and will abort if the
4638 4638 resulting changeset has a different ID than the one recorded in
4639 4639 the patch. This may happen due to character set problems or other
4640 4640 deficiencies in the text patch format.
4641 4641
4642 4642 Use --partial to ensure a changeset will be created from the patch
4643 4643 even if some hunks fail to apply. Hunks that fail to apply will be
4644 4644 written to a <target-file>.rej file. Conflicts can then be resolved
4645 4645 by hand before :hg:`commit --amend` is run to update the created
4646 4646 changeset. This flag exists to let people import patches that
4647 4647 partially apply without losing the associated metadata (author,
4648 4648 date, description, ...).
4649 4649
4650 4650 .. note::
4651 4651
4652 4652 When no hunks apply cleanly, :hg:`import --partial` will create
4653 4653 an empty changeset, importing only the patch metadata.
4654 4654
4655 4655 With -s/--similarity, hg will attempt to discover renames and
4656 4656 copies in the patch in the same way as :hg:`addremove`.
4657 4657
4658 4658 It is possible to use external patch programs to perform the patch
4659 4659 by setting the ``ui.patch`` configuration option. For the default
4660 4660 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4661 4661 See :hg:`help config` for more information about configuration
4662 4662 files and how to use these options.
4663 4663
4664 4664 See :hg:`help dates` for a list of formats valid for -d/--date.
4665 4665
4666 4666 .. container:: verbose
4667 4667
4668 4668 Examples:
4669 4669
4670 4670 - import a traditional patch from a website and detect renames::
4671 4671
4672 4672 hg import -s 80 http://example.com/bugfix.patch
4673 4673
4674 4674 - import a changeset from an hgweb server::
4675 4675
4676 4676 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
4677 4677
4678 4678 - import all the patches in an Unix-style mbox::
4679 4679
4680 4680 hg import incoming-patches.mbox
4681 4681
4682 4682 - attempt to exactly restore an exported changeset (not always
4683 4683 possible)::
4684 4684
4685 4685 hg import --exact proposed-fix.patch
4686 4686
4687 4687 - use an external tool to apply a patch which is too fuzzy for
4688 4688 the default internal tool.
4689 4689
4690 4690 hg import --config ui.patch="patch --merge" fuzzy.patch
4691 4691
4692 4692 - change the default fuzzing from 2 to a less strict 7
4693 4693
4694 4694 hg import --config ui.fuzz=7 fuzz.patch
4695 4695
4696 4696 Returns 0 on success, 1 on partial success (see --partial).
4697 4697 """
4698 4698
4699 4699 if not patch1:
4700 4700 raise error.Abort(_('need at least one patch to import'))
4701 4701
4702 4702 patches = (patch1,) + patches
4703 4703
4704 4704 date = opts.get('date')
4705 4705 if date:
4706 4706 opts['date'] = util.parsedate(date)
4707 4707
4708 4708 exact = opts.get('exact')
4709 4709 update = not opts.get('bypass')
4710 4710 if not update and opts.get('no_commit'):
4711 4711 raise error.Abort(_('cannot use --no-commit with --bypass'))
4712 4712 try:
4713 4713 sim = float(opts.get('similarity') or 0)
4714 4714 except ValueError:
4715 4715 raise error.Abort(_('similarity must be a number'))
4716 4716 if sim < 0 or sim > 100:
4717 4717 raise error.Abort(_('similarity must be between 0 and 100'))
4718 4718 if sim and not update:
4719 4719 raise error.Abort(_('cannot use --similarity with --bypass'))
4720 4720 if exact:
4721 4721 if opts.get('edit'):
4722 4722 raise error.Abort(_('cannot use --exact with --edit'))
4723 4723 if opts.get('prefix'):
4724 4724 raise error.Abort(_('cannot use --exact with --prefix'))
4725 4725
4726 4726 base = opts["base"]
4727 4727 wlock = dsguard = lock = tr = None
4728 4728 msgs = []
4729 4729 ret = 0
4730 4730
4731 4731
4732 4732 try:
4733 4733 wlock = repo.wlock()
4734 4734
4735 4735 if update:
4736 4736 cmdutil.checkunfinished(repo)
4737 4737 if (exact or not opts.get('force')):
4738 4738 cmdutil.bailifchanged(repo)
4739 4739
4740 4740 if not opts.get('no_commit'):
4741 4741 lock = repo.lock()
4742 4742 tr = repo.transaction('import')
4743 4743 else:
4744 4744 dsguard = cmdutil.dirstateguard(repo, 'import')
4745 4745 parents = repo[None].parents()
4746 4746 for patchurl in patches:
4747 4747 if patchurl == '-':
4748 4748 ui.status(_('applying patch from stdin\n'))
4749 4749 patchfile = ui.fin
4750 4750 patchurl = 'stdin' # for error message
4751 4751 else:
4752 4752 patchurl = os.path.join(base, patchurl)
4753 4753 ui.status(_('applying %s\n') % patchurl)
4754 4754 patchfile = hg.openpath(ui, patchurl)
4755 4755
4756 4756 haspatch = False
4757 4757 for hunk in patch.split(patchfile):
4758 4758 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
4759 4759 parents, opts,
4760 4760 msgs, hg.clean)
4761 4761 if msg:
4762 4762 haspatch = True
4763 4763 ui.note(msg + '\n')
4764 4764 if update or exact:
4765 4765 parents = repo[None].parents()
4766 4766 else:
4767 4767 parents = [repo[node]]
4768 4768 if rej:
4769 4769 ui.write_err(_("patch applied partially\n"))
4770 4770 ui.write_err(_("(fix the .rej files and run "
4771 4771 "`hg commit --amend`)\n"))
4772 4772 ret = 1
4773 4773 break
4774 4774
4775 4775 if not haspatch:
4776 4776 raise error.Abort(_('%s: no diffs found') % patchurl)
4777 4777
4778 4778 if tr:
4779 4779 tr.close()
4780 4780 if msgs:
4781 4781 repo.savecommitmessage('\n* * *\n'.join(msgs))
4782 4782 if dsguard:
4783 4783 dsguard.close()
4784 4784 return ret
4785 4785 finally:
4786 4786 if tr:
4787 4787 tr.release()
4788 4788 release(lock, dsguard, wlock)
4789 4789
4790 4790 @command('incoming|in',
4791 4791 [('f', 'force', None,
4792 4792 _('run even if remote repository is unrelated')),
4793 4793 ('n', 'newest-first', None, _('show newest record first')),
4794 4794 ('', 'bundle', '',
4795 4795 _('file to store the bundles into'), _('FILE')),
4796 4796 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4797 4797 ('B', 'bookmarks', False, _("compare bookmarks")),
4798 4798 ('b', 'branch', [],
4799 4799 _('a specific branch you would like to pull'), _('BRANCH')),
4800 4800 ] + logopts + remoteopts + subrepoopts,
4801 4801 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
4802 4802 def incoming(ui, repo, source="default", **opts):
4803 4803 """show new changesets found in source
4804 4804
4805 4805 Show new changesets found in the specified path/URL or the default
4806 4806 pull location. These are the changesets that would have been pulled
4807 4807 if a pull at the time you issued this command.
4808 4808
4809 4809 See pull for valid source format details.
4810 4810
4811 4811 .. container:: verbose
4812 4812
4813 4813 With -B/--bookmarks, the result of bookmark comparison between
4814 4814 local and remote repositories is displayed. With -v/--verbose,
4815 4815 status is also displayed for each bookmark like below::
4816 4816
4817 4817 BM1 01234567890a added
4818 4818 BM2 1234567890ab advanced
4819 4819 BM3 234567890abc diverged
4820 4820 BM4 34567890abcd changed
4821 4821
4822 4822 The action taken locally when pulling depends on the
4823 4823 status of each bookmark:
4824 4824
4825 4825 :``added``: pull will create it
4826 4826 :``advanced``: pull will update it
4827 4827 :``diverged``: pull will create a divergent bookmark
4828 4828 :``changed``: result depends on remote changesets
4829 4829
4830 4830 From the point of view of pulling behavior, bookmark
4831 4831 existing only in the remote repository are treated as ``added``,
4832 4832 even if it is in fact locally deleted.
4833 4833
4834 4834 .. container:: verbose
4835 4835
4836 4836 For remote repository, using --bundle avoids downloading the
4837 4837 changesets twice if the incoming is followed by a pull.
4838 4838
4839 4839 Examples:
4840 4840
4841 4841 - show incoming changes with patches and full description::
4842 4842
4843 4843 hg incoming -vp
4844 4844
4845 4845 - show incoming changes excluding merges, store a bundle::
4846 4846
4847 4847 hg in -vpM --bundle incoming.hg
4848 4848 hg pull incoming.hg
4849 4849
4850 4850 - briefly list changes inside a bundle::
4851 4851
4852 4852 hg in changes.hg -T "{desc|firstline}\\n"
4853 4853
4854 4854 Returns 0 if there are incoming changes, 1 otherwise.
4855 4855 """
4856 4856 if opts.get('graph'):
4857 4857 cmdutil.checkunsupportedgraphflags([], opts)
4858 4858 def display(other, chlist, displayer):
4859 4859 revdag = cmdutil.graphrevs(other, chlist, opts)
4860 4860 cmdutil.displaygraph(ui, repo, revdag, displayer,
4861 4861 graphmod.asciiedges)
4862 4862
4863 4863 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4864 4864 return 0
4865 4865
4866 4866 if opts.get('bundle') and opts.get('subrepos'):
4867 4867 raise error.Abort(_('cannot combine --bundle and --subrepos'))
4868 4868
4869 4869 if opts.get('bookmarks'):
4870 4870 source, branches = hg.parseurl(ui.expandpath(source),
4871 4871 opts.get('branch'))
4872 4872 other = hg.peer(repo, opts, source)
4873 4873 if 'bookmarks' not in other.listkeys('namespaces'):
4874 4874 ui.warn(_("remote doesn't support bookmarks\n"))
4875 4875 return 0
4876 4876 ui.status(_('comparing with %s\n') % util.hidepassword(source))
4877 4877 return bookmarks.incoming(ui, repo, other)
4878 4878
4879 4879 repo._subtoppath = ui.expandpath(source)
4880 4880 try:
4881 4881 return hg.incoming(ui, repo, source, opts)
4882 4882 finally:
4883 4883 del repo._subtoppath
4884 4884
4885 4885
4886 4886 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
4887 4887 norepo=True)
4888 4888 def init(ui, dest=".", **opts):
4889 4889 """create a new repository in the given directory
4890 4890
4891 4891 Initialize a new repository in the given directory. If the given
4892 4892 directory does not exist, it will be created.
4893 4893
4894 4894 If no directory is given, the current directory is used.
4895 4895
4896 4896 It is possible to specify an ``ssh://`` URL as the destination.
4897 4897 See :hg:`help urls` for more information.
4898 4898
4899 4899 Returns 0 on success.
4900 4900 """
4901 4901 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4902 4902
4903 4903 @command('locate',
4904 4904 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
4905 4905 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4906 4906 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
4907 4907 ] + walkopts,
4908 4908 _('[OPTION]... [PATTERN]...'))
4909 4909 def locate(ui, repo, *pats, **opts):
4910 4910 """locate files matching specific patterns (DEPRECATED)
4911 4911
4912 4912 Print files under Mercurial control in the working directory whose
4913 4913 names match the given patterns.
4914 4914
4915 4915 By default, this command searches all directories in the working
4916 4916 directory. To search just the current directory and its
4917 4917 subdirectories, use "--include .".
4918 4918
4919 4919 If no patterns are given to match, this command prints the names
4920 4920 of all files under Mercurial control in the working directory.
4921 4921
4922 4922 If you want to feed the output of this command into the "xargs"
4923 4923 command, use the -0 option to both this command and "xargs". This
4924 4924 will avoid the problem of "xargs" treating single filenames that
4925 4925 contain whitespace as multiple filenames.
4926 4926
4927 4927 See :hg:`help files` for a more versatile command.
4928 4928
4929 4929 Returns 0 if a match is found, 1 otherwise.
4930 4930 """
4931 4931 if opts.get('print0'):
4932 4932 end = '\0'
4933 4933 else:
4934 4934 end = '\n'
4935 4935 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
4936 4936
4937 4937 ret = 1
4938 4938 ctx = repo[rev]
4939 4939 m = scmutil.match(ctx, pats, opts, default='relglob',
4940 4940 badfn=lambda x, y: False)
4941 4941
4942 4942 for abs in ctx.matches(m):
4943 4943 if opts.get('fullpath'):
4944 4944 ui.write(repo.wjoin(abs), end)
4945 4945 else:
4946 4946 ui.write(((pats and m.rel(abs)) or abs), end)
4947 4947 ret = 0
4948 4948
4949 4949 return ret
4950 4950
4951 4951 @command('^log|history',
4952 4952 [('f', 'follow', None,
4953 4953 _('follow changeset history, or file history across copies and renames')),
4954 4954 ('', 'follow-first', None,
4955 4955 _('only follow the first parent of merge changesets (DEPRECATED)')),
4956 4956 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
4957 4957 ('C', 'copies', None, _('show copied files')),
4958 4958 ('k', 'keyword', [],
4959 4959 _('do case-insensitive search for a given text'), _('TEXT')),
4960 4960 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
4961 4961 ('', 'removed', None, _('include revisions where files were removed')),
4962 4962 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
4963 4963 ('u', 'user', [], _('revisions committed by user'), _('USER')),
4964 4964 ('', 'only-branch', [],
4965 4965 _('show only changesets within the given named branch (DEPRECATED)'),
4966 4966 _('BRANCH')),
4967 4967 ('b', 'branch', [],
4968 4968 _('show changesets within the given named branch'), _('BRANCH')),
4969 4969 ('P', 'prune', [],
4970 4970 _('do not display revision or any of its ancestors'), _('REV')),
4971 4971 ] + logopts + walkopts,
4972 4972 _('[OPTION]... [FILE]'),
4973 4973 inferrepo=True)
4974 4974 def log(ui, repo, *pats, **opts):
4975 4975 """show revision history of entire repository or files
4976 4976
4977 4977 Print the revision history of the specified files or the entire
4978 4978 project.
4979 4979
4980 4980 If no revision range is specified, the default is ``tip:0`` unless
4981 4981 --follow is set, in which case the working directory parent is
4982 4982 used as the starting revision.
4983 4983
4984 4984 File history is shown without following rename or copy history of
4985 4985 files. Use -f/--follow with a filename to follow history across
4986 4986 renames and copies. --follow without a filename will only show
4987 4987 ancestors or descendants of the starting revision.
4988 4988
4989 4989 By default this command prints revision number and changeset id,
4990 4990 tags, non-trivial parents, user, date and time, and a summary for
4991 4991 each commit. When the -v/--verbose switch is used, the list of
4992 4992 changed files and full commit message are shown.
4993 4993
4994 4994 With --graph the revisions are shown as an ASCII art DAG with the most
4995 4995 recent changeset at the top.
4996 4996 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
4997 4997 and '+' represents a fork where the changeset from the lines below is a
4998 4998 parent of the 'o' merge on the same line.
4999 4999
5000 5000 .. note::
5001 5001
5002 5002 :hg:`log --patch` may generate unexpected diff output for merge
5003 5003 changesets, as it will only compare the merge changeset against
5004 5004 its first parent. Also, only files different from BOTH parents
5005 5005 will appear in files:.
5006 5006
5007 5007 .. note::
5008 5008
5009 5009 For performance reasons, :hg:`log FILE` may omit duplicate changes
5010 5010 made on branches and will not show removals or mode changes. To
5011 5011 see all such changes, use the --removed switch.
5012 5012
5013 5013 .. container:: verbose
5014 5014
5015 5015 Some examples:
5016 5016
5017 5017 - changesets with full descriptions and file lists::
5018 5018
5019 5019 hg log -v
5020 5020
5021 5021 - changesets ancestral to the working directory::
5022 5022
5023 5023 hg log -f
5024 5024
5025 5025 - last 10 commits on the current branch::
5026 5026
5027 5027 hg log -l 10 -b .
5028 5028
5029 5029 - changesets showing all modifications of a file, including removals::
5030 5030
5031 5031 hg log --removed file.c
5032 5032
5033 5033 - all changesets that touch a directory, with diffs, excluding merges::
5034 5034
5035 5035 hg log -Mp lib/
5036 5036
5037 5037 - all revision numbers that match a keyword::
5038 5038
5039 5039 hg log -k bug --template "{rev}\\n"
5040 5040
5041 5041 - the full hash identifier of the working directory parent::
5042 5042
5043 5043 hg log -r . --template "{node}\\n"
5044 5044
5045 5045 - list available log templates::
5046 5046
5047 5047 hg log -T list
5048 5048
5049 5049 - check if a given changeset is included in a tagged release::
5050 5050
5051 5051 hg log -r "a21ccf and ancestor(1.9)"
5052 5052
5053 5053 - find all changesets by some user in a date range::
5054 5054
5055 5055 hg log -k alice -d "may 2008 to jul 2008"
5056 5056
5057 5057 - summary of all changesets after the last tag::
5058 5058
5059 5059 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
5060 5060
5061 5061 See :hg:`help dates` for a list of formats valid for -d/--date.
5062 5062
5063 5063 See :hg:`help revisions` and :hg:`help revsets` for more about
5064 5064 specifying and ordering revisions.
5065 5065
5066 5066 See :hg:`help templates` for more about pre-packaged styles and
5067 5067 specifying custom templates.
5068 5068
5069 5069 Returns 0 on success.
5070 5070
5071 5071 """
5072 5072 if opts.get('follow') and opts.get('rev'):
5073 5073 opts['rev'] = [revset.formatspec('reverse(::%lr)', opts.get('rev'))]
5074 5074 del opts['follow']
5075 5075
5076 5076 if opts.get('graph'):
5077 5077 return cmdutil.graphlog(ui, repo, *pats, **opts)
5078 5078
5079 5079 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
5080 5080 limit = cmdutil.loglimit(opts)
5081 5081 count = 0
5082 5082
5083 5083 getrenamed = None
5084 5084 if opts.get('copies'):
5085 5085 endrev = None
5086 5086 if opts.get('rev'):
5087 5087 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
5088 5088 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
5089 5089
5090 5090 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5091 5091 for rev in revs:
5092 5092 if count == limit:
5093 5093 break
5094 5094 ctx = repo[rev]
5095 5095 copies = None
5096 5096 if getrenamed is not None and rev:
5097 5097 copies = []
5098 5098 for fn in ctx.files():
5099 5099 rename = getrenamed(fn, rev)
5100 5100 if rename:
5101 5101 copies.append((fn, rename[0]))
5102 5102 if filematcher:
5103 5103 revmatchfn = filematcher(ctx.rev())
5104 5104 else:
5105 5105 revmatchfn = None
5106 5106 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
5107 5107 if displayer.flush(ctx):
5108 5108 count += 1
5109 5109
5110 5110 displayer.close()
5111 5111
5112 5112 @command('manifest',
5113 5113 [('r', 'rev', '', _('revision to display'), _('REV')),
5114 5114 ('', 'all', False, _("list files from all revisions"))]
5115 5115 + formatteropts,
5116 5116 _('[-r REV]'))
5117 5117 def manifest(ui, repo, node=None, rev=None, **opts):
5118 5118 """output the current or given revision of the project manifest
5119 5119
5120 5120 Print a list of version controlled files for the given revision.
5121 5121 If no revision is given, the first parent of the working directory
5122 5122 is used, or the null revision if no revision is checked out.
5123 5123
5124 5124 With -v, print file permissions, symlink and executable bits.
5125 5125 With --debug, print file revision hashes.
5126 5126
5127 5127 If option --all is specified, the list of all files from all revisions
5128 5128 is printed. This includes deleted and renamed files.
5129 5129
5130 5130 Returns 0 on success.
5131 5131 """
5132 5132
5133 5133 fm = ui.formatter('manifest', opts)
5134 5134
5135 5135 if opts.get('all'):
5136 5136 if rev or node:
5137 5137 raise error.Abort(_("can't specify a revision with --all"))
5138 5138
5139 5139 res = []
5140 5140 prefix = "data/"
5141 5141 suffix = ".i"
5142 5142 plen = len(prefix)
5143 5143 slen = len(suffix)
5144 5144 with repo.lock():
5145 5145 for fn, b, size in repo.store.datafiles():
5146 5146 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
5147 5147 res.append(fn[plen:-slen])
5148 5148 for f in res:
5149 5149 fm.startitem()
5150 5150 fm.write("path", '%s\n', f)
5151 5151 fm.end()
5152 5152 return
5153 5153
5154 5154 if rev and node:
5155 5155 raise error.Abort(_("please specify just one revision"))
5156 5156
5157 5157 if not node:
5158 5158 node = rev
5159 5159
5160 5160 char = {'l': '@', 'x': '*', '': ''}
5161 5161 mode = {'l': '644', 'x': '755', '': '644'}
5162 5162 ctx = scmutil.revsingle(repo, node)
5163 5163 mf = ctx.manifest()
5164 5164 for f in ctx:
5165 5165 fm.startitem()
5166 5166 fl = ctx[f].flags()
5167 5167 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
5168 5168 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
5169 5169 fm.write('path', '%s\n', f)
5170 5170 fm.end()
5171 5171
5172 5172 @command('^merge',
5173 5173 [('f', 'force', None,
5174 5174 _('force a merge including outstanding changes (DEPRECATED)')),
5175 5175 ('r', 'rev', '', _('revision to merge'), _('REV')),
5176 5176 ('P', 'preview', None,
5177 5177 _('review revisions to merge (no merge is performed)'))
5178 5178 ] + mergetoolopts,
5179 5179 _('[-P] [-f] [[-r] REV]'))
5180 5180 def merge(ui, repo, node=None, **opts):
5181 5181 """merge another revision into working directory
5182 5182
5183 5183 The current working directory is updated with all changes made in
5184 5184 the requested revision since the last common predecessor revision.
5185 5185
5186 5186 Files that changed between either parent are marked as changed for
5187 5187 the next commit and a commit must be performed before any further
5188 5188 updates to the repository are allowed. The next commit will have
5189 5189 two parents.
5190 5190
5191 5191 ``--tool`` can be used to specify the merge tool used for file
5192 5192 merges. It overrides the HGMERGE environment variable and your
5193 5193 configuration files. See :hg:`help merge-tools` for options.
5194 5194
5195 5195 If no revision is specified, the working directory's parent is a
5196 5196 head revision, and the current branch contains exactly one other
5197 5197 head, the other head is merged with by default. Otherwise, an
5198 5198 explicit revision with which to merge with must be provided.
5199 5199
5200 5200 See :hg:`help resolve` for information on handling file conflicts.
5201 5201
5202 5202 To undo an uncommitted merge, use :hg:`update --clean .` which
5203 5203 will check out a clean copy of the original merge parent, losing
5204 5204 all changes.
5205 5205
5206 5206 Returns 0 on success, 1 if there are unresolved files.
5207 5207 """
5208 5208
5209 5209 if opts.get('rev') and node:
5210 5210 raise error.Abort(_("please specify just one revision"))
5211 5211 if not node:
5212 5212 node = opts.get('rev')
5213 5213
5214 5214 if node:
5215 5215 node = scmutil.revsingle(repo, node).node()
5216 5216
5217 5217 if not node:
5218 5218 node = repo[destutil.destmerge(repo)].node()
5219 5219
5220 5220 if opts.get('preview'):
5221 5221 # find nodes that are ancestors of p2 but not of p1
5222 5222 p1 = repo.lookup('.')
5223 5223 p2 = repo.lookup(node)
5224 5224 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
5225 5225
5226 5226 displayer = cmdutil.show_changeset(ui, repo, opts)
5227 5227 for node in nodes:
5228 5228 displayer.show(repo[node])
5229 5229 displayer.close()
5230 5230 return 0
5231 5231
5232 5232 try:
5233 5233 # ui.forcemerge is an internal variable, do not document
5234 5234 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
5235 5235 return hg.merge(repo, node, force=opts.get('force'))
5236 5236 finally:
5237 5237 ui.setconfig('ui', 'forcemerge', '', 'merge')
5238 5238
5239 5239 @command('outgoing|out',
5240 5240 [('f', 'force', None, _('run even when the destination is unrelated')),
5241 5241 ('r', 'rev', [],
5242 5242 _('a changeset intended to be included in the destination'), _('REV')),
5243 5243 ('n', 'newest-first', None, _('show newest record first')),
5244 5244 ('B', 'bookmarks', False, _('compare bookmarks')),
5245 5245 ('b', 'branch', [], _('a specific branch you would like to push'),
5246 5246 _('BRANCH')),
5247 5247 ] + logopts + remoteopts + subrepoopts,
5248 5248 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
5249 5249 def outgoing(ui, repo, dest=None, **opts):
5250 5250 """show changesets not found in the destination
5251 5251
5252 5252 Show changesets not found in the specified destination repository
5253 5253 or the default push location. These are the changesets that would
5254 5254 be pushed if a push was requested.
5255 5255
5256 5256 See pull for details of valid destination formats.
5257 5257
5258 5258 .. container:: verbose
5259 5259
5260 5260 With -B/--bookmarks, the result of bookmark comparison between
5261 5261 local and remote repositories is displayed. With -v/--verbose,
5262 5262 status is also displayed for each bookmark like below::
5263 5263
5264 5264 BM1 01234567890a added
5265 5265 BM2 deleted
5266 5266 BM3 234567890abc advanced
5267 5267 BM4 34567890abcd diverged
5268 5268 BM5 4567890abcde changed
5269 5269
5270 5270 The action taken when pushing depends on the
5271 5271 status of each bookmark:
5272 5272
5273 5273 :``added``: push with ``-B`` will create it
5274 5274 :``deleted``: push with ``-B`` will delete it
5275 5275 :``advanced``: push will update it
5276 5276 :``diverged``: push with ``-B`` will update it
5277 5277 :``changed``: push with ``-B`` will update it
5278 5278
5279 5279 From the point of view of pushing behavior, bookmarks
5280 5280 existing only in the remote repository are treated as
5281 5281 ``deleted``, even if it is in fact added remotely.
5282 5282
5283 5283 Returns 0 if there are outgoing changes, 1 otherwise.
5284 5284 """
5285 5285 if opts.get('graph'):
5286 5286 cmdutil.checkunsupportedgraphflags([], opts)
5287 5287 o, other = hg._outgoing(ui, repo, dest, opts)
5288 5288 if not o:
5289 5289 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5290 5290 return
5291 5291
5292 5292 revdag = cmdutil.graphrevs(repo, o, opts)
5293 5293 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
5294 5294 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
5295 5295 cmdutil.outgoinghooks(ui, repo, other, opts, o)
5296 5296 return 0
5297 5297
5298 5298 if opts.get('bookmarks'):
5299 5299 dest = ui.expandpath(dest or 'default-push', dest or 'default')
5300 5300 dest, branches = hg.parseurl(dest, opts.get('branch'))
5301 5301 other = hg.peer(repo, opts, dest)
5302 5302 if 'bookmarks' not in other.listkeys('namespaces'):
5303 5303 ui.warn(_("remote doesn't support bookmarks\n"))
5304 5304 return 0
5305 5305 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
5306 5306 return bookmarks.outgoing(ui, repo, other)
5307 5307
5308 5308 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
5309 5309 try:
5310 5310 return hg.outgoing(ui, repo, dest, opts)
5311 5311 finally:
5312 5312 del repo._subtoppath
5313 5313
5314 5314 @command('parents',
5315 5315 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
5316 5316 ] + templateopts,
5317 5317 _('[-r REV] [FILE]'),
5318 5318 inferrepo=True)
5319 5319 def parents(ui, repo, file_=None, **opts):
5320 5320 """show the parents of the working directory or revision (DEPRECATED)
5321 5321
5322 5322 Print the working directory's parent revisions. If a revision is
5323 5323 given via -r/--rev, the parent of that revision will be printed.
5324 5324 If a file argument is given, the revision in which the file was
5325 5325 last changed (before the working directory revision or the
5326 5326 argument to --rev if given) is printed.
5327 5327
5328 5328 This command is equivalent to::
5329 5329
5330 5330 hg log -r "p1()+p2()" or
5331 5331 hg log -r "p1(REV)+p2(REV)" or
5332 5332 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5333 5333 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5334 5334
5335 5335 See :hg:`summary` and :hg:`help revsets` for related information.
5336 5336
5337 5337 Returns 0 on success.
5338 5338 """
5339 5339
5340 5340 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
5341 5341
5342 5342 if file_:
5343 5343 m = scmutil.match(ctx, (file_,), opts)
5344 5344 if m.anypats() or len(m.files()) != 1:
5345 5345 raise error.Abort(_('can only specify an explicit filename'))
5346 5346 file_ = m.files()[0]
5347 5347 filenodes = []
5348 5348 for cp in ctx.parents():
5349 5349 if not cp:
5350 5350 continue
5351 5351 try:
5352 5352 filenodes.append(cp.filenode(file_))
5353 5353 except error.LookupError:
5354 5354 pass
5355 5355 if not filenodes:
5356 5356 raise error.Abort(_("'%s' not found in manifest!") % file_)
5357 5357 p = []
5358 5358 for fn in filenodes:
5359 5359 fctx = repo.filectx(file_, fileid=fn)
5360 5360 p.append(fctx.node())
5361 5361 else:
5362 5362 p = [cp.node() for cp in ctx.parents()]
5363 5363
5364 5364 displayer = cmdutil.show_changeset(ui, repo, opts)
5365 5365 for n in p:
5366 5366 if n != nullid:
5367 5367 displayer.show(repo[n])
5368 5368 displayer.close()
5369 5369
5370 5370 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True)
5371 5371 def paths(ui, repo, search=None, **opts):
5372 5372 """show aliases for remote repositories
5373 5373
5374 5374 Show definition of symbolic path name NAME. If no name is given,
5375 5375 show definition of all available names.
5376 5376
5377 5377 Option -q/--quiet suppresses all output when searching for NAME
5378 5378 and shows only the path names when listing all definitions.
5379 5379
5380 5380 Path names are defined in the [paths] section of your
5381 5381 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5382 5382 repository, ``.hg/hgrc`` is used, too.
5383 5383
5384 5384 The path names ``default`` and ``default-push`` have a special
5385 5385 meaning. When performing a push or pull operation, they are used
5386 5386 as fallbacks if no location is specified on the command-line.
5387 5387 When ``default-push`` is set, it will be used for push and
5388 5388 ``default`` will be used for pull; otherwise ``default`` is used
5389 5389 as the fallback for both. When cloning a repository, the clone
5390 5390 source is written as ``default`` in ``.hg/hgrc``.
5391 5391
5392 5392 .. note::
5393 5393
5394 5394 ``default`` and ``default-push`` apply to all inbound (e.g.
5395 5395 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5396 5396 and :hg:`bundle`) operations.
5397 5397
5398 5398 See :hg:`help urls` for more information.
5399 5399
5400 5400 Returns 0 on success.
5401 5401 """
5402 5402 if search:
5403 5403 pathitems = [(name, path) for name, path in ui.paths.iteritems()
5404 5404 if name == search]
5405 5405 else:
5406 5406 pathitems = sorted(ui.paths.iteritems())
5407 5407
5408 5408 fm = ui.formatter('paths', opts)
5409 5409 if fm:
5410 5410 hidepassword = str
5411 5411 else:
5412 5412 hidepassword = util.hidepassword
5413 5413 if ui.quiet:
5414 5414 namefmt = '%s\n'
5415 5415 else:
5416 5416 namefmt = '%s = '
5417 5417 showsubopts = not search and not ui.quiet
5418 5418
5419 5419 for name, path in pathitems:
5420 5420 fm.startitem()
5421 5421 fm.condwrite(not search, 'name', namefmt, name)
5422 5422 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
5423 5423 for subopt, value in sorted(path.suboptions.items()):
5424 5424 assert subopt not in ('name', 'url')
5425 5425 if showsubopts:
5426 5426 fm.plain('%s:%s = ' % (name, subopt))
5427 5427 fm.condwrite(showsubopts, subopt, '%s\n', value)
5428 5428
5429 5429 fm.end()
5430 5430
5431 5431 if search and not pathitems:
5432 5432 if not ui.quiet:
5433 5433 ui.warn(_("not found!\n"))
5434 5434 return 1
5435 5435 else:
5436 5436 return 0
5437 5437
5438 5438 @command('phase',
5439 5439 [('p', 'public', False, _('set changeset phase to public')),
5440 5440 ('d', 'draft', False, _('set changeset phase to draft')),
5441 5441 ('s', 'secret', False, _('set changeset phase to secret')),
5442 5442 ('f', 'force', False, _('allow to move boundary backward')),
5443 5443 ('r', 'rev', [], _('target revision'), _('REV')),
5444 5444 ],
5445 5445 _('[-p|-d|-s] [-f] [-r] [REV...]'))
5446 5446 def phase(ui, repo, *revs, **opts):
5447 5447 """set or show the current phase name
5448 5448
5449 5449 With no argument, show the phase name of the current revision(s).
5450 5450
5451 5451 With one of -p/--public, -d/--draft or -s/--secret, change the
5452 5452 phase value of the specified revisions.
5453 5453
5454 5454 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
5455 5455 lower phase to an higher phase. Phases are ordered as follows::
5456 5456
5457 5457 public < draft < secret
5458 5458
5459 5459 Returns 0 on success, 1 if some phases could not be changed.
5460 5460
5461 5461 (For more information about the phases concept, see :hg:`help phases`.)
5462 5462 """
5463 5463 # search for a unique phase argument
5464 5464 targetphase = None
5465 5465 for idx, name in enumerate(phases.phasenames):
5466 5466 if opts[name]:
5467 5467 if targetphase is not None:
5468 5468 raise error.Abort(_('only one phase can be specified'))
5469 5469 targetphase = idx
5470 5470
5471 5471 # look for specified revision
5472 5472 revs = list(revs)
5473 5473 revs.extend(opts['rev'])
5474 5474 if not revs:
5475 5475 # display both parents as the second parent phase can influence
5476 5476 # the phase of a merge commit
5477 5477 revs = [c.rev() for c in repo[None].parents()]
5478 5478
5479 5479 revs = scmutil.revrange(repo, revs)
5480 5480
5481 5481 lock = None
5482 5482 ret = 0
5483 5483 if targetphase is None:
5484 5484 # display
5485 5485 for r in revs:
5486 5486 ctx = repo[r]
5487 5487 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5488 5488 else:
5489 5489 tr = None
5490 5490 lock = repo.lock()
5491 5491 try:
5492 5492 tr = repo.transaction("phase")
5493 5493 # set phase
5494 5494 if not revs:
5495 5495 raise error.Abort(_('empty revision set'))
5496 5496 nodes = [repo[r].node() for r in revs]
5497 5497 # moving revision from public to draft may hide them
5498 5498 # We have to check result on an unfiltered repository
5499 5499 unfi = repo.unfiltered()
5500 5500 getphase = unfi._phasecache.phase
5501 5501 olddata = [getphase(unfi, r) for r in unfi]
5502 5502 phases.advanceboundary(repo, tr, targetphase, nodes)
5503 5503 if opts['force']:
5504 5504 phases.retractboundary(repo, tr, targetphase, nodes)
5505 5505 tr.close()
5506 5506 finally:
5507 5507 if tr is not None:
5508 5508 tr.release()
5509 5509 lock.release()
5510 5510 getphase = unfi._phasecache.phase
5511 5511 newdata = [getphase(unfi, r) for r in unfi]
5512 5512 changes = sum(newdata[r] != olddata[r] for r in unfi)
5513 5513 cl = unfi.changelog
5514 5514 rejected = [n for n in nodes
5515 5515 if newdata[cl.rev(n)] < targetphase]
5516 5516 if rejected:
5517 5517 ui.warn(_('cannot move %i changesets to a higher '
5518 5518 'phase, use --force\n') % len(rejected))
5519 5519 ret = 1
5520 5520 if changes:
5521 5521 msg = _('phase changed for %i changesets\n') % changes
5522 5522 if ret:
5523 5523 ui.status(msg)
5524 5524 else:
5525 5525 ui.note(msg)
5526 5526 else:
5527 5527 ui.warn(_('no phases changed\n'))
5528 5528 return ret
5529 5529
5530 5530 def postincoming(ui, repo, modheads, optupdate, checkout):
5531 5531 if modheads == 0:
5532 5532 return
5533 5533 if optupdate:
5534 5534 try:
5535 5535 brev = checkout
5536 5536 movemarkfrom = None
5537 5537 if not checkout:
5538 5538 updata = destutil.destupdate(repo)
5539 5539 checkout, movemarkfrom, brev = updata
5540 5540 ret = hg.update(repo, checkout)
5541 5541 except error.UpdateAbort as inst:
5542 5542 msg = _("not updating: %s") % str(inst)
5543 5543 hint = inst.hint
5544 5544 raise error.UpdateAbort(msg, hint=hint)
5545 5545 if not ret and not checkout:
5546 5546 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
5547 5547 ui.status(_("updating bookmark %s\n") % repo._activebookmark)
5548 5548 return ret
5549 5549 if modheads > 1:
5550 5550 currentbranchheads = len(repo.branchheads())
5551 5551 if currentbranchheads == modheads:
5552 5552 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
5553 5553 elif currentbranchheads > 1:
5554 5554 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
5555 5555 "merge)\n"))
5556 5556 else:
5557 5557 ui.status(_("(run 'hg heads' to see heads)\n"))
5558 5558 else:
5559 5559 ui.status(_("(run 'hg update' to get a working copy)\n"))
5560 5560
5561 5561 @command('^pull',
5562 5562 [('u', 'update', None,
5563 5563 _('update to new branch head if changesets were pulled')),
5564 5564 ('f', 'force', None, _('run even when remote repository is unrelated')),
5565 5565 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
5566 5566 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
5567 5567 ('b', 'branch', [], _('a specific branch you would like to pull'),
5568 5568 _('BRANCH')),
5569 5569 ] + remoteopts,
5570 5570 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
5571 5571 def pull(ui, repo, source="default", **opts):
5572 5572 """pull changes from the specified source
5573 5573
5574 5574 Pull changes from a remote repository to a local one.
5575 5575
5576 5576 This finds all changes from the repository at the specified path
5577 5577 or URL and adds them to a local repository (the current one unless
5578 5578 -R is specified). By default, this does not update the copy of the
5579 5579 project in the working directory.
5580 5580
5581 5581 Use :hg:`incoming` if you want to see what would have been added
5582 5582 by a pull at the time you issued this command. If you then decide
5583 5583 to add those changes to the repository, you should use :hg:`pull
5584 5584 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5585 5585
5586 5586 If SOURCE is omitted, the 'default' path will be used.
5587 5587 See :hg:`help urls` for more information.
5588 5588
5589 5589 Returns 0 on success, 1 if an update had unresolved files.
5590 5590 """
5591 5591 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
5592 5592 ui.status(_('pulling from %s\n') % util.hidepassword(source))
5593 5593 other = hg.peer(repo, opts, source)
5594 5594 try:
5595 5595 revs, checkout = hg.addbranchrevs(repo, other, branches,
5596 5596 opts.get('rev'))
5597 5597
5598 5598
5599 5599 pullopargs = {}
5600 5600 if opts.get('bookmark'):
5601 5601 if not revs:
5602 5602 revs = []
5603 5603 # The list of bookmark used here is not the one used to actually
5604 5604 # update the bookmark name. This can result in the revision pulled
5605 5605 # not ending up with the name of the bookmark because of a race
5606 5606 # condition on the server. (See issue 4689 for details)
5607 5607 remotebookmarks = other.listkeys('bookmarks')
5608 5608 pullopargs['remotebookmarks'] = remotebookmarks
5609 5609 for b in opts['bookmark']:
5610 5610 if b not in remotebookmarks:
5611 5611 raise error.Abort(_('remote bookmark %s not found!') % b)
5612 5612 revs.append(remotebookmarks[b])
5613 5613
5614 5614 if revs:
5615 5615 try:
5616 5616 # When 'rev' is a bookmark name, we cannot guarantee that it
5617 5617 # will be updated with that name because of a race condition
5618 5618 # server side. (See issue 4689 for details)
5619 5619 oldrevs = revs
5620 5620 revs = [] # actually, nodes
5621 5621 for r in oldrevs:
5622 5622 node = other.lookup(r)
5623 5623 revs.append(node)
5624 5624 if r == checkout:
5625 5625 checkout = node
5626 5626 except error.CapabilityError:
5627 5627 err = _("other repository doesn't support revision lookup, "
5628 5628 "so a rev cannot be specified.")
5629 5629 raise error.Abort(err)
5630 5630
5631 5631 pullopargs.update(opts.get('opargs', {}))
5632 5632 modheads = exchange.pull(repo, other, heads=revs,
5633 5633 force=opts.get('force'),
5634 5634 bookmarks=opts.get('bookmark', ()),
5635 5635 opargs=pullopargs).cgresult
5636 5636 if checkout:
5637 5637 checkout = str(repo.changelog.rev(checkout))
5638 5638 repo._subtoppath = source
5639 5639 try:
5640 5640 ret = postincoming(ui, repo, modheads, opts.get('update'), checkout)
5641 5641
5642 5642 finally:
5643 5643 del repo._subtoppath
5644 5644
5645 5645 finally:
5646 5646 other.close()
5647 5647 return ret
5648 5648
5649 5649 @command('^push',
5650 5650 [('f', 'force', None, _('force push')),
5651 5651 ('r', 'rev', [],
5652 5652 _('a changeset intended to be included in the destination'),
5653 5653 _('REV')),
5654 5654 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
5655 5655 ('b', 'branch', [],
5656 5656 _('a specific branch you would like to push'), _('BRANCH')),
5657 5657 ('', 'new-branch', False, _('allow pushing a new branch')),
5658 5658 ] + remoteopts,
5659 5659 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
5660 5660 def push(ui, repo, dest=None, **opts):
5661 5661 """push changes to the specified destination
5662 5662
5663 5663 Push changesets from the local repository to the specified
5664 5664 destination.
5665 5665
5666 5666 This operation is symmetrical to pull: it is identical to a pull
5667 5667 in the destination repository from the current one.
5668 5668
5669 5669 By default, push will not allow creation of new heads at the
5670 5670 destination, since multiple heads would make it unclear which head
5671 5671 to use. In this situation, it is recommended to pull and merge
5672 5672 before pushing.
5673 5673
5674 5674 Use --new-branch if you want to allow push to create a new named
5675 5675 branch that is not present at the destination. This allows you to
5676 5676 only create a new branch without forcing other changes.
5677 5677
5678 5678 .. note::
5679 5679
5680 5680 Extra care should be taken with the -f/--force option,
5681 5681 which will push all new heads on all branches, an action which will
5682 5682 almost always cause confusion for collaborators.
5683 5683
5684 5684 If -r/--rev is used, the specified revision and all its ancestors
5685 5685 will be pushed to the remote repository.
5686 5686
5687 5687 If -B/--bookmark is used, the specified bookmarked revision, its
5688 5688 ancestors, and the bookmark will be pushed to the remote
5689 5689 repository.
5690 5690
5691 5691 Please see :hg:`help urls` for important details about ``ssh://``
5692 5692 URLs. If DESTINATION is omitted, a default path will be used.
5693 5693
5694 5694 Returns 0 if push was successful, 1 if nothing to push.
5695 5695 """
5696 5696
5697 5697 if opts.get('bookmark'):
5698 5698 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
5699 5699 for b in opts['bookmark']:
5700 5700 # translate -B options to -r so changesets get pushed
5701 5701 if b in repo._bookmarks:
5702 5702 opts.setdefault('rev', []).append(b)
5703 5703 else:
5704 5704 # if we try to push a deleted bookmark, translate it to null
5705 5705 # this lets simultaneous -r, -b options continue working
5706 5706 opts.setdefault('rev', []).append("null")
5707 5707
5708 5708 path = ui.paths.getpath(dest, default=('default-push', 'default'))
5709 5709 if not path:
5710 5710 raise error.Abort(_('default repository not configured!'),
5711 5711 hint=_('see the "path" section in "hg help config"'))
5712 5712 dest = path.pushloc or path.loc
5713 5713 branches = (path.branch, opts.get('branch') or [])
5714 5714 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
5715 5715 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
5716 5716 other = hg.peer(repo, opts, dest)
5717 5717
5718 5718 if revs:
5719 5719 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
5720 5720 if not revs:
5721 5721 raise error.Abort(_("specified revisions evaluate to an empty set"),
5722 5722 hint=_("use different revision arguments"))
5723 5723
5724 5724 repo._subtoppath = dest
5725 5725 try:
5726 5726 # push subrepos depth-first for coherent ordering
5727 5727 c = repo['']
5728 5728 subs = c.substate # only repos that are committed
5729 5729 for s in sorted(subs):
5730 5730 result = c.sub(s).push(opts)
5731 5731 if result == 0:
5732 5732 return not result
5733 5733 finally:
5734 5734 del repo._subtoppath
5735 5735 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
5736 5736 newbranch=opts.get('new_branch'),
5737 5737 bookmarks=opts.get('bookmark', ()),
5738 5738 opargs=opts.get('opargs'))
5739 5739
5740 5740 result = not pushop.cgresult
5741 5741
5742 5742 if pushop.bkresult is not None:
5743 5743 if pushop.bkresult == 2:
5744 5744 result = 2
5745 5745 elif not result and pushop.bkresult:
5746 5746 result = 2
5747 5747
5748 5748 return result
5749 5749
5750 5750 @command('recover', [])
5751 5751 def recover(ui, repo):
5752 5752 """roll back an interrupted transaction
5753 5753
5754 5754 Recover from an interrupted commit or pull.
5755 5755
5756 5756 This command tries to fix the repository status after an
5757 5757 interrupted operation. It should only be necessary when Mercurial
5758 5758 suggests it.
5759 5759
5760 5760 Returns 0 if successful, 1 if nothing to recover or verify fails.
5761 5761 """
5762 5762 if repo.recover():
5763 5763 return hg.verify(repo)
5764 5764 return 1
5765 5765
5766 5766 @command('^remove|rm',
5767 5767 [('A', 'after', None, _('record delete for missing files')),
5768 5768 ('f', 'force', None,
5769 5769 _('remove (and delete) file even if added or modified')),
5770 5770 ] + subrepoopts + walkopts,
5771 5771 _('[OPTION]... FILE...'),
5772 5772 inferrepo=True)
5773 5773 def remove(ui, repo, *pats, **opts):
5774 5774 """remove the specified files on the next commit
5775 5775
5776 5776 Schedule the indicated files for removal from the current branch.
5777 5777
5778 5778 This command schedules the files to be removed at the next commit.
5779 5779 To undo a remove before that, see :hg:`revert`. To undo added
5780 5780 files, see :hg:`forget`.
5781 5781
5782 5782 .. container:: verbose
5783 5783
5784 5784 -A/--after can be used to remove only files that have already
5785 5785 been deleted, -f/--force can be used to force deletion, and -Af
5786 5786 can be used to remove files from the next revision without
5787 5787 deleting them from the working directory.
5788 5788
5789 5789 The following table details the behavior of remove for different
5790 5790 file states (columns) and option combinations (rows). The file
5791 5791 states are Added [A], Clean [C], Modified [M] and Missing [!]
5792 5792 (as reported by :hg:`status`). The actions are Warn, Remove
5793 5793 (from branch) and Delete (from disk):
5794 5794
5795 5795 ========= == == == ==
5796 5796 opt/state A C M !
5797 5797 ========= == == == ==
5798 5798 none W RD W R
5799 5799 -f R RD RD R
5800 5800 -A W W W R
5801 5801 -Af R R R R
5802 5802 ========= == == == ==
5803 5803
5804 5804 .. note::
5805 5805
5806 5806 :hg:`remove` never deletes files in Added [A] state from the
5807 5807 working directory, not even if ``--force`` is specified.
5808 5808
5809 5809 Returns 0 on success, 1 if any warnings encountered.
5810 5810 """
5811 5811
5812 5812 after, force = opts.get('after'), opts.get('force')
5813 5813 if not pats and not after:
5814 5814 raise error.Abort(_('no files specified'))
5815 5815
5816 5816 m = scmutil.match(repo[None], pats, opts)
5817 5817 subrepos = opts.get('subrepos')
5818 5818 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
5819 5819
5820 5820 @command('rename|move|mv',
5821 5821 [('A', 'after', None, _('record a rename that has already occurred')),
5822 5822 ('f', 'force', None, _('forcibly copy over an existing managed file')),
5823 5823 ] + walkopts + dryrunopts,
5824 5824 _('[OPTION]... SOURCE... DEST'))
5825 5825 def rename(ui, repo, *pats, **opts):
5826 5826 """rename files; equivalent of copy + remove
5827 5827
5828 5828 Mark dest as copies of sources; mark sources for deletion. If dest
5829 5829 is a directory, copies are put in that directory. If dest is a
5830 5830 file, there can only be one source.
5831 5831
5832 5832 By default, this command copies the contents of files as they
5833 5833 exist in the working directory. If invoked with -A/--after, the
5834 5834 operation is recorded, but no copying is performed.
5835 5835
5836 5836 This command takes effect at the next commit. To undo a rename
5837 5837 before that, see :hg:`revert`.
5838 5838
5839 5839 Returns 0 on success, 1 if errors are encountered.
5840 5840 """
5841 5841 with repo.wlock(False):
5842 5842 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5843 5843
5844 5844 @command('resolve',
5845 5845 [('a', 'all', None, _('select all unresolved files')),
5846 5846 ('l', 'list', None, _('list state of files needing merge')),
5847 5847 ('m', 'mark', None, _('mark files as resolved')),
5848 5848 ('u', 'unmark', None, _('mark files as unresolved')),
5849 5849 ('n', 'no-status', None, _('hide status prefix'))]
5850 5850 + mergetoolopts + walkopts + formatteropts,
5851 5851 _('[OPTION]... [FILE]...'),
5852 5852 inferrepo=True)
5853 5853 def resolve(ui, repo, *pats, **opts):
5854 5854 """redo merges or set/view the merge status of files
5855 5855
5856 5856 Merges with unresolved conflicts are often the result of
5857 5857 non-interactive merging using the ``internal:merge`` configuration
5858 5858 setting, or a command-line merge tool like ``diff3``. The resolve
5859 5859 command is used to manage the files involved in a merge, after
5860 5860 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5861 5861 working directory must have two parents). See :hg:`help
5862 5862 merge-tools` for information on configuring merge tools.
5863 5863
5864 5864 The resolve command can be used in the following ways:
5865 5865
5866 5866 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
5867 5867 files, discarding any previous merge attempts. Re-merging is not
5868 5868 performed for files already marked as resolved. Use ``--all/-a``
5869 5869 to select all unresolved files. ``--tool`` can be used to specify
5870 5870 the merge tool used for the given files. It overrides the HGMERGE
5871 5871 environment variable and your configuration files. Previous file
5872 5872 contents are saved with a ``.orig`` suffix.
5873 5873
5874 5874 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5875 5875 (e.g. after having manually fixed-up the files). The default is
5876 5876 to mark all unresolved files.
5877 5877
5878 5878 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5879 5879 default is to mark all resolved files.
5880 5880
5881 5881 - :hg:`resolve -l`: list files which had or still have conflicts.
5882 5882 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5883 5883
5884 5884 .. note::
5885 5885
5886 5886 Mercurial will not let you commit files with unresolved merge
5887 5887 conflicts. You must use :hg:`resolve -m ...` before you can
5888 5888 commit after a conflicting merge.
5889 5889
5890 5890 Returns 0 on success, 1 if any files fail a resolve attempt.
5891 5891 """
5892 5892
5893 5893 all, mark, unmark, show, nostatus = \
5894 5894 [opts.get(o) for o in 'all mark unmark list no_status'.split()]
5895 5895
5896 5896 if (show and (mark or unmark)) or (mark and unmark):
5897 5897 raise error.Abort(_("too many options specified"))
5898 5898 if pats and all:
5899 5899 raise error.Abort(_("can't specify --all and patterns"))
5900 5900 if not (all or pats or show or mark or unmark):
5901 5901 raise error.Abort(_('no files or directories specified'),
5902 5902 hint=('use --all to re-merge all unresolved files'))
5903 5903
5904 5904 if show:
5905 5905 fm = ui.formatter('resolve', opts)
5906 5906 ms = mergemod.mergestate.read(repo)
5907 5907 m = scmutil.match(repo[None], pats, opts)
5908 5908 for f in ms:
5909 5909 if not m(f):
5910 5910 continue
5911 5911 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
5912 5912 'd': 'driverresolved'}[ms[f]]
5913 5913 fm.startitem()
5914 5914 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
5915 5915 fm.write('path', '%s\n', f, label=l)
5916 5916 fm.end()
5917 5917 return 0
5918 5918
5919 5919 with repo.wlock():
5920 5920 ms = mergemod.mergestate.read(repo)
5921 5921
5922 5922 if not (ms.active() or repo.dirstate.p2() != nullid):
5923 5923 raise error.Abort(
5924 5924 _('resolve command not applicable when not merging'))
5925 5925
5926 5926 wctx = repo[None]
5927 5927
5928 5928 if ms.mergedriver and ms.mdstate() == 'u':
5929 5929 proceed = mergemod.driverpreprocess(repo, ms, wctx)
5930 5930 ms.commit()
5931 5931 # allow mark and unmark to go through
5932 5932 if not mark and not unmark and not proceed:
5933 5933 return 1
5934 5934
5935 5935 m = scmutil.match(wctx, pats, opts)
5936 5936 ret = 0
5937 5937 didwork = False
5938 5938 runconclude = False
5939 5939
5940 5940 tocomplete = []
5941 5941 for f in ms:
5942 5942 if not m(f):
5943 5943 continue
5944 5944
5945 5945 didwork = True
5946 5946
5947 5947 # don't let driver-resolved files be marked, and run the conclude
5948 5948 # step if asked to resolve
5949 5949 if ms[f] == "d":
5950 5950 exact = m.exact(f)
5951 5951 if mark:
5952 5952 if exact:
5953 5953 ui.warn(_('not marking %s as it is driver-resolved\n')
5954 5954 % f)
5955 5955 elif unmark:
5956 5956 if exact:
5957 5957 ui.warn(_('not unmarking %s as it is driver-resolved\n')
5958 5958 % f)
5959 5959 else:
5960 5960 runconclude = True
5961 5961 continue
5962 5962
5963 5963 if mark:
5964 5964 ms.mark(f, "r")
5965 5965 elif unmark:
5966 5966 ms.mark(f, "u")
5967 5967 else:
5968 5968 # backup pre-resolve (merge uses .orig for its own purposes)
5969 5969 a = repo.wjoin(f)
5970 5970 try:
5971 5971 util.copyfile(a, a + ".resolve")
5972 5972 except (IOError, OSError) as inst:
5973 5973 if inst.errno != errno.ENOENT:
5974 5974 raise
5975 5975
5976 5976 try:
5977 5977 # preresolve file
5978 5978 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
5979 5979 'resolve')
5980 5980 complete, r = ms.preresolve(f, wctx)
5981 5981 if not complete:
5982 5982 tocomplete.append(f)
5983 5983 elif r:
5984 5984 ret = 1
5985 5985 finally:
5986 5986 ui.setconfig('ui', 'forcemerge', '', 'resolve')
5987 5987 ms.commit()
5988 5988
5989 5989 # replace filemerge's .orig file with our resolve file, but only
5990 5990 # for merges that are complete
5991 5991 if complete:
5992 5992 try:
5993 5993 util.rename(a + ".resolve",
5994 5994 scmutil.origpath(ui, repo, a))
5995 5995 except OSError as inst:
5996 5996 if inst.errno != errno.ENOENT:
5997 5997 raise
5998 5998
5999 5999 for f in tocomplete:
6000 6000 try:
6001 6001 # resolve file
6002 6002 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
6003 6003 'resolve')
6004 6004 r = ms.resolve(f, wctx)
6005 6005 if r:
6006 6006 ret = 1
6007 6007 finally:
6008 6008 ui.setconfig('ui', 'forcemerge', '', 'resolve')
6009 6009 ms.commit()
6010 6010
6011 6011 # replace filemerge's .orig file with our resolve file
6012 6012 a = repo.wjoin(f)
6013 6013 try:
6014 6014 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
6015 6015 except OSError as inst:
6016 6016 if inst.errno != errno.ENOENT:
6017 6017 raise
6018 6018
6019 6019 ms.commit()
6020 6020 ms.recordactions()
6021 6021
6022 6022 if not didwork and pats:
6023 6023 ui.warn(_("arguments do not match paths that need resolving\n"))
6024 6024 elif ms.mergedriver and ms.mdstate() != 's':
6025 6025 # run conclude step when either a driver-resolved file is requested
6026 6026 # or there are no driver-resolved files
6027 6027 # we can't use 'ret' to determine whether any files are unresolved
6028 6028 # because we might not have tried to resolve some
6029 6029 if ((runconclude or not list(ms.driverresolved()))
6030 6030 and not list(ms.unresolved())):
6031 6031 proceed = mergemod.driverconclude(repo, ms, wctx)
6032 6032 ms.commit()
6033 6033 if not proceed:
6034 6034 return 1
6035 6035
6036 6036 # Nudge users into finishing an unfinished operation
6037 6037 unresolvedf = list(ms.unresolved())
6038 6038 driverresolvedf = list(ms.driverresolved())
6039 6039 if not unresolvedf and not driverresolvedf:
6040 6040 ui.status(_('(no more unresolved files)\n'))
6041 6041 cmdutil.checkafterresolved(repo)
6042 6042 elif not unresolvedf:
6043 6043 ui.status(_('(no more unresolved files -- '
6044 6044 'run "hg resolve --all" to conclude)\n'))
6045 6045
6046 6046 return ret
6047 6047
6048 6048 @command('revert',
6049 6049 [('a', 'all', None, _('revert all changes when no arguments given')),
6050 6050 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6051 6051 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
6052 6052 ('C', 'no-backup', None, _('do not save backup copies of files')),
6053 6053 ('i', 'interactive', None,
6054 6054 _('interactively select the changes (EXPERIMENTAL)')),
6055 6055 ] + walkopts + dryrunopts,
6056 6056 _('[OPTION]... [-r REV] [NAME]...'))
6057 6057 def revert(ui, repo, *pats, **opts):
6058 6058 """restore files to their checkout state
6059 6059
6060 6060 .. note::
6061 6061
6062 6062 To check out earlier revisions, you should use :hg:`update REV`.
6063 6063 To cancel an uncommitted merge (and lose your changes),
6064 6064 use :hg:`update --clean .`.
6065 6065
6066 6066 With no revision specified, revert the specified files or directories
6067 6067 to the contents they had in the parent of the working directory.
6068 6068 This restores the contents of files to an unmodified
6069 6069 state and unschedules adds, removes, copies, and renames. If the
6070 6070 working directory has two parents, you must explicitly specify a
6071 6071 revision.
6072 6072
6073 6073 Using the -r/--rev or -d/--date options, revert the given files or
6074 6074 directories to their states as of a specific revision. Because
6075 6075 revert does not change the working directory parents, this will
6076 6076 cause these files to appear modified. This can be helpful to "back
6077 6077 out" some or all of an earlier change. See :hg:`backout` for a
6078 6078 related method.
6079 6079
6080 6080 Modified files are saved with a .orig suffix before reverting.
6081 6081 To disable these backups, use --no-backup.
6082 6082
6083 6083 See :hg:`help dates` for a list of formats valid for -d/--date.
6084 6084
6085 6085 See :hg:`help backout` for a way to reverse the effect of an
6086 6086 earlier changeset.
6087 6087
6088 6088 Returns 0 on success.
6089 6089 """
6090 6090
6091 6091 if opts.get("date"):
6092 6092 if opts.get("rev"):
6093 6093 raise error.Abort(_("you can't specify a revision and a date"))
6094 6094 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
6095 6095
6096 6096 parent, p2 = repo.dirstate.parents()
6097 6097 if not opts.get('rev') and p2 != nullid:
6098 6098 # revert after merge is a trap for new users (issue2915)
6099 6099 raise error.Abort(_('uncommitted merge with no revision specified'),
6100 6100 hint=_('use "hg update" or see "hg help revert"'))
6101 6101
6102 6102 ctx = scmutil.revsingle(repo, opts.get('rev'))
6103 6103
6104 6104 if (not (pats or opts.get('include') or opts.get('exclude') or
6105 6105 opts.get('all') or opts.get('interactive'))):
6106 6106 msg = _("no files or directories specified")
6107 6107 if p2 != nullid:
6108 6108 hint = _("uncommitted merge, use --all to discard all changes,"
6109 6109 " or 'hg update -C .' to abort the merge")
6110 6110 raise error.Abort(msg, hint=hint)
6111 6111 dirty = any(repo.status())
6112 6112 node = ctx.node()
6113 6113 if node != parent:
6114 6114 if dirty:
6115 6115 hint = _("uncommitted changes, use --all to discard all"
6116 6116 " changes, or 'hg update %s' to update") % ctx.rev()
6117 6117 else:
6118 6118 hint = _("use --all to revert all files,"
6119 6119 " or 'hg update %s' to update") % ctx.rev()
6120 6120 elif dirty:
6121 6121 hint = _("uncommitted changes, use --all to discard all changes")
6122 6122 else:
6123 6123 hint = _("use --all to revert all files")
6124 6124 raise error.Abort(msg, hint=hint)
6125 6125
6126 6126 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
6127 6127
6128 6128 @command('rollback', dryrunopts +
6129 6129 [('f', 'force', False, _('ignore safety measures'))])
6130 6130 def rollback(ui, repo, **opts):
6131 6131 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6132 6132
6133 6133 Please use :hg:`commit --amend` instead of rollback to correct
6134 6134 mistakes in the last commit.
6135 6135
6136 6136 This command should be used with care. There is only one level of
6137 6137 rollback, and there is no way to undo a rollback. It will also
6138 6138 restore the dirstate at the time of the last transaction, losing
6139 6139 any dirstate changes since that time. This command does not alter
6140 6140 the working directory.
6141 6141
6142 6142 Transactions are used to encapsulate the effects of all commands
6143 6143 that create new changesets or propagate existing changesets into a
6144 6144 repository.
6145 6145
6146 6146 .. container:: verbose
6147 6147
6148 6148 For example, the following commands are transactional, and their
6149 6149 effects can be rolled back:
6150 6150
6151 6151 - commit
6152 6152 - import
6153 6153 - pull
6154 6154 - push (with this repository as the destination)
6155 6155 - unbundle
6156 6156
6157 6157 To avoid permanent data loss, rollback will refuse to rollback a
6158 6158 commit transaction if it isn't checked out. Use --force to
6159 6159 override this protection.
6160 6160
6161 6161 This command is not intended for use on public repositories. Once
6162 6162 changes are visible for pull by other users, rolling a transaction
6163 6163 back locally is ineffective (someone else may already have pulled
6164 6164 the changes). Furthermore, a race is possible with readers of the
6165 6165 repository; for example an in-progress pull from the repository
6166 6166 may fail if a rollback is performed.
6167 6167
6168 6168 Returns 0 on success, 1 if no rollback data is available.
6169 6169 """
6170 6170 return repo.rollback(dryrun=opts.get('dry_run'),
6171 6171 force=opts.get('force'))
6172 6172
6173 6173 @command('root', [])
6174 6174 def root(ui, repo):
6175 6175 """print the root (top) of the current working directory
6176 6176
6177 6177 Print the root directory of the current repository.
6178 6178
6179 6179 Returns 0 on success.
6180 6180 """
6181 6181 ui.write(repo.root + "\n")
6182 6182
6183 6183 @command('^serve',
6184 6184 [('A', 'accesslog', '', _('name of access log file to write to'),
6185 6185 _('FILE')),
6186 6186 ('d', 'daemon', None, _('run server in background')),
6187 6187 ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('FILE')),
6188 6188 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
6189 6189 # use string type, then we can check if something was passed
6190 6190 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
6191 6191 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
6192 6192 _('ADDR')),
6193 6193 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
6194 6194 _('PREFIX')),
6195 6195 ('n', 'name', '',
6196 6196 _('name to show in web pages (default: working directory)'), _('NAME')),
6197 6197 ('', 'web-conf', '',
6198 6198 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
6199 6199 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
6200 6200 _('FILE')),
6201 6201 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
6202 6202 ('', 'stdio', None, _('for remote clients')),
6203 6203 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
6204 6204 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
6205 6205 ('', 'style', '', _('template style to use'), _('STYLE')),
6206 6206 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
6207 6207 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
6208 6208 _('[OPTION]...'),
6209 6209 optionalrepo=True)
6210 6210 def serve(ui, repo, **opts):
6211 6211 """start stand-alone webserver
6212 6212
6213 6213 Start a local HTTP repository browser and pull server. You can use
6214 6214 this for ad-hoc sharing and browsing of repositories. It is
6215 6215 recommended to use a real web server to serve a repository for
6216 6216 longer periods of time.
6217 6217
6218 6218 Please note that the server does not implement access control.
6219 6219 This means that, by default, anybody can read from the server and
6220 6220 nobody can write to it by default. Set the ``web.allow_push``
6221 6221 option to ``*`` to allow everybody to push to the server. You
6222 6222 should use a real web server if you need to authenticate users.
6223 6223
6224 6224 By default, the server logs accesses to stdout and errors to
6225 6225 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6226 6226 files.
6227 6227
6228 6228 To have the server choose a free port number to listen on, specify
6229 6229 a port number of 0; in this case, the server will print the port
6230 6230 number it uses.
6231 6231
6232 6232 Returns 0 on success.
6233 6233 """
6234 6234
6235 6235 if opts["stdio"] and opts["cmdserver"]:
6236 6236 raise error.Abort(_("cannot use --stdio with --cmdserver"))
6237 6237
6238 6238 if opts["stdio"]:
6239 6239 if repo is None:
6240 6240 raise error.RepoError(_("there is no Mercurial repository here"
6241 6241 " (.hg not found)"))
6242 6242 s = sshserver.sshserver(ui, repo)
6243 6243 s.serve_forever()
6244 6244
6245 6245 if opts["cmdserver"]:
6246 6246 service = commandserver.createservice(ui, repo, opts)
6247 6247 else:
6248 6248 service = hgweb.createservice(ui, repo, opts)
6249 6249 return cmdutil.service(opts, initfn=service.init, runfn=service.run)
6250 6250
6251 6251 @command('^status|st',
6252 6252 [('A', 'all', None, _('show status of all files')),
6253 6253 ('m', 'modified', None, _('show only modified files')),
6254 6254 ('a', 'added', None, _('show only added files')),
6255 6255 ('r', 'removed', None, _('show only removed files')),
6256 6256 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
6257 6257 ('c', 'clean', None, _('show only files without changes')),
6258 6258 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
6259 6259 ('i', 'ignored', None, _('show only ignored files')),
6260 6260 ('n', 'no-status', None, _('hide status prefix')),
6261 6261 ('C', 'copies', None, _('show source of copied files')),
6262 6262 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
6263 6263 ('', 'rev', [], _('show difference from revision'), _('REV')),
6264 6264 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
6265 6265 ] + walkopts + subrepoopts + formatteropts,
6266 6266 _('[OPTION]... [FILE]...'),
6267 6267 inferrepo=True)
6268 6268 def status(ui, repo, *pats, **opts):
6269 6269 """show changed files in the working directory
6270 6270
6271 6271 Show status of files in the repository. If names are given, only
6272 6272 files that match are shown. Files that are clean or ignored or
6273 6273 the source of a copy/move operation, are not listed unless
6274 6274 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6275 6275 Unless options described with "show only ..." are given, the
6276 6276 options -mardu are used.
6277 6277
6278 6278 Option -q/--quiet hides untracked (unknown and ignored) files
6279 6279 unless explicitly requested with -u/--unknown or -i/--ignored.
6280 6280
6281 6281 .. note::
6282 6282
6283 6283 :hg:`status` may appear to disagree with diff if permissions have
6284 6284 changed or a merge has occurred. The standard diff format does
6285 6285 not report permission changes and diff only reports changes
6286 6286 relative to one merge parent.
6287 6287
6288 6288 If one revision is given, it is used as the base revision.
6289 6289 If two revisions are given, the differences between them are
6290 6290 shown. The --change option can also be used as a shortcut to list
6291 6291 the changed files of a revision from its first parent.
6292 6292
6293 6293 The codes used to show the status of files are::
6294 6294
6295 6295 M = modified
6296 6296 A = added
6297 6297 R = removed
6298 6298 C = clean
6299 6299 ! = missing (deleted by non-hg command, but still tracked)
6300 6300 ? = not tracked
6301 6301 I = ignored
6302 6302 = origin of the previous file (with --copies)
6303 6303
6304 6304 .. container:: verbose
6305 6305
6306 6306 Examples:
6307 6307
6308 6308 - show changes in the working directory relative to a
6309 6309 changeset::
6310 6310
6311 6311 hg status --rev 9353
6312 6312
6313 6313 - show changes in the working directory relative to the
6314 6314 current directory (see :hg:`help patterns` for more information)::
6315 6315
6316 6316 hg status re:
6317 6317
6318 6318 - show all changes including copies in an existing changeset::
6319 6319
6320 6320 hg status --copies --change 9353
6321 6321
6322 6322 - get a NUL separated list of added files, suitable for xargs::
6323 6323
6324 6324 hg status -an0
6325 6325
6326 6326 Returns 0 on success.
6327 6327 """
6328 6328
6329 6329 revs = opts.get('rev')
6330 6330 change = opts.get('change')
6331 6331
6332 6332 if revs and change:
6333 6333 msg = _('cannot specify --rev and --change at the same time')
6334 6334 raise error.Abort(msg)
6335 6335 elif change:
6336 6336 node2 = scmutil.revsingle(repo, change, None).node()
6337 6337 node1 = repo[node2].p1().node()
6338 6338 else:
6339 6339 node1, node2 = scmutil.revpair(repo, revs)
6340 6340
6341 6341 if pats:
6342 6342 cwd = repo.getcwd()
6343 6343 else:
6344 6344 cwd = ''
6345 6345
6346 6346 if opts.get('print0'):
6347 6347 end = '\0'
6348 6348 else:
6349 6349 end = '\n'
6350 6350 copy = {}
6351 6351 states = 'modified added removed deleted unknown ignored clean'.split()
6352 6352 show = [k for k in states if opts.get(k)]
6353 6353 if opts.get('all'):
6354 6354 show += ui.quiet and (states[:4] + ['clean']) or states
6355 6355 if not show:
6356 6356 if ui.quiet:
6357 6357 show = states[:4]
6358 6358 else:
6359 6359 show = states[:5]
6360 6360
6361 6361 m = scmutil.match(repo[node2], pats, opts)
6362 6362 stat = repo.status(node1, node2, m,
6363 6363 'ignored' in show, 'clean' in show, 'unknown' in show,
6364 6364 opts.get('subrepos'))
6365 6365 changestates = zip(states, 'MAR!?IC', stat)
6366 6366
6367 6367 if (opts.get('all') or opts.get('copies')
6368 6368 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
6369 6369 copy = copies.pathcopies(repo[node1], repo[node2], m)
6370 6370
6371 6371 fm = ui.formatter('status', opts)
6372 6372 fmt = '%s' + end
6373 6373 showchar = not opts.get('no_status')
6374 6374
6375 6375 for state, char, files in changestates:
6376 6376 if state in show:
6377 6377 label = 'status.' + state
6378 6378 for f in files:
6379 6379 fm.startitem()
6380 6380 fm.condwrite(showchar, 'status', '%s ', char, label=label)
6381 6381 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
6382 6382 if f in copy:
6383 6383 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
6384 6384 label='status.copied')
6385 6385 fm.end()
6386 6386
6387 6387 @command('^summary|sum',
6388 6388 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
6389 6389 def summary(ui, repo, **opts):
6390 6390 """summarize working directory state
6391 6391
6392 6392 This generates a brief summary of the working directory state,
6393 6393 including parents, branch, commit status, phase and available updates.
6394 6394
6395 6395 With the --remote option, this will check the default paths for
6396 6396 incoming and outgoing changes. This can be time-consuming.
6397 6397
6398 6398 Returns 0 on success.
6399 6399 """
6400 6400
6401 6401 ctx = repo[None]
6402 6402 parents = ctx.parents()
6403 6403 pnode = parents[0].node()
6404 6404 marks = []
6405 6405
6406 6406 for p in parents:
6407 6407 # label with log.changeset (instead of log.parent) since this
6408 6408 # shows a working directory parent *changeset*:
6409 6409 # i18n: column positioning for "hg summary"
6410 6410 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
6411 6411 label='log.changeset changeset.%s' % p.phasestr())
6412 6412 ui.write(' '.join(p.tags()), label='log.tag')
6413 6413 if p.bookmarks():
6414 6414 marks.extend(p.bookmarks())
6415 6415 if p.rev() == -1:
6416 6416 if not len(repo):
6417 6417 ui.write(_(' (empty repository)'))
6418 6418 else:
6419 6419 ui.write(_(' (no revision checked out)'))
6420 6420 ui.write('\n')
6421 6421 if p.description():
6422 6422 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
6423 6423 label='log.summary')
6424 6424
6425 6425 branch = ctx.branch()
6426 6426 bheads = repo.branchheads(branch)
6427 6427 # i18n: column positioning for "hg summary"
6428 6428 m = _('branch: %s\n') % branch
6429 6429 if branch != 'default':
6430 6430 ui.write(m, label='log.branch')
6431 6431 else:
6432 6432 ui.status(m, label='log.branch')
6433 6433
6434 6434 if marks:
6435 6435 active = repo._activebookmark
6436 6436 # i18n: column positioning for "hg summary"
6437 6437 ui.write(_('bookmarks:'), label='log.bookmark')
6438 6438 if active is not None:
6439 6439 if active in marks:
6440 6440 ui.write(' *' + active, label=activebookmarklabel)
6441 6441 marks.remove(active)
6442 6442 else:
6443 6443 ui.write(' [%s]' % active, label=activebookmarklabel)
6444 6444 for m in marks:
6445 6445 ui.write(' ' + m, label='log.bookmark')
6446 6446 ui.write('\n', label='log.bookmark')
6447 6447
6448 6448 status = repo.status(unknown=True)
6449 6449
6450 6450 c = repo.dirstate.copies()
6451 6451 copied, renamed = [], []
6452 6452 for d, s in c.iteritems():
6453 6453 if s in status.removed:
6454 6454 status.removed.remove(s)
6455 6455 renamed.append(d)
6456 6456 else:
6457 6457 copied.append(d)
6458 6458 if d in status.added:
6459 6459 status.added.remove(d)
6460 6460
6461 6461 try:
6462 6462 ms = mergemod.mergestate.read(repo)
6463 6463 except error.UnsupportedMergeRecords as e:
6464 6464 s = ' '.join(e.recordtypes)
6465 6465 ui.warn(
6466 6466 _('warning: merge state has unsupported record types: %s\n') % s)
6467 6467 unresolved = 0
6468 6468 else:
6469 6469 unresolved = [f for f in ms if ms[f] == 'u']
6470 6470
6471 6471 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
6472 6472
6473 6473 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
6474 6474 (ui.label(_('%d added'), 'status.added'), status.added),
6475 6475 (ui.label(_('%d removed'), 'status.removed'), status.removed),
6476 6476 (ui.label(_('%d renamed'), 'status.copied'), renamed),
6477 6477 (ui.label(_('%d copied'), 'status.copied'), copied),
6478 6478 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
6479 6479 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
6480 6480 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
6481 6481 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
6482 6482 t = []
6483 6483 for l, s in labels:
6484 6484 if s:
6485 6485 t.append(l % len(s))
6486 6486
6487 6487 t = ', '.join(t)
6488 6488 cleanworkdir = False
6489 6489
6490 6490 if repo.vfs.exists('graftstate'):
6491 6491 t += _(' (graft in progress)')
6492 6492 if repo.vfs.exists('updatestate'):
6493 6493 t += _(' (interrupted update)')
6494 6494 elif len(parents) > 1:
6495 6495 t += _(' (merge)')
6496 6496 elif branch != parents[0].branch():
6497 6497 t += _(' (new branch)')
6498 6498 elif (parents[0].closesbranch() and
6499 6499 pnode in repo.branchheads(branch, closed=True)):
6500 6500 t += _(' (head closed)')
6501 6501 elif not (status.modified or status.added or status.removed or renamed or
6502 6502 copied or subs):
6503 6503 t += _(' (clean)')
6504 6504 cleanworkdir = True
6505 6505 elif pnode not in bheads:
6506 6506 t += _(' (new branch head)')
6507 6507
6508 6508 if parents:
6509 6509 pendingphase = max(p.phase() for p in parents)
6510 6510 else:
6511 6511 pendingphase = phases.public
6512 6512
6513 6513 if pendingphase > phases.newcommitphase(ui):
6514 6514 t += ' (%s)' % phases.phasenames[pendingphase]
6515 6515
6516 6516 if cleanworkdir:
6517 6517 # i18n: column positioning for "hg summary"
6518 6518 ui.status(_('commit: %s\n') % t.strip())
6519 6519 else:
6520 6520 # i18n: column positioning for "hg summary"
6521 6521 ui.write(_('commit: %s\n') % t.strip())
6522 6522
6523 6523 # all ancestors of branch heads - all ancestors of parent = new csets
6524 6524 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
6525 6525 bheads))
6526 6526
6527 6527 if new == 0:
6528 6528 # i18n: column positioning for "hg summary"
6529 6529 ui.status(_('update: (current)\n'))
6530 6530 elif pnode not in bheads:
6531 6531 # i18n: column positioning for "hg summary"
6532 6532 ui.write(_('update: %d new changesets (update)\n') % new)
6533 6533 else:
6534 6534 # i18n: column positioning for "hg summary"
6535 6535 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
6536 6536 (new, len(bheads)))
6537 6537
6538 6538 t = []
6539 6539 draft = len(repo.revs('draft()'))
6540 6540 if draft:
6541 6541 t.append(_('%d draft') % draft)
6542 6542 secret = len(repo.revs('secret()'))
6543 6543 if secret:
6544 6544 t.append(_('%d secret') % secret)
6545 6545
6546 6546 if draft or secret:
6547 6547 ui.status(_('phases: %s\n') % ', '.join(t))
6548 6548
6549 6549 if obsolete.isenabled(repo, obsolete.createmarkersopt):
6550 6550 for trouble in ("unstable", "divergent", "bumped"):
6551 6551 numtrouble = len(repo.revs(trouble + "()"))
6552 6552 # We write all the possibilities to ease translation
6553 6553 troublemsg = {
6554 6554 "unstable": _("unstable: %d changesets"),
6555 6555 "divergent": _("divergent: %d changesets"),
6556 6556 "bumped": _("bumped: %d changesets"),
6557 6557 }
6558 6558 if numtrouble > 0:
6559 6559 ui.status(troublemsg[trouble] % numtrouble + "\n")
6560 6560
6561 6561 cmdutil.summaryhooks(ui, repo)
6562 6562
6563 6563 if opts.get('remote'):
6564 6564 needsincoming, needsoutgoing = True, True
6565 6565 else:
6566 6566 needsincoming, needsoutgoing = False, False
6567 6567 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
6568 6568 if i:
6569 6569 needsincoming = True
6570 6570 if o:
6571 6571 needsoutgoing = True
6572 6572 if not needsincoming and not needsoutgoing:
6573 6573 return
6574 6574
6575 6575 def getincoming():
6576 6576 source, branches = hg.parseurl(ui.expandpath('default'))
6577 6577 sbranch = branches[0]
6578 6578 try:
6579 6579 other = hg.peer(repo, {}, source)
6580 6580 except error.RepoError:
6581 6581 if opts.get('remote'):
6582 6582 raise
6583 6583 return source, sbranch, None, None, None
6584 6584 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
6585 6585 if revs:
6586 6586 revs = [other.lookup(rev) for rev in revs]
6587 6587 ui.debug('comparing with %s\n' % util.hidepassword(source))
6588 6588 repo.ui.pushbuffer()
6589 6589 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
6590 6590 repo.ui.popbuffer()
6591 6591 return source, sbranch, other, commoninc, commoninc[1]
6592 6592
6593 6593 if needsincoming:
6594 6594 source, sbranch, sother, commoninc, incoming = getincoming()
6595 6595 else:
6596 6596 source = sbranch = sother = commoninc = incoming = None
6597 6597
6598 6598 def getoutgoing():
6599 6599 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
6600 6600 dbranch = branches[0]
6601 6601 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
6602 6602 if source != dest:
6603 6603 try:
6604 6604 dother = hg.peer(repo, {}, dest)
6605 6605 except error.RepoError:
6606 6606 if opts.get('remote'):
6607 6607 raise
6608 6608 return dest, dbranch, None, None
6609 6609 ui.debug('comparing with %s\n' % util.hidepassword(dest))
6610 6610 elif sother is None:
6611 6611 # there is no explicit destination peer, but source one is invalid
6612 6612 return dest, dbranch, None, None
6613 6613 else:
6614 6614 dother = sother
6615 6615 if (source != dest or (sbranch is not None and sbranch != dbranch)):
6616 6616 common = None
6617 6617 else:
6618 6618 common = commoninc
6619 6619 if revs:
6620 6620 revs = [repo.lookup(rev) for rev in revs]
6621 6621 repo.ui.pushbuffer()
6622 6622 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
6623 6623 commoninc=common)
6624 6624 repo.ui.popbuffer()
6625 6625 return dest, dbranch, dother, outgoing
6626 6626
6627 6627 if needsoutgoing:
6628 6628 dest, dbranch, dother, outgoing = getoutgoing()
6629 6629 else:
6630 6630 dest = dbranch = dother = outgoing = None
6631 6631
6632 6632 if opts.get('remote'):
6633 6633 t = []
6634 6634 if incoming:
6635 6635 t.append(_('1 or more incoming'))
6636 6636 o = outgoing.missing
6637 6637 if o:
6638 6638 t.append(_('%d outgoing') % len(o))
6639 6639 other = dother or sother
6640 6640 if 'bookmarks' in other.listkeys('namespaces'):
6641 6641 counts = bookmarks.summary(repo, other)
6642 6642 if counts[0] > 0:
6643 6643 t.append(_('%d incoming bookmarks') % counts[0])
6644 6644 if counts[1] > 0:
6645 6645 t.append(_('%d outgoing bookmarks') % counts[1])
6646 6646
6647 6647 if t:
6648 6648 # i18n: column positioning for "hg summary"
6649 6649 ui.write(_('remote: %s\n') % (', '.join(t)))
6650 6650 else:
6651 6651 # i18n: column positioning for "hg summary"
6652 6652 ui.status(_('remote: (synced)\n'))
6653 6653
6654 6654 cmdutil.summaryremotehooks(ui, repo, opts,
6655 6655 ((source, sbranch, sother, commoninc),
6656 6656 (dest, dbranch, dother, outgoing)))
6657 6657
6658 6658 @command('tag',
6659 6659 [('f', 'force', None, _('force tag')),
6660 6660 ('l', 'local', None, _('make the tag local')),
6661 6661 ('r', 'rev', '', _('revision to tag'), _('REV')),
6662 6662 ('', 'remove', None, _('remove a tag')),
6663 6663 # -l/--local is already there, commitopts cannot be used
6664 6664 ('e', 'edit', None, _('invoke editor on commit messages')),
6665 6665 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
6666 6666 ] + commitopts2,
6667 6667 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
6668 6668 def tag(ui, repo, name1, *names, **opts):
6669 6669 """add one or more tags for the current or given revision
6670 6670
6671 6671 Name a particular revision using <name>.
6672 6672
6673 6673 Tags are used to name particular revisions of the repository and are
6674 6674 very useful to compare different revisions, to go back to significant
6675 6675 earlier versions or to mark branch points as releases, etc. Changing
6676 6676 an existing tag is normally disallowed; use -f/--force to override.
6677 6677
6678 6678 If no revision is given, the parent of the working directory is
6679 6679 used.
6680 6680
6681 6681 To facilitate version control, distribution, and merging of tags,
6682 6682 they are stored as a file named ".hgtags" which is managed similarly
6683 6683 to other project files and can be hand-edited if necessary. This
6684 6684 also means that tagging creates a new commit. The file
6685 6685 ".hg/localtags" is used for local tags (not shared among
6686 6686 repositories).
6687 6687
6688 6688 Tag commits are usually made at the head of a branch. If the parent
6689 6689 of the working directory is not a branch head, :hg:`tag` aborts; use
6690 6690 -f/--force to force the tag commit to be based on a non-head
6691 6691 changeset.
6692 6692
6693 6693 See :hg:`help dates` for a list of formats valid for -d/--date.
6694 6694
6695 6695 Since tag names have priority over branch names during revision
6696 6696 lookup, using an existing branch name as a tag name is discouraged.
6697 6697
6698 6698 Returns 0 on success.
6699 6699 """
6700 6700 wlock = lock = None
6701 6701 try:
6702 6702 wlock = repo.wlock()
6703 6703 lock = repo.lock()
6704 6704 rev_ = "."
6705 6705 names = [t.strip() for t in (name1,) + names]
6706 6706 if len(names) != len(set(names)):
6707 6707 raise error.Abort(_('tag names must be unique'))
6708 6708 for n in names:
6709 6709 scmutil.checknewlabel(repo, n, 'tag')
6710 6710 if not n:
6711 6711 raise error.Abort(_('tag names cannot consist entirely of '
6712 6712 'whitespace'))
6713 6713 if opts.get('rev') and opts.get('remove'):
6714 6714 raise error.Abort(_("--rev and --remove are incompatible"))
6715 6715 if opts.get('rev'):
6716 6716 rev_ = opts['rev']
6717 6717 message = opts.get('message')
6718 6718 if opts.get('remove'):
6719 6719 if opts.get('local'):
6720 6720 expectedtype = 'local'
6721 6721 else:
6722 6722 expectedtype = 'global'
6723 6723
6724 6724 for n in names:
6725 6725 if not repo.tagtype(n):
6726 6726 raise error.Abort(_("tag '%s' does not exist") % n)
6727 6727 if repo.tagtype(n) != expectedtype:
6728 6728 if expectedtype == 'global':
6729 6729 raise error.Abort(_("tag '%s' is not a global tag") % n)
6730 6730 else:
6731 6731 raise error.Abort(_("tag '%s' is not a local tag") % n)
6732 6732 rev_ = 'null'
6733 6733 if not message:
6734 6734 # we don't translate commit messages
6735 6735 message = 'Removed tag %s' % ', '.join(names)
6736 6736 elif not opts.get('force'):
6737 6737 for n in names:
6738 6738 if n in repo.tags():
6739 6739 raise error.Abort(_("tag '%s' already exists "
6740 6740 "(use -f to force)") % n)
6741 6741 if not opts.get('local'):
6742 6742 p1, p2 = repo.dirstate.parents()
6743 6743 if p2 != nullid:
6744 6744 raise error.Abort(_('uncommitted merge'))
6745 6745 bheads = repo.branchheads()
6746 6746 if not opts.get('force') and bheads and p1 not in bheads:
6747 6747 raise error.Abort(_('not at a branch head (use -f to force)'))
6748 6748 r = scmutil.revsingle(repo, rev_).node()
6749 6749
6750 6750 if not message:
6751 6751 # we don't translate commit messages
6752 6752 message = ('Added tag %s for changeset %s' %
6753 6753 (', '.join(names), short(r)))
6754 6754
6755 6755 date = opts.get('date')
6756 6756 if date:
6757 6757 date = util.parsedate(date)
6758 6758
6759 6759 if opts.get('remove'):
6760 6760 editform = 'tag.remove'
6761 6761 else:
6762 6762 editform = 'tag.add'
6763 6763 editor = cmdutil.getcommiteditor(editform=editform, **opts)
6764 6764
6765 6765 # don't allow tagging the null rev
6766 6766 if (not opts.get('remove') and
6767 6767 scmutil.revsingle(repo, rev_).rev() == nullrev):
6768 6768 raise error.Abort(_("cannot tag null revision"))
6769 6769
6770 6770 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
6771 6771 editor=editor)
6772 6772 finally:
6773 6773 release(lock, wlock)
6774 6774
6775 6775 @command('tags', formatteropts, '')
6776 6776 def tags(ui, repo, **opts):
6777 6777 """list repository tags
6778 6778
6779 6779 This lists both regular and local tags. When the -v/--verbose
6780 6780 switch is used, a third column "local" is printed for local tags.
6781 6781 When the -q/--quiet switch is used, only the tag name is printed.
6782 6782
6783 6783 Returns 0 on success.
6784 6784 """
6785 6785
6786 6786 fm = ui.formatter('tags', opts)
6787 6787 hexfunc = fm.hexfunc
6788 6788 tagtype = ""
6789 6789
6790 6790 for t, n in reversed(repo.tagslist()):
6791 6791 hn = hexfunc(n)
6792 6792 label = 'tags.normal'
6793 6793 tagtype = ''
6794 6794 if repo.tagtype(t) == 'local':
6795 6795 label = 'tags.local'
6796 6796 tagtype = 'local'
6797 6797
6798 6798 fm.startitem()
6799 6799 fm.write('tag', '%s', t, label=label)
6800 6800 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
6801 6801 fm.condwrite(not ui.quiet, 'rev node', fmt,
6802 6802 repo.changelog.rev(n), hn, label=label)
6803 6803 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
6804 6804 tagtype, label=label)
6805 6805 fm.plain('\n')
6806 6806 fm.end()
6807 6807
6808 6808 @command('tip',
6809 6809 [('p', 'patch', None, _('show patch')),
6810 6810 ('g', 'git', None, _('use git extended diff format')),
6811 6811 ] + templateopts,
6812 6812 _('[-p] [-g]'))
6813 6813 def tip(ui, repo, **opts):
6814 6814 """show the tip revision (DEPRECATED)
6815 6815
6816 6816 The tip revision (usually just called the tip) is the changeset
6817 6817 most recently added to the repository (and therefore the most
6818 6818 recently changed head).
6819 6819
6820 6820 If you have just made a commit, that commit will be the tip. If
6821 6821 you have just pulled changes from another repository, the tip of
6822 6822 that repository becomes the current tip. The "tip" tag is special
6823 6823 and cannot be renamed or assigned to a different changeset.
6824 6824
6825 6825 This command is deprecated, please use :hg:`heads` instead.
6826 6826
6827 6827 Returns 0 on success.
6828 6828 """
6829 6829 displayer = cmdutil.show_changeset(ui, repo, opts)
6830 6830 displayer.show(repo['tip'])
6831 6831 displayer.close()
6832 6832
6833 6833 @command('unbundle',
6834 6834 [('u', 'update', None,
6835 6835 _('update to new branch head if changesets were unbundled'))],
6836 6836 _('[-u] FILE...'))
6837 6837 def unbundle(ui, repo, fname1, *fnames, **opts):
6838 6838 """apply one or more changegroup files
6839 6839
6840 6840 Apply one or more compressed changegroup files generated by the
6841 6841 bundle command.
6842 6842
6843 6843 Returns 0 on success, 1 if an update has unresolved files.
6844 6844 """
6845 6845 fnames = (fname1,) + fnames
6846 6846
6847 6847 with repo.lock():
6848 6848 for fname in fnames:
6849 6849 f = hg.openpath(ui, fname)
6850 6850 gen = exchange.readbundle(ui, f, fname)
6851 6851 if isinstance(gen, bundle2.unbundle20):
6852 6852 tr = repo.transaction('unbundle')
6853 6853 try:
6854 6854 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
6855 6855 url='bundle:' + fname)
6856 6856 tr.close()
6857 6857 except error.BundleUnknownFeatureError as exc:
6858 6858 raise error.Abort(_('%s: unknown bundle feature, %s')
6859 6859 % (fname, exc),
6860 6860 hint=_("see https://mercurial-scm.org/"
6861 6861 "wiki/BundleFeature for more "
6862 6862 "information"))
6863 6863 finally:
6864 6864 if tr:
6865 6865 tr.release()
6866 6866 changes = [r.get('return', 0)
6867 6867 for r in op.records['changegroup']]
6868 6868 modheads = changegroup.combineresults(changes)
6869 6869 elif isinstance(gen, streamclone.streamcloneapplier):
6870 6870 raise error.Abort(
6871 6871 _('packed bundles cannot be applied with '
6872 6872 '"hg unbundle"'),
6873 6873 hint=_('use "hg debugapplystreamclonebundle"'))
6874 6874 else:
6875 6875 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
6876 6876
6877 6877 return postincoming(ui, repo, modheads, opts.get('update'), None)
6878 6878
6879 6879 @command('^update|up|checkout|co',
6880 6880 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
6881 6881 ('c', 'check', None,
6882 6882 _('update across branches if no uncommitted changes')),
6883 6883 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6884 6884 ('r', 'rev', '', _('revision'), _('REV'))
6885 6885 ] + mergetoolopts,
6886 6886 _('[-c] [-C] [-d DATE] [[-r] REV]'))
6887 6887 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
6888 6888 tool=None):
6889 6889 """update working directory (or switch revisions)
6890 6890
6891 6891 Update the repository's working directory to the specified
6892 6892 changeset. If no changeset is specified, update to the tip of the
6893 6893 current named branch and move the active bookmark (see :hg:`help
6894 6894 bookmarks`).
6895 6895
6896 6896 Update sets the working directory's parent revision to the specified
6897 6897 changeset (see :hg:`help parents`).
6898 6898
6899 6899 If the changeset is not a descendant or ancestor of the working
6900 6900 directory's parent, the update is aborted. With the -c/--check
6901 6901 option, the working directory is checked for uncommitted changes; if
6902 6902 none are found, the working directory is updated to the specified
6903 6903 changeset.
6904 6904
6905 6905 .. container:: verbose
6906 6906
6907 6907 The following rules apply when the working directory contains
6908 6908 uncommitted changes:
6909 6909
6910 6910 1. If neither -c/--check nor -C/--clean is specified, and if
6911 6911 the requested changeset is an ancestor or descendant of
6912 6912 the working directory's parent, the uncommitted changes
6913 6913 are merged into the requested changeset and the merged
6914 6914 result is left uncommitted. If the requested changeset is
6915 6915 not an ancestor or descendant (that is, it is on another
6916 6916 branch), the update is aborted and the uncommitted changes
6917 6917 are preserved.
6918 6918
6919 6919 2. With the -c/--check option, the update is aborted and the
6920 6920 uncommitted changes are preserved.
6921 6921
6922 6922 3. With the -C/--clean option, uncommitted changes are discarded and
6923 6923 the working directory is updated to the requested changeset.
6924 6924
6925 6925 To cancel an uncommitted merge (and lose your changes), use
6926 6926 :hg:`update --clean .`.
6927 6927
6928 6928 Use null as the changeset to remove the working directory (like
6929 6929 :hg:`clone -U`).
6930 6930
6931 6931 If you want to revert just one file to an older revision, use
6932 6932 :hg:`revert [-r REV] NAME`.
6933 6933
6934 6934 See :hg:`help dates` for a list of formats valid for -d/--date.
6935 6935
6936 6936 Returns 0 on success, 1 if there are unresolved files.
6937 6937 """
6938 6938 movemarkfrom = None
6939 6939 if rev and node:
6940 6940 raise error.Abort(_("please specify just one revision"))
6941 6941
6942 6942 if rev is None or rev == '':
6943 6943 rev = node
6944 6944
6945 6945 with repo.wlock():
6946 6946 cmdutil.clearunfinished(repo)
6947 6947
6948 6948 if date:
6949 6949 if rev is not None:
6950 6950 raise error.Abort(_("you can't specify a revision and a date"))
6951 6951 rev = cmdutil.finddate(ui, repo, date)
6952 6952
6953 6953 # if we defined a bookmark, we have to remember the original name
6954 6954 brev = rev
6955 6955 rev = scmutil.revsingle(repo, rev, rev).rev()
6956 6956
6957 6957 if check and clean:
6958 6958 raise error.Abort(_("cannot specify both -c/--check and -C/--clean")
6959 6959 )
6960 6960
6961 6961 if check:
6962 6962 cmdutil.bailifchanged(repo, merge=False)
6963 6963 if rev is None:
6964 6964 updata = destutil.destupdate(repo, clean=clean, check=check)
6965 6965 rev, movemarkfrom, brev = updata
6966 6966
6967 6967 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
6968 6968
6969 6969 if clean:
6970 6970 ret = hg.clean(repo, rev)
6971 6971 else:
6972 6972 ret = hg.update(repo, rev)
6973 6973
6974 6974 if not ret and movemarkfrom:
6975 6975 if movemarkfrom == repo['.'].node():
6976 6976 pass # no-op update
6977 6977 elif bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
6978 6978 ui.status(_("updating bookmark %s\n") % repo._activebookmark)
6979 6979 else:
6980 6980 # this can happen with a non-linear update
6981 6981 ui.status(_("(leaving bookmark %s)\n") %
6982 6982 repo._activebookmark)
6983 6983 bookmarks.deactivate(repo)
6984 6984 elif brev in repo._bookmarks:
6985 6985 bookmarks.activate(repo, brev)
6986 6986 ui.status(_("(activating bookmark %s)\n") % brev)
6987 6987 elif brev:
6988 6988 if repo._activebookmark:
6989 6989 ui.status(_("(leaving bookmark %s)\n") %
6990 6990 repo._activebookmark)
6991 6991 bookmarks.deactivate(repo)
6992 6992
6993 6993 return ret
6994 6994
6995 6995 @command('verify', [])
6996 6996 def verify(ui, repo):
6997 6997 """verify the integrity of the repository
6998 6998
6999 6999 Verify the integrity of the current repository.
7000 7000
7001 7001 This will perform an extensive check of the repository's
7002 7002 integrity, validating the hashes and checksums of each entry in
7003 7003 the changelog, manifest, and tracked files, as well as the
7004 7004 integrity of their crosslinks and indices.
7005 7005
7006 7006 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7007 7007 for more information about recovery from corruption of the
7008 7008 repository.
7009 7009
7010 7010 Returns 0 on success, 1 if errors are encountered.
7011 7011 """
7012 7012 return hg.verify(repo)
7013 7013
7014 7014 @command('version', [], norepo=True)
7015 7015 def version_(ui):
7016 7016 """output version and copyright information"""
7017 7017 ui.write(_("Mercurial Distributed SCM (version %s)\n")
7018 7018 % util.version())
7019 7019 ui.status(_(
7020 7020 "(see https://mercurial-scm.org for more information)\n"
7021 "\nCopyright (C) 2005-2015 Matt Mackall and others\n"
7021 "\nCopyright (C) 2005-2016 Matt Mackall and others\n"
7022 7022 "This is free software; see the source for copying conditions. "
7023 7023 "There is NO\nwarranty; "
7024 7024 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7025 7025 ))
7026 7026
7027 7027 ui.note(_("\nEnabled extensions:\n\n"))
7028 7028 if ui.verbose:
7029 7029 # format names and versions into columns
7030 7030 names = []
7031 7031 vers = []
7032 7032 for name, module in extensions.extensions():
7033 7033 names.append(name)
7034 7034 vers.append(extensions.moduleversion(module))
7035 7035 if names:
7036 7036 maxnamelen = max(len(n) for n in names)
7037 7037 for i, name in enumerate(names):
7038 7038 ui.write(" %-*s %s\n" % (maxnamelen, name, vers[i]))
Show file before | Show file after | Hide comments
@@ -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: http://selenic.com/hg
110 110
111 111 Mailing list: http://selenic.com/mailman/listinfo/mercurial
112 112
113 113 Copying
114 114 """""""
115 Copyright (C) 2005-2015 Matt Mackall.
115 Copyright (C) 2005-2016 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
Show file before | Show file after | Hide comments
@@ -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-2015 Matt Mackall.
29 Mercurial is copyright 2005-2016 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
Show file before | Show file after | Hide comments
@@ -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-2015 Matt Mackall.
37 Mercurial is copyright 2005-2016 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
Show file before | Show file after | Hide comments
@@ -1,707 +1,707 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
7 7 import sys, platform
8 8 if getattr(sys, 'version_info', (0, 0, 0)) < (2, 6, 0, 'final'):
9 9 raise SystemExit("Mercurial requires Python 2.6 or later.")
10 10
11 11 if sys.version_info[0] >= 3:
12 12 printf = eval('print')
13 13 libdir_escape = 'unicode_escape'
14 14 else:
15 15 libdir_escape = 'string_escape'
16 16 def printf(*args, **kwargs):
17 17 f = kwargs.get('file', sys.stdout)
18 18 end = kwargs.get('end', '\n')
19 19 f.write(b' '.join(args) + end)
20 20
21 21 # Solaris Python packaging brain damage
22 22 try:
23 23 import hashlib
24 24 sha = hashlib.sha1()
25 25 except ImportError:
26 26 try:
27 27 import sha
28 28 sha.sha # silence unused import warning
29 29 except ImportError:
30 30 raise SystemExit(
31 31 "Couldn't import standard hashlib (incomplete Python install).")
32 32
33 33 try:
34 34 import zlib
35 35 zlib.compressobj # silence unused import warning
36 36 except ImportError:
37 37 raise SystemExit(
38 38 "Couldn't import standard zlib (incomplete Python install).")
39 39
40 40 # The base IronPython distribution (as of 2.7.1) doesn't support bz2
41 41 isironpython = False
42 42 try:
43 43 isironpython = (platform.python_implementation()
44 44 .lower().find("ironpython") != -1)
45 45 except AttributeError:
46 46 pass
47 47
48 48 if isironpython:
49 49 sys.stderr.write("warning: IronPython detected (no bz2 support)\n")
50 50 else:
51 51 try:
52 52 import bz2
53 53 bz2.BZ2Compressor # silence unused import warning
54 54 except ImportError:
55 55 raise SystemExit(
56 56 "Couldn't import standard bz2 (incomplete Python install).")
57 57
58 58 ispypy = "PyPy" in sys.version
59 59
60 60 import os, stat, subprocess, time
61 61 import re
62 62 import shutil
63 63 import tempfile
64 64 from distutils import log
65 65 if 'FORCE_SETUPTOOLS' in os.environ:
66 66 from setuptools import setup
67 67 else:
68 68 from distutils.core import setup
69 69 from distutils.core import Command, Extension
70 70 from distutils.dist import Distribution
71 71 from distutils.command.build import build
72 72 from distutils.command.build_ext import build_ext
73 73 from distutils.command.build_py import build_py
74 74 from distutils.command.build_scripts import build_scripts
75 75 from distutils.command.install_lib import install_lib
76 76 from distutils.command.install_scripts import install_scripts
77 77 from distutils.spawn import spawn, find_executable
78 78 from distutils import file_util
79 79 from distutils.errors import (
80 80 CCompilerError,
81 81 DistutilsError,
82 82 DistutilsExecError,
83 83 )
84 84 from distutils.sysconfig import get_python_inc, get_config_var
85 85 from distutils.version import StrictVersion
86 86
87 87 convert2to3 = '--c2to3' in sys.argv
88 88 if convert2to3:
89 89 try:
90 90 from distutils.command.build_py import build_py_2to3 as build_py
91 91 from lib2to3.refactor import get_fixers_from_package as getfixers
92 92 except ImportError:
93 93 if sys.version_info[0] < 3:
94 94 raise SystemExit("--c2to3 is only compatible with python3.")
95 95 raise
96 96 sys.path.append('contrib')
97 97 elif sys.version_info[0] >= 3:
98 98 raise SystemExit("setup.py with python3 needs --c2to3 (experimental)")
99 99
100 100 scripts = ['hg']
101 101 if os.name == 'nt':
102 102 # We remove hg.bat if we are able to build hg.exe.
103 103 scripts.append('contrib/win32/hg.bat')
104 104
105 105 # simplified version of distutils.ccompiler.CCompiler.has_function
106 106 # that actually removes its temporary files.
107 107 def hasfunction(cc, funcname):
108 108 tmpdir = tempfile.mkdtemp(prefix='hg-install-')
109 109 devnull = oldstderr = None
110 110 try:
111 111 fname = os.path.join(tmpdir, 'funcname.c')
112 112 f = open(fname, 'w')
113 113 f.write('int main(void) {\n')
114 114 f.write(' %s();\n' % funcname)
115 115 f.write('}\n')
116 116 f.close()
117 117 # Redirect stderr to /dev/null to hide any error messages
118 118 # from the compiler.
119 119 # This will have to be changed if we ever have to check
120 120 # for a function on Windows.
121 121 devnull = open('/dev/null', 'w')
122 122 oldstderr = os.dup(sys.stderr.fileno())
123 123 os.dup2(devnull.fileno(), sys.stderr.fileno())
124 124 objects = cc.compile([fname], output_dir=tmpdir)
125 125 cc.link_executable(objects, os.path.join(tmpdir, "a.out"))
126 126 return True
127 127 except Exception:
128 128 return False
129 129 finally:
130 130 if oldstderr is not None:
131 131 os.dup2(oldstderr, sys.stderr.fileno())
132 132 if devnull is not None:
133 133 devnull.close()
134 134 shutil.rmtree(tmpdir)
135 135
136 136 # py2exe needs to be installed to work
137 137 try:
138 138 import py2exe
139 139 py2exe.Distribution # silence unused import warning
140 140 py2exeloaded = True
141 141 # import py2exe's patched Distribution class
142 142 from distutils.core import Distribution
143 143 except ImportError:
144 144 py2exeloaded = False
145 145
146 146 def runcmd(cmd, env):
147 147 if (sys.platform == 'plan9'
148 148 and (sys.version_info[0] == 2 and sys.version_info[1] < 7)):
149 149 # subprocess kludge to work around issues in half-baked Python
150 150 # ports, notably bichued/python:
151 151 _, out, err = os.popen3(cmd)
152 152 return str(out), str(err)
153 153 else:
154 154 p = subprocess.Popen(cmd, stdout=subprocess.PIPE,
155 155 stderr=subprocess.PIPE, env=env)
156 156 out, err = p.communicate()
157 157 return out, err
158 158
159 159 def runhg(cmd, env):
160 160 out, err = runcmd(cmd, env)
161 161 # If root is executing setup.py, but the repository is owned by
162 162 # another user (as in "sudo python setup.py install") we will get
163 163 # trust warnings since the .hg/hgrc file is untrusted. That is
164 164 # fine, we don't want to load it anyway. Python may warn about
165 165 # a missing __init__.py in mercurial/locale, we also ignore that.
166 166 err = [e for e in err.splitlines()
167 167 if not e.startswith(b'not trusting file') \
168 168 and not e.startswith(b'warning: Not importing') \
169 169 and not e.startswith(b'obsolete feature not enabled')]
170 170 if err:
171 171 printf("stderr from '%s':" % (' '.join(cmd)), file=sys.stderr)
172 172 printf(b'\n'.join([b' ' + e for e in err]), file=sys.stderr)
173 173 return ''
174 174 return out
175 175
176 176 version = ''
177 177
178 178 # Execute hg out of this directory with a custom environment which takes care
179 179 # to not use any hgrc files and do no localization.
180 180 env = {'HGMODULEPOLICY': 'py',
181 181 'HGRCPATH': '',
182 182 'LANGUAGE': 'C'}
183 183 if 'LD_LIBRARY_PATH' in os.environ:
184 184 env['LD_LIBRARY_PATH'] = os.environ['LD_LIBRARY_PATH']
185 185 if 'SystemRoot' in os.environ:
186 186 # Copy SystemRoot into the custom environment for Python 2.6
187 187 # under Windows. Otherwise, the subprocess will fail with
188 188 # error 0xc0150004. See: http://bugs.python.org/issue3440
189 189 env['SystemRoot'] = os.environ['SystemRoot']
190 190
191 191 if os.path.isdir('.hg'):
192 192 cmd = [sys.executable, 'hg', 'log', '-r', '.', '--template', '{tags}\n']
193 193 numerictags = [t for t in runhg(cmd, env).split() if t[0].isdigit()]
194 194 hgid = runhg([sys.executable, 'hg', 'id', '-i'], env).strip()
195 195 if numerictags: # tag(s) found
196 196 version = numerictags[-1]
197 197 if hgid.endswith('+'): # propagate the dirty status to the tag
198 198 version += '+'
199 199 else: # no tag found
200 200 ltagcmd = [sys.executable, 'hg', 'parents', '--template',
201 201 '{latesttag}']
202 202 ltag = runhg(ltagcmd, env)
203 203 changessincecmd = [sys.executable, 'hg', 'log', '-T', 'x\n', '-r',
204 204 "only(.,'%s')" % ltag]
205 205 changessince = len(runhg(changessincecmd, env).splitlines())
206 206 version = '%s+%s-%s' % (ltag, changessince, hgid)
207 207 if version.endswith('+'):
208 208 version += time.strftime('%Y%m%d')
209 209 elif os.path.exists('.hg_archival.txt'):
210 210 kw = dict([[t.strip() for t in l.split(':', 1)]
211 211 for l in open('.hg_archival.txt')])
212 212 if 'tag' in kw:
213 213 version = kw['tag']
214 214 elif 'latesttag' in kw:
215 215 if 'changessincelatesttag' in kw:
216 216 version = '%(latesttag)s+%(changessincelatesttag)s-%(node).12s' % kw
217 217 else:
218 218 version = '%(latesttag)s+%(latesttagdistance)s-%(node).12s' % kw
219 219 else:
220 220 version = kw.get('node', '')[:12]
221 221
222 222 if version:
223 223 f = open("mercurial/__version__.py", "w")
224 224 f.write('# this file is autogenerated by setup.py\n')
225 225 f.write('version = "%s"\n' % version)
226 226 f.close()
227 227
228 228
229 229 try:
230 230 from mercurial import __version__
231 231 version = __version__.version
232 232 except ImportError:
233 233 version = 'unknown'
234 234
235 235 class hgbuild(build):
236 236 # Insert hgbuildmo first so that files in mercurial/locale/ are found
237 237 # when build_py is run next.
238 238 sub_commands = [('build_mo', None),
239 239
240 240 # We also need build_ext before build_py. Otherwise, when 2to3 is
241 241 # called (in build_py), it will not find osutil & friends,
242 242 # thinking that those modules are global and, consequently, making
243 243 # a mess, now that all module imports are global.
244 244
245 245 ('build_ext', build.has_ext_modules),
246 246 ] + build.sub_commands
247 247
248 248 class hgbuildmo(build):
249 249
250 250 description = "build translations (.mo files)"
251 251
252 252 def run(self):
253 253 if not find_executable('msgfmt'):
254 254 self.warn("could not find msgfmt executable, no translations "
255 255 "will be built")
256 256 return
257 257
258 258 podir = 'i18n'
259 259 if not os.path.isdir(podir):
260 260 self.warn("could not find %s/ directory" % podir)
261 261 return
262 262
263 263 join = os.path.join
264 264 for po in os.listdir(podir):
265 265 if not po.endswith('.po'):
266 266 continue
267 267 pofile = join(podir, po)
268 268 modir = join('locale', po[:-3], 'LC_MESSAGES')
269 269 mofile = join(modir, 'hg.mo')
270 270 mobuildfile = join('mercurial', mofile)
271 271 cmd = ['msgfmt', '-v', '-o', mobuildfile, pofile]
272 272 if sys.platform != 'sunos5':
273 273 # msgfmt on Solaris does not know about -c
274 274 cmd.append('-c')
275 275 self.mkpath(join('mercurial', modir))
276 276 self.make_file([pofile], mobuildfile, spawn, (cmd,))
277 277
278 278
279 279 class hgdist(Distribution):
280 280 pure = ispypy
281 281
282 282 global_options = Distribution.global_options + \
283 283 [('pure', None, "use pure (slow) Python "
284 284 "code instead of C extensions"),
285 285 ('c2to3', None, "(experimental!) convert "
286 286 "code with 2to3"),
287 287 ]
288 288
289 289 def has_ext_modules(self):
290 290 # self.ext_modules is emptied in hgbuildpy.finalize_options which is
291 291 # too late for some cases
292 292 return not self.pure and Distribution.has_ext_modules(self)
293 293
294 294 class hgbuildext(build_ext):
295 295
296 296 def build_extension(self, ext):
297 297 try:
298 298 build_ext.build_extension(self, ext)
299 299 except CCompilerError:
300 300 if not getattr(ext, 'optional', False):
301 301 raise
302 302 log.warn("Failed to build optional extension '%s' (skipping)",
303 303 ext.name)
304 304
305 305 class hgbuildscripts(build_scripts):
306 306 def run(self):
307 307 if os.name != 'nt':
308 308 return build_scripts.run(self)
309 309
310 310 exebuilt = False
311 311 try:
312 312 self.run_command('build_hgexe')
313 313 exebuilt = True
314 314 except (DistutilsError, CCompilerError):
315 315 log.warn('failed to build optional hg.exe')
316 316
317 317 if exebuilt:
318 318 # Copying hg.exe to the scripts build directory ensures it is
319 319 # installed by the install_scripts command.
320 320 hgexecommand = self.get_finalized_command('build_hgexe')
321 321 dest = os.path.join(self.build_dir, 'hg.exe')
322 322 self.mkpath(self.build_dir)
323 323 self.copy_file(hgexecommand.hgexepath, dest)
324 324
325 325 # Remove hg.bat because it is redundant with hg.exe.
326 326 self.scripts.remove('contrib/win32/hg.bat')
327 327
328 328 return build_scripts.run(self)
329 329
330 330 class hgbuildpy(build_py):
331 331 if convert2to3:
332 332 fixer_names = sorted(set(getfixers("lib2to3.fixes") +
333 333 getfixers("hgfixes")))
334 334
335 335 def finalize_options(self):
336 336 build_py.finalize_options(self)
337 337
338 338 if self.distribution.pure:
339 339 self.distribution.ext_modules = []
340 340 else:
341 341 h = os.path.join(get_python_inc(), 'Python.h')
342 342 if not os.path.exists(h):
343 343 raise SystemExit('Python headers are required to build '
344 344 'Mercurial but weren\'t found in %s' % h)
345 345
346 346 def copy_file(self, *args, **kwargs):
347 347 dst, copied = build_py.copy_file(self, *args, **kwargs)
348 348
349 349 if copied and dst.endswith('__init__.py'):
350 350 if self.distribution.pure:
351 351 modulepolicy = 'py'
352 352 else:
353 353 modulepolicy = 'c'
354 354 content = open(dst, 'rb').read()
355 355 content = content.replace(b'@MODULELOADPOLICY@',
356 356 modulepolicy.encode(libdir_escape))
357 357 with open(dst, 'wb') as fh:
358 358 fh.write(content)
359 359
360 360 return dst, copied
361 361
362 362 class buildhgextindex(Command):
363 363 description = 'generate prebuilt index of hgext (for frozen package)'
364 364 user_options = []
365 365 _indexfilename = 'hgext/__index__.py'
366 366
367 367 def initialize_options(self):
368 368 pass
369 369
370 370 def finalize_options(self):
371 371 pass
372 372
373 373 def run(self):
374 374 if os.path.exists(self._indexfilename):
375 375 f = open(self._indexfilename, 'w')
376 376 f.write('# empty\n')
377 377 f.close()
378 378
379 379 # here no extension enabled, disabled() lists up everything
380 380 code = ('import pprint; from mercurial import extensions; '
381 381 'pprint.pprint(extensions.disabled())')
382 382 out, err = runcmd([sys.executable, '-c', code], env)
383 383 if err:
384 384 raise DistutilsExecError(err)
385 385
386 386 f = open(self._indexfilename, 'w')
387 387 f.write('# this file is autogenerated by setup.py\n')
388 388 f.write('docs = ')
389 389 f.write(out)
390 390 f.close()
391 391
392 392 class buildhgexe(build_ext):
393 393 description = 'compile hg.exe from mercurial/exewrapper.c'
394 394
395 395 def build_extensions(self):
396 396 if os.name != 'nt':
397 397 return
398 398 if isinstance(self.compiler, HackedMingw32CCompiler):
399 399 self.compiler.compiler_so = self.compiler.compiler # no -mdll
400 400 self.compiler.dll_libraries = [] # no -lmsrvc90
401 401 hv = sys.hexversion
402 402 pythonlib = 'python%d%d' % (hv >> 24, (hv >> 16) & 0xff)
403 403 f = open('mercurial/hgpythonlib.h', 'wb')
404 404 f.write('/* this file is autogenerated by setup.py */\n')
405 405 f.write('#define HGPYTHONLIB "%s"\n' % pythonlib)
406 406 f.close()
407 407 objects = self.compiler.compile(['mercurial/exewrapper.c'],
408 408 output_dir=self.build_temp)
409 409 dir = os.path.dirname(self.get_ext_fullpath('dummy'))
410 410 target = os.path.join(dir, 'hg')
411 411 self.compiler.link_executable(objects, target,
412 412 libraries=[],
413 413 output_dir=self.build_temp)
414 414
415 415 @property
416 416 def hgexepath(self):
417 417 dir = os.path.dirname(self.get_ext_fullpath('dummy'))
418 418 return os.path.join(self.build_temp, dir, 'hg.exe')
419 419
420 420 class hginstalllib(install_lib):
421 421 '''
422 422 This is a specialization of install_lib that replaces the copy_file used
423 423 there so that it supports setting the mode of files after copying them,
424 424 instead of just preserving the mode that the files originally had. If your
425 425 system has a umask of something like 027, preserving the permissions when
426 426 copying will lead to a broken install.
427 427
428 428 Note that just passing keep_permissions=False to copy_file would be
429 429 insufficient, as it might still be applying a umask.
430 430 '''
431 431
432 432 def run(self):
433 433 realcopyfile = file_util.copy_file
434 434 def copyfileandsetmode(*args, **kwargs):
435 435 src, dst = args[0], args[1]
436 436 dst, copied = realcopyfile(*args, **kwargs)
437 437 if copied:
438 438 st = os.stat(src)
439 439 # Persist executable bit (apply it to group and other if user
440 440 # has it)
441 441 if st[stat.ST_MODE] & stat.S_IXUSR:
442 442 setmode = int('0755', 8)
443 443 else:
444 444 setmode = int('0644', 8)
445 445 m = stat.S_IMODE(st[stat.ST_MODE])
446 446 m = (m & ~int('0777', 8)) | setmode
447 447 os.chmod(dst, m)
448 448 file_util.copy_file = copyfileandsetmode
449 449 try:
450 450 install_lib.run(self)
451 451 finally:
452 452 file_util.copy_file = realcopyfile
453 453
454 454 class hginstallscripts(install_scripts):
455 455 '''
456 456 This is a specialization of install_scripts that replaces the @LIBDIR@ with
457 457 the configured directory for modules. If possible, the path is made relative
458 458 to the directory for scripts.
459 459 '''
460 460
461 461 def initialize_options(self):
462 462 install_scripts.initialize_options(self)
463 463
464 464 self.install_lib = None
465 465
466 466 def finalize_options(self):
467 467 install_scripts.finalize_options(self)
468 468 self.set_undefined_options('install',
469 469 ('install_lib', 'install_lib'))
470 470
471 471 def run(self):
472 472 install_scripts.run(self)
473 473
474 474 # It only makes sense to replace @LIBDIR@ with the install path if
475 475 # the install path is known. For wheels, the logic below calculates
476 476 # the libdir to be "../..". This is because the internal layout of a
477 477 # wheel archive looks like:
478 478 #
479 479 # mercurial-3.6.1.data/scripts/hg
480 480 # mercurial/__init__.py
481 481 #
482 482 # When installing wheels, the subdirectories of the "<pkg>.data"
483 483 # directory are translated to system local paths and files therein
484 484 # are copied in place. The mercurial/* files are installed into the
485 485 # site-packages directory. However, the site-packages directory
486 486 # isn't known until wheel install time. This means we have no clue
487 487 # at wheel generation time what the installed site-packages directory
488 488 # will be. And, wheels don't appear to provide the ability to register
489 489 # custom code to run during wheel installation. This all means that
490 490 # we can't reliably set the libdir in wheels: the default behavior
491 491 # of looking in sys.path must do.
492 492
493 493 if (os.path.splitdrive(self.install_dir)[0] !=
494 494 os.path.splitdrive(self.install_lib)[0]):
495 495 # can't make relative paths from one drive to another, so use an
496 496 # absolute path instead
497 497 libdir = self.install_lib
498 498 else:
499 499 common = os.path.commonprefix((self.install_dir, self.install_lib))
500 500 rest = self.install_dir[len(common):]
501 501 uplevel = len([n for n in os.path.split(rest) if n])
502 502
503 503 libdir = uplevel * ('..' + os.sep) + self.install_lib[len(common):]
504 504
505 505 for outfile in self.outfiles:
506 506 fp = open(outfile, 'rb')
507 507 data = fp.read()
508 508 fp.close()
509 509
510 510 # skip binary files
511 511 if b'\0' in data:
512 512 continue
513 513
514 514 # During local installs, the shebang will be rewritten to the final
515 515 # install path. During wheel packaging, the shebang has a special
516 516 # value.
517 517 if data.startswith(b'#!python'):
518 518 log.info('not rewriting @LIBDIR@ in %s because install path '
519 519 'not known' % outfile)
520 520 continue
521 521
522 522 data = data.replace(b'@LIBDIR@', libdir.encode(libdir_escape))
523 523 fp = open(outfile, 'wb')
524 524 fp.write(data)
525 525 fp.close()
526 526
527 527 cmdclass = {'build': hgbuild,
528 528 'build_mo': hgbuildmo,
529 529 'build_ext': hgbuildext,
530 530 'build_py': hgbuildpy,
531 531 'build_scripts': hgbuildscripts,
532 532 'build_hgextindex': buildhgextindex,
533 533 'install_lib': hginstalllib,
534 534 'install_scripts': hginstallscripts,
535 535 'build_hgexe': buildhgexe,
536 536 }
537 537
538 538 packages = ['mercurial', 'mercurial.hgweb', 'mercurial.httpclient',
539 539 'mercurial.pure',
540 540 'hgext', 'hgext.convert', 'hgext.highlight', 'hgext.zeroconf',
541 541 'hgext.largefiles']
542 542
543 543 common_depends = ['mercurial/util.h']
544 544
545 545 osutil_ldflags = []
546 546
547 547 if sys.platform == 'darwin':
548 548 osutil_ldflags += ['-framework', 'ApplicationServices']
549 549
550 550 extmodules = [
551 551 Extension('mercurial.base85', ['mercurial/base85.c'],
552 552 depends=common_depends),
553 553 Extension('mercurial.bdiff', ['mercurial/bdiff.c'],
554 554 depends=common_depends),
555 555 Extension('mercurial.diffhelpers', ['mercurial/diffhelpers.c'],
556 556 depends=common_depends),
557 557 Extension('mercurial.mpatch', ['mercurial/mpatch.c'],
558 558 depends=common_depends),
559 559 Extension('mercurial.parsers', ['mercurial/dirs.c',
560 560 'mercurial/manifest.c',
561 561 'mercurial/parsers.c',
562 562 'mercurial/pathencode.c'],
563 563 depends=common_depends),
564 564 Extension('mercurial.osutil', ['mercurial/osutil.c'],
565 565 extra_link_args=osutil_ldflags,
566 566 depends=common_depends),
567 567 ]
568 568
569 569 try:
570 570 from distutils import cygwinccompiler
571 571
572 572 # the -mno-cygwin option has been deprecated for years
573 573 compiler = cygwinccompiler.Mingw32CCompiler
574 574
575 575 class HackedMingw32CCompiler(cygwinccompiler.Mingw32CCompiler):
576 576 def __init__(self, *args, **kwargs):
577 577 compiler.__init__(self, *args, **kwargs)
578 578 for i in 'compiler compiler_so linker_exe linker_so'.split():
579 579 try:
580 580 getattr(self, i).remove('-mno-cygwin')
581 581 except ValueError:
582 582 pass
583 583
584 584 cygwinccompiler.Mingw32CCompiler = HackedMingw32CCompiler
585 585 except ImportError:
586 586 # the cygwinccompiler package is not available on some Python
587 587 # distributions like the ones from the optware project for Synology
588 588 # DiskStation boxes
589 589 class HackedMingw32CCompiler(object):
590 590 pass
591 591
592 592 packagedata = {'mercurial': ['locale/*/LC_MESSAGES/hg.mo',
593 593 'help/*.txt',
594 594 'help/internals/*.txt',
595 595 'default.d/*.rc',
596 596 'dummycert.pem']}
597 597
598 598 def ordinarypath(p):
599 599 return p and p[0] != '.' and p[-1] != '~'
600 600
601 601 for root in ('templates',):
602 602 for curdir, dirs, files in os.walk(os.path.join('mercurial', root)):
603 603 curdir = curdir.split(os.sep, 1)[1]
604 604 dirs[:] = filter(ordinarypath, dirs)
605 605 for f in filter(ordinarypath, files):
606 606 f = os.path.join(curdir, f)
607 607 packagedata['mercurial'].append(f)
608 608
609 609 datafiles = []
610 610 setupversion = version
611 611 extra = {}
612 612
613 613 if py2exeloaded:
614 614 extra['console'] = [
615 615 {'script':'hg',
616 'copyright':'Copyright (C) 2005-2015 Matt Mackall and others',
616 'copyright':'Copyright (C) 2005-2016 Matt Mackall and others',
617 617 'product_version':version}]
618 618 # sub command of 'build' because 'py2exe' does not handle sub_commands
619 619 build.sub_commands.insert(0, ('build_hgextindex', None))
620 620 # put dlls in sub directory so that they won't pollute PATH
621 621 extra['zipfile'] = 'lib/library.zip'
622 622
623 623 if os.name == 'nt':
624 624 # Windows binary file versions for exe/dll files must have the
625 625 # form W.X.Y.Z, where W,X,Y,Z are numbers in the range 0..65535
626 626 setupversion = version.split('+', 1)[0]
627 627
628 628 if sys.platform == 'darwin' and os.path.exists('/usr/bin/xcodebuild'):
629 629 version = runcmd(['/usr/bin/xcodebuild', '-version'], {})[0].splitlines()
630 630 if version:
631 631 version = version[0]
632 632 if sys.version_info[0] == 3:
633 633 version = version.decode('utf-8')
634 634 xcode4 = (version.startswith('Xcode') and
635 635 StrictVersion(version.split()[1]) >= StrictVersion('4.0'))
636 636 xcode51 = re.match(r'^Xcode\s+5\.1', version) is not None
637 637 else:
638 638 # xcodebuild returns empty on OS X Lion with XCode 4.3 not
639 639 # installed, but instead with only command-line tools. Assume
640 640 # that only happens on >= Lion, thus no PPC support.
641 641 xcode4 = True
642 642 xcode51 = False
643 643
644 644 # XCode 4.0 dropped support for ppc architecture, which is hardcoded in
645 645 # distutils.sysconfig
646 646 if xcode4:
647 647 os.environ['ARCHFLAGS'] = ''
648 648
649 649 # XCode 5.1 changes clang such that it now fails to compile if the
650 650 # -mno-fused-madd flag is passed, but the version of Python shipped with
651 651 # OS X 10.9 Mavericks includes this flag. This causes problems in all
652 652 # C extension modules, and a bug has been filed upstream at
653 653 # http://bugs.python.org/issue21244. We also need to patch this here
654 654 # so Mercurial can continue to compile in the meantime.
655 655 if xcode51:
656 656 cflags = get_config_var('CFLAGS')
657 657 if cflags and re.search(r'-mno-fused-madd\b', cflags) is not None:
658 658 os.environ['CFLAGS'] = (
659 659 os.environ.get('CFLAGS', '') + ' -Qunused-arguments')
660 660
661 661 setup(name='mercurial',
662 662 version=setupversion,
663 663 author='Matt Mackall and many others',
664 664 author_email='mercurial@selenic.com',
665 665 url='https://mercurial-scm.org/',
666 666 download_url='https://mercurial-scm.org/release/',
667 667 description=('Fast scalable distributed SCM (revision control, version '
668 668 'control) system'),
669 669 long_description=('Mercurial is a distributed SCM tool written in Python.'
670 670 ' It is used by a number of large projects that require'
671 671 ' fast, reliable distributed revision control, such as '
672 672 'Mozilla.'),
673 673 license='GNU GPLv2 or any later version',
674 674 classifiers=[
675 675 'Development Status :: 6 - Mature',
676 676 'Environment :: Console',
677 677 'Intended Audience :: Developers',
678 678 'Intended Audience :: System Administrators',
679 679 'License :: OSI Approved :: GNU General Public License (GPL)',
680 680 'Natural Language :: Danish',
681 681 'Natural Language :: English',
682 682 'Natural Language :: German',
683 683 'Natural Language :: Italian',
684 684 'Natural Language :: Japanese',
685 685 'Natural Language :: Portuguese (Brazilian)',
686 686 'Operating System :: Microsoft :: Windows',
687 687 'Operating System :: OS Independent',
688 688 'Operating System :: POSIX',
689 689 'Programming Language :: C',
690 690 'Programming Language :: Python',
691 691 'Topic :: Software Development :: Version Control',
692 692 ],
693 693 scripts=scripts,
694 694 packages=packages,
695 695 ext_modules=extmodules,
696 696 data_files=datafiles,
697 697 package_data=packagedata,
698 698 cmdclass=cmdclass,
699 699 distclass=hgdist,
700 700 options={'py2exe': {'packages': ['hgext', 'email']},
701 701 'bdist_mpkg': {'zipdist': False,
702 702 'license': 'COPYING',
703 703 'readme': 'contrib/macosx/Readme.html',
704 704 'welcome': 'contrib/macosx/Welcome.html',
705 705 },
706 706 },
707 707 **extra)
Show file before | Show file after | Hide comments
@@ -1,2994 +1,2994 b''
1 1 Short help:
2 2
3 3 $ hg
4 4 Mercurial Distributed SCM
5 5
6 6 basic commands:
7 7
8 8 add add the specified files on the next commit
9 9 annotate show changeset information by line for each file
10 10 clone make a copy of an existing repository
11 11 commit commit the specified files or all outstanding changes
12 12 diff diff repository (or selected files)
13 13 export dump the header and diffs for one or more changesets
14 14 forget forget the specified files on the next commit
15 15 init create a new repository in the given directory
16 16 log show revision history of entire repository or files
17 17 merge merge another revision into working directory
18 18 pull pull changes from the specified source
19 19 push push changes to the specified destination
20 20 remove remove the specified files on the next commit
21 21 serve start stand-alone webserver
22 22 status show changed files in the working directory
23 23 summary summarize working directory state
24 24 update update working directory (or switch revisions)
25 25
26 26 (use "hg help" for the full list of commands or "hg -v" for details)
27 27
28 28 $ hg -q
29 29 add add the specified files on the next commit
30 30 annotate show changeset information by line for each file
31 31 clone make a copy of an existing repository
32 32 commit commit the specified files or all outstanding changes
33 33 diff diff repository (or selected files)
34 34 export dump the header and diffs for one or more changesets
35 35 forget forget the specified files on the next commit
36 36 init create a new repository in the given directory
37 37 log show revision history of entire repository or files
38 38 merge merge another revision into working directory
39 39 pull pull changes from the specified source
40 40 push push changes to the specified destination
41 41 remove remove the specified files on the next commit
42 42 serve start stand-alone webserver
43 43 status show changed files in the working directory
44 44 summary summarize working directory state
45 45 update update working directory (or switch revisions)
46 46
47 47 $ hg help
48 48 Mercurial Distributed SCM
49 49
50 50 list of commands:
51 51
52 52 add add the specified files on the next commit
53 53 addremove add all new files, delete all missing files
54 54 annotate show changeset information by line for each file
55 55 archive create an unversioned archive of a repository revision
56 56 backout reverse effect of earlier changeset
57 57 bisect subdivision search of changesets
58 58 bookmarks create a new bookmark or list existing bookmarks
59 59 branch set or show the current branch name
60 60 branches list repository named branches
61 61 bundle create a changegroup file
62 62 cat output the current or given revision of files
63 63 clone make a copy of an existing repository
64 64 commit commit the specified files or all outstanding changes
65 65 config show combined config settings from all hgrc files
66 66 copy mark files as copied for the next commit
67 67 diff diff repository (or selected files)
68 68 export dump the header and diffs for one or more changesets
69 69 files list tracked files
70 70 forget forget the specified files on the next commit
71 71 graft copy changes from other branches onto the current branch
72 72 grep search for a pattern in specified files and revisions
73 73 heads show branch heads
74 74 help show help for a given topic or a help overview
75 75 identify identify the working directory or specified revision
76 76 import import an ordered set of patches
77 77 incoming show new changesets found in source
78 78 init create a new repository in the given directory
79 79 log show revision history of entire repository or files
80 80 manifest output the current or given revision of the project manifest
81 81 merge merge another revision into working directory
82 82 outgoing show changesets not found in the destination
83 83 paths show aliases for remote repositories
84 84 phase set or show the current phase name
85 85 pull pull changes from the specified source
86 86 push push changes to the specified destination
87 87 recover roll back an interrupted transaction
88 88 remove remove the specified files on the next commit
89 89 rename rename files; equivalent of copy + remove
90 90 resolve redo merges or set/view the merge status of files
91 91 revert restore files to their checkout state
92 92 root print the root (top) of the current working directory
93 93 serve start stand-alone webserver
94 94 status show changed files in the working directory
95 95 summary summarize working directory state
96 96 tag add one or more tags for the current or given revision
97 97 tags list repository tags
98 98 unbundle apply one or more changegroup files
99 99 update update working directory (or switch revisions)
100 100 verify verify the integrity of the repository
101 101 version output version and copyright information
102 102
103 103 additional help topics:
104 104
105 105 config Configuration Files
106 106 dates Date Formats
107 107 diffs Diff Formats
108 108 environment Environment Variables
109 109 extensions Using Additional Features
110 110 filesets Specifying File Sets
111 111 glossary Glossary
112 112 hgignore Syntax for Mercurial Ignore Files
113 113 hgweb Configuring hgweb
114 114 internals Technical implementation topics
115 115 merge-tools Merge Tools
116 116 multirevs Specifying Multiple Revisions
117 117 patterns File Name Patterns
118 118 phases Working with Phases
119 119 revisions Specifying Single Revisions
120 120 revsets Specifying Revision Sets
121 121 scripting Using Mercurial from scripts and automation
122 122 subrepos Subrepositories
123 123 templating Template Usage
124 124 urls URL Paths
125 125
126 126 (use "hg help -v" to show built-in aliases and global options)
127 127
128 128 $ hg -q help
129 129 add add the specified files on the next commit
130 130 addremove add all new files, delete all missing files
131 131 annotate show changeset information by line for each file
132 132 archive create an unversioned archive of a repository revision
133 133 backout reverse effect of earlier changeset
134 134 bisect subdivision search of changesets
135 135 bookmarks create a new bookmark or list existing bookmarks
136 136 branch set or show the current branch name
137 137 branches list repository named branches
138 138 bundle create a changegroup file
139 139 cat output the current or given revision of files
140 140 clone make a copy of an existing repository
141 141 commit commit the specified files or all outstanding changes
142 142 config show combined config settings from all hgrc files
143 143 copy mark files as copied for the next commit
144 144 diff diff repository (or selected files)
145 145 export dump the header and diffs for one or more changesets
146 146 files list tracked files
147 147 forget forget the specified files on the next commit
148 148 graft copy changes from other branches onto the current branch
149 149 grep search for a pattern in specified files and revisions
150 150 heads show branch heads
151 151 help show help for a given topic or a help overview
152 152 identify identify the working directory or specified revision
153 153 import import an ordered set of patches
154 154 incoming show new changesets found in source
155 155 init create a new repository in the given directory
156 156 log show revision history of entire repository or files
157 157 manifest output the current or given revision of the project manifest
158 158 merge merge another revision into working directory
159 159 outgoing show changesets not found in the destination
160 160 paths show aliases for remote repositories
161 161 phase set or show the current phase name
162 162 pull pull changes from the specified source
163 163 push push changes to the specified destination
164 164 recover roll back an interrupted transaction
165 165 remove remove the specified files on the next commit
166 166 rename rename files; equivalent of copy + remove
167 167 resolve redo merges or set/view the merge status of files
168 168 revert restore files to their checkout state
169 169 root print the root (top) of the current working directory
170 170 serve start stand-alone webserver
171 171 status show changed files in the working directory
172 172 summary summarize working directory state
173 173 tag add one or more tags for the current or given revision
174 174 tags list repository tags
175 175 unbundle apply one or more changegroup files
176 176 update update working directory (or switch revisions)
177 177 verify verify the integrity of the repository
178 178 version output version and copyright information
179 179
180 180 additional help topics:
181 181
182 182 config Configuration Files
183 183 dates Date Formats
184 184 diffs Diff Formats
185 185 environment Environment Variables
186 186 extensions Using Additional Features
187 187 filesets Specifying File Sets
188 188 glossary Glossary
189 189 hgignore Syntax for Mercurial Ignore Files
190 190 hgweb Configuring hgweb
191 191 internals Technical implementation topics
192 192 merge-tools Merge Tools
193 193 multirevs Specifying Multiple Revisions
194 194 patterns File Name Patterns
195 195 phases Working with Phases
196 196 revisions Specifying Single Revisions
197 197 revsets Specifying Revision Sets
198 198 scripting Using Mercurial from scripts and automation
199 199 subrepos Subrepositories
200 200 templating Template Usage
201 201 urls URL Paths
202 202
203 203 Test extension help:
204 204 $ hg help extensions --config extensions.rebase= --config extensions.children=
205 205 Using Additional Features
206 206 """""""""""""""""""""""""
207 207
208 208 Mercurial has the ability to add new features through the use of
209 209 extensions. Extensions may add new commands, add options to existing
210 210 commands, change the default behavior of commands, or implement hooks.
211 211
212 212 To enable the "foo" extension, either shipped with Mercurial or in the
213 213 Python search path, create an entry for it in your configuration file,
214 214 like this:
215 215
216 216 [extensions]
217 217 foo =
218 218
219 219 You may also specify the full path to an extension:
220 220
221 221 [extensions]
222 222 myfeature = ~/.hgext/myfeature.py
223 223
224 224 See 'hg help config' for more information on configuration files.
225 225
226 226 Extensions are not loaded by default for a variety of reasons: they can
227 227 increase startup overhead; they may be meant for advanced usage only; they
228 228 may provide potentially dangerous abilities (such as letting you destroy
229 229 or modify history); they might not be ready for prime time; or they may
230 230 alter some usual behaviors of stock Mercurial. It is thus up to the user
231 231 to activate extensions as needed.
232 232
233 233 To explicitly disable an extension enabled in a configuration file of
234 234 broader scope, prepend its path with !:
235 235
236 236 [extensions]
237 237 # disabling extension bar residing in /path/to/extension/bar.py
238 238 bar = !/path/to/extension/bar.py
239 239 # ditto, but no path was supplied for extension baz
240 240 baz = !
241 241
242 242 enabled extensions:
243 243
244 244 children command to display child changesets (DEPRECATED)
245 245 rebase command to move sets of revisions to a different ancestor
246 246
247 247 disabled extensions:
248 248
249 249 acl hooks for controlling repository access
250 250 blackbox log repository events to a blackbox for debugging
251 251 bugzilla hooks for integrating with the Bugzilla bug tracker
252 252 censor erase file content at a given revision
253 253 churn command to display statistics about repository history
254 254 clonebundles advertise pre-generated bundles to seed clones
255 255 color colorize output from some commands
256 256 convert import revisions from foreign VCS repositories into
257 257 Mercurial
258 258 eol automatically manage newlines in repository files
259 259 extdiff command to allow external programs to compare revisions
260 260 factotum http authentication with factotum
261 261 gpg commands to sign and verify changesets
262 262 hgcia hooks for integrating with the CIA.vc notification service
263 263 hgk browse the repository in a graphical way
264 264 highlight syntax highlighting for hgweb (requires Pygments)
265 265 histedit interactive history editing
266 266 keyword expand keywords in tracked files
267 267 largefiles track large binary files
268 268 mq manage a stack of patches
269 269 notify hooks for sending email push notifications
270 270 pager browse command output with an external pager
271 271 patchbomb command to send changesets as (a series of) patch emails
272 272 purge command to delete untracked files from the working
273 273 directory
274 274 record commands to interactively select changes for
275 275 commit/qrefresh
276 276 relink recreates hardlinks between repository clones
277 277 schemes extend schemes with shortcuts to repository swarms
278 278 share share a common history between several working directories
279 279 shelve save and restore changes to the working directory
280 280 strip strip changesets and their descendants from history
281 281 transplant command to transplant changesets from another branch
282 282 win32mbcs allow the use of MBCS paths with problematic encodings
283 283 zeroconf discover and advertise repositories on the local network
284 284
285 285 Verify that extension keywords appear in help templates
286 286
287 287 $ hg help --config extensions.transplant= templating|grep transplant > /dev/null
288 288
289 289 Test short command list with verbose option
290 290
291 291 $ hg -v help shortlist
292 292 Mercurial Distributed SCM
293 293
294 294 basic commands:
295 295
296 296 add add the specified files on the next commit
297 297 annotate, blame
298 298 show changeset information by line for each file
299 299 clone make a copy of an existing repository
300 300 commit, ci commit the specified files or all outstanding changes
301 301 diff diff repository (or selected files)
302 302 export dump the header and diffs for one or more changesets
303 303 forget forget the specified files on the next commit
304 304 init create a new repository in the given directory
305 305 log, history show revision history of entire repository or files
306 306 merge merge another revision into working directory
307 307 pull pull changes from the specified source
308 308 push push changes to the specified destination
309 309 remove, rm remove the specified files on the next commit
310 310 serve start stand-alone webserver
311 311 status, st show changed files in the working directory
312 312 summary, sum summarize working directory state
313 313 update, up, checkout, co
314 314 update working directory (or switch revisions)
315 315
316 316 global options ([+] can be repeated):
317 317
318 318 -R --repository REPO repository root directory or name of overlay bundle
319 319 file
320 320 --cwd DIR change working directory
321 321 -y --noninteractive do not prompt, automatically pick the first choice for
322 322 all prompts
323 323 -q --quiet suppress output
324 324 -v --verbose enable additional output
325 325 --config CONFIG [+] set/override config option (use 'section.name=value')
326 326 --debug enable debugging output
327 327 --debugger start debugger
328 328 --encoding ENCODE set the charset encoding (default: ascii)
329 329 --encodingmode MODE set the charset encoding mode (default: strict)
330 330 --traceback always print a traceback on exception
331 331 --time time how long the command takes
332 332 --profile print command execution profile
333 333 --version output version information and exit
334 334 -h --help display help and exit
335 335 --hidden consider hidden changesets
336 336
337 337 (use "hg help" for the full list of commands)
338 338
339 339 $ hg add -h
340 340 hg add [OPTION]... [FILE]...
341 341
342 342 add the specified files on the next commit
343 343
344 344 Schedule files to be version controlled and added to the repository.
345 345
346 346 The files will be added to the repository at the next commit. To undo an
347 347 add before that, see 'hg forget'.
348 348
349 349 If no names are given, add all files to the repository (except files
350 350 matching ".hgignore").
351 351
352 352 Returns 0 if all files are successfully added.
353 353
354 354 options ([+] can be repeated):
355 355
356 356 -I --include PATTERN [+] include names matching the given patterns
357 357 -X --exclude PATTERN [+] exclude names matching the given patterns
358 358 -S --subrepos recurse into subrepositories
359 359 -n --dry-run do not perform actions, just print output
360 360
361 361 (some details hidden, use --verbose to show complete help)
362 362
363 363 Verbose help for add
364 364
365 365 $ hg add -hv
366 366 hg add [OPTION]... [FILE]...
367 367
368 368 add the specified files on the next commit
369 369
370 370 Schedule files to be version controlled and added to the repository.
371 371
372 372 The files will be added to the repository at the next commit. To undo an
373 373 add before that, see 'hg forget'.
374 374
375 375 If no names are given, add all files to the repository (except files
376 376 matching ".hgignore").
377 377
378 378 Examples:
379 379
380 380 - New (unknown) files are added automatically by 'hg add':
381 381
382 382 $ ls
383 383 foo.c
384 384 $ hg status
385 385 ? foo.c
386 386 $ hg add
387 387 adding foo.c
388 388 $ hg status
389 389 A foo.c
390 390
391 391 - Specific files to be added can be specified:
392 392
393 393 $ ls
394 394 bar.c foo.c
395 395 $ hg status
396 396 ? bar.c
397 397 ? foo.c
398 398 $ hg add bar.c
399 399 $ hg status
400 400 A bar.c
401 401 ? foo.c
402 402
403 403 Returns 0 if all files are successfully added.
404 404
405 405 options ([+] can be repeated):
406 406
407 407 -I --include PATTERN [+] include names matching the given patterns
408 408 -X --exclude PATTERN [+] exclude names matching the given patterns
409 409 -S --subrepos recurse into subrepositories
410 410 -n --dry-run do not perform actions, just print output
411 411
412 412 global options ([+] can be repeated):
413 413
414 414 -R --repository REPO repository root directory or name of overlay bundle
415 415 file
416 416 --cwd DIR change working directory
417 417 -y --noninteractive do not prompt, automatically pick the first choice for
418 418 all prompts
419 419 -q --quiet suppress output
420 420 -v --verbose enable additional output
421 421 --config CONFIG [+] set/override config option (use 'section.name=value')
422 422 --debug enable debugging output
423 423 --debugger start debugger
424 424 --encoding ENCODE set the charset encoding (default: ascii)
425 425 --encodingmode MODE set the charset encoding mode (default: strict)
426 426 --traceback always print a traceback on exception
427 427 --time time how long the command takes
428 428 --profile print command execution profile
429 429 --version output version information and exit
430 430 -h --help display help and exit
431 431 --hidden consider hidden changesets
432 432
433 433 Test help option with version option
434 434
435 435 $ hg add -h --version
436 436 Mercurial Distributed SCM (version *) (glob)
437 437 (see https://mercurial-scm.org for more information)
438 438
439 Copyright (C) 2005-2015 Matt Mackall and others
439 Copyright (C) 2005-2016 Matt Mackall and others
440 440 This is free software; see the source for copying conditions. There is NO
441 441 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
442 442
443 443 $ hg add --skjdfks
444 444 hg add: option --skjdfks not recognized
445 445 hg add [OPTION]... [FILE]...
446 446
447 447 add the specified files on the next commit
448 448
449 449 options ([+] can be repeated):
450 450
451 451 -I --include PATTERN [+] include names matching the given patterns
452 452 -X --exclude PATTERN [+] exclude names matching the given patterns
453 453 -S --subrepos recurse into subrepositories
454 454 -n --dry-run do not perform actions, just print output
455 455
456 456 (use "hg add -h" to show more help)
457 457 [255]
458 458
459 459 Test ambiguous command help
460 460
461 461 $ hg help ad
462 462 list of commands:
463 463
464 464 add add the specified files on the next commit
465 465 addremove add all new files, delete all missing files
466 466
467 467 (use "hg help -v ad" to show built-in aliases and global options)
468 468
469 469 Test command without options
470 470
471 471 $ hg help verify
472 472 hg verify
473 473
474 474 verify the integrity of the repository
475 475
476 476 Verify the integrity of the current repository.
477 477
478 478 This will perform an extensive check of the repository's integrity,
479 479 validating the hashes and checksums of each entry in the changelog,
480 480 manifest, and tracked files, as well as the integrity of their crosslinks
481 481 and indices.
482 482
483 483 Please see https://mercurial-scm.org/wiki/RepositoryCorruption for more
484 484 information about recovery from corruption of the repository.
485 485
486 486 Returns 0 on success, 1 if errors are encountered.
487 487
488 488 (some details hidden, use --verbose to show complete help)
489 489
490 490 $ hg help diff
491 491 hg diff [OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...
492 492
493 493 diff repository (or selected files)
494 494
495 495 Show differences between revisions for the specified files.
496 496
497 497 Differences between files are shown using the unified diff format.
498 498
499 499 Note:
500 500 'hg diff' may generate unexpected results for merges, as it will
501 501 default to comparing against the working directory's first parent
502 502 changeset if no revisions are specified.
503 503
504 504 When two revision arguments are given, then changes are shown between
505 505 those revisions. If only one revision is specified then that revision is
506 506 compared to the working directory, and, when no revisions are specified,
507 507 the working directory files are compared to its first parent.
508 508
509 509 Alternatively you can specify -c/--change with a revision to see the
510 510 changes in that changeset relative to its first parent.
511 511
512 512 Without the -a/--text option, diff will avoid generating diffs of files it
513 513 detects as binary. With -a, diff will generate a diff anyway, probably
514 514 with undesirable results.
515 515
516 516 Use the -g/--git option to generate diffs in the git extended diff format.
517 517 For more information, read 'hg help diffs'.
518 518
519 519 Returns 0 on success.
520 520
521 521 options ([+] can be repeated):
522 522
523 523 -r --rev REV [+] revision
524 524 -c --change REV change made by revision
525 525 -a --text treat all files as text
526 526 -g --git use git extended diff format
527 527 --nodates omit dates from diff headers
528 528 --noprefix omit a/ and b/ prefixes from filenames
529 529 -p --show-function show which function each change is in
530 530 --reverse produce a diff that undoes the changes
531 531 -w --ignore-all-space ignore white space when comparing lines
532 532 -b --ignore-space-change ignore changes in the amount of white space
533 533 -B --ignore-blank-lines ignore changes whose lines are all blank
534 534 -U --unified NUM number of lines of context to show
535 535 --stat output diffstat-style summary of changes
536 536 --root DIR produce diffs relative to subdirectory
537 537 -I --include PATTERN [+] include names matching the given patterns
538 538 -X --exclude PATTERN [+] exclude names matching the given patterns
539 539 -S --subrepos recurse into subrepositories
540 540
541 541 (some details hidden, use --verbose to show complete help)
542 542
543 543 $ hg help status
544 544 hg status [OPTION]... [FILE]...
545 545
546 546 aliases: st
547 547
548 548 show changed files in the working directory
549 549
550 550 Show status of files in the repository. If names are given, only files
551 551 that match are shown. Files that are clean or ignored or the source of a
552 552 copy/move operation, are not listed unless -c/--clean, -i/--ignored,
553 553 -C/--copies or -A/--all are given. Unless options described with "show
554 554 only ..." are given, the options -mardu are used.
555 555
556 556 Option -q/--quiet hides untracked (unknown and ignored) files unless
557 557 explicitly requested with -u/--unknown or -i/--ignored.
558 558
559 559 Note:
560 560 'hg status' may appear to disagree with diff if permissions have
561 561 changed or a merge has occurred. The standard diff format does not
562 562 report permission changes and diff only reports changes relative to one
563 563 merge parent.
564 564
565 565 If one revision is given, it is used as the base revision. If two
566 566 revisions are given, the differences between them are shown. The --change
567 567 option can also be used as a shortcut to list the changed files of a
568 568 revision from its first parent.
569 569
570 570 The codes used to show the status of files are:
571 571
572 572 M = modified
573 573 A = added
574 574 R = removed
575 575 C = clean
576 576 ! = missing (deleted by non-hg command, but still tracked)
577 577 ? = not tracked
578 578 I = ignored
579 579 = origin of the previous file (with --copies)
580 580
581 581 Returns 0 on success.
582 582
583 583 options ([+] can be repeated):
584 584
585 585 -A --all show status of all files
586 586 -m --modified show only modified files
587 587 -a --added show only added files
588 588 -r --removed show only removed files
589 589 -d --deleted show only deleted (but tracked) files
590 590 -c --clean show only files without changes
591 591 -u --unknown show only unknown (not tracked) files
592 592 -i --ignored show only ignored files
593 593 -n --no-status hide status prefix
594 594 -C --copies show source of copied files
595 595 -0 --print0 end filenames with NUL, for use with xargs
596 596 --rev REV [+] show difference from revision
597 597 --change REV list the changed files of a revision
598 598 -I --include PATTERN [+] include names matching the given patterns
599 599 -X --exclude PATTERN [+] exclude names matching the given patterns
600 600 -S --subrepos recurse into subrepositories
601 601
602 602 (some details hidden, use --verbose to show complete help)
603 603
604 604 $ hg -q help status
605 605 hg status [OPTION]... [FILE]...
606 606
607 607 show changed files in the working directory
608 608
609 609 $ hg help foo
610 610 abort: no such help topic: foo
611 611 (try "hg help --keyword foo")
612 612 [255]
613 613
614 614 $ hg skjdfks
615 615 hg: unknown command 'skjdfks'
616 616 Mercurial Distributed SCM
617 617
618 618 basic commands:
619 619
620 620 add add the specified files on the next commit
621 621 annotate show changeset information by line for each file
622 622 clone make a copy of an existing repository
623 623 commit commit the specified files or all outstanding changes
624 624 diff diff repository (or selected files)
625 625 export dump the header and diffs for one or more changesets
626 626 forget forget the specified files on the next commit
627 627 init create a new repository in the given directory
628 628 log show revision history of entire repository or files
629 629 merge merge another revision into working directory
630 630 pull pull changes from the specified source
631 631 push push changes to the specified destination
632 632 remove remove the specified files on the next commit
633 633 serve start stand-alone webserver
634 634 status show changed files in the working directory
635 635 summary summarize working directory state
636 636 update update working directory (or switch revisions)
637 637
638 638 (use "hg help" for the full list of commands or "hg -v" for details)
639 639 [255]
640 640
641 641
642 642 Make sure that we don't run afoul of the help system thinking that
643 643 this is a section and erroring out weirdly.
644 644
645 645 $ hg .log
646 646 hg: unknown command '.log'
647 647 (did you mean log?)
648 648 [255]
649 649
650 650 $ hg log.
651 651 hg: unknown command 'log.'
652 652 (did you mean log?)
653 653 [255]
654 654 $ hg pu.lh
655 655 hg: unknown command 'pu.lh'
656 656 (did you mean one of pull, push?)
657 657 [255]
658 658
659 659 $ cat > helpext.py <<EOF
660 660 > import os
661 661 > from mercurial import cmdutil, commands
662 662 >
663 663 > cmdtable = {}
664 664 > command = cmdutil.command(cmdtable)
665 665 >
666 666 > @command('nohelp',
667 667 > [('', 'longdesc', 3, 'x'*90),
668 668 > ('n', '', None, 'normal desc'),
669 669 > ('', 'newline', '', 'line1\nline2')],
670 670 > 'hg nohelp',
671 671 > norepo=True)
672 672 > @command('debugoptDEP', [('', 'dopt', None, 'option is (DEPRECATED)')])
673 673 > @command('debugoptEXP', [('', 'eopt', None, 'option is (EXPERIMENTAL)')])
674 674 > def nohelp(ui, *args, **kwargs):
675 675 > pass
676 676 >
677 677 > EOF
678 678 $ echo '[extensions]' >> $HGRCPATH
679 679 $ echo "helpext = `pwd`/helpext.py" >> $HGRCPATH
680 680
681 681 Test command with no help text
682 682
683 683 $ hg help nohelp
684 684 hg nohelp
685 685
686 686 (no help text available)
687 687
688 688 options:
689 689
690 690 --longdesc VALUE xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
691 691 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx (default: 3)
692 692 -n -- normal desc
693 693 --newline VALUE line1 line2
694 694
695 695 (some details hidden, use --verbose to show complete help)
696 696
697 697 $ hg help -k nohelp
698 698 Commands:
699 699
700 700 nohelp hg nohelp
701 701
702 702 Extension Commands:
703 703
704 704 nohelp (no help text available)
705 705
706 706 Test that default list of commands omits extension commands
707 707
708 708 $ hg help
709 709 Mercurial Distributed SCM
710 710
711 711 list of commands:
712 712
713 713 add add the specified files on the next commit
714 714 addremove add all new files, delete all missing files
715 715 annotate show changeset information by line for each file
716 716 archive create an unversioned archive of a repository revision
717 717 backout reverse effect of earlier changeset
718 718 bisect subdivision search of changesets
719 719 bookmarks create a new bookmark or list existing bookmarks
720 720 branch set or show the current branch name
721 721 branches list repository named branches
722 722 bundle create a changegroup file
723 723 cat output the current or given revision of files
724 724 clone make a copy of an existing repository
725 725 commit commit the specified files or all outstanding changes
726 726 config show combined config settings from all hgrc files
727 727 copy mark files as copied for the next commit
728 728 diff diff repository (or selected files)
729 729 export dump the header and diffs for one or more changesets
730 730 files list tracked files
731 731 forget forget the specified files on the next commit
732 732 graft copy changes from other branches onto the current branch
733 733 grep search for a pattern in specified files and revisions
734 734 heads show branch heads
735 735 help show help for a given topic or a help overview
736 736 identify identify the working directory or specified revision
737 737 import import an ordered set of patches
738 738 incoming show new changesets found in source
739 739 init create a new repository in the given directory
740 740 log show revision history of entire repository or files
741 741 manifest output the current or given revision of the project manifest
742 742 merge merge another revision into working directory
743 743 outgoing show changesets not found in the destination
744 744 paths show aliases for remote repositories
745 745 phase set or show the current phase name
746 746 pull pull changes from the specified source
747 747 push push changes to the specified destination
748 748 recover roll back an interrupted transaction
749 749 remove remove the specified files on the next commit
750 750 rename rename files; equivalent of copy + remove
751 751 resolve redo merges or set/view the merge status of files
752 752 revert restore files to their checkout state
753 753 root print the root (top) of the current working directory
754 754 serve start stand-alone webserver
755 755 status show changed files in the working directory
756 756 summary summarize working directory state
757 757 tag add one or more tags for the current or given revision
758 758 tags list repository tags
759 759 unbundle apply one or more changegroup files
760 760 update update working directory (or switch revisions)
761 761 verify verify the integrity of the repository
762 762 version output version and copyright information
763 763
764 764 enabled extensions:
765 765
766 766 helpext (no help text available)
767 767
768 768 additional help topics:
769 769
770 770 config Configuration Files
771 771 dates Date Formats
772 772 diffs Diff Formats
773 773 environment Environment Variables
774 774 extensions Using Additional Features
775 775 filesets Specifying File Sets
776 776 glossary Glossary
777 777 hgignore Syntax for Mercurial Ignore Files
778 778 hgweb Configuring hgweb
779 779 internals Technical implementation topics
780 780 merge-tools Merge Tools
781 781 multirevs Specifying Multiple Revisions
782 782 patterns File Name Patterns
783 783 phases Working with Phases
784 784 revisions Specifying Single Revisions
785 785 revsets Specifying Revision Sets
786 786 scripting Using Mercurial from scripts and automation
787 787 subrepos Subrepositories
788 788 templating Template Usage
789 789 urls URL Paths
790 790
791 791 (use "hg help -v" to show built-in aliases and global options)
792 792
793 793
794 794 Test list of internal help commands
795 795
796 796 $ hg help debug
797 797 debug commands (internal and unsupported):
798 798
799 799 debugancestor
800 800 find the ancestor revision of two revisions in a given index
801 801 debugapplystreamclonebundle
802 802 apply a stream clone bundle file
803 803 debugbuilddag
804 804 builds a repo with a given DAG from scratch in the current
805 805 empty repo
806 806 debugbundle lists the contents of a bundle
807 807 debugcheckstate
808 808 validate the correctness of the current dirstate
809 809 debugcommands
810 810 list all available commands and options
811 811 debugcomplete
812 812 returns the completion list associated with the given command
813 813 debugcreatestreamclonebundle
814 814 create a stream clone bundle file
815 815 debugdag format the changelog or an index DAG as a concise textual
816 816 description
817 817 debugdata dump the contents of a data file revision
818 818 debugdate parse and display a date
819 819 debugdeltachain
820 820 dump information about delta chains in a revlog
821 821 debugdirstate
822 822 show the contents of the current dirstate
823 823 debugdiscovery
824 824 runs the changeset discovery protocol in isolation
825 825 debugextensions
826 826 show information about active extensions
827 827 debugfileset parse and apply a fileset specification
828 828 debugfsinfo show information detected about current filesystem
829 829 debuggetbundle
830 830 retrieves a bundle from a repo
831 831 debugignore display the combined ignore pattern and information about
832 832 ignored files
833 833 debugindex dump the contents of an index file
834 834 debugindexdot
835 835 dump an index DAG as a graphviz dot file
836 836 debuginstall test Mercurial installation
837 837 debugknown test whether node ids are known to a repo
838 838 debuglocks show or modify state of locks
839 839 debugmergestate
840 840 print merge state
841 841 debugnamecomplete
842 842 complete "names" - tags, open branch names, bookmark names
843 843 debugobsolete
844 844 create arbitrary obsolete marker
845 845 debugoptDEP (no help text available)
846 846 debugoptEXP (no help text available)
847 847 debugpathcomplete
848 848 complete part or all of a tracked path
849 849 debugpushkey access the pushkey key/value protocol
850 850 debugpvec (no help text available)
851 851 debugrebuilddirstate
852 852 rebuild the dirstate as it would look like for the given
853 853 revision
854 854 debugrebuildfncache
855 855 rebuild the fncache file
856 856 debugrename dump rename information
857 857 debugrevlog show data and statistics about a revlog
858 858 debugrevspec parse and apply a revision specification
859 859 debugsetparents
860 860 manually set the parents of the current working directory
861 861 debugsub (no help text available)
862 862 debugsuccessorssets
863 863 show set of successors for revision
864 864 debugwalk show how files match on given patterns
865 865 debugwireargs
866 866 (no help text available)
867 867
868 868 (use "hg help -v debug" to show built-in aliases and global options)
869 869
870 870 internals topic renders index of available sub-topics
871 871
872 872 $ hg help internals
873 873 Technical implementation topics
874 874 """""""""""""""""""""""""""""""
875 875
876 876 bundles container for exchange of repository data
877 877 changegroups representation of revlog data
878 878 revlogs revision storage mechanism
879 879
880 880 sub-topics can be accessed
881 881
882 882 $ hg help internals.changegroups
883 883 Changegroups
884 884 ============
885 885
886 886 Changegroups are representations of repository revlog data, specifically
887 887 the changelog, manifest, and filelogs.
888 888
889 889 There are 3 versions of changegroups: "1", "2", and "3". From a high-
890 890 level, versions "1" and "2" are almost exactly the same, with the only
891 891 difference being a header on entries in the changeset segment. Version "3"
892 892 adds support for exchanging treemanifests and includes revlog flags in the
893 893 delta header.
894 894
895 895 Changegroups consists of 3 logical segments:
896 896
897 897 +---------------------------------+
898 898 | | | |
899 899 | changeset | manifest | filelogs |
900 900 | | | |
901 901 +---------------------------------+
902 902
903 903 The principle building block of each segment is a *chunk*. A *chunk* is a
904 904 framed piece of data:
905 905
906 906 +---------------------------------------+
907 907 | | |
908 908 | length | data |
909 909 | (32 bits) | <length> bytes |
910 910 | | |
911 911 +---------------------------------------+
912 912
913 913 Each chunk starts with a 32-bit big-endian signed integer indicating the
914 914 length of the raw data that follows.
915 915
916 916 There is a special case chunk that has 0 length ("0x00000000"). We call
917 917 this an *empty chunk*.
918 918
919 919 Delta Groups
920 920 ------------
921 921
922 922 A *delta group* expresses the content of a revlog as a series of deltas,
923 923 or patches against previous revisions.
924 924
925 925 Delta groups consist of 0 or more *chunks* followed by the *empty chunk*
926 926 to signal the end of the delta group:
927 927
928 928 +------------------------------------------------------------------------+
929 929 | | | | | |
930 930 | chunk0 length | chunk0 data | chunk1 length | chunk1 data | 0x0 |
931 931 | (32 bits) | (various) | (32 bits) | (various) | (32 bits) |
932 932 | | | | | |
933 933 +------------------------------------------------------------+-----------+
934 934
935 935 Each *chunk*'s data consists of the following:
936 936
937 937 +-----------------------------------------+
938 938 | | | |
939 939 | delta header | mdiff header | delta |
940 940 | (various) | (12 bytes) | (various) |
941 941 | | | |
942 942 +-----------------------------------------+
943 943
944 944 The *length* field is the byte length of the remaining 3 logical pieces of
945 945 data. The *delta* is a diff from an existing entry in the changelog.
946 946
947 947 The *delta header* is different between versions "1", "2", and "3" of the
948 948 changegroup format.
949 949
950 950 Version 1:
951 951
952 952 +------------------------------------------------------+
953 953 | | | | |
954 954 | node | p1 node | p2 node | link node |
955 955 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
956 956 | | | | |
957 957 +------------------------------------------------------+
958 958
959 959 Version 2:
960 960
961 961 +------------------------------------------------------------------+
962 962 | | | | | |
963 963 | node | p1 node | p2 node | base node | link node |
964 964 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
965 965 | | | | | |
966 966 +------------------------------------------------------------------+
967 967
968 968 Version 3:
969 969
970 970 +------------------------------------------------------------------------------+
971 971 | | | | | | |
972 972 | node | p1 node | p2 node | base node | link node | flags |
973 973 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (2 bytes) |
974 974 | | | | | | |
975 975 +------------------------------------------------------------------------------+
976 976
977 977 The *mdiff header* consists of 3 32-bit big-endian signed integers
978 978 describing offsets at which to apply the following delta content:
979 979
980 980 +-------------------------------------+
981 981 | | | |
982 982 | offset | old length | new length |
983 983 | (32 bits) | (32 bits) | (32 bits) |
984 984 | | | |
985 985 +-------------------------------------+
986 986
987 987 In version 1, the delta is always applied against the previous node from
988 988 the changegroup or the first parent if this is the first entry in the
989 989 changegroup.
990 990
991 991 In version 2, the delta base node is encoded in the entry in the
992 992 changegroup. This allows the delta to be expressed against any parent,
993 993 which can result in smaller deltas and more efficient encoding of data.
994 994
995 995 Changeset Segment
996 996 -----------------
997 997
998 998 The *changeset segment* consists of a single *delta group* holding
999 999 changelog data. It is followed by an *empty chunk* to denote the boundary
1000 1000 to the *manifests segment*.
1001 1001
1002 1002 Manifest Segment
1003 1003 ----------------
1004 1004
1005 1005 The *manifest segment* consists of a single *delta group* holding manifest
1006 1006 data. It is followed by an *empty chunk* to denote the boundary to the
1007 1007 *filelogs segment*.
1008 1008
1009 1009 Filelogs Segment
1010 1010 ----------------
1011 1011
1012 1012 The *filelogs* segment consists of multiple sub-segments, each
1013 1013 corresponding to an individual file whose data is being described:
1014 1014
1015 1015 +--------------------------------------+
1016 1016 | | | | |
1017 1017 | filelog0 | filelog1 | filelog2 | ... |
1018 1018 | | | | |
1019 1019 +--------------------------------------+
1020 1020
1021 1021 In version "3" of the changegroup format, filelogs may include directory
1022 1022 logs when treemanifests are in use. directory logs are identified by
1023 1023 having a trailing '/' on their filename (see below).
1024 1024
1025 1025 The final filelog sub-segment is followed by an *empty chunk* to denote
1026 1026 the end of the segment and the overall changegroup.
1027 1027
1028 1028 Each filelog sub-segment consists of the following:
1029 1029
1030 1030 +------------------------------------------+
1031 1031 | | | |
1032 1032 | filename size | filename | delta group |
1033 1033 | (32 bits) | (various) | (various) |
1034 1034 | | | |
1035 1035 +------------------------------------------+
1036 1036
1037 1037 That is, a *chunk* consisting of the filename (not terminated or padded)
1038 1038 followed by N chunks constituting the *delta group* for this file.
1039 1039
1040 1040 Test list of commands with command with no help text
1041 1041
1042 1042 $ hg help helpext
1043 1043 helpext extension - no help text available
1044 1044
1045 1045 list of commands:
1046 1046
1047 1047 nohelp (no help text available)
1048 1048
1049 1049 (use "hg help -v helpext" to show built-in aliases and global options)
1050 1050
1051 1051
1052 1052 test deprecated and experimental options are hidden in command help
1053 1053 $ hg help debugoptDEP
1054 1054 hg debugoptDEP
1055 1055
1056 1056 (no help text available)
1057 1057
1058 1058 options:
1059 1059
1060 1060 (some details hidden, use --verbose to show complete help)
1061 1061
1062 1062 $ hg help debugoptEXP
1063 1063 hg debugoptEXP
1064 1064
1065 1065 (no help text available)
1066 1066
1067 1067 options:
1068 1068
1069 1069 (some details hidden, use --verbose to show complete help)
1070 1070
1071 1071 test deprecated and experimental options is shown with -v
1072 1072 $ hg help -v debugoptDEP | grep dopt
1073 1073 --dopt option is (DEPRECATED)
1074 1074 $ hg help -v debugoptEXP | grep eopt
1075 1075 --eopt option is (EXPERIMENTAL)
1076 1076
1077 1077 #if gettext
1078 1078 test deprecated option is hidden with translation with untranslated description
1079 1079 (use many globy for not failing on changed transaction)
1080 1080 $ LANGUAGE=sv hg help debugoptDEP
1081 1081 hg debugoptDEP
1082 1082
1083 1083 (*) (glob)
1084 1084
1085 1085 options:
1086 1086
1087 1087 (some details hidden, use --verbose to show complete help)
1088 1088 #endif
1089 1089
1090 1090 Test commands that collide with topics (issue4240)
1091 1091
1092 1092 $ hg config -hq
1093 1093 hg config [-u] [NAME]...
1094 1094
1095 1095 show combined config settings from all hgrc files
1096 1096 $ hg showconfig -hq
1097 1097 hg config [-u] [NAME]...
1098 1098
1099 1099 show combined config settings from all hgrc files
1100 1100
1101 1101 Test a help topic
1102 1102
1103 1103 $ hg help revs
1104 1104 Specifying Single Revisions
1105 1105 """""""""""""""""""""""""""
1106 1106
1107 1107 Mercurial supports several ways to specify individual revisions.
1108 1108
1109 1109 A plain integer is treated as a revision number. Negative integers are
1110 1110 treated as sequential offsets from the tip, with -1 denoting the tip, -2
1111 1111 denoting the revision prior to the tip, and so forth.
1112 1112
1113 1113 A 40-digit hexadecimal string is treated as a unique revision identifier.
1114 1114
1115 1115 A hexadecimal string less than 40 characters long is treated as a unique
1116 1116 revision identifier and is referred to as a short-form identifier. A
1117 1117 short-form identifier is only valid if it is the prefix of exactly one
1118 1118 full-length identifier.
1119 1119
1120 1120 Any other string is treated as a bookmark, tag, or branch name. A bookmark
1121 1121 is a movable pointer to a revision. A tag is a permanent name associated
1122 1122 with a revision. A branch name denotes the tipmost open branch head of
1123 1123 that branch - or if they are all closed, the tipmost closed head of the
1124 1124 branch. Bookmark, tag, and branch names must not contain the ":"
1125 1125 character.
1126 1126
1127 1127 The reserved name "tip" always identifies the most recent revision.
1128 1128
1129 1129 The reserved name "null" indicates the null revision. This is the revision
1130 1130 of an empty repository, and the parent of revision 0.
1131 1131
1132 1132 The reserved name "." indicates the working directory parent. If no
1133 1133 working directory is checked out, it is equivalent to null. If an
1134 1134 uncommitted merge is in progress, "." is the revision of the first parent.
1135 1135
1136 1136 Test repeated config section name
1137 1137
1138 1138 $ hg help config.host
1139 1139 "http_proxy.host"
1140 1140 Host name and (optional) port of the proxy server, for example
1141 1141 "myproxy:8000".
1142 1142
1143 1143 "smtp.host"
1144 1144 Host name of mail server, e.g. "mail.example.com".
1145 1145
1146 1146 Unrelated trailing paragraphs shouldn't be included
1147 1147
1148 1148 $ hg help config.extramsg | grep '^$'
1149 1149
1150 1150
1151 1151 Test capitalized section name
1152 1152
1153 1153 $ hg help scripting.HGPLAIN > /dev/null
1154 1154
1155 1155 Help subsection:
1156 1156
1157 1157 $ hg help config.charsets |grep "Email example:" > /dev/null
1158 1158 [1]
1159 1159
1160 1160 Show nested definitions
1161 1161 ("profiling.type"[break]"ls"[break]"stat"[break])
1162 1162
1163 1163 $ hg help config.type | egrep '^$'|wc -l
1164 1164 \s*3 (re)
1165 1165
1166 1166 Separate sections from subsections
1167 1167
1168 1168 $ hg help config.format | egrep '^ ("|-)|^\s*$' | uniq
1169 1169 "format"
1170 1170 --------
1171 1171
1172 1172 "usegeneraldelta"
1173 1173
1174 1174 "dotencode"
1175 1175
1176 1176 "usefncache"
1177 1177
1178 1178 "usestore"
1179 1179
1180 1180 "profiling"
1181 1181 -----------
1182 1182
1183 1183 "format"
1184 1184
1185 1185 "progress"
1186 1186 ----------
1187 1187
1188 1188 "format"
1189 1189
1190 1190
1191 1191 Last item in help config.*:
1192 1192
1193 1193 $ hg help config.`hg help config|grep '^ "'| \
1194 1194 > tail -1|sed 's![ "]*!!g'`| \
1195 1195 > grep "hg help -c config" > /dev/null
1196 1196 [1]
1197 1197
1198 1198 note to use help -c for general hg help config:
1199 1199
1200 1200 $ hg help config |grep "hg help -c config" > /dev/null
1201 1201
1202 1202 Test templating help
1203 1203
1204 1204 $ hg help templating | egrep '(desc|diffstat|firstline|nonempty) '
1205 1205 desc String. The text of the changeset description.
1206 1206 diffstat String. Statistics of changes with the following format:
1207 1207 firstline Any text. Returns the first line of text.
1208 1208 nonempty Any text. Returns '(none)' if the string is empty.
1209 1209
1210 1210 Test deprecated items
1211 1211
1212 1212 $ hg help -v templating | grep currentbookmark
1213 1213 currentbookmark
1214 1214 $ hg help templating | (grep currentbookmark || true)
1215 1215
1216 1216 Test help hooks
1217 1217
1218 1218 $ cat > helphook1.py <<EOF
1219 1219 > from mercurial import help
1220 1220 >
1221 1221 > def rewrite(ui, topic, doc):
1222 1222 > return doc + '\nhelphook1\n'
1223 1223 >
1224 1224 > def extsetup(ui):
1225 1225 > help.addtopichook('revsets', rewrite)
1226 1226 > EOF
1227 1227 $ cat > helphook2.py <<EOF
1228 1228 > from mercurial import help
1229 1229 >
1230 1230 > def rewrite(ui, topic, doc):
1231 1231 > return doc + '\nhelphook2\n'
1232 1232 >
1233 1233 > def extsetup(ui):
1234 1234 > help.addtopichook('revsets', rewrite)
1235 1235 > EOF
1236 1236 $ echo '[extensions]' >> $HGRCPATH
1237 1237 $ echo "helphook1 = `pwd`/helphook1.py" >> $HGRCPATH
1238 1238 $ echo "helphook2 = `pwd`/helphook2.py" >> $HGRCPATH
1239 1239 $ hg help revsets | grep helphook
1240 1240 helphook1
1241 1241 helphook2
1242 1242
1243 1243 help -c should only show debug --debug
1244 1244
1245 1245 $ hg help -c --debug|egrep debug|wc -l|egrep '^\s*0\s*$'
1246 1246 [1]
1247 1247
1248 1248 help -c should only show deprecated for -v
1249 1249
1250 1250 $ hg help -c -v|egrep DEPRECATED|wc -l|egrep '^\s*0\s*$'
1251 1251 [1]
1252 1252
1253 1253 Test -s / --system
1254 1254
1255 1255 $ hg help config.files -s windows |grep 'etc/mercurial' | \
1256 1256 > wc -l | sed -e 's/ //g'
1257 1257 0
1258 1258 $ hg help config.files --system unix | grep 'USER' | \
1259 1259 > wc -l | sed -e 's/ //g'
1260 1260 0
1261 1261
1262 1262 Test -e / -c / -k combinations
1263 1263
1264 1264 $ hg help -c|egrep '^[A-Z].*:|^ debug'
1265 1265 Commands:
1266 1266 $ hg help -e|egrep '^[A-Z].*:|^ debug'
1267 1267 Extensions:
1268 1268 $ hg help -k|egrep '^[A-Z].*:|^ debug'
1269 1269 Topics:
1270 1270 Commands:
1271 1271 Extensions:
1272 1272 Extension Commands:
1273 1273 $ hg help -c schemes
1274 1274 abort: no such help topic: schemes
1275 1275 (try "hg help --keyword schemes")
1276 1276 [255]
1277 1277 $ hg help -e schemes |head -1
1278 1278 schemes extension - extend schemes with shortcuts to repository swarms
1279 1279 $ hg help -c -k dates |egrep '^(Topics|Extensions|Commands):'
1280 1280 Commands:
1281 1281 $ hg help -e -k a |egrep '^(Topics|Extensions|Commands):'
1282 1282 Extensions:
1283 1283 $ hg help -e -c -k date |egrep '^(Topics|Extensions|Commands):'
1284 1284 Extensions:
1285 1285 Commands:
1286 1286 $ hg help -c commit > /dev/null
1287 1287 $ hg help -e -c commit > /dev/null
1288 1288 $ hg help -e commit > /dev/null
1289 1289 abort: no such help topic: commit
1290 1290 (try "hg help --keyword commit")
1291 1291 [255]
1292 1292
1293 1293 Test keyword search help
1294 1294
1295 1295 $ cat > prefixedname.py <<EOF
1296 1296 > '''matched against word "clone"
1297 1297 > '''
1298 1298 > EOF
1299 1299 $ echo '[extensions]' >> $HGRCPATH
1300 1300 $ echo "dot.dot.prefixedname = `pwd`/prefixedname.py" >> $HGRCPATH
1301 1301 $ hg help -k clone
1302 1302 Topics:
1303 1303
1304 1304 config Configuration Files
1305 1305 extensions Using Additional Features
1306 1306 glossary Glossary
1307 1307 phases Working with Phases
1308 1308 subrepos Subrepositories
1309 1309 urls URL Paths
1310 1310
1311 1311 Commands:
1312 1312
1313 1313 bookmarks create a new bookmark or list existing bookmarks
1314 1314 clone make a copy of an existing repository
1315 1315 paths show aliases for remote repositories
1316 1316 update update working directory (or switch revisions)
1317 1317
1318 1318 Extensions:
1319 1319
1320 1320 clonebundles advertise pre-generated bundles to seed clones
1321 1321 prefixedname matched against word "clone"
1322 1322 relink recreates hardlinks between repository clones
1323 1323
1324 1324 Extension Commands:
1325 1325
1326 1326 qclone clone main and patch repository at same time
1327 1327
1328 1328 Test unfound topic
1329 1329
1330 1330 $ hg help nonexistingtopicthatwillneverexisteverever
1331 1331 abort: no such help topic: nonexistingtopicthatwillneverexisteverever
1332 1332 (try "hg help --keyword nonexistingtopicthatwillneverexisteverever")
1333 1333 [255]
1334 1334
1335 1335 Test unfound keyword
1336 1336
1337 1337 $ hg help --keyword nonexistingwordthatwillneverexisteverever
1338 1338 abort: no matches
1339 1339 (try "hg help" for a list of topics)
1340 1340 [255]
1341 1341
1342 1342 Test omit indicating for help
1343 1343
1344 1344 $ cat > addverboseitems.py <<EOF
1345 1345 > '''extension to test omit indicating.
1346 1346 >
1347 1347 > This paragraph is never omitted (for extension)
1348 1348 >
1349 1349 > .. container:: verbose
1350 1350 >
1351 1351 > This paragraph is omitted,
1352 1352 > if :hg:\`help\` is invoked without \`\`-v\`\` (for extension)
1353 1353 >
1354 1354 > This paragraph is never omitted, too (for extension)
1355 1355 > '''
1356 1356 >
1357 1357 > from mercurial import help, commands
1358 1358 > testtopic = """This paragraph is never omitted (for topic).
1359 1359 >
1360 1360 > .. container:: verbose
1361 1361 >
1362 1362 > This paragraph is omitted,
1363 1363 > if :hg:\`help\` is invoked without \`\`-v\`\` (for topic)
1364 1364 >
1365 1365 > This paragraph is never omitted, too (for topic)
1366 1366 > """
1367 1367 > def extsetup(ui):
1368 1368 > help.helptable.append((["topic-containing-verbose"],
1369 1369 > "This is the topic to test omit indicating.",
1370 1370 > lambda ui: testtopic))
1371 1371 > EOF
1372 1372 $ echo '[extensions]' >> $HGRCPATH
1373 1373 $ echo "addverboseitems = `pwd`/addverboseitems.py" >> $HGRCPATH
1374 1374 $ hg help addverboseitems
1375 1375 addverboseitems extension - extension to test omit indicating.
1376 1376
1377 1377 This paragraph is never omitted (for extension)
1378 1378
1379 1379 This paragraph is never omitted, too (for extension)
1380 1380
1381 1381 (some details hidden, use --verbose to show complete help)
1382 1382
1383 1383 no commands defined
1384 1384 $ hg help -v addverboseitems
1385 1385 addverboseitems extension - extension to test omit indicating.
1386 1386
1387 1387 This paragraph is never omitted (for extension)
1388 1388
1389 1389 This paragraph is omitted, if 'hg help' is invoked without "-v" (for
1390 1390 extension)
1391 1391
1392 1392 This paragraph is never omitted, too (for extension)
1393 1393
1394 1394 no commands defined
1395 1395 $ hg help topic-containing-verbose
1396 1396 This is the topic to test omit indicating.
1397 1397 """"""""""""""""""""""""""""""""""""""""""
1398 1398
1399 1399 This paragraph is never omitted (for topic).
1400 1400
1401 1401 This paragraph is never omitted, too (for topic)
1402 1402
1403 1403 (some details hidden, use --verbose to show complete help)
1404 1404 $ hg help -v topic-containing-verbose
1405 1405 This is the topic to test omit indicating.
1406 1406 """"""""""""""""""""""""""""""""""""""""""
1407 1407
1408 1408 This paragraph is never omitted (for topic).
1409 1409
1410 1410 This paragraph is omitted, if 'hg help' is invoked without "-v" (for
1411 1411 topic)
1412 1412
1413 1413 This paragraph is never omitted, too (for topic)
1414 1414
1415 1415 Test section lookup
1416 1416
1417 1417 $ hg help revset.merge
1418 1418 "merge()"
1419 1419 Changeset is a merge changeset.
1420 1420
1421 1421 $ hg help glossary.dag
1422 1422 DAG
1423 1423 The repository of changesets of a distributed version control system
1424 1424 (DVCS) can be described as a directed acyclic graph (DAG), consisting
1425 1425 of nodes and edges, where nodes correspond to changesets and edges
1426 1426 imply a parent -> child relation. This graph can be visualized by
1427 1427 graphical tools such as 'hg log --graph'. In Mercurial, the DAG is
1428 1428 limited by the requirement for children to have at most two parents.
1429 1429
1430 1430
1431 1431 $ hg help hgrc.paths
1432 1432 "paths"
1433 1433 -------
1434 1434
1435 1435 Assigns symbolic names and behavior to repositories.
1436 1436
1437 1437 Options are symbolic names defining the URL or directory that is the
1438 1438 location of the repository. Example:
1439 1439
1440 1440 [paths]
1441 1441 my_server = https://example.com/my_repo
1442 1442 local_path = /home/me/repo
1443 1443
1444 1444 These symbolic names can be used from the command line. To pull from
1445 1445 "my_server": 'hg pull my_server'. To push to "local_path": 'hg push
1446 1446 local_path'.
1447 1447
1448 1448 Options containing colons (":") denote sub-options that can influence
1449 1449 behavior for that specific path. Example:
1450 1450
1451 1451 [paths]
1452 1452 my_server = https://example.com/my_path
1453 1453 my_server:pushurl = ssh://example.com/my_path
1454 1454
1455 1455 The following sub-options can be defined:
1456 1456
1457 1457 "pushurl"
1458 1458 The URL to use for push operations. If not defined, the location
1459 1459 defined by the path's main entry is used.
1460 1460
1461 1461 The following special named paths exist:
1462 1462
1463 1463 "default"
1464 1464 The URL or directory to use when no source or remote is specified.
1465 1465
1466 1466 'hg clone' will automatically define this path to the location the
1467 1467 repository was cloned from.
1468 1468
1469 1469 "default-push"
1470 1470 (deprecated) The URL or directory for the default 'hg push' location.
1471 1471 "default:pushurl" should be used instead.
1472 1472
1473 1473 $ hg help glossary.mcguffin
1474 1474 abort: help section not found
1475 1475 [255]
1476 1476
1477 1477 $ hg help glossary.mc.guffin
1478 1478 abort: help section not found
1479 1479 [255]
1480 1480
1481 1481 $ hg help template.files
1482 1482 files List of strings. All files modified, added, or removed by
1483 1483 this changeset.
1484 1484
1485 1485 Test dynamic list of merge tools only shows up once
1486 1486 $ hg help merge-tools
1487 1487 Merge Tools
1488 1488 """""""""""
1489 1489
1490 1490 To merge files Mercurial uses merge tools.
1491 1491
1492 1492 A merge tool combines two different versions of a file into a merged file.
1493 1493 Merge tools are given the two files and the greatest common ancestor of
1494 1494 the two file versions, so they can determine the changes made on both
1495 1495 branches.
1496 1496
1497 1497 Merge tools are used both for 'hg resolve', 'hg merge', 'hg update', 'hg
1498 1498 backout' and in several extensions.
1499 1499
1500 1500 Usually, the merge tool tries to automatically reconcile the files by
1501 1501 combining all non-overlapping changes that occurred separately in the two
1502 1502 different evolutions of the same initial base file. Furthermore, some
1503 1503 interactive merge programs make it easier to manually resolve conflicting
1504 1504 merges, either in a graphical way, or by inserting some conflict markers.
1505 1505 Mercurial does not include any interactive merge programs but relies on
1506 1506 external tools for that.
1507 1507
1508 1508 Available merge tools
1509 1509 =====================
1510 1510
1511 1511 External merge tools and their properties are configured in the merge-
1512 1512 tools configuration section - see hgrc(5) - but they can often just be
1513 1513 named by their executable.
1514 1514
1515 1515 A merge tool is generally usable if its executable can be found on the
1516 1516 system and if it can handle the merge. The executable is found if it is an
1517 1517 absolute or relative executable path or the name of an application in the
1518 1518 executable search path. The tool is assumed to be able to handle the merge
1519 1519 if it can handle symlinks if the file is a symlink, if it can handle
1520 1520 binary files if the file is binary, and if a GUI is available if the tool
1521 1521 requires a GUI.
1522 1522
1523 1523 There are some internal merge tools which can be used. The internal merge
1524 1524 tools are:
1525 1525
1526 1526 ":dump"
1527 1527 Creates three versions of the files to merge, containing the contents of
1528 1528 local, other and base. These files can then be used to perform a merge
1529 1529 manually. If the file to be merged is named "a.txt", these files will
1530 1530 accordingly be named "a.txt.local", "a.txt.other" and "a.txt.base" and
1531 1531 they will be placed in the same directory as "a.txt".
1532 1532
1533 1533 ":fail"
1534 1534 Rather than attempting to merge files that were modified on both
1535 1535 branches, it marks them as unresolved. The resolve command must be used
1536 1536 to resolve these conflicts.
1537 1537
1538 1538 ":local"
1539 1539 Uses the local version of files as the merged version.
1540 1540
1541 1541 ":merge"
1542 1542 Uses the internal non-interactive simple merge algorithm for merging
1543 1543 files. It will fail if there are any conflicts and leave markers in the
1544 1544 partially merged file. Markers will have two sections, one for each side
1545 1545 of merge.
1546 1546
1547 1547 ":merge-local"
1548 1548 Like :merge, but resolve all conflicts non-interactively in favor of the
1549 1549 local changes.
1550 1550
1551 1551 ":merge-other"
1552 1552 Like :merge, but resolve all conflicts non-interactively in favor of the
1553 1553 other changes.
1554 1554
1555 1555 ":merge3"
1556 1556 Uses the internal non-interactive simple merge algorithm for merging
1557 1557 files. It will fail if there are any conflicts and leave markers in the
1558 1558 partially merged file. Marker will have three sections, one from each
1559 1559 side of the merge and one for the base content.
1560 1560
1561 1561 ":other"
1562 1562 Uses the other version of files as the merged version.
1563 1563
1564 1564 ":prompt"
1565 1565 Asks the user which of the local or the other version to keep as the
1566 1566 merged version.
1567 1567
1568 1568 ":tagmerge"
1569 1569 Uses the internal tag merge algorithm (experimental).
1570 1570
1571 1571 ":union"
1572 1572 Uses the internal non-interactive simple merge algorithm for merging
1573 1573 files. It will use both left and right sides for conflict regions. No
1574 1574 markers are inserted.
1575 1575
1576 1576 Internal tools are always available and do not require a GUI but will by
1577 1577 default not handle symlinks or binary files.
1578 1578
1579 1579 Choosing a merge tool
1580 1580 =====================
1581 1581
1582 1582 Mercurial uses these rules when deciding which merge tool to use:
1583 1583
1584 1584 1. If a tool has been specified with the --tool option to merge or
1585 1585 resolve, it is used. If it is the name of a tool in the merge-tools
1586 1586 configuration, its configuration is used. Otherwise the specified tool
1587 1587 must be executable by the shell.
1588 1588 2. If the "HGMERGE" environment variable is present, its value is used and
1589 1589 must be executable by the shell.
1590 1590 3. If the filename of the file to be merged matches any of the patterns in
1591 1591 the merge-patterns configuration section, the first usable merge tool
1592 1592 corresponding to a matching pattern is used. Here, binary capabilities
1593 1593 of the merge tool are not considered.
1594 1594 4. If ui.merge is set it will be considered next. If the value is not the
1595 1595 name of a configured tool, the specified value is used and must be
1596 1596 executable by the shell. Otherwise the named tool is used if it is
1597 1597 usable.
1598 1598 5. If any usable merge tools are present in the merge-tools configuration
1599 1599 section, the one with the highest priority is used.
1600 1600 6. If a program named "hgmerge" can be found on the system, it is used -
1601 1601 but it will by default not be used for symlinks and binary files.
1602 1602 7. If the file to be merged is not binary and is not a symlink, then
1603 1603 internal ":merge" is used.
1604 1604 8. The merge of the file fails and must be resolved before commit.
1605 1605
1606 1606 Note:
1607 1607 After selecting a merge program, Mercurial will by default attempt to
1608 1608 merge the files using a simple merge algorithm first. Only if it
1609 1609 doesn't succeed because of conflicting changes Mercurial will actually
1610 1610 execute the merge program. Whether to use the simple merge algorithm
1611 1611 first can be controlled by the premerge setting of the merge tool.
1612 1612 Premerge is enabled by default unless the file is binary or a symlink.
1613 1613
1614 1614 See the merge-tools and ui sections of hgrc(5) for details on the
1615 1615 configuration of merge tools.
1616 1616
1617 1617 Test usage of section marks in help documents
1618 1618
1619 1619 $ cd "$TESTDIR"/../doc
1620 1620 $ python check-seclevel.py
1621 1621 $ cd $TESTTMP
1622 1622
1623 1623 #if serve
1624 1624
1625 1625 Test the help pages in hgweb.
1626 1626
1627 1627 Dish up an empty repo; serve it cold.
1628 1628
1629 1629 $ hg init "$TESTTMP/test"
1630 1630 $ hg serve -R "$TESTTMP/test" -n test -p $HGPORT -d --pid-file=hg.pid
1631 1631 $ cat hg.pid >> $DAEMON_PIDS
1632 1632
1633 1633 $ get-with-headers.py 127.0.0.1:$HGPORT "help"
1634 1634 200 Script output follows
1635 1635
1636 1636 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
1637 1637 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
1638 1638 <head>
1639 1639 <link rel="icon" href="/static/hgicon.png" type="image/png" />
1640 1640 <meta name="robots" content="index, nofollow" />
1641 1641 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
1642 1642 <script type="text/javascript" src="/static/mercurial.js"></script>
1643 1643
1644 1644 <title>Help: Index</title>
1645 1645 </head>
1646 1646 <body>
1647 1647
1648 1648 <div class="container">
1649 1649 <div class="menu">
1650 1650 <div class="logo">
1651 1651 <a href="https://mercurial-scm.org/">
1652 1652 <img src="/static/hglogo.png" alt="mercurial" /></a>
1653 1653 </div>
1654 1654 <ul>
1655 1655 <li><a href="/shortlog">log</a></li>
1656 1656 <li><a href="/graph">graph</a></li>
1657 1657 <li><a href="/tags">tags</a></li>
1658 1658 <li><a href="/bookmarks">bookmarks</a></li>
1659 1659 <li><a href="/branches">branches</a></li>
1660 1660 </ul>
1661 1661 <ul>
1662 1662 <li class="active">help</li>
1663 1663 </ul>
1664 1664 </div>
1665 1665
1666 1666 <div class="main">
1667 1667 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
1668 1668 <form class="search" action="/log">
1669 1669
1670 1670 <p><input name="rev" id="search1" type="text" size="30" /></p>
1671 1671 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
1672 1672 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
1673 1673 </form>
1674 1674 <table class="bigtable">
1675 1675 <tr><td colspan="2"><h2><a name="main" href="#topics">Topics</a></h2></td></tr>
1676 1676
1677 1677 <tr><td>
1678 1678 <a href="/help/config">
1679 1679 config
1680 1680 </a>
1681 1681 </td><td>
1682 1682 Configuration Files
1683 1683 </td></tr>
1684 1684 <tr><td>
1685 1685 <a href="/help/dates">
1686 1686 dates
1687 1687 </a>
1688 1688 </td><td>
1689 1689 Date Formats
1690 1690 </td></tr>
1691 1691 <tr><td>
1692 1692 <a href="/help/diffs">
1693 1693 diffs
1694 1694 </a>
1695 1695 </td><td>
1696 1696 Diff Formats
1697 1697 </td></tr>
1698 1698 <tr><td>
1699 1699 <a href="/help/environment">
1700 1700 environment
1701 1701 </a>
1702 1702 </td><td>
1703 1703 Environment Variables
1704 1704 </td></tr>
1705 1705 <tr><td>
1706 1706 <a href="/help/extensions">
1707 1707 extensions
1708 1708 </a>
1709 1709 </td><td>
1710 1710 Using Additional Features
1711 1711 </td></tr>
1712 1712 <tr><td>
1713 1713 <a href="/help/filesets">
1714 1714 filesets
1715 1715 </a>
1716 1716 </td><td>
1717 1717 Specifying File Sets
1718 1718 </td></tr>
1719 1719 <tr><td>
1720 1720 <a href="/help/glossary">
1721 1721 glossary
1722 1722 </a>
1723 1723 </td><td>
1724 1724 Glossary
1725 1725 </td></tr>
1726 1726 <tr><td>
1727 1727 <a href="/help/hgignore">
1728 1728 hgignore
1729 1729 </a>
1730 1730 </td><td>
1731 1731 Syntax for Mercurial Ignore Files
1732 1732 </td></tr>
1733 1733 <tr><td>
1734 1734 <a href="/help/hgweb">
1735 1735 hgweb
1736 1736 </a>
1737 1737 </td><td>
1738 1738 Configuring hgweb
1739 1739 </td></tr>
1740 1740 <tr><td>
1741 1741 <a href="/help/internals">
1742 1742 internals
1743 1743 </a>
1744 1744 </td><td>
1745 1745 Technical implementation topics
1746 1746 </td></tr>
1747 1747 <tr><td>
1748 1748 <a href="/help/merge-tools">
1749 1749 merge-tools
1750 1750 </a>
1751 1751 </td><td>
1752 1752 Merge Tools
1753 1753 </td></tr>
1754 1754 <tr><td>
1755 1755 <a href="/help/multirevs">
1756 1756 multirevs
1757 1757 </a>
1758 1758 </td><td>
1759 1759 Specifying Multiple Revisions
1760 1760 </td></tr>
1761 1761 <tr><td>
1762 1762 <a href="/help/patterns">
1763 1763 patterns
1764 1764 </a>
1765 1765 </td><td>
1766 1766 File Name Patterns
1767 1767 </td></tr>
1768 1768 <tr><td>
1769 1769 <a href="/help/phases">
1770 1770 phases
1771 1771 </a>
1772 1772 </td><td>
1773 1773 Working with Phases
1774 1774 </td></tr>
1775 1775 <tr><td>
1776 1776 <a href="/help/revisions">
1777 1777 revisions
1778 1778 </a>
1779 1779 </td><td>
1780 1780 Specifying Single Revisions
1781 1781 </td></tr>
1782 1782 <tr><td>
1783 1783 <a href="/help/revsets">
1784 1784 revsets
1785 1785 </a>
1786 1786 </td><td>
1787 1787 Specifying Revision Sets
1788 1788 </td></tr>
1789 1789 <tr><td>
1790 1790 <a href="/help/scripting">
1791 1791 scripting
1792 1792 </a>
1793 1793 </td><td>
1794 1794 Using Mercurial from scripts and automation
1795 1795 </td></tr>
1796 1796 <tr><td>
1797 1797 <a href="/help/subrepos">
1798 1798 subrepos
1799 1799 </a>
1800 1800 </td><td>
1801 1801 Subrepositories
1802 1802 </td></tr>
1803 1803 <tr><td>
1804 1804 <a href="/help/templating">
1805 1805 templating
1806 1806 </a>
1807 1807 </td><td>
1808 1808 Template Usage
1809 1809 </td></tr>
1810 1810 <tr><td>
1811 1811 <a href="/help/urls">
1812 1812 urls
1813 1813 </a>
1814 1814 </td><td>
1815 1815 URL Paths
1816 1816 </td></tr>
1817 1817 <tr><td>
1818 1818 <a href="/help/topic-containing-verbose">
1819 1819 topic-containing-verbose
1820 1820 </a>
1821 1821 </td><td>
1822 1822 This is the topic to test omit indicating.
1823 1823 </td></tr>
1824 1824
1825 1825
1826 1826 <tr><td colspan="2"><h2><a name="main" href="#main">Main Commands</a></h2></td></tr>
1827 1827
1828 1828 <tr><td>
1829 1829 <a href="/help/add">
1830 1830 add
1831 1831 </a>
1832 1832 </td><td>
1833 1833 add the specified files on the next commit
1834 1834 </td></tr>
1835 1835 <tr><td>
1836 1836 <a href="/help/annotate">
1837 1837 annotate
1838 1838 </a>
1839 1839 </td><td>
1840 1840 show changeset information by line for each file
1841 1841 </td></tr>
1842 1842 <tr><td>
1843 1843 <a href="/help/clone">
1844 1844 clone
1845 1845 </a>
1846 1846 </td><td>
1847 1847 make a copy of an existing repository
1848 1848 </td></tr>
1849 1849 <tr><td>
1850 1850 <a href="/help/commit">
1851 1851 commit
1852 1852 </a>
1853 1853 </td><td>
1854 1854 commit the specified files or all outstanding changes
1855 1855 </td></tr>
1856 1856 <tr><td>
1857 1857 <a href="/help/diff">
1858 1858 diff
1859 1859 </a>
1860 1860 </td><td>
1861 1861 diff repository (or selected files)
1862 1862 </td></tr>
1863 1863 <tr><td>
1864 1864 <a href="/help/export">
1865 1865 export
1866 1866 </a>
1867 1867 </td><td>
1868 1868 dump the header and diffs for one or more changesets
1869 1869 </td></tr>
1870 1870 <tr><td>
1871 1871 <a href="/help/forget">
1872 1872 forget
1873 1873 </a>
1874 1874 </td><td>
1875 1875 forget the specified files on the next commit
1876 1876 </td></tr>
1877 1877 <tr><td>
1878 1878 <a href="/help/init">
1879 1879 init
1880 1880 </a>
1881 1881 </td><td>
1882 1882 create a new repository in the given directory
1883 1883 </td></tr>
1884 1884 <tr><td>
1885 1885 <a href="/help/log">
1886 1886 log
1887 1887 </a>
1888 1888 </td><td>
1889 1889 show revision history of entire repository or files
1890 1890 </td></tr>
1891 1891 <tr><td>
1892 1892 <a href="/help/merge">
1893 1893 merge
1894 1894 </a>
1895 1895 </td><td>
1896 1896 merge another revision into working directory
1897 1897 </td></tr>
1898 1898 <tr><td>
1899 1899 <a href="/help/pull">
1900 1900 pull
1901 1901 </a>
1902 1902 </td><td>
1903 1903 pull changes from the specified source
1904 1904 </td></tr>
1905 1905 <tr><td>
1906 1906 <a href="/help/push">
1907 1907 push
1908 1908 </a>
1909 1909 </td><td>
1910 1910 push changes to the specified destination
1911 1911 </td></tr>
1912 1912 <tr><td>
1913 1913 <a href="/help/remove">
1914 1914 remove
1915 1915 </a>
1916 1916 </td><td>
1917 1917 remove the specified files on the next commit
1918 1918 </td></tr>
1919 1919 <tr><td>
1920 1920 <a href="/help/serve">
1921 1921 serve
1922 1922 </a>
1923 1923 </td><td>
1924 1924 start stand-alone webserver
1925 1925 </td></tr>
1926 1926 <tr><td>
1927 1927 <a href="/help/status">
1928 1928 status
1929 1929 </a>
1930 1930 </td><td>
1931 1931 show changed files in the working directory
1932 1932 </td></tr>
1933 1933 <tr><td>
1934 1934 <a href="/help/summary">
1935 1935 summary
1936 1936 </a>
1937 1937 </td><td>
1938 1938 summarize working directory state
1939 1939 </td></tr>
1940 1940 <tr><td>
1941 1941 <a href="/help/update">
1942 1942 update
1943 1943 </a>
1944 1944 </td><td>
1945 1945 update working directory (or switch revisions)
1946 1946 </td></tr>
1947 1947
1948 1948
1949 1949
1950 1950 <tr><td colspan="2"><h2><a name="other" href="#other">Other Commands</a></h2></td></tr>
1951 1951
1952 1952 <tr><td>
1953 1953 <a href="/help/addremove">
1954 1954 addremove
1955 1955 </a>
1956 1956 </td><td>
1957 1957 add all new files, delete all missing files
1958 1958 </td></tr>
1959 1959 <tr><td>
1960 1960 <a href="/help/archive">
1961 1961 archive
1962 1962 </a>
1963 1963 </td><td>
1964 1964 create an unversioned archive of a repository revision
1965 1965 </td></tr>
1966 1966 <tr><td>
1967 1967 <a href="/help/backout">
1968 1968 backout
1969 1969 </a>
1970 1970 </td><td>
1971 1971 reverse effect of earlier changeset
1972 1972 </td></tr>
1973 1973 <tr><td>
1974 1974 <a href="/help/bisect">
1975 1975 bisect
1976 1976 </a>
1977 1977 </td><td>
1978 1978 subdivision search of changesets
1979 1979 </td></tr>
1980 1980 <tr><td>
1981 1981 <a href="/help/bookmarks">
1982 1982 bookmarks
1983 1983 </a>
1984 1984 </td><td>
1985 1985 create a new bookmark or list existing bookmarks
1986 1986 </td></tr>
1987 1987 <tr><td>
1988 1988 <a href="/help/branch">
1989 1989 branch
1990 1990 </a>
1991 1991 </td><td>
1992 1992 set or show the current branch name
1993 1993 </td></tr>
1994 1994 <tr><td>
1995 1995 <a href="/help/branches">
1996 1996 branches
1997 1997 </a>
1998 1998 </td><td>
1999 1999 list repository named branches
2000 2000 </td></tr>
2001 2001 <tr><td>
2002 2002 <a href="/help/bundle">
2003 2003 bundle
2004 2004 </a>
2005 2005 </td><td>
2006 2006 create a changegroup file
2007 2007 </td></tr>
2008 2008 <tr><td>
2009 2009 <a href="/help/cat">
2010 2010 cat
2011 2011 </a>
2012 2012 </td><td>
2013 2013 output the current or given revision of files
2014 2014 </td></tr>
2015 2015 <tr><td>
2016 2016 <a href="/help/config">
2017 2017 config
2018 2018 </a>
2019 2019 </td><td>
2020 2020 show combined config settings from all hgrc files
2021 2021 </td></tr>
2022 2022 <tr><td>
2023 2023 <a href="/help/copy">
2024 2024 copy
2025 2025 </a>
2026 2026 </td><td>
2027 2027 mark files as copied for the next commit
2028 2028 </td></tr>
2029 2029 <tr><td>
2030 2030 <a href="/help/files">
2031 2031 files
2032 2032 </a>
2033 2033 </td><td>
2034 2034 list tracked files
2035 2035 </td></tr>
2036 2036 <tr><td>
2037 2037 <a href="/help/graft">
2038 2038 graft
2039 2039 </a>
2040 2040 </td><td>
2041 2041 copy changes from other branches onto the current branch
2042 2042 </td></tr>
2043 2043 <tr><td>
2044 2044 <a href="/help/grep">
2045 2045 grep
2046 2046 </a>
2047 2047 </td><td>
2048 2048 search for a pattern in specified files and revisions
2049 2049 </td></tr>
2050 2050 <tr><td>
2051 2051 <a href="/help/heads">
2052 2052 heads
2053 2053 </a>
2054 2054 </td><td>
2055 2055 show branch heads
2056 2056 </td></tr>
2057 2057 <tr><td>
2058 2058 <a href="/help/help">
2059 2059 help
2060 2060 </a>
2061 2061 </td><td>
2062 2062 show help for a given topic or a help overview
2063 2063 </td></tr>
2064 2064 <tr><td>
2065 2065 <a href="/help/identify">
2066 2066 identify
2067 2067 </a>
2068 2068 </td><td>
2069 2069 identify the working directory or specified revision
2070 2070 </td></tr>
2071 2071 <tr><td>
2072 2072 <a href="/help/import">
2073 2073 import
2074 2074 </a>
2075 2075 </td><td>
2076 2076 import an ordered set of patches
2077 2077 </td></tr>
2078 2078 <tr><td>
2079 2079 <a href="/help/incoming">
2080 2080 incoming
2081 2081 </a>
2082 2082 </td><td>
2083 2083 show new changesets found in source
2084 2084 </td></tr>
2085 2085 <tr><td>
2086 2086 <a href="/help/manifest">
2087 2087 manifest
2088 2088 </a>
2089 2089 </td><td>
2090 2090 output the current or given revision of the project manifest
2091 2091 </td></tr>
2092 2092 <tr><td>
2093 2093 <a href="/help/nohelp">
2094 2094 nohelp
2095 2095 </a>
2096 2096 </td><td>
2097 2097 (no help text available)
2098 2098 </td></tr>
2099 2099 <tr><td>
2100 2100 <a href="/help/outgoing">
2101 2101 outgoing
2102 2102 </a>
2103 2103 </td><td>
2104 2104 show changesets not found in the destination
2105 2105 </td></tr>
2106 2106 <tr><td>
2107 2107 <a href="/help/paths">
2108 2108 paths
2109 2109 </a>
2110 2110 </td><td>
2111 2111 show aliases for remote repositories
2112 2112 </td></tr>
2113 2113 <tr><td>
2114 2114 <a href="/help/phase">
2115 2115 phase
2116 2116 </a>
2117 2117 </td><td>
2118 2118 set or show the current phase name
2119 2119 </td></tr>
2120 2120 <tr><td>
2121 2121 <a href="/help/recover">
2122 2122 recover
2123 2123 </a>
2124 2124 </td><td>
2125 2125 roll back an interrupted transaction
2126 2126 </td></tr>
2127 2127 <tr><td>
2128 2128 <a href="/help/rename">
2129 2129 rename
2130 2130 </a>
2131 2131 </td><td>
2132 2132 rename files; equivalent of copy + remove
2133 2133 </td></tr>
2134 2134 <tr><td>
2135 2135 <a href="/help/resolve">
2136 2136 resolve
2137 2137 </a>
2138 2138 </td><td>
2139 2139 redo merges or set/view the merge status of files
2140 2140 </td></tr>
2141 2141 <tr><td>
2142 2142 <a href="/help/revert">
2143 2143 revert
2144 2144 </a>
2145 2145 </td><td>
2146 2146 restore files to their checkout state
2147 2147 </td></tr>
2148 2148 <tr><td>
2149 2149 <a href="/help/root">
2150 2150 root
2151 2151 </a>
2152 2152 </td><td>
2153 2153 print the root (top) of the current working directory
2154 2154 </td></tr>
2155 2155 <tr><td>
2156 2156 <a href="/help/tag">
2157 2157 tag
2158 2158 </a>
2159 2159 </td><td>
2160 2160 add one or more tags for the current or given revision
2161 2161 </td></tr>
2162 2162 <tr><td>
2163 2163 <a href="/help/tags">
2164 2164 tags
2165 2165 </a>
2166 2166 </td><td>
2167 2167 list repository tags
2168 2168 </td></tr>
2169 2169 <tr><td>
2170 2170 <a href="/help/unbundle">
2171 2171 unbundle
2172 2172 </a>
2173 2173 </td><td>
2174 2174 apply one or more changegroup files
2175 2175 </td></tr>
2176 2176 <tr><td>
2177 2177 <a href="/help/verify">
2178 2178 verify
2179 2179 </a>
2180 2180 </td><td>
2181 2181 verify the integrity of the repository
2182 2182 </td></tr>
2183 2183 <tr><td>
2184 2184 <a href="/help/version">
2185 2185 version
2186 2186 </a>
2187 2187 </td><td>
2188 2188 output version and copyright information
2189 2189 </td></tr>
2190 2190
2191 2191
2192 2192 </table>
2193 2193 </div>
2194 2194 </div>
2195 2195
2196 2196 <script type="text/javascript">process_dates()</script>
2197 2197
2198 2198
2199 2199 </body>
2200 2200 </html>
2201 2201
2202 2202
2203 2203 $ get-with-headers.py 127.0.0.1:$HGPORT "help/add"
2204 2204 200 Script output follows
2205 2205
2206 2206 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2207 2207 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2208 2208 <head>
2209 2209 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2210 2210 <meta name="robots" content="index, nofollow" />
2211 2211 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2212 2212 <script type="text/javascript" src="/static/mercurial.js"></script>
2213 2213
2214 2214 <title>Help: add</title>
2215 2215 </head>
2216 2216 <body>
2217 2217
2218 2218 <div class="container">
2219 2219 <div class="menu">
2220 2220 <div class="logo">
2221 2221 <a href="https://mercurial-scm.org/">
2222 2222 <img src="/static/hglogo.png" alt="mercurial" /></a>
2223 2223 </div>
2224 2224 <ul>
2225 2225 <li><a href="/shortlog">log</a></li>
2226 2226 <li><a href="/graph">graph</a></li>
2227 2227 <li><a href="/tags">tags</a></li>
2228 2228 <li><a href="/bookmarks">bookmarks</a></li>
2229 2229 <li><a href="/branches">branches</a></li>
2230 2230 </ul>
2231 2231 <ul>
2232 2232 <li class="active"><a href="/help">help</a></li>
2233 2233 </ul>
2234 2234 </div>
2235 2235
2236 2236 <div class="main">
2237 2237 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2238 2238 <h3>Help: add</h3>
2239 2239
2240 2240 <form class="search" action="/log">
2241 2241
2242 2242 <p><input name="rev" id="search1" type="text" size="30" /></p>
2243 2243 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2244 2244 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2245 2245 </form>
2246 2246 <div id="doc">
2247 2247 <p>
2248 2248 hg add [OPTION]... [FILE]...
2249 2249 </p>
2250 2250 <p>
2251 2251 add the specified files on the next commit
2252 2252 </p>
2253 2253 <p>
2254 2254 Schedule files to be version controlled and added to the
2255 2255 repository.
2256 2256 </p>
2257 2257 <p>
2258 2258 The files will be added to the repository at the next commit. To
2259 2259 undo an add before that, see 'hg forget'.
2260 2260 </p>
2261 2261 <p>
2262 2262 If no names are given, add all files to the repository (except
2263 2263 files matching &quot;.hgignore&quot;).
2264 2264 </p>
2265 2265 <p>
2266 2266 Examples:
2267 2267 </p>
2268 2268 <ul>
2269 2269 <li> New (unknown) files are added automatically by 'hg add':
2270 2270 <pre>
2271 2271 \$ ls (re)
2272 2272 foo.c
2273 2273 \$ hg status (re)
2274 2274 ? foo.c
2275 2275 \$ hg add (re)
2276 2276 adding foo.c
2277 2277 \$ hg status (re)
2278 2278 A foo.c
2279 2279 </pre>
2280 2280 <li> Specific files to be added can be specified:
2281 2281 <pre>
2282 2282 \$ ls (re)
2283 2283 bar.c foo.c
2284 2284 \$ hg status (re)
2285 2285 ? bar.c
2286 2286 ? foo.c
2287 2287 \$ hg add bar.c (re)
2288 2288 \$ hg status (re)
2289 2289 A bar.c
2290 2290 ? foo.c
2291 2291 </pre>
2292 2292 </ul>
2293 2293 <p>
2294 2294 Returns 0 if all files are successfully added.
2295 2295 </p>
2296 2296 <p>
2297 2297 options ([+] can be repeated):
2298 2298 </p>
2299 2299 <table>
2300 2300 <tr><td>-I</td>
2301 2301 <td>--include PATTERN [+]</td>
2302 2302 <td>include names matching the given patterns</td></tr>
2303 2303 <tr><td>-X</td>
2304 2304 <td>--exclude PATTERN [+]</td>
2305 2305 <td>exclude names matching the given patterns</td></tr>
2306 2306 <tr><td>-S</td>
2307 2307 <td>--subrepos</td>
2308 2308 <td>recurse into subrepositories</td></tr>
2309 2309 <tr><td>-n</td>
2310 2310 <td>--dry-run</td>
2311 2311 <td>do not perform actions, just print output</td></tr>
2312 2312 </table>
2313 2313 <p>
2314 2314 global options ([+] can be repeated):
2315 2315 </p>
2316 2316 <table>
2317 2317 <tr><td>-R</td>
2318 2318 <td>--repository REPO</td>
2319 2319 <td>repository root directory or name of overlay bundle file</td></tr>
2320 2320 <tr><td></td>
2321 2321 <td>--cwd DIR</td>
2322 2322 <td>change working directory</td></tr>
2323 2323 <tr><td>-y</td>
2324 2324 <td>--noninteractive</td>
2325 2325 <td>do not prompt, automatically pick the first choice for all prompts</td></tr>
2326 2326 <tr><td>-q</td>
2327 2327 <td>--quiet</td>
2328 2328 <td>suppress output</td></tr>
2329 2329 <tr><td>-v</td>
2330 2330 <td>--verbose</td>
2331 2331 <td>enable additional output</td></tr>
2332 2332 <tr><td></td>
2333 2333 <td>--config CONFIG [+]</td>
2334 2334 <td>set/override config option (use 'section.name=value')</td></tr>
2335 2335 <tr><td></td>
2336 2336 <td>--debug</td>
2337 2337 <td>enable debugging output</td></tr>
2338 2338 <tr><td></td>
2339 2339 <td>--debugger</td>
2340 2340 <td>start debugger</td></tr>
2341 2341 <tr><td></td>
2342 2342 <td>--encoding ENCODE</td>
2343 2343 <td>set the charset encoding (default: ascii)</td></tr>
2344 2344 <tr><td></td>
2345 2345 <td>--encodingmode MODE</td>
2346 2346 <td>set the charset encoding mode (default: strict)</td></tr>
2347 2347 <tr><td></td>
2348 2348 <td>--traceback</td>
2349 2349 <td>always print a traceback on exception</td></tr>
2350 2350 <tr><td></td>
2351 2351 <td>--time</td>
2352 2352 <td>time how long the command takes</td></tr>
2353 2353 <tr><td></td>
2354 2354 <td>--profile</td>
2355 2355 <td>print command execution profile</td></tr>
2356 2356 <tr><td></td>
2357 2357 <td>--version</td>
2358 2358 <td>output version information and exit</td></tr>
2359 2359 <tr><td>-h</td>
2360 2360 <td>--help</td>
2361 2361 <td>display help and exit</td></tr>
2362 2362 <tr><td></td>
2363 2363 <td>--hidden</td>
2364 2364 <td>consider hidden changesets</td></tr>
2365 2365 </table>
2366 2366
2367 2367 </div>
2368 2368 </div>
2369 2369 </div>
2370 2370
2371 2371 <script type="text/javascript">process_dates()</script>
2372 2372
2373 2373
2374 2374 </body>
2375 2375 </html>
2376 2376
2377 2377
2378 2378 $ get-with-headers.py 127.0.0.1:$HGPORT "help/remove"
2379 2379 200 Script output follows
2380 2380
2381 2381 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2382 2382 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2383 2383 <head>
2384 2384 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2385 2385 <meta name="robots" content="index, nofollow" />
2386 2386 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2387 2387 <script type="text/javascript" src="/static/mercurial.js"></script>
2388 2388
2389 2389 <title>Help: remove</title>
2390 2390 </head>
2391 2391 <body>
2392 2392
2393 2393 <div class="container">
2394 2394 <div class="menu">
2395 2395 <div class="logo">
2396 2396 <a href="https://mercurial-scm.org/">
2397 2397 <img src="/static/hglogo.png" alt="mercurial" /></a>
2398 2398 </div>
2399 2399 <ul>
2400 2400 <li><a href="/shortlog">log</a></li>
2401 2401 <li><a href="/graph">graph</a></li>
2402 2402 <li><a href="/tags">tags</a></li>
2403 2403 <li><a href="/bookmarks">bookmarks</a></li>
2404 2404 <li><a href="/branches">branches</a></li>
2405 2405 </ul>
2406 2406 <ul>
2407 2407 <li class="active"><a href="/help">help</a></li>
2408 2408 </ul>
2409 2409 </div>
2410 2410
2411 2411 <div class="main">
2412 2412 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2413 2413 <h3>Help: remove</h3>
2414 2414
2415 2415 <form class="search" action="/log">
2416 2416
2417 2417 <p><input name="rev" id="search1" type="text" size="30" /></p>
2418 2418 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2419 2419 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2420 2420 </form>
2421 2421 <div id="doc">
2422 2422 <p>
2423 2423 hg remove [OPTION]... FILE...
2424 2424 </p>
2425 2425 <p>
2426 2426 aliases: rm
2427 2427 </p>
2428 2428 <p>
2429 2429 remove the specified files on the next commit
2430 2430 </p>
2431 2431 <p>
2432 2432 Schedule the indicated files for removal from the current branch.
2433 2433 </p>
2434 2434 <p>
2435 2435 This command schedules the files to be removed at the next commit.
2436 2436 To undo a remove before that, see 'hg revert'. To undo added
2437 2437 files, see 'hg forget'.
2438 2438 </p>
2439 2439 <p>
2440 2440 -A/--after can be used to remove only files that have already
2441 2441 been deleted, -f/--force can be used to force deletion, and -Af
2442 2442 can be used to remove files from the next revision without
2443 2443 deleting them from the working directory.
2444 2444 </p>
2445 2445 <p>
2446 2446 The following table details the behavior of remove for different
2447 2447 file states (columns) and option combinations (rows). The file
2448 2448 states are Added [A], Clean [C], Modified [M] and Missing [!]
2449 2449 (as reported by 'hg status'). The actions are Warn, Remove
2450 2450 (from branch) and Delete (from disk):
2451 2451 </p>
2452 2452 <table>
2453 2453 <tr><td>opt/state</td>
2454 2454 <td>A</td>
2455 2455 <td>C</td>
2456 2456 <td>M</td>
2457 2457 <td>!</td></tr>
2458 2458 <tr><td>none</td>
2459 2459 <td>W</td>
2460 2460 <td>RD</td>
2461 2461 <td>W</td>
2462 2462 <td>R</td></tr>
2463 2463 <tr><td>-f</td>
2464 2464 <td>R</td>
2465 2465 <td>RD</td>
2466 2466 <td>RD</td>
2467 2467 <td>R</td></tr>
2468 2468 <tr><td>-A</td>
2469 2469 <td>W</td>
2470 2470 <td>W</td>
2471 2471 <td>W</td>
2472 2472 <td>R</td></tr>
2473 2473 <tr><td>-Af</td>
2474 2474 <td>R</td>
2475 2475 <td>R</td>
2476 2476 <td>R</td>
2477 2477 <td>R</td></tr>
2478 2478 </table>
2479 2479 <p>
2480 2480 <b>Note:</b>
2481 2481 </p>
2482 2482 <p>
2483 2483 'hg remove' never deletes files in Added [A] state from the
2484 2484 working directory, not even if &quot;--force&quot; is specified.
2485 2485 </p>
2486 2486 <p>
2487 2487 Returns 0 on success, 1 if any warnings encountered.
2488 2488 </p>
2489 2489 <p>
2490 2490 options ([+] can be repeated):
2491 2491 </p>
2492 2492 <table>
2493 2493 <tr><td>-A</td>
2494 2494 <td>--after</td>
2495 2495 <td>record delete for missing files</td></tr>
2496 2496 <tr><td>-f</td>
2497 2497 <td>--force</td>
2498 2498 <td>remove (and delete) file even if added or modified</td></tr>
2499 2499 <tr><td>-S</td>
2500 2500 <td>--subrepos</td>
2501 2501 <td>recurse into subrepositories</td></tr>
2502 2502 <tr><td>-I</td>
2503 2503 <td>--include PATTERN [+]</td>
2504 2504 <td>include names matching the given patterns</td></tr>
2505 2505 <tr><td>-X</td>
2506 2506 <td>--exclude PATTERN [+]</td>
2507 2507 <td>exclude names matching the given patterns</td></tr>
2508 2508 </table>
2509 2509 <p>
2510 2510 global options ([+] can be repeated):
2511 2511 </p>
2512 2512 <table>
2513 2513 <tr><td>-R</td>
2514 2514 <td>--repository REPO</td>
2515 2515 <td>repository root directory or name of overlay bundle file</td></tr>
2516 2516 <tr><td></td>
2517 2517 <td>--cwd DIR</td>
2518 2518 <td>change working directory</td></tr>
2519 2519 <tr><td>-y</td>
2520 2520 <td>--noninteractive</td>
2521 2521 <td>do not prompt, automatically pick the first choice for all prompts</td></tr>
2522 2522 <tr><td>-q</td>
2523 2523 <td>--quiet</td>
2524 2524 <td>suppress output</td></tr>
2525 2525 <tr><td>-v</td>
2526 2526 <td>--verbose</td>
2527 2527 <td>enable additional output</td></tr>
2528 2528 <tr><td></td>
2529 2529 <td>--config CONFIG [+]</td>
2530 2530 <td>set/override config option (use 'section.name=value')</td></tr>
2531 2531 <tr><td></td>
2532 2532 <td>--debug</td>
2533 2533 <td>enable debugging output</td></tr>
2534 2534 <tr><td></td>
2535 2535 <td>--debugger</td>
2536 2536 <td>start debugger</td></tr>
2537 2537 <tr><td></td>
2538 2538 <td>--encoding ENCODE</td>
2539 2539 <td>set the charset encoding (default: ascii)</td></tr>
2540 2540 <tr><td></td>
2541 2541 <td>--encodingmode MODE</td>
2542 2542 <td>set the charset encoding mode (default: strict)</td></tr>
2543 2543 <tr><td></td>
2544 2544 <td>--traceback</td>
2545 2545 <td>always print a traceback on exception</td></tr>
2546 2546 <tr><td></td>
2547 2547 <td>--time</td>
2548 2548 <td>time how long the command takes</td></tr>
2549 2549 <tr><td></td>
2550 2550 <td>--profile</td>
2551 2551 <td>print command execution profile</td></tr>
2552 2552 <tr><td></td>
2553 2553 <td>--version</td>
2554 2554 <td>output version information and exit</td></tr>
2555 2555 <tr><td>-h</td>
2556 2556 <td>--help</td>
2557 2557 <td>display help and exit</td></tr>
2558 2558 <tr><td></td>
2559 2559 <td>--hidden</td>
2560 2560 <td>consider hidden changesets</td></tr>
2561 2561 </table>
2562 2562
2563 2563 </div>
2564 2564 </div>
2565 2565 </div>
2566 2566
2567 2567 <script type="text/javascript">process_dates()</script>
2568 2568
2569 2569
2570 2570 </body>
2571 2571 </html>
2572 2572
2573 2573
2574 2574 $ get-with-headers.py 127.0.0.1:$HGPORT "help/revisions"
2575 2575 200 Script output follows
2576 2576
2577 2577 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2578 2578 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2579 2579 <head>
2580 2580 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2581 2581 <meta name="robots" content="index, nofollow" />
2582 2582 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2583 2583 <script type="text/javascript" src="/static/mercurial.js"></script>
2584 2584
2585 2585 <title>Help: revisions</title>
2586 2586 </head>
2587 2587 <body>
2588 2588
2589 2589 <div class="container">
2590 2590 <div class="menu">
2591 2591 <div class="logo">
2592 2592 <a href="https://mercurial-scm.org/">
2593 2593 <img src="/static/hglogo.png" alt="mercurial" /></a>
2594 2594 </div>
2595 2595 <ul>
2596 2596 <li><a href="/shortlog">log</a></li>
2597 2597 <li><a href="/graph">graph</a></li>
2598 2598 <li><a href="/tags">tags</a></li>
2599 2599 <li><a href="/bookmarks">bookmarks</a></li>
2600 2600 <li><a href="/branches">branches</a></li>
2601 2601 </ul>
2602 2602 <ul>
2603 2603 <li class="active"><a href="/help">help</a></li>
2604 2604 </ul>
2605 2605 </div>
2606 2606
2607 2607 <div class="main">
2608 2608 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2609 2609 <h3>Help: revisions</h3>
2610 2610
2611 2611 <form class="search" action="/log">
2612 2612
2613 2613 <p><input name="rev" id="search1" type="text" size="30" /></p>
2614 2614 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2615 2615 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2616 2616 </form>
2617 2617 <div id="doc">
2618 2618 <h1>Specifying Single Revisions</h1>
2619 2619 <p>
2620 2620 Mercurial supports several ways to specify individual revisions.
2621 2621 </p>
2622 2622 <p>
2623 2623 A plain integer is treated as a revision number. Negative integers are
2624 2624 treated as sequential offsets from the tip, with -1 denoting the tip,
2625 2625 -2 denoting the revision prior to the tip, and so forth.
2626 2626 </p>
2627 2627 <p>
2628 2628 A 40-digit hexadecimal string is treated as a unique revision
2629 2629 identifier.
2630 2630 </p>
2631 2631 <p>
2632 2632 A hexadecimal string less than 40 characters long is treated as a
2633 2633 unique revision identifier and is referred to as a short-form
2634 2634 identifier. A short-form identifier is only valid if it is the prefix
2635 2635 of exactly one full-length identifier.
2636 2636 </p>
2637 2637 <p>
2638 2638 Any other string is treated as a bookmark, tag, or branch name. A
2639 2639 bookmark is a movable pointer to a revision. A tag is a permanent name
2640 2640 associated with a revision. A branch name denotes the tipmost open branch head
2641 2641 of that branch - or if they are all closed, the tipmost closed head of the
2642 2642 branch. Bookmark, tag, and branch names must not contain the &quot;:&quot; character.
2643 2643 </p>
2644 2644 <p>
2645 2645 The reserved name &quot;tip&quot; always identifies the most recent revision.
2646 2646 </p>
2647 2647 <p>
2648 2648 The reserved name &quot;null&quot; indicates the null revision. This is the
2649 2649 revision of an empty repository, and the parent of revision 0.
2650 2650 </p>
2651 2651 <p>
2652 2652 The reserved name &quot;.&quot; indicates the working directory parent. If no
2653 2653 working directory is checked out, it is equivalent to null. If an
2654 2654 uncommitted merge is in progress, &quot;.&quot; is the revision of the first
2655 2655 parent.
2656 2656 </p>
2657 2657
2658 2658 </div>
2659 2659 </div>
2660 2660 </div>
2661 2661
2662 2662 <script type="text/javascript">process_dates()</script>
2663 2663
2664 2664
2665 2665 </body>
2666 2666 </html>
2667 2667
2668 2668
2669 2669 Sub-topic indexes rendered properly
2670 2670
2671 2671 $ get-with-headers.py 127.0.0.1:$HGPORT "help/internals"
2672 2672 200 Script output follows
2673 2673
2674 2674 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2675 2675 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2676 2676 <head>
2677 2677 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2678 2678 <meta name="robots" content="index, nofollow" />
2679 2679 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2680 2680 <script type="text/javascript" src="/static/mercurial.js"></script>
2681 2681
2682 2682 <title>Help: internals</title>
2683 2683 </head>
2684 2684 <body>
2685 2685
2686 2686 <div class="container">
2687 2687 <div class="menu">
2688 2688 <div class="logo">
2689 2689 <a href="https://mercurial-scm.org/">
2690 2690 <img src="/static/hglogo.png" alt="mercurial" /></a>
2691 2691 </div>
2692 2692 <ul>
2693 2693 <li><a href="/shortlog">log</a></li>
2694 2694 <li><a href="/graph">graph</a></li>
2695 2695 <li><a href="/tags">tags</a></li>
2696 2696 <li><a href="/bookmarks">bookmarks</a></li>
2697 2697 <li><a href="/branches">branches</a></li>
2698 2698 </ul>
2699 2699 <ul>
2700 2700 <li><a href="/help">help</a></li>
2701 2701 </ul>
2702 2702 </div>
2703 2703
2704 2704 <div class="main">
2705 2705 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2706 2706 <form class="search" action="/log">
2707 2707
2708 2708 <p><input name="rev" id="search1" type="text" size="30" /></p>
2709 2709 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2710 2710 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2711 2711 </form>
2712 2712 <table class="bigtable">
2713 2713 <tr><td colspan="2"><h2><a name="main" href="#topics">Topics</a></h2></td></tr>
2714 2714
2715 2715 <tr><td>
2716 2716 <a href="/help/internals.bundles">
2717 2717 bundles
2718 2718 </a>
2719 2719 </td><td>
2720 2720 container for exchange of repository data
2721 2721 </td></tr>
2722 2722 <tr><td>
2723 2723 <a href="/help/internals.changegroups">
2724 2724 changegroups
2725 2725 </a>
2726 2726 </td><td>
2727 2727 representation of revlog data
2728 2728 </td></tr>
2729 2729 <tr><td>
2730 2730 <a href="/help/internals.revlogs">
2731 2731 revlogs
2732 2732 </a>
2733 2733 </td><td>
2734 2734 revision storage mechanism
2735 2735 </td></tr>
2736 2736
2737 2737
2738 2738
2739 2739
2740 2740
2741 2741 </table>
2742 2742 </div>
2743 2743 </div>
2744 2744
2745 2745 <script type="text/javascript">process_dates()</script>
2746 2746
2747 2747
2748 2748 </body>
2749 2749 </html>
2750 2750
2751 2751
2752 2752 Sub-topic topics rendered properly
2753 2753
2754 2754 $ get-with-headers.py 127.0.0.1:$HGPORT "help/internals.changegroups"
2755 2755 200 Script output follows
2756 2756
2757 2757 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2758 2758 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2759 2759 <head>
2760 2760 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2761 2761 <meta name="robots" content="index, nofollow" />
2762 2762 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2763 2763 <script type="text/javascript" src="/static/mercurial.js"></script>
2764 2764
2765 2765 <title>Help: internals.changegroups</title>
2766 2766 </head>
2767 2767 <body>
2768 2768
2769 2769 <div class="container">
2770 2770 <div class="menu">
2771 2771 <div class="logo">
2772 2772 <a href="https://mercurial-scm.org/">
2773 2773 <img src="/static/hglogo.png" alt="mercurial" /></a>
2774 2774 </div>
2775 2775 <ul>
2776 2776 <li><a href="/shortlog">log</a></li>
2777 2777 <li><a href="/graph">graph</a></li>
2778 2778 <li><a href="/tags">tags</a></li>
2779 2779 <li><a href="/bookmarks">bookmarks</a></li>
2780 2780 <li><a href="/branches">branches</a></li>
2781 2781 </ul>
2782 2782 <ul>
2783 2783 <li class="active"><a href="/help">help</a></li>
2784 2784 </ul>
2785 2785 </div>
2786 2786
2787 2787 <div class="main">
2788 2788 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2789 2789 <h3>Help: internals.changegroups</h3>
2790 2790
2791 2791 <form class="search" action="/log">
2792 2792
2793 2793 <p><input name="rev" id="search1" type="text" size="30" /></p>
2794 2794 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2795 2795 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2796 2796 </form>
2797 2797 <div id="doc">
2798 2798 <h1>representation of revlog data</h1>
2799 2799 <h2>Changegroups</h2>
2800 2800 <p>
2801 2801 Changegroups are representations of repository revlog data, specifically
2802 2802 the changelog, manifest, and filelogs.
2803 2803 </p>
2804 2804 <p>
2805 2805 There are 3 versions of changegroups: &quot;1&quot;, &quot;2&quot;, and &quot;3&quot;. From a
2806 2806 high-level, versions &quot;1&quot; and &quot;2&quot; are almost exactly the same, with
2807 2807 the only difference being a header on entries in the changeset
2808 2808 segment. Version &quot;3&quot; adds support for exchanging treemanifests and
2809 2809 includes revlog flags in the delta header.
2810 2810 </p>
2811 2811 <p>
2812 2812 Changegroups consists of 3 logical segments:
2813 2813 </p>
2814 2814 <pre>
2815 2815 +---------------------------------+
2816 2816 | | | |
2817 2817 | changeset | manifest | filelogs |
2818 2818 | | | |
2819 2819 +---------------------------------+
2820 2820 </pre>
2821 2821 <p>
2822 2822 The principle building block of each segment is a *chunk*. A *chunk*
2823 2823 is a framed piece of data:
2824 2824 </p>
2825 2825 <pre>
2826 2826 +---------------------------------------+
2827 2827 | | |
2828 2828 | length | data |
2829 2829 | (32 bits) | &lt;length&gt; bytes |
2830 2830 | | |
2831 2831 +---------------------------------------+
2832 2832 </pre>
2833 2833 <p>
2834 2834 Each chunk starts with a 32-bit big-endian signed integer indicating
2835 2835 the length of the raw data that follows.
2836 2836 </p>
2837 2837 <p>
2838 2838 There is a special case chunk that has 0 length (&quot;0x00000000&quot;). We
2839 2839 call this an *empty chunk*.
2840 2840 </p>
2841 2841 <h3>Delta Groups</h3>
2842 2842 <p>
2843 2843 A *delta group* expresses the content of a revlog as a series of deltas,
2844 2844 or patches against previous revisions.
2845 2845 </p>
2846 2846 <p>
2847 2847 Delta groups consist of 0 or more *chunks* followed by the *empty chunk*
2848 2848 to signal the end of the delta group:
2849 2849 </p>
2850 2850 <pre>
2851 2851 +------------------------------------------------------------------------+
2852 2852 | | | | | |
2853 2853 | chunk0 length | chunk0 data | chunk1 length | chunk1 data | 0x0 |
2854 2854 | (32 bits) | (various) | (32 bits) | (various) | (32 bits) |
2855 2855 | | | | | |
2856 2856 +------------------------------------------------------------+-----------+
2857 2857 </pre>
2858 2858 <p>
2859 2859 Each *chunk*'s data consists of the following:
2860 2860 </p>
2861 2861 <pre>
2862 2862 +-----------------------------------------+
2863 2863 | | | |
2864 2864 | delta header | mdiff header | delta |
2865 2865 | (various) | (12 bytes) | (various) |
2866 2866 | | | |
2867 2867 +-----------------------------------------+
2868 2868 </pre>
2869 2869 <p>
2870 2870 The *length* field is the byte length of the remaining 3 logical pieces
2871 2871 of data. The *delta* is a diff from an existing entry in the changelog.
2872 2872 </p>
2873 2873 <p>
2874 2874 The *delta header* is different between versions &quot;1&quot;, &quot;2&quot;, and
2875 2875 &quot;3&quot; of the changegroup format.
2876 2876 </p>
2877 2877 <p>
2878 2878 Version 1:
2879 2879 </p>
2880 2880 <pre>
2881 2881 +------------------------------------------------------+
2882 2882 | | | | |
2883 2883 | node | p1 node | p2 node | link node |
2884 2884 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
2885 2885 | | | | |
2886 2886 +------------------------------------------------------+
2887 2887 </pre>
2888 2888 <p>
2889 2889 Version 2:
2890 2890 </p>
2891 2891 <pre>
2892 2892 +------------------------------------------------------------------+
2893 2893 | | | | | |
2894 2894 | node | p1 node | p2 node | base node | link node |
2895 2895 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) |
2896 2896 | | | | | |
2897 2897 +------------------------------------------------------------------+
2898 2898 </pre>
2899 2899 <p>
2900 2900 Version 3:
2901 2901 </p>
2902 2902 <pre>
2903 2903 +------------------------------------------------------------------------------+
2904 2904 | | | | | | |
2905 2905 | node | p1 node | p2 node | base node | link node | flags |
2906 2906 | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (20 bytes) | (2 bytes) |
2907 2907 | | | | | | |
2908 2908 +------------------------------------------------------------------------------+
2909 2909 </pre>
2910 2910 <p>
2911 2911 The *mdiff header* consists of 3 32-bit big-endian signed integers
2912 2912 describing offsets at which to apply the following delta content:
2913 2913 </p>
2914 2914 <pre>
2915 2915 +-------------------------------------+
2916 2916 | | | |
2917 2917 | offset | old length | new length |
2918 2918 | (32 bits) | (32 bits) | (32 bits) |
2919 2919 | | | |
2920 2920 +-------------------------------------+
2921 2921 </pre>
2922 2922 <p>
2923 2923 In version 1, the delta is always applied against the previous node from
2924 2924 the changegroup or the first parent if this is the first entry in the
2925 2925 changegroup.
2926 2926 </p>
2927 2927 <p>
2928 2928 In version 2, the delta base node is encoded in the entry in the
2929 2929 changegroup. This allows the delta to be expressed against any parent,
2930 2930 which can result in smaller deltas and more efficient encoding of data.
2931 2931 </p>
2932 2932 <h3>Changeset Segment</h3>
2933 2933 <p>
2934 2934 The *changeset segment* consists of a single *delta group* holding
2935 2935 changelog data. It is followed by an *empty chunk* to denote the
2936 2936 boundary to the *manifests segment*.
2937 2937 </p>
2938 2938 <h3>Manifest Segment</h3>
2939 2939 <p>
2940 2940 The *manifest segment* consists of a single *delta group* holding
2941 2941 manifest data. It is followed by an *empty chunk* to denote the boundary
2942 2942 to the *filelogs segment*.
2943 2943 </p>
2944 2944 <h3>Filelogs Segment</h3>
2945 2945 <p>
2946 2946 The *filelogs* segment consists of multiple sub-segments, each
2947 2947 corresponding to an individual file whose data is being described:
2948 2948 </p>
2949 2949 <pre>
2950 2950 +--------------------------------------+
2951 2951 | | | | |
2952 2952 | filelog0 | filelog1 | filelog2 | ... |
2953 2953 | | | | |
2954 2954 +--------------------------------------+
2955 2955 </pre>
2956 2956 <p>
2957 2957 In version &quot;3&quot; of the changegroup format, filelogs may include
2958 2958 directory logs when treemanifests are in use. directory logs are
2959 2959 identified by having a trailing '/' on their filename (see below).
2960 2960 </p>
2961 2961 <p>
2962 2962 The final filelog sub-segment is followed by an *empty chunk* to denote
2963 2963 the end of the segment and the overall changegroup.
2964 2964 </p>
2965 2965 <p>
2966 2966 Each filelog sub-segment consists of the following:
2967 2967 </p>
2968 2968 <pre>
2969 2969 +------------------------------------------+
2970 2970 | | | |
2971 2971 | filename size | filename | delta group |
2972 2972 | (32 bits) | (various) | (various) |
2973 2973 | | | |
2974 2974 +------------------------------------------+
2975 2975 </pre>
2976 2976 <p>
2977 2977 That is, a *chunk* consisting of the filename (not terminated or padded)
2978 2978 followed by N chunks constituting the *delta group* for this file.
2979 2979 </p>
2980 2980
2981 2981 </div>
2982 2982 </div>
2983 2983 </div>
2984 2984
2985 2985 <script type="text/javascript">process_dates()</script>
2986 2986
2987 2987
2988 2988 </body>
2989 2989 </html>
2990 2990
2991 2991
2992 2992 $ killdaemons.py
2993 2993
2994 2994 #endif
Show file before | Show file after | Hide comments
@@ -1,227 +1,227 b''
1 1 hide outer repo
2 2 $ hg init
3 3
4 4 Use hgrc within $TESTTMP
5 5
6 6 $ HGRCPATH=`pwd`/hgrc
7 7 $ export HGRCPATH
8 8
9 9 Use an alternate var for scribbling on hgrc to keep check-code from
10 10 complaining about the important settings we may be overwriting:
11 11
12 12 $ HGRC=`pwd`/hgrc
13 13 $ export HGRC
14 14
15 15 Basic syntax error
16 16
17 17 $ echo "invalid" > $HGRC
18 18 $ hg version
19 19 hg: parse error at $TESTTMP/hgrc:1: invalid
20 20 [255]
21 21 $ echo "" > $HGRC
22 22
23 23 Issue1199: Can't use '%' in hgrc (eg url encoded username)
24 24
25 25 $ hg init "foo%bar"
26 26 $ hg clone "foo%bar" foobar
27 27 updating to branch default
28 28 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
29 29 $ cd foobar
30 30 $ cat .hg/hgrc
31 31 # example repository config (see "hg help config" for more info)
32 32 [paths]
33 33 default = $TESTTMP/foo%bar (glob)
34 34
35 35 # path aliases to other clones of this repo in URLs or filesystem paths
36 36 # (see "hg help config.paths" for more info)
37 37 #
38 38 # default-push = ssh://jdoe@example.net/hg/jdoes-fork
39 39 # my-fork = ssh://jdoe@example.net/hg/jdoes-fork
40 40 # my-clone = /home/jdoe/jdoes-clone
41 41
42 42 [ui]
43 43 # name and email (local to this repository, optional), e.g.
44 44 # username = Jane Doe <jdoe@example.com>
45 45 $ hg paths
46 46 default = $TESTTMP/foo%bar (glob)
47 47 $ hg showconfig
48 48 bundle.mainreporoot=$TESTTMP/foobar (glob)
49 49 paths.default=$TESTTMP/foo%bar (glob)
50 50 $ cd ..
51 51
52 52 issue1829: wrong indentation
53 53
54 54 $ echo '[foo]' > $HGRC
55 55 $ echo ' x = y' >> $HGRC
56 56 $ hg version
57 57 hg: parse error at $TESTTMP/hgrc:2: x = y
58 58 unexpected leading whitespace
59 59 [255]
60 60
61 61 $ $PYTHON -c "print '[foo]\nbar = a\n b\n c \n de\n fg \nbaz = bif cb \n'" \
62 62 > > $HGRC
63 63 $ hg showconfig foo
64 64 foo.bar=a\nb\nc\nde\nfg
65 65 foo.baz=bif cb
66 66
67 67 $ FAKEPATH=/path/to/nowhere
68 68 $ export FAKEPATH
69 69 $ echo '%include $FAKEPATH/no-such-file' > $HGRC
70 70 $ hg version
71 71 Mercurial Distributed SCM (version *) (glob)
72 72 (see https://mercurial-scm.org for more information)
73 73
74 Copyright (C) 2005-2015 Matt Mackall and others
74 Copyright (C) 2005-2016 Matt Mackall and others
75 75 This is free software; see the source for copying conditions. There is NO
76 76 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
77 77 $ unset FAKEPATH
78 78
79 79 make sure global options given on the cmdline take precedence
80 80
81 81 $ hg showconfig --config ui.verbose=True --quiet
82 82 bundle.mainreporoot=$TESTTMP
83 83 ui.verbose=False
84 84 ui.debug=False
85 85 ui.quiet=True
86 86
87 87 $ touch foobar/untracked
88 88 $ cat >> foobar/.hg/hgrc <<EOF
89 89 > [ui]
90 90 > verbose=True
91 91 > EOF
92 92 $ hg -R foobar st -q
93 93
94 94 username expansion
95 95
96 96 $ olduser=$HGUSER
97 97 $ unset HGUSER
98 98
99 99 $ FAKEUSER='John Doe'
100 100 $ export FAKEUSER
101 101 $ echo '[ui]' > $HGRC
102 102 $ echo 'username = $FAKEUSER' >> $HGRC
103 103
104 104 $ hg init usertest
105 105 $ cd usertest
106 106 $ touch bar
107 107 $ hg commit --addremove --quiet -m "added bar"
108 108 $ hg log --template "{author}\n"
109 109 John Doe
110 110 $ cd ..
111 111
112 112 $ hg showconfig
113 113 bundle.mainreporoot=$TESTTMP
114 114 ui.username=$FAKEUSER
115 115
116 116 $ unset FAKEUSER
117 117 $ HGUSER=$olduser
118 118 $ export HGUSER
119 119
120 120 showconfig with multiple arguments
121 121
122 122 $ echo "[alias]" > $HGRC
123 123 $ echo "log = log -g" >> $HGRC
124 124 $ echo "[defaults]" >> $HGRC
125 125 $ echo "identify = -n" >> $HGRC
126 126 $ hg showconfig alias defaults
127 127 alias.log=log -g
128 128 defaults.identify=-n
129 129 $ hg showconfig alias defaults.identify
130 130 abort: only one config item permitted
131 131 [255]
132 132 $ hg showconfig alias.log defaults.identify
133 133 abort: only one config item permitted
134 134 [255]
135 135
136 136 HGPLAIN
137 137
138 138 $ echo "[ui]" > $HGRC
139 139 $ echo "debug=true" >> $HGRC
140 140 $ echo "fallbackencoding=ASCII" >> $HGRC
141 141 $ echo "quiet=true" >> $HGRC
142 142 $ echo "slash=true" >> $HGRC
143 143 $ echo "traceback=true" >> $HGRC
144 144 $ echo "verbose=true" >> $HGRC
145 145 $ echo "style=~/.hgstyle" >> $HGRC
146 146 $ echo "logtemplate={node}" >> $HGRC
147 147 $ echo "[defaults]" >> $HGRC
148 148 $ echo "identify=-n" >> $HGRC
149 149 $ echo "[alias]" >> $HGRC
150 150 $ echo "log=log -g" >> $HGRC
151 151
152 152 customized hgrc
153 153
154 154 $ hg showconfig
155 155 read config from: $TESTTMP/hgrc
156 156 $TESTTMP/hgrc:13: alias.log=log -g
157 157 repo: bundle.mainreporoot=$TESTTMP
158 158 $TESTTMP/hgrc:11: defaults.identify=-n
159 159 $TESTTMP/hgrc:2: ui.debug=true
160 160 $TESTTMP/hgrc:3: ui.fallbackencoding=ASCII
161 161 $TESTTMP/hgrc:4: ui.quiet=true
162 162 $TESTTMP/hgrc:5: ui.slash=true
163 163 $TESTTMP/hgrc:6: ui.traceback=true
164 164 $TESTTMP/hgrc:7: ui.verbose=true
165 165 $TESTTMP/hgrc:8: ui.style=~/.hgstyle
166 166 $TESTTMP/hgrc:9: ui.logtemplate={node}
167 167
168 168 plain hgrc
169 169
170 170 $ HGPLAIN=; export HGPLAIN
171 171 $ hg showconfig --config ui.traceback=True --debug
172 172 read config from: $TESTTMP/hgrc
173 173 repo: bundle.mainreporoot=$TESTTMP
174 174 --config: ui.traceback=True
175 175 --verbose: ui.verbose=False
176 176 --debug: ui.debug=True
177 177 --quiet: ui.quiet=False
178 178
179 179 plain mode with exceptions
180 180
181 181 $ cat > plain.py <<EOF
182 182 > def uisetup(ui):
183 183 > ui.write('plain: %r\n' % ui.plain())
184 184 > EOF
185 185 $ echo "[extensions]" >> $HGRC
186 186 $ echo "plain=./plain.py" >> $HGRC
187 187 $ HGPLAINEXCEPT=; export HGPLAINEXCEPT
188 188 $ hg showconfig --config ui.traceback=True --debug
189 189 plain: True
190 190 read config from: $TESTTMP/hgrc
191 191 repo: bundle.mainreporoot=$TESTTMP
192 192 $TESTTMP/hgrc:15: extensions.plain=./plain.py
193 193 --config: ui.traceback=True
194 194 --verbose: ui.verbose=False
195 195 --debug: ui.debug=True
196 196 --quiet: ui.quiet=False
197 197 $ unset HGPLAIN
198 198 $ hg showconfig --config ui.traceback=True --debug
199 199 plain: True
200 200 read config from: $TESTTMP/hgrc
201 201 repo: bundle.mainreporoot=$TESTTMP
202 202 $TESTTMP/hgrc:15: extensions.plain=./plain.py
203 203 --config: ui.traceback=True
204 204 --verbose: ui.verbose=False
205 205 --debug: ui.debug=True
206 206 --quiet: ui.quiet=False
207 207 $ HGPLAINEXCEPT=i18n; export HGPLAINEXCEPT
208 208 $ hg showconfig --config ui.traceback=True --debug
209 209 plain: True
210 210 read config from: $TESTTMP/hgrc
211 211 repo: bundle.mainreporoot=$TESTTMP
212 212 $TESTTMP/hgrc:15: extensions.plain=./plain.py
213 213 --config: ui.traceback=True
214 214 --verbose: ui.verbose=False
215 215 --debug: ui.debug=True
216 216 --quiet: ui.quiet=False
217 217
218 218 source of paths is not mangled
219 219
220 220 $ cat >> $HGRCPATH <<EOF
221 221 > [paths]
222 222 > foo = bar
223 223 > EOF
224 224 $ hg showconfig --debug paths
225 225 plain: True
226 226 read config from: $TESTTMP/hgrc
227 227 $TESTTMP/hgrc:17: paths.foo=$TESTTMP/bar (glob)
General Comments 0
You need to be logged in to leave comments. Login now